Merge branch 'release-1.2.1'

Author: zchi88

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/openpearl/PearlEngine.git
-  revision: 162a546aae6d1f8e331f737ebe81279f05c14175
+  revision: 978fa99ebdc30e8379a961b31908f66e7fb73653
   branch: master
   specs:
     pearl_engine (1.2.0)

app/controllers/api/v1/conversations_controller.rb

@@ -4,6 +4,11 @@ class Api::V1::ConversationsController < ApplicationController
   before_action :authenticate_user!
 
 
+  # For testing/debugging
+  def test
+
+  end
+
   # Returns a storyboard card at the cardID given if a plugin is loaded and initialized.
   def converse
     card = @plugin.getCard(context_params["cardID"], current_user.id)
@@ -23,7 +28,8 @@ def converse
   def getContextUpdateRequirements
     contextRequirements = @plugin.getContextRequirements.with_indifferent_access
     contextUpdateRequirements = {}
-    defaultEndDate = Time.new(2000).to_s(:db)
+    defaultStartDate = Time.new(2000).to_i
+    defaultEndDate = Time.now.to_i
 
     # Strip out any custom Pearl context requirements, since the client does not have any knowledge of them.
     contextRequirements.keys.each do |context|
@@ -40,10 +46,11 @@ def getContextUpdateRequirements
     # first time), then populate it with a default endDate from the year 2000.
     contextUpdateRequirements.keys.each do |key|
       if data.key?(key) and not data[key].nil?
-        contextUpdateRequirements[key]["endDate"] = data[key]["endDate"]
+        contextUpdateRequirements[key]["startDate"] = data[key]["endDate"]
       else
-        contextUpdateRequirements[key]["endDate"] = defaultEndDate
+        contextUpdateRequirements[key]["startDate"] = defaultStartDate
       end
+      contextUpdateRequirements[key]["endDate"] = defaultEndDate
     end
 
     # Return the final hash which should include all the information that the client will need to retrieve the
@@ -73,7 +80,23 @@ def syncContext
     end
   end
 
-
+  # Returns neatly formatted context data for graphing
+  def showGraphData
+    if not @document.nil?
+      contextRequirements = @plugin.getContextRequirements.with_indifferent_access
+      contextData = @document.read_tv_document(@@tvVaultID, @@tvAdminAPI, contextRequirements).with_indifferent_access
+      dataPointsArray = @document.getGraphData(contextData)
+      render json: {
+        status: 'success',
+        data: dataPointsArray
+      }
+    else
+      render json: {
+        status: 'error',
+        message: 'Document does not exist!'
+      }
+    end
+  end
 
 
   private

app/models/document.rb

@@ -1,6 +1,6 @@
 class Document < ActiveRecord::Base
   belongs_to :user
-  
+
   # Retuns a base 64 encoded json string which represents the default user document on Truevault
   def get_base_truevault_doc
     filePath = Rails.root.join("lib", "base_truevault_doc.json")
@@ -19,10 +19,10 @@ def create_tv_document(vault_id, api_key)
                   -X POST \
                   -d "document=#{baseTVDoc}"`
     # Parse and return a json hash of the TrueVault response
-    tvResponseJSON = JSON.parse(tvResponse)   
+    tvResponseJSON = JSON.parse(tvResponse)
   end
-  
-  
+
+
   # Reads the TrueVault document belonging to the current user.
   # If a hash of context requirements for a plugin are given, returns
   # a json of all the values corresponding to each context requirement.
@@ -32,21 +32,21 @@ def read_tv_document(vault_id, api_key, context_requirements = false)
     tvDocBase64 = `curl https://api.truevault.com/v1/vaults/#{vault_id}/documents/#{self.documentID} \
                   -X GET \
                   -u #{api_key}:`
-    
-    # Decode the encoded JSON string             
-    tvDocDecode = Base64.decode64(tvDocBase64) 
-    
+
+    # Decode the encoded JSON string
+    tvDocDecode = Base64.decode64(tvDocBase64)
+
     # Parse the decoded string as a JSON hash
     tvDocDecodeJson = JSON.parse(tvDocDecode).with_indifferent_access
-    
+
     if context_requirements
       queryData = {}
       context_requirements.keys.each do |key|
-        if tvDocDecodeJson.key?(key) 
+        if tvDocDecodeJson.key?(key)
           queryData[key] = tvDocDecodeJson[key]
-        end 
+        end
       end
