validic 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33f8543ef109856fdd4dd43b1596c52489fed422
-  data.tar.gz: 8cf5a8e0d41473a58924c9fd8609c1493bfc3b34
+  metadata.gz: f97e21569bf865fe471589664134bd74d6262e8d
+  data.tar.gz: dfcbf98d9653b7c7f3c800c5707b6976d1f0bd5d
 SHA512:
-  metadata.gz: 824c8b8d0834310140fd4d77e62efd5911cd8538d460d0d164d470227df8a7890443da8fa95fa628ab9ddb72a70fac51580a76bad7ddf3b0e7bffe91760c1c0f
-  data.tar.gz: fdb9bafdf0710abcd37f0d4523ae7d108e40f49d3246b871330e49268acd65b0919c539e8f42312235ac5fe52b40870b79c48073749bc5d911bf2cb7b8e8cd7d
+  metadata.gz: 14377f4da207974aa7c5a6d7f1d4ec2a63cb5f275a4d3284fbb6f9620bd10e21e2a1b403d8245b09583c7d106de5876138b2e26d68fdc8dae149d6568f1f90b9
+  data.tar.gz: 998e8aaf31789428b41d2b186e48c96fb31a8ddb67974bf892e81c7a0399a19662912c55048d63c0d643cafce3c9fbd9311446e513005908b7a8672c4dbb6344

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    validic (0.3.1)
+    validic (0.3.2)
       activesupport
       faraday_middleware (~> 0.9.0)
       hashie (~> 2.0.3)

data/README.md

@@ -24,14 +24,14 @@ Or install it yourself as:
 ```ruby
     require 'validic'
 
-    # If your using Rails 3+
+    # If you're using Rails 3+
     # config/initializers/validic.rb
     Validic.configure do |config|
       config.api_url        = 'https://api.validic.com'
       config.api_version    = 'v1'
     end
 
-    # If your using plain RUBY
+    # If you're using plain RUBY
     # Create Validic::Client Object
     options = {
       api_url: 'https://api.validic.com',
@@ -44,11 +44,11 @@ Or install it yourself as:
     # Validic::Client Object
     client = Validic::Client.new
 
-    # => Get Account Activities
-    client.get_activities
+    # => Get Account Fitness
+    client.get_fitness
 
-    # => Get Organization Activities
-    client.get_activites({organization_id: "YOUR_organization_id",
+    # => Get Organization Fitness
+    client.get_fitness({organization_id: "YOUR_organization_id",
                           access_token: "YOUR_ACCESS_TOKEN"})
 ```
 

data/lib/validic/client.rb

@@ -32,7 +32,7 @@ module Validic
     include TobaccoCessation
     include ThirdPartyApp
 
-    attr_reader :api_url,
+    attr_accessor :api_url,
       :api_version,
       :access_token,
       :organization_id
@@ -42,10 +42,12 @@ module Validic
     #
     # @params options[Hash]
     def initialize(options={})
-      @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
+      @api_url        = options[:api_url].nil? ? Validic.api_url : options[:api_url]
+      @api_version    = options[:api_version].nil? ? 'v1' : options[:api_version]
+      @access_token   = options[:access_token].nil? ? Validic.access_token : options[:access_token]
+      @organization_id = options[:organization_id].nil? ? Validic.organization_id : options[:organization_id]
+
+      reload_config
     end
 
     ##
@@ -54,7 +56,7 @@ module Validic
     # @return [Faraday::Connection]
     def connection
       params = {}
-      @connection = Faraday.new(url: api_url, params: params, headers: default_headers, ssl: {verify: true}) 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
@@ -83,8 +85,10 @@ module Validic
 
       url = "/#{Validic.api_version}/organizations/#{Validic.organization_id}/#{type.to_s}.json"
 
-      if Validic.user_id
+      if Validic.user_id && type != :users
         url = "/#{Validic.api_version}/organizations/#{Validic.organization_id}/users/#{Validic.user_id}/#{type.to_s}.json"
+      elsif Validic.user_id && type == :users
+        url = "/#{Validic.api_version}/organizations/#{Validic.organization_id}/users/#{Validic.user_id}.json"
       end
 
       get(url, params)
