validic 0.2.1 → 0.3.1

data/lib/validic/request.rb

@@ -5,6 +5,12 @@ require 'multi_json'
 module Validic
   module Request
 
+    def extract_params(params)
+      Validic.organization_id = params.delete(:organization_id) if params[:organization_id]
+      Validic.user_id = params.delete(:user_id) if params[:user_id]
+      params
+    end
+
     def get(path, options)
       request(:get, path, options)
     end

data/lib/validic/routine.rb

@@ -17,27 +17,13 @@ module Validic
     # @params :expanded - optional - will show the raw data
     # 
     # @return [Hashie::Mash] with list of Routine
-    def get_routines(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}/routine.json", options)
-      elsif user_id
-        response = get("/#{Validic.api_version}/users/#{user_id}/routine.json", options)
-      else
-        response = get("/#{Validic.api_version}/routine.json", options)
-      end
-      response if response
+    def get_routine(params={})
+      params = extract_params(params)
+      get_endpoint(:routine, params)
     end
 
+    alias :get_routines :get_routine
+
     ##
     # Create Routine base on `access_token` and `authentication_token`
     #

data/lib/validic/sleep.rb

@@ -17,27 +17,13 @@ module Validic
     # @params :expanded - optional - will show the raw data
     # 
     # @return [Hashie::Mash] with list of Sleep
-    def get_sleeps(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}/sleep.json", options)
-      elsif user_id
-        response = get("/#{Validic.api_version}/users/#{user_id}/sleep.json", options)
-      else
-        response = get("/#{Validic.api_version}/sleep.json", options)
-      end
-      response if response
+    def get_sleep(params={})
+      params = extract_params(params)
+      get_endpoint(:sleep, params)
     end
 
+    alias :get_sleeps :get_sleep
+
     ##
     # Create Sleep base on `access_token` and `authentication_token`
     #

data/lib/validic/third_party_app.rb

@@ -10,14 +10,9 @@ module Validic
     # params[:access_token] required parameter
     #
     # @return [Hashie::Mash] with list of Organization
-    def get_apps(options={})
-      organization_id = options[:organization_id]
-      options = {
-        access_token: options[:access_token],
-        authentication_token: options[:authentication_token]
-      }
-      response = get("/#{Validic.api_version}/organizations/#{organization_id}/apps.json", options)
-      response if response
+    def get_apps(params={})
+      params = extract_params(params)
+      get_endpoint(:apps, params)
     end
 
     ##

data/lib/validic/tobacco_cessation.rb

@@ -17,25 +17,9 @@ module Validic
     # @params :expanded - optional - will show the raw data
     # 
     # @return [Hashie::Mash] with list of TobaccoCessation
-    def get_tobacco_cessations(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}/tobacco_cessation.json", options)
-      elsif user_id
-        response = get("/#{Validic.api_version}/users/#{user_id}/tobacco_cessation.json", options)
-      else
-        response = get("/#{Validic.api_version}/tobacco_cessation.json", options)
-      end
-      response if response
+    def get_tobacco_cessations(params={})
+      params = extract_params(params)
+      get_endpoint(:tobacco_cessation, params)
     end
 
     ##

data/lib/validic/version.rb

@@ -1,3 +1,3 @@
 module Validic
-  VERSION = "0.2.1"
+  VERSION = "0.3.1"
 end

data/lib/validic/weight.rb

@@ -17,26 +17,13 @@ module Validic
     # @params :expanded - optional - will show the raw data
     # 
     # @return [Hashie::Mash] with list of Weight
-    def get_weights(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}/weight.json", options)
-      elsif user_id
-        response = get("/#{Validic.api_version}/users/#{user_id}/weight.json", options)
-      else
-        response = get("/#{Validic.api_version}/weight.json", options)
-      end
+    def get_weight(params={})
+      params = extract_params(params)
+      get_endpoint(:weight, params)
     end
 
+    alias :get_weights :get_weight
+
     ##
     # Create Weight base on `access_token` and `authentication_token`
     #