-      return queryData 
+      return queryData
     else
       return tvDocDecodeJson
     end
@@ -61,7 +61,7 @@ def read_tv_document(vault_id, api_key, context_requirements = false)
   # Returns a json hash of the updated document
   def update_tv_document(vault_id, api_key, document_params)
     tvDocDecodeJson = self.read_tv_document(vault_id, api_key)
-    
+
     # For each key in the parameters, check if it already exists in the Truevault document.
     # If the key exists and its value is an array, append the new values.
     # Otherwise, update the key-value pair or add it if it does not exist.
@@ -75,63 +75,63 @@ def update_tv_document(vault_id, api_key, document_params)
                 value.keys.each do |replace|
                   check[replace] = value[replace]
                 end
-                exists = true     
-              end       
+                exists = true
+              end
             end
             if !exists
               tvDocDecodeJson[key].append(value)
-            end   
+            end
           end
         else
           tvDocDecodeJson[key] = document_params[key]
         end
       end
-        
-    end      
-    
+
+    end
+
     # Encode the updated document as a base 64 encoded JSON string.
-    tvDocEncode = Base64.encode64(tvDocDecodeJson.to_json) 
-    
+    tvDocEncode = Base64.encode64(tvDocDecodeJson.to_json)
+
     # Update the document on truevualt.
     `curl https://api.truevault.com/v1/vaults/#{vault_id}/documents/#{self.documentID} \
     -u #{api_key}: \
     -X PUT \
     -d "document=#{tvDocEncode}"`
-   
+
     # Return the updated document as a json hash
     return tvDocDecodeJson
   end
-  
-  
+
+
   # Destroy the TrueVault document
   # Returns a json representation of the TrueVault response.
   def destroy_tv_document(vault_id, api_key)
     tvResponse = `curl https://api.truevault.com/v1/vaults/#{vault_id}/documents/#{self.documentID} \
                   -X DELETE \
                   -u #{api_key}:`
     # Parse and return a json hash of the TrueVault response
-    tvResponseJSON = JSON.parse(tvResponse)               
+    tvResponseJSON = JSON.parse(tvResponse)
   end
-  
-  
+
+
   # Reset the TrueVault document to an empty json hash
   def reset_tv_document(vault_id, api_key)
     baseTVDoc = self.get_base_truevault_doc
     tvResponse = `curl https://api.truevault.com/v1/vaults/#{vault_id}/documents/#{self.documentID} \
     -u #{api_key}: \
     -X PUT \
     -d "document=#{baseTVDoc}"`
-    
+
     # Parse and return a json hash of the TrueVault response
-    tvResponseJSON = JSON.parse(tvResponse) 
+    tvResponseJSON = JSON.parse(tvResponse)
   end
 
 
   # Given the context requirements, gets only the most recent datapoints stored in TrueVault for each context.
   def get_latest_datapoints(vault_id, api_key, context_requirements)
     queryData = self.read_tv_document(vault_id, api_key, context_requirements)
     queryData.keys.each do |key|
-      if queryData[key].class == Array and not queryData[key].empty?  
+      if queryData[key].class == Array and not queryData[key].empty?
         latestPoint = queryData[key][0]
         queryData[key].each do |value|
           if value["endDate"] > latestPoint["endDate"]
@@ -144,4 +144,17 @@ def get_latest_datapoints(vault_id, api_key, context_requirements)
     return queryData
   end
 
+
+  def getGraphData(contextData)
+    dataPointsArray = []
+    contextData.keys.each do |dataType|
+      contextData[dataType].each do |dataPoint|
+        hash = {}
+        hash["timestamp"] = dataPoint["endDate"]
+        hash["steps"] = dataPoint["quantity"]
+        dataPointsArray.push(hash)
+      end
+    end
+    return dataPointsArray
+  end
 end

config/environments/development.rb

@@ -8,7 +8,7 @@
   config.cache_store = :memory_store
 
   # Do not eager load code on boot.
-  config.eager_load = false
+  config.eager_load = true
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

config/routes.rb

@@ -17,7 +17,8 @@
       post 'converse'          => 'conversations#converse', as: :converse
       get 'context'            => 'conversations#getContextUpdateRequirements', as: :context
       post 'context'           => 'conversations#syncContext', as: :sync 
-      get 'test' => 'conversations#test', as: :test
+      get 'context/graphs'     => 'conversations#showGraphData', as: :graph 
+      post 'test' => 'conversations#test', as: :test
     end
   end