@@ -111,5 +115,12 @@ module Validic
       }
     end
 
+    def reload_config
+      Validic.api_url = api_url
+      Validic.api_version = api_version
+      Validic.access_token = access_token
+      Validic.organization_id = organization_id
+    end
+
   end
 end

data/lib/validic/organization.rb

@@ -13,30 +13,5 @@ module Validic
       get("/#{Validic.api_version}/organizations/#{Validic.organization_id}.json", params)
     end
 
-    ##
-    # Get Users base on `access_token` and organization_id
-    # 
-    # @params :status - optional (active or inactive) default :all
-    # @params :access_token - optional
-    # @params :start_date - optional
-    # @params :end_date - optional
-    # @params :offset - optional
-    # @params :limit - optional
-    #
-    # @return [Hashie::Mash] with list of Organization
-    def get_users(options={})
-      organization_id = options[:organization_id]
-      options = {
-        access_token: options[:access_token],
-        start_data: options[:start_date],
-        end_date: options[:end_date],
-        offset: options[:offset],
-        limit: options[:limit],
-        status: options[:status]
-      }
-      response = get("/#{Validic.api_version}/organizations/#{organization_id}/users.json", options)
-      response if response
-    end
-
   end
 end

data/lib/validic/user.rb

@@ -3,6 +3,22 @@
 module Validic
   module User
 
+    ##
+    # Get Users base on `access_token` and organization_id
+    # 
+    # @params :status - optional (active or inactive) default :all
+    # @params :access_token - optional
+    # @params :start_date - optional
+    # @params :end_date - optional
+    # @params :offset - optional
+    # @params :limit - optional
+    #
+    # @return [Hashie::Mash] with list of Organization
+    def get_users(params={})
+      params = extract_params(params)
+      get_endpoint(:users, params)
+    end
+
     ##
     # Get User id base on `access_token`
     # 

data/lib/validic/version.rb

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

data/spec/spec_helper.rb

@@ -37,7 +37,7 @@ RSpec.configure do |c|
       # 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.access_token     = ENV['TEST_ORG_TOKEN']
       config.organization_id  = '51aca5a06dedda916400002b'
     end
   end

data/spec/validic/biometrics_spec.rb

@@ -10,7 +10,7 @@ describe Validic::Biometric do
       @user_biometrics = client
         .get_biometrics({
           start_date: '2014-01-01',
-          user_id: '52967e076dedda5d4300000b'
+          user_id: ENV['TEST_USER_ID']
         })
     end
 

data/spec/validic/diabetes_spec.rb

@@ -26,7 +26,7 @@ describe Validic::Diabetes do
   context "#create_diabetes" do
     it "should create new diabetes record", vcr: true do
       pending