data/spec/spec_helper.rb

@@ -34,10 +34,11 @@ RSpec.configure do |c|
   #
   c.before(:each) do
     Validic.configure do |config|
-      # config.api_url        = 'https://api.validic.com'
-      config.api_url        = 'http://api.validic.dev' #development config
-      config.api_version    = 'v1'
-      config.access_token   = '9c03ad2bcb022425944e4686d398ef8398f537c2f7c113495ffa7bc9cfa49286'
+      # This is using ACME Corp Credentials as per Documentation
+      config.api_url          = 'https://api.validic.com'
+      config.api_version      = 'v1'
+      config.access_token     = 'ef617d9d3bb39b4112f60dc65ee40061165c1ab4375e3ea63896f63a7390c4db'
+      config.organization_id  = '51aca5a06dedda916400002b'
     end
   end
 end

data/spec/validic/biometrics_spec.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Validic::Biometric do
+
+  let(:client) { Validic::Client.new }
+
+  context "#get_biometrics" do
+    before do
+      @user_biometrics = client
+        .get_biometrics({
+          start_date: '2014-01-01',
+          user_id: '52967e076dedda5d4300000b'
+        })
+    end
+
+    it "returns JSON response of Validic::Biometrics", vcr: true do
+      @user_biometrics.should_not be_nil
+    end
+
+    it "status 200" do
+      @user_biometrics.summary.status.should == 200
+    end
+
+    context "#summary response" do
+      it "not nil" do
+        @user_biometrics.summary.should_not be_nil
+      end
+
+      it "results not 0" do
+        @user_biometrics.summary.results.should_not == 0
+      end
+    end
+
+    context "#biometrics collection" do
+      it "has a collection" do
+        @user_biometrics.biometrics.should be_a(Array)
+      end
+    end
+
+  end
+
+end

data/spec/validic/client_spec.rb

@@ -3,9 +3,47 @@ require 'spec_helper'
 
 describe Validic::Client do
 
+  let(:client) { Validic::Client.new }
+
   it "creates a Faraday::Connection" do
-    client = Validic::Client.new
     client.connection.should be_kind_of Faraday::Connection
   end
 
+  context "#latest" do
+    it "#fitness", vcr: true do
+      latest_fitness = client.latest(:fitness)
+      latest_fitness.summary.should_not be_nil
+    end
+
+    it "#sleep", vcr: true do
+      latest_sleep = client.latest(:sleep)
+      latest_sleep.summary.should_not be_nil
+    end
+
+    it "#routine", vcr: true do
+      latest_routine = client.latest(:routine)
+      latest_routine.summary.should_not be_nil
+    end
+
+    it "#weight", vcr: true do
+      latest_weight = client.latest(:weight)
+      latest_weight.summary.should_not be_nil
+    end
+
+    it "#biometrics", vcr: true do
+      latest_biometrics = client.latest(:biometrics)
+      latest_biometrics.summary.should_not be_nil
+    end
+
+    it "#nutrition", vcr: true do
+      latest_nutrition = client.latest(:nutrition)
+      latest_nutrition.summary.should_not be_nil
+    end
+
+    it "#tobacco_cessation", vcr: true do
+      latest_tobacco_cessation = client.latest(:tobacco_cessation)
+      latest_tobacco_cessation.summary.should_not be_nil
+    end
+  end
+
 end

data/spec/validic/diabetes_spec.rb

@@ -24,7 +24,8 @@ describe Validic::Diabetes do
   end
 
   context "#create_diabetes" do
-    it "should create new diabetes record" do
+    it "should create new diabetes record", vcr: true do
+      pending
       @new_diabetes = client.create_diabetes({authentication_token: "mqwpDx8RYcmSFBJDmy3J",
                                               access_token: "DEMO_KEY",
                                               c_peptide: 1,
@@ -51,7 +52,7 @@ describe Validic::Diabetes do
 
   context "#get_diabetes by organization" do
     before do
-      @org_diabetes = client.get_diabetes({organization_id: "519e24e16a7e0cc7ef00002b", access_token: "ENTERPRISE_KEY"})
+      @org_diabetes = client.get_diabetes({organization_id: "51aca5a06dedda916400002b", access_token: "ENTERPRISE_KEY"})
     end
 
     it "returns JSON response of Validic::Diabetes", vcr: true do
@@ -69,7 +70,7 @@ describe Validic::Diabetes do
 
   context "#get_diabetes by user" do
     before do
-      @user_diabetes = client.get_diabetes({user_id: "519e24e16a7e0cc7ef00002c"})
+      @user_diabetes = client.get_diabetes({user_id: "52967e076dedda5d4300000b"})
     end
 
     it "returns JSON response of Validic::Diabetes", vcr: true do

data/spec/validic/fitness_spec.rb

@@ -25,6 +25,7 @@ describe Validic::Fitness do
 
   context "#create_fitness" do
     it "should create new fitness record" do
+      pending
       @new_fitness = client.create_fitness({authentication_token: "mqwpDx8RYcmSFBJDmy3J",
                                             access_token: "DEMO_KEY",
                                             timestamp: "2013-03-10 07:12:16 -05:00",
@@ -47,7 +48,7 @@ describe Validic::Fitness do
 
   context "#get_fitnesses by organization" do
     before do
-      @fitness = client.get_fitnesses({organization_id: "519e24e16a7e0cc7ef00002b", access_token: "ENTERPRISE_KEY"})
+      @fitness = client.get_fitnesses({organization_id: "51aca5a06dedda916400002b", access_token: "ENTERPRISE_KEY"})
     end
 
     it "returns JSON response of Validic::Fitness", vcr: true do
@@ -65,7 +66,7 @@ describe Validic::Fitness do
 
   context "#get_fitnesses by user" do
     before do
-      @fitness = client.get_fitnesses({user_id: "519e24e16a7e0cc7ef00002c"})
+      @fitness = client.get_fitnesses({user_id: "52967e076dedda5d4300000b"})
     end
 
     it "returns JSON response of Validic::Fitness", vcr: true do

data/spec/validic/nutrition_spec.rb

@@ -25,6 +25,7 @@ describe Validic::Nutrition do
 
   context "#create_nutrition" do
     it "should create new nutrition record" do
+      pending
       @new_nutrition = client.create_nutrition({authentication_token: "mqwpDx8RYcmSFBJDmy3J",
                                                 access_token: "DEMO_KEY",
                                                 calories: 850,
@@ -53,7 +54,7 @@ describe Validic::Nutrition do
 
   context "#get_nutritions by organization" do
     before do
-      @nutrition = client.get_nutritions({organization_id: "519e24e16a7e0cc7ef00002b", access_token: "ENTERPRISE_KEY"})
+      @nutrition = client.get_nutritions({organization_id: "51aca5a06dedda916400002b", access_token: "ENTERPRISE_KEY"})
     end
 
     it "returns JSON response of Validic::Nutrition", vcr: true do
@@ -71,7 +72,7 @@ describe Validic::Nutrition do
 
   context "#get_nutritions by user" do
     before do
-      @nutrition = client.get_nutritions({user_id: "519e24e16a7e0cc7ef00002c"})
+      @nutrition = client.get_nutritions({user_id: "52967e076dedda5d4300000b"})
     end
 
     it "returns JSON response of Validic::Nutrition", vcr: true do

data/spec/validic/organization_spec.rb

@@ -7,7 +7,7 @@ describe Validic::Organization do
 
   context "#get_organization" do
     before do
-      @organization_response = client.get_organization({organization_id: "519e24e16a7e0cc7ef00002b", access_token: "ENTERPRISE_KEY"})
+      @organization_response = client.get_organization({organization_id: "51aca5a06dedda916400002b", access_token: "ENTERPRISE_KEY"})
     end
 
     it "returns JSON response of Validic::Organization", vcr: true do
@@ -25,7 +25,7 @@ describe Validic::Organization do
 
   context "#get_users" do
     before do
-      @users_response = client.get_users({organization_id: "519e24e16a7e0cc7ef00002b", access_token: "ENTERPRISE_KEY"})
+      @users_response = client.get_users({organization_id: "51aca5a06dedda916400002b", access_token: "ENTERPRISE_KEY"})
     end
 
     it "returns JSON response of Validic::Organization", vcr: true do

data/spec/validic/profile_spec.rb

@@ -11,36 +11,9 @@ describe Validic::Profile do
     end
 
     it "returns JSON response of Validic::Profile", vcr: true do
+      pending
       @profile.should_not be_nil
     end
   end
 
-  # context "#update_profile" do
-  #   before do
-  #     @updated_profile = client.update_profile({gender: "M",
-  #                                               location: "TX",
-  #                                               birth_year: "1985",
-  #                                               height: 168.75,
-  #                                               weight: 69,
-  #                                               first_name: "Demo",
-  #                                               last_name: "User"})
-  #   end
-
-  #   it "should return gender" do
-  #     @updated_profile.profile.gender.should eq 'M'
-  #   end
-
-  #   it "should return location" do
-  #     @updated_profile.profile.location.should eq 'TX'
-  #   end
-
-  #   it "should return height" do
-  #     @updated_profile.profile.height.should eq "168.75"
-  #   end
-
-  #   it "should return weight" do
-  #     @updated_profile.profile.weight.should eq 69
-  #   end
-  # end
-
 end

data/spec/validic/routine_spec.rb

@@ -25,6 +25,7 @@ describe Validic::Routine do
 
   context "#create_routine" do
     it "should create new routine record" do
+      pending
       @new_routine = client.create_routine({authentication_token: "mqwpDx8RYcmSFBJDmy3J",
                                             access_token: "DEMO_KEY",
                                             timestamp: "2013-05-16 07:12:16 -05:00",
@@ -45,7 +46,7 @@ describe Validic::Routine do
 
   context "#get_routines by organization" do
     before do
-      @routine = client.get_routines({organization_id: "519e24e16a7e0cc7ef00002b", access_token: "ENTERPRISE_KEY"})
+      @routine = client.get_routines({organization_id: "51aca5a06dedda916400002b", access_token: "ENTERPRISE_KEY"})
     end
 
     it "returns JSON response of Validic::Routine", vcr: true do
@@ -63,7 +64,7 @@ describe Validic::Routine do
 
   context "#get_routines by user" do
     before do
-      @routine = client.get_routines({user_id: "519e24e16a7e0cc7ef00002c"})
+      @routine = client.get_routines({user_id: "52967e076dedda5d4300000b"})
     end
 
     it "returns JSON response of Validic::Routine", vcr: true do

data/spec/validic/sleep_spec.rb

@@ -25,6 +25,7 @@ describe Validic::Sleep do
 
   context "#create_sleep" do
     it "should create new sleep record" do
+      pending
       @new_sleep = client.create_sleep({authentication_token: "mqwpDx8RYcmSFBJDmy3J",
                                         access_token: "DEMO_KEY",
                                         total_sleep: 210,
@@ -49,7 +50,7 @@ describe Validic::Sleep do
 
   context "#get_sleeps by organization" do
     before do
-      @sleep = client.get_sleeps({organization_id: "519e24e16a7e0cc7ef00002b", access_token: "ENTERPRISE_KEY"})
+      @sleep = client.get_sleeps({organization_id: "51aca5a06dedda916400002b", access_token: "ENTERPRISE_KEY"})
     end
 
     it "returns JSON response of Validic::Sleep", vcr: true do
@@ -67,7 +68,7 @@ describe Validic::Sleep do
 
   context "#get_sleeps by user" do
     before do
-      @sleep = client.get_sleeps({user_id: "519e24e16a7e0cc7ef00002c"})
+      @sleep = client.get_sleeps({user_id: "52967e076dedda5d4300000b"})
     end
 
     it "returns JSON response of Validic::Sleep", vcr: true do