validic 0.2.1 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 33f8543ef109856fdd4dd43b1596c52489fed422
+  data.tar.gz: 8cf5a8e0d41473a58924c9fd8609c1493bfc3b34
+SHA512:
+  metadata.gz: 824c8b8d0834310140fd4d77e62efd5911cd8538d460d0d164d470227df8a7890443da8fa95fa628ab9ddb72a70fac51580a76bad7ddf3b0e7bffe91760c1c0f
+  data.tar.gz: fdb9bafdf0710abcd37f0d4523ae7d108e40f49d3246b871330e49268acd65b0919c539e8f42312235ac5fe52b40870b79c48073749bc5d911bf2cb7b8e8cd7d

data/.gitignore

@@ -8,10 +8,14 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
+spec/cassette
 test/tmp
 test/version_tmp
 tmp
 
+# OSX
+.DS_Store
+
 # YARD artifacts
 .yardoc
 _yardoc

data/Gemfile.lock

@@ -1,80 +1,87 @@
 PATH
   remote: .
   specs:
-    validic (0.2.1)
+    validic (0.3.1)
       activesupport
-      faraday (~> 0.8)
-      faraday_middleware (~> 0.9)
+      faraday_middleware (~> 0.9.0)
       hashie (~> 2.0.3)
       multi_json
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    addressable (2.3.4)
-    api_matchers (0.1.1)
+    activesupport (4.0.2)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    addressable (2.3.5)
+    api_matchers (0.4.0)
       activesupport (>= 3.2.5)
       nokogiri (>= 1.5.2)
       rspec (>= 2.10.0)
-    bourne (1.4.0)
-      mocha (~> 0.13.2)
-    crack (0.3.2)
-    diff-lcs (1.2.3)
-    faraday (0.8.8)
+    atomic (1.1.14)
+    crack (0.4.1)
+      safe_yaml (~> 0.9.0)
+    diff-lcs (1.2.5)
+    docile (1.1.2)
+    faraday (0.8.9)
       multipart-post (~> 1.2.0)
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
     hashie (2.0.5)
-    i18n (0.6.1)
-    metaclass (0.0.1)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.7.2)
+    i18n (0.6.9)
+    mini_portile (0.5.2)
+    minitest (4.7.5)
+    multi_json (1.8.4)
     multipart-post (1.2.0)
-    nokogiri (1.5.9)
-    rake (10.0.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    rake (10.1.1)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    shoulda (3.4.0)
+    rspec-mocks (2.14.4)
+    safe_yaml (0.9.7)
+    shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (~> 1.0, >= 1.4.1)
-    shoulda-context (1.1.1)
-    shoulda-matchers (1.5.6)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.1.6)
+    shoulda-matchers (2.5.0)
       activesupport (>= 3.0.0)
-      bourne (~> 1.3)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
-    vcr (2.4.0)
-    webmock (1.11.0)
+    thread_safe (0.1.3)
+      atomic
+    tzinfo (0.3.38)
+    vcr (2.8.0)
+    webmock (1.8.11)
       addressable (>= 2.2.7)
-      crack (>= 0.3.2)
-    yard (0.8.6.1)
+      crack (>= 0.1.7)
+    yard (0.8.7.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   api_matchers
-  bundler (~> 1.3)
+  bundler
   rake
   rspec
   shoulda
   simplecov
   simplecov-rcov
   validic!
-  vcr
-  webmock
+  vcr (~> 2.8.0)
+  webmock (~> 1.8.0)
   yard

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Motivation Science
+Copyright (c) 2013 Validic
 
 MIT License
 

data/lib/validic.rb

@@ -8,7 +8,11 @@ directory = File.expand_path(File.dirname(__FILE__))
 module Validic
 
   class << self
-    attr_accessor :api_url, :api_version, :access_token
+    attr_accessor :api_url,
+      :api_version,
+      :access_token,
+      :organization_id,
+      :user_id
 
     ##
     # Configure default
@@ -23,9 +27,10 @@ module Validic
     private
 
     def load_defaults
-      self.api_url      ||= 'https://api.validic.com'
-      self.api_version  ||= 'v1'
-      self.access_token ||= 'DEMO_KEY'
+      self.api_url          ||= 'https://api.validic.com'
+      self.api_version      ||= 'v1'
+      self.access_token     ||= 'ENTERPRISE_KEY'
+      self.organization_id  ||= '51aca5a06dedda916400002b'
     end
   end
 

data/lib/validic/{general_measurement.rb → biometric.rb}

@@ -1,13 +1,13 @@
 # encoding: utf-8
 
 module Validic
-  module GeneralMeasurement
+  module Biometric
 
     ##
     # Get GeneralMeasurement Activities base on `access_token`
     # Default data fetched is from yesterday
     #
-    # @params :organization_id - for organization specific
+    # @params :org_id - for organization specific
     # @params :user_id - for user specific
     #
     # @params :start_date - optional
@@ -17,25 +17,9 @@ module Validic
     # @params :expanded - optional - will show the raw data
     # 
     # @return [Hashie::Mash] with list of GeneralMeasurement
-    def get_general_measurements(options={})
-      organization_id = options[:organization_id]
-      user_id = options[:user_id]
-      options = {
-        start_date: options[:start_date],
-        end_date: options[:end_date],
-        access_token: options[:access_token],
-        source: options[:source],
-        expanded: options[:expanded]
-      }
-
-      if organization_id
-        response = get("/#{Validic.api_version}/organizations/#{organization_id}/biometrics.json", options)
-      elsif user_id
-        response = get("/#{Validic.api_version}/users/#{user_id}/biometrics.json", options)
-      else
-        response = get("/#{Validic.api_version}/biometrics.json", options)
-      end
-      response if response
+    def get_biometrics(params={})
+      params = extract_params(params)
+      get_endpoint(:biometrics, params)
     end
 
     ##
@@ -72,7 +56,7 @@ module Validic
     # @params :source
     # 
     # @return success
-    def create_general_measurement(options={})
+    def create_biometric(options={})
       options = {
         access_token: options[:access_token],
         general_measurement: {

data/lib/validic/client.rb

@@ -2,7 +2,6 @@
 require 'forwardable'
 require 'validic/request'
 require 'validic/organization'
-require 'validic/activity'
 require 'validic/user'
 require 'validic/profile'
 require 'validic/fitness'
@@ -10,7 +9,7 @@ require 'validic/weight'
 require 'validic/nutrition'
 require 'validic/sleep'
 require 'validic/diabetes'
-require 'validic/general_measurement'
+require 'validic/biometric'
 require 'validic/routine'
 require 'validic/tobacco_cessation'
 require 'validic/third_party_app'
@@ -21,7 +20,6 @@ module Validic
 
     include Request
     include Organization
-    include Activity
     include User
     include Profile
     include Fitness
@@ -29,12 +27,15 @@ module Validic
     include Nutrition
     include Sleep
     include Diabetes
-    include GeneralMeasurement
+    include Biometric
     include Routine
     include TobaccoCessation
     include ThirdPartyApp
 
-    attr_reader :api_url, :api_version, :access_token
+    attr_reader :api_url,
+      :api_version,
+      :access_token,
+      :organization_id
 
     ##
     # Create a new Validic::Client object
@@ -44,6 +45,7 @@ module Validic
       @api_url        = options[:api_url]       || Validic.api_url
       @api_version    = options[:api_version]   || Validic.api_version || 'v1'
       @access_token   = options[:access_token]  || Validic.access_token
+      @organization_id = options[:organization_id] || Validic.organization_id
     end
 
     ##
@@ -52,7 +54,7 @@ module Validic
     # @return [Faraday::Connection]
     def connection
       params = {}
-      @connection = Faraday.new(url: api_url, params: params, headers: default_headers, ssl: {verify: false}) do |faraday|
+      @connection = Faraday.new(url: api_url, params: params, headers: default_headers, ssl: {verify: true}) do |faraday|
         faraday.use FaradayMiddleware::Mashify
         faraday.use FaradayMiddleware::ParseJson, content_type: /\bjson$/
         faraday.use FaradayMiddleware::FollowRedirects
@@ -60,10 +62,49 @@ module Validic
       end
     end
 
+    ##
+    # Pull the latest endpoint
+    def latest(type, org_id=nil, user_id=nil, params={})
+      organization_id = org_id.nil? ? Validic.organization_id : org_id
+      user_id = org_id.nil? ? Validic.user_id : org_id
+
+      url = "/#{Validic.api_version}/organizations/#{organization_id}/#{type.to_s}/latest.json"
+
+      if user_id
+        url = "/#{Validic.api_version}/organizations/#{organization_id}/users/#{user_id}/#{type.to_s}/latest.json"
+      end
+
+      get(url, params)
+    end
+
+    ##
+    # Generic Pull of Validic Objects
+    def get_endpoint(type, params={})
+
+      url = "/#{Validic.api_version}/organizations/#{Validic.organization_id}/#{type.to_s}.json"
+
+      if Validic.user_id
+        url = "/#{Validic.api_version}/organizations/#{Validic.organization_id}/users/#{Validic.user_id}/#{type.to_s}.json"
+      end
+
+      get(url, params)
+    end
+
+    ##
+    # Generic POST to Validic
+    def post_to_validic(type, params={})
+      url = "/#{Validic.api_version}/organizations/#{Validic.organization_id}/#{type.to_s}.json"
+
+      if Validic.user_id
+        url = "/#{Validic.api_version}/organizations/#{Validic.organization_id}/users/#{Validic.user_id}/#{type.to_s}.json"
+      end
+      post(url, params)
+    end
+
     private
 
     def default_headers
-      headers = {
+      {
         accept: 'application/json',
         content_type: 'application/json',
         user_agent: "Ruby Gem by Validic #{Validic::VERSION}"

data/lib/validic/diabetes.rb

@@ -17,26 +17,9 @@ module Validic
     # @params :expanded - optional - will show the raw data
     #
     # @return [Hashie::Mash] with list of Diabetes
-    def get_diabetes(options={})
-      organization_id = options[:organization_id]
-      user_id = options[:user_id]
-      options = {
-        start_date: options[:start_date],
-        end_date: options[:end_date],
-        access_token: options[:access_token],
-        source: options[:source],
-        expanded: options[:expanded]
-      }
-
-      if organization_id
-        response = get("/#{Validic.api_version}/organizations/#{organization_id}/diabetes.json", options)
-      elsif user_id
-        response = get("/#{Validic.api_version}/users/#{user_id}/diabetes.json", options)
-      else
-        response = get("/#{Validic.api_version}/diabetes.json", options)
-      end
-      
-      response if response
+    def get_diabetes(params={})
+      params = extract_params(params)
+      get_endpoint(:diabetes, params)
     end
 
     ##

data/lib/validic/fitness.rb

@@ -17,27 +17,13 @@ module Validic
     # @params :expanded - optional - will show the raw data
     #
     # @return [Hashie::Mash] with list of Fitness
-    def get_fitnesses(options={})
-      organization_id = options[:organization_id]
-      user_id = options[:user_id]
-      options = {
-        start_date: options[:start_date],
-        end_date: options[:end_date],
-        access_token: options[:access_token],
-        source: options[:source],
-        expanded: options[:expanded]
-      }
-
-      if options[:access_token] && organization_id
-        response = get("/#{Validic.api_version}/organizations/#{organization_id}/fitness.json", options)
-      elsif user_id
-        response = get("/#{Validic.api_version}/users/#{user_id}/fitness.json", options)
-      else
-        response = get("/#{Validic.api_version}/fitness.json", options)
-      end
-      response if response
+    def get_fitness(params={})
+      params = extract_params(params)
+      get_endpoint(:fitness, params)
     end
 
+    alias :get_fitnesses :get_fitness
+
     ##
     # Create Fitness base on `access_token` and `authentication_token`
     #

data/lib/validic/nutrition.rb

@@ -17,25 +17,9 @@ module Validic
     # @params :expanded - optional - will show the raw data
     # 
     # @return [Hashie::Mash] with list of Nutrition
-    def get_nutritions(options={})
-      organization_id = options[:organization_id]
-      user_id = options[:user_id]
-      options = {
-        start_date: options[:start_date],
-        end_date: options[:end_date],
-        access_token: options[:access_token],
-        source: options[:source],
-        expanded: options[:expanded]
-      }
-
-      if organization_id
-        response = get("/#{Validic.api_version}/organizations/#{organization_id}/nutrition.json", options)
-      elsif user_id
-        response = get("/#{Validic.api_version}/users/#{user_id}/nutrition.json", options)
-      else
-        response = get("/#{Validic.api_version}/nutrition.json", options)
-      end
-      response if response
+    def get_nutritions(params={})
+      params = extract_params(params)
+      get_endpoint(:nutrition, params)
     end
 
     ##

data/lib/validic/organization.rb

@@ -8,13 +8,9 @@ module Validic
     # 
     # @params :access_token
     # @return [Hashie::Mash] with list of Organization
-    def get_organization(options={})
-      organization_id = options[:organization_id]
-      options = {
-        access_token: options[:access_token]
-      }
-      response = get("/#{Validic.api_version}/organizations/#{organization_id}.json", options)
-      response if response
+    def get_organization(params={})
+      params = extract_params(params)
+      get("/#{Validic.api_version}/organizations/#{Validic.organization_id}.json", params)
     end
 
     ##