-      @new_diabetes = client.create_diabetes({authentication_token: "mqwpDx8RYcmSFBJDmy3J",
+      @new_diabetes = client.create_diabetes({authentication_token: ENV['TEST_USER_AUTHENTICATION_TOKEN'],
                                               access_token: "DEMO_KEY",
                                               c_peptide: 1,
                                               fasting_plasma_glucose_test: 50,
@@ -70,7 +70,7 @@ describe Validic::Diabetes do
 
   context "#get_diabetes by user" do
     before do
-      @user_diabetes = client.get_diabetes({user_id: "52967e076dedda5d4300000b"})
+      @user_diabetes = client.get_diabetes({user_id: ENV['TEST_USER_ID']})
     end
 
     it "returns JSON response of Validic::Diabetes", vcr: true do

data/spec/validic/fitness_spec.rb

@@ -26,7 +26,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",
+      @new_fitness = client.create_fitness({authentication_token: ENV['TEST_USER_AUTHENTICATION_TOKEN'],
                                             access_token: "DEMO_KEY",
                                             timestamp: "2013-03-10 07:12:16 -05:00",
                                             primary_type: "Running",
@@ -66,7 +66,7 @@ describe Validic::Fitness do
 
   context "#get_fitnesses by user" do
     before do
-      @fitness = client.get_fitnesses({user_id: "52967e076dedda5d4300000b"})
+      @fitness = client.get_fitnesses({user_id: ENV['TEST_USER_ID']})
     end
 
     it "returns JSON response of Validic::Fitness", vcr: true do

data/spec/validic/nutrition_spec.rb

@@ -15,7 +15,7 @@ describe Validic::Nutrition do
     end
 
     it "status 200" do
-      @nutrition.summary.status.should == 200 
+      @nutrition.summary.status.should == 200
     end
 
     it "has summary node" do
@@ -26,7 +26,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",
+      @new_nutrition = client.create_nutrition({authentication_token: ENV['TEST_USER_AUTHENTICATION_TOKEN'],
                                                 access_token: "DEMO_KEY",
                                                 calories: 850,
                                                 carbohydrates: 351,
@@ -62,7 +62,7 @@ describe Validic::Nutrition do
     end
 
     it "status 200" do
-      @nutrition.summary.status.should == 200 
+      @nutrition.summary.status.should == 200
     end
 
     it "has summary node" do
@@ -72,7 +72,7 @@ describe Validic::Nutrition do
 
   context "#get_nutritions by user" do
     before do
-      @nutrition = client.get_nutritions({user_id: "52967e076dedda5d4300000b"})
+      @nutrition = client.get_nutritions({user_id: ENV['TEST_USER_ID']})
     end
 
     it "returns JSON response of Validic::Nutrition", vcr: true do
@@ -80,7 +80,7 @@ describe Validic::Nutrition do
     end
 
     it "status 200" do
-      @nutrition.summary.status.should == 200 
+      @nutrition.summary.status.should == 200
     end
 
     it "has summary node" do

data/spec/validic/organization_spec.rb

@@ -22,25 +22,5 @@ describe Validic::Organization do
       @organization_response.summary.should_not be_nil
     end
   end
-
-  context "#get_users" do
-    before do
-      @users_response = client.get_users({organization_id: "51aca5a06dedda916400002b", access_token: "ENTERPRISE_KEY"})
-    end
-
-    it "returns JSON response of Validic::Organization", vcr: true do
-      @users_response.should_not be_nil
-    end
-
-    it "status 200" do
-      @users_response.summary.status.should == 200
-    end
-
-    it "has summary node" do
-      @users_response.summary.should_not be_nil
-    end
-
-  end
-
 end
 

data/spec/validic/routine_spec.rb

@@ -26,7 +26,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",
+      @new_routine = client.create_routine({authentication_token: ENV['TEST_USER_AUTHENTICATION_TOKEN'],
                                             access_token: "DEMO_KEY",
                                             timestamp: "2013-05-16 07:12:16 -05:00",
                                             steps: 10000,
@@ -64,7 +64,7 @@ describe Validic::Routine do
 
   context "#get_routines by user" do
     before do
-      @routine = client.get_routines({user_id: "52967e076dedda5d4300000b"})
+      @routine = client.get_routines({user_id: ENV['TEST_USER_ID']})
     end
 
     it "returns JSON response of Validic::Routine", vcr: true do

data/spec/validic/sleep_spec.rb

@@ -26,7 +26,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",
+      @new_sleep = client.create_sleep({authentication_token: ENV['TEST_USER_AUTHENTICATION_TOKEN'],
                                         access_token: "DEMO_KEY",
                                         total_sleep: 210,
                                         awake: 10,
@@ -68,7 +68,7 @@ describe Validic::Sleep do
 
   context "#get_sleeps by user" do
     before do
-      @sleep = client.get_sleeps({user_id: "52967e076dedda5d4300000b"})
+      @sleep = client.get_sleeps({user_id: ENV['TEST_USER_ID']})
     end
 
     it "returns JSON response of Validic::Sleep", vcr: true do

data/spec/validic/third_party_app_spec.rb

@@ -7,7 +7,7 @@ describe Validic::ThirdPartyApp do
 
   context "#get_apps" do
     before do
-      @app_response = client.get_apps({organization_id: "51aca5a06dedda916400002b", authentication_token: "ef617d9d3bb39b4112f60dc65ee40061165c1ab4375e3ea63896f63a7390c4db"})
+      @app_response = client.get_apps
     end
 
     it "returns JSON response of Validic::ThirdPartyApp", vcr: true do
@@ -21,7 +21,7 @@ describe Validic::ThirdPartyApp do
 
   context "#get_synced_apps" do
     before do
-      @synced_app_response = client.get_synced_apps({authentication_token: "efL6rrKifMK6wYfShJBA"})
+      @synced_app_response = client.get_synced_apps({authentication_token: ENV['TEST_USER_AUTHENTICATION_TOKEN']})
     end
 
     it "returns JSON response of Validic::ThirdPartyApp", vcr: true do

data/spec/validic/tobacco_cessation_spec.rb

@@ -26,7 +26,7 @@ describe Validic::TobaccoCessation do
   context "#create_tobacco_cessation" do
     it "should create new tobacco_cessation record" do
       pending
-      @new_tobacco_cessation = client.create_tobacco_cessation({authentication_token: "mqwpDx8RYcmSFBJDmy3J",
+      @new_tobacco_cessation = client.create_tobacco_cessation({authentication_token: ENV['TEST_USER_AUTHENTICATION_TOKEN'],
                                                                 access_token: "DEMO_KEY",
                                                                 timestamp: "2013-05-01 07:12:16 -05:00",
                                                                 cigarettes_allowed: 10,
@@ -63,7 +63,7 @@ describe Validic::TobaccoCessation do
 
   context "#get_tobacco_cessations by user" do
     before do
-      @tobacco_cessation = client.get_tobacco_cessations({user_id: "52967e076dedda5d4300000b"})
+      @tobacco_cessation = client.get_tobacco_cessations({user_id: ENV['TEST_USER_ID']})
     end
 
     it "returns JSON response of Validic::TobaccoCessation", vcr: true do

data/spec/validic/user_spec.rb

@@ -5,6 +5,25 @@ describe Validic::User do
 
   let(:client) { Validic::Client.new }
 
+  context "#get_users" do
+    before do
+      @users_response = client.get_users
+    end
+
+    it "returns JSON response of Validic::Organization", vcr: true do
+      @users_response.should_not be_nil
+    end
+
+    it "status 200" do
+      @users_response.summary.status.should == 200
+    end
+
+    it "has summary node" do
+      @users_response.summary.should_not be_nil
+    end
+
+  end
+
   context "#me" do
     before do
       @me = client.me({})
@@ -25,7 +44,6 @@ describe Validic::User do
     it "should create a new user under an organization" do
       pending
       @new_user = client.user_provision(organization_id: "51aca5a06dedda916400002b",
-                                        access_token: "ENTERPRISE_KEY",
                                         uid: "123asdfg",
                                         height: 167,
                                         weight: 69,
@@ -43,7 +61,7 @@ describe Validic::User do
     it "should suspend a user" do
       pending
       @suspend_user = client.user_suspend(organization_id: "51aca5a06dedda916400002b",
-                                          user_id: "52967e076dedda5d4300000b",
+                                          user_id: ENV['TEST_USER_ID'],
                                           access_token: "9c03ad2bcb022425944e4686d398ef8398f537c2f7c113495ffa7bc9cfa49286",
                                           suspend: 1)
       @suspend_user.message.should eq "The user has been suspended successfully"

data/spec/validic/weight_spec.rb

@@ -26,7 +26,7 @@ describe Validic::Weight do
   context "#create_weight" do
     it "should create new weight record" do
       pending
-      @new_weight = client.create_weight({authentication_token: "mqwpDx8RYcmSFBJDmy3J",
+      @new_weight = client.create_weight({authentication_token: ENV['TEST_USER_AUTHENTICATION_TOKEN'],
                                           access_token: "DEMO_KEY",
                                           timestamp: "2013-05-16 07:12:16 -05:00",
                                           bmi: 133.26,
@@ -69,7 +69,7 @@ describe Validic::Weight do
 
   context "#get_weights by user" do
     before do
-      @weight = client.get_weights({user_id: "52967e076dedda5d4300000b"})
+      @weight = client.get_weights({user_id: ENV['TEST_USER_ID']})
     end
 
     it "returns JSON response of Validic::Weight", vcr: true do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validic
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Julius Francisco & Jay Balanay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-25 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware