validic 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8852001360881e470bc390ff9e44d0c83f8c42c
-  data.tar.gz: e3494be76d5d6794db140f08a7228b8ed9788430
+  metadata.gz: 126d89621c9028f5e07f6988e1d460d273f864b2
+  data.tar.gz: cfd36bbb933bb2e10d239a049bb6dbd375c3ca16
 SHA512:
-  metadata.gz: 3ca048da5b89cbada497942557373b0b9d25bc25d296c238349edf72211caf5054a38832b3e26cc8477ea5c8ad36050476eb861e65791941ec0e867c1ab77394
-  data.tar.gz: 06ef87e636504d0db352769653d77bbb690e8e94d156a8c1dda454f99886f3a30897df85443aefd4e98dad4f47afb4de719b7555f81d598150668666f0157ded
+  metadata.gz: 6c77c1e8227a18bbff2bc64d9fa4d3a160fa8803707bf7db7635d2dfd648cdfe00d4bcfc36231a68a661f8038648cc1d19c7363f1dfb26d5d418e6ef4682dcce
+  data.tar.gz: a94a08ba6093f64a15f8e60b52e0fdbf05de887c86cb52b2b98b4bf06c0a354c8f8341eff5e82c9081749ccbc45add1a82cfba258c68a797abb7f994cfb83a6e

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Change Log
+
+0.5.0
+-----------
+- Ability to call the next or previous page from a Validic::Response

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    validic (0.4.1)
+    validic (0.5.0)
       faraday_middleware (~> 0.9.0)
       multi_json
 
@@ -13,12 +13,12 @@ GEM
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.9.1)
+    faraday_middleware (0.9.2)
       faraday (>= 0.7.4, < 0.10)
     method_source (0.8.2)
-    multi_json (1.11.0)
+    multi_json (1.11.2)
     multipart-post (2.0.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
@@ -55,3 +55,6 @@ DEPENDENCIES
   validic!
   webmock (~> 1.20.4)
   yard
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -71,7 +71,7 @@ require 'validic'
 Validic.configure do |config|
   config.api_url          = 'https://api.validic.com'
   config.api_version      = 'v1'
-  config.access_token     = 'ORGANIZATION_ACCESS_TOKEN',
+  config.access_token     = 'ORGANIZATION_ACCESS_TOKEN'
   config.organization_id  = 'ORGANIZATION_ID'
 end
 
@@ -88,7 +88,7 @@ options = {
   access_token:    'ORGANIZATION_ACCESS_TOKEN',
   organization_id: 'ORGANIZATION_ID'
 }
-client = Validic::Client.new options
+client = Validic::Client.new(options)
 ```
 
 Now you can use the wrapper's helper methods to interface with the Validic API.
@@ -112,9 +112,6 @@ client.get_routine(start_date: '2015-01-01T00:00:00+00:00')
 
 ### More Examples ###
 
-You can override initialized organization id and access tokens for all helper
-methods by passing parameters in an options hash as a final parameter.
-
 Below are examples of all helper methods.
 
 ```ruby
@@ -230,7 +227,7 @@ client.get_users(user_id: '5499a29b84626b0339000094')
 client.refresh_token(user_id: '5499a29b84626b0339000094')
 ```
 
-##### Get user id from authentication token
+##### Get user_id from authentication token
 ```ruby
 client.me(authentication_token: 'L9RFSRnJvkwfiZm8vEc4')
 ```
@@ -338,15 +335,27 @@ client.get_sleep
 client.get_tobacco_cessations
 ```
 
+##### Get the next page of a Validic::Response
+```ruby
+data = client.get_routine(start_date: '2013-01-01', paginated: "true")
+data.next
+```
+
+##### Get the previous page of a Validic::Response
+```ruby
+data = client.get_routine(start_date: '2013-01-01', paginated: "true", page: 3)
+data.previous
+```
+
 ##   [Validic Connect](https://validic.com/api/partners)
 
 
 ##### CRUD Operations
-As a Validic Connect partner you have access to all CRUD operations including create, update and delete.  The gem supports all 3 of these:
+As a Validic Connect partner you have access to all CRUD operations.
 
 **Create**
 ```ruby
-client.create_sleep(user_id: 'VALIDIC_USER_ID, activity_id: 'UNIQUE_ACTIVITY_ID', awake: 2, rem: 1, deep: 7)
+client.create_sleep(user_id: 'VALIDIC_USER_ID', activity_id: 'UNIQUE_ACTIVITY_ID', awake: 2, rem: 1, deep: 7)
 =>  #<Validic::Sleep:0x007fafcc2cdd40
  @_id="54b93e1b84626b0581000012",
  @activity_id="22323",

data/lib/validic/client.rb

@@ -9,11 +9,11 @@ require 'validic/rest/nutrition'
 require 'validic/rest/organizations'
 require 'validic/rest/profile'
 require 'validic/rest/request'
+require 'validic/rest/response'
 require 'validic/rest/routine'
 require 'validic/rest/sleep'
 require 'validic/rest/tobacco_cessation'
 require 'validic/rest/users'
-require 'validic/rest/utils'
 require 'validic/rest/weight'
 require 'validic/version'
 
@@ -27,11 +27,11 @@ module Validic
     include REST::Organizations
     include REST::Profile
     include REST::Request
+    include REST::Response
     include REST::Routine
     include REST::Sleep
     include REST::TobaccoCessation
     include REST::Users
-    include REST::Utils
     include REST::Weight
 
     attr_accessor :api_url,
@@ -44,10 +44,10 @@ module Validic
     #
     # @params options[Hash]
     def initialize(options={})
-      @api_url        = options[:api_url].nil? ? 'https://api.validic.com' : 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]
+      @api_url          = options.fetch(:api_url, 'https://api.validic.com')
+      @api_version      = options.fetch(:api_version, 'v1')
+      @access_token     = options.fetch(:access_token, Validic.access_token)
+      @organization_id  = options.fetch(:organization_id, Validic.organization_id)
       reload_config
     end
 

data/lib/validic/error.rb

@@ -9,11 +9,13 @@ module Validic
     UnprocessableEntity = Class.new(ClientError)
     Conflict = Class.new(ClientError)
     InternalServerError = Class.new(ServerError)
+    InvalidDate = Class.new(ClientError)
 
     ERRORS = {
       401 => Validic::Error::Unauthorized,
       403 => Validic::Error::Forbidden,
       404 => Validic::Error::NotFound,
+      406 => Validic::Error::InvalidDate,
       409 => Validic::Error::Conflict,
       422 => Validic::Error::UnprocessableEntity,
       500 => Validic::Error::InternalServerError

data/lib/validic/response.rb

@@ -1,15 +1,54 @@
+require 'validic/summary'
+
 module Validic
   class Response
+    include REST::Request
     attr_reader :summary, :records, :attributes
-    def initialize(summary, response)
-      @summary = summary
 
-      case response
+    def initialize(response, connection = nil)
+      @connection = connection
+      @summary = summary_object(response)
+      case resp = response_object(response)
       when Array
-        @records = response
+        @records = resp
       when Hash
-        @attributes = response
+        @attributes = resp
       end
     end
+
+    def next
+      return nil unless next_url = summary.next
+      resp = get(next_url, {})
+      self.class.new(resp, connection)
+    end
+
+    def previous
+      return nil unless previous_url = summary.previous
+      resp = get(previous_url, {})
+      self.class.new(resp, connection)
+    end
+
+    private
+
+    def connection
+      @connection
+    end
+
+    def summary_object(resp)
+      Validic::Summary.new(resp.delete("summary"))
+    end
+
+    def response_object(resp)
+      return resp.values.first if resp.values.first.is_a? Hash
+      klass = Validic.const_get(camelize_response_key(resp))
+      resp.values.flatten.collect { |obj| klass.new(obj) }
+    end
+
+    def camelize_response_key(resp)
+      key = resp.keys.first
+      key = key.include?('_') ? key.split('_').map(&:capitalize).join : key.capitalize
+      key.chop! if %w(Users Apps).include?(key) #strip last letter off to match ::User or ::App
+      key
+    end
   end
 end

data/lib/validic/rest/apps.rb

@@ -4,16 +4,14 @@ module Validic
   module REST
     module Apps
 
-      def get_org_apps
-        resp = get_request(:apps)
-        build_response_attr(resp)
+      def get_org_apps(params = {})
+        build_response(get_request(:apps, params))
       end
       alias :get_apps :get_org_apps
 
       def get_user_synced_apps(options = {})
-        resp = get_request(:sync_apps,
-                           authentication_token: options[:authentication_token])
-        build_response_attr(resp)
+        build_response(get_request(:sync_apps,
+                           authentication_token: options[:authentication_token]))
       end
       alias :get_synced_apps :get_user_synced_apps
     end

data/lib/validic/rest/biometrics.rb

@@ -5,8 +5,7 @@ module Validic
     module Biometrics
 
       def get_biometrics(options = {})
-        resp = get_request(:biometrics, options)
-        build_response_attr(resp)
+        build_response(get_request(:biometrics, options))
       end
 
       def create_biometrics(options = {})
@@ -31,8 +30,7 @@ module Validic
       end
 
       def latest_biometrics(options = {})
-        resp = latest(:biometrics, options)
-        build_response_attr(resp)
+        build_response(latest(:biometrics, options))
       end
     end
   end

data/lib/validic/rest/diabetes.rb

@@ -5,8 +5,7 @@ module Validic
     module Diabetes
 
       def get_diabetes(options = {})
-        resp = get_request(:diabetes, options)
-        build_response_attr(resp)
+        build_response(get_request(:diabetes, options))
       end
 
       def create_diabetes(options = {})
@@ -31,8 +30,7 @@ module Validic
       end
 
       def latest_diabetes(options = {})
-        resp = latest(:diabetes, options)
-        build_response_attr(resp)
+        build_response(latest(:diabetes, options))
       end
     end
   end

data/lib/validic/rest/fitness.rb

@@ -5,8 +5,7 @@ module Validic
     module Fitness
 
       def get_fitness(options = {})
-        resp = get_request(:fitness, options)
-        build_response_attr(resp)
+        build_response(get_request(:fitness, options))
       end
       alias :get_fitnesses :get_fitness
 
@@ -32,8 +31,7 @@ module Validic
       end
 
       def latest_fitness(options = {})
-        resp = latest(:fitness, options)
-        build_response_attr(resp)
+        build_response(latest(:fitness, options))
       end
     end
   end

data/lib/validic/rest/nutrition.rb

@@ -5,8 +5,7 @@ module Validic
     module Nutrition
 
       def get_nutrition(options = {})
-        resp = get_request(:nutrition, options)
-        build_response_attr(resp)
+        build_response(get_request(:nutrition, options))
       end
       alias :get_nutritions :get_nutrition
 
@@ -32,8 +31,7 @@ module Validic
       end
 
       def latest_nutrition(options = {})
-        resp = latest(:nutrition, options)
-        build_response_attr(resp)
+        build_response(latest(:nutrition, options))
       end
     end
   end

data/lib/validic/rest/organizations.rb

@@ -4,8 +4,7 @@ module Validic
   module REST
     module Organizations
       def get_organization(params = {})
-        resp = get_request(:organizations, params)
-        build_response_attr(resp)
+        build_response(get_request(:organizations, params))
       end
     end
   end

data/lib/validic/rest/response.rb

@@ -0,0 +1,13 @@
+require 'validic/response'
+
+module Validic
+  module REST
+    module Response
+      private
+
+      def build_response(response)
+        Validic::Response.new(response, connection)
+      end
+    end
+  end
+end

data/lib/validic/rest/routine.rb

@@ -5,8 +5,7 @@ module Validic
     module Routine
 
       def get_routine(params = {})
-        resp = get_request(:routine, params)
-        build_response_attr(resp)
+        build_response(get_request(:routine, params))
       end
       alias :get_routines :get_routine
 
@@ -32,8 +31,7 @@ module Validic
       end
 
       def latest_routine(options = {})
-        resp = latest(:routine, options)
-        build_response_attr(resp)
+        build_response(latest(:routine, options))
       end
     end
   end

data/lib/validic/rest/sleep.rb

@@ -5,8 +5,7 @@ module Validic
     module Sleep
 
       def get_sleep(options = {})
-        resp = get_request(:sleep, options)
-        build_response_attr(resp)
+        build_response(get_request(:sleep, options))
       end
       alias :get_sleeps :get_sleep
 
@@ -25,8 +24,7 @@ module Validic
       end
 
       def latest_sleep(options = {})
-        resp = latest(:sleep, options)
-        build_response_attr(resp)
+        build_response(latest(:sleep, options))
       end
 
       def delete_sleep(options = {})

data/lib/validic/rest/tobacco_cessation.rb

@@ -5,8 +5,7 @@ module Validic
     module TobaccoCessation
 
       def get_tobacco_cessation(options = {})
-        resp = get_request(:tobacco_cessation, options)
-        build_response_attr(resp)
+        build_response(get_request(:tobacco_cessation, options))
       end
       alias :get_tobacco_cessations :get_tobacco_cessation
 
@@ -32,8 +31,7 @@ module Validic
       end
 
       def latest_tobacco_cessation(options = {})
-        resp = latest(:tobacco_cessation, options)
-        build_response_attr(resp)
+        build_response(latest(:tobacco_cessation, options))
       end
     end
   end

data/lib/validic/rest/users.rb

@@ -5,8 +5,7 @@ module Validic
     module Users
 
       def get_users(options = {})
-        resp = get_request(:users, options)
-        build_response_attr(resp)
+        build_response(get_request(:users, options))
       end
       alias :get_user :get_users
 

data/lib/validic/rest/weight.rb

@@ -5,10 +5,8 @@ module Validic
     module Weight
 
       def get_weight(params={})
-        resp = get_request(:weight, params)
-        build_response_attr(resp)
+        build_response(get_request(:weight, params))
       end
-
       alias :get_weights :get_weight
 
       def create_weight(options={})
@@ -34,10 +32,8 @@ module Validic
       end
 
       def latest_weight(options={})
-        resp = latest(:weight, options)
-        build_response_attr(resp)
+        build_response(latest(:weight, options))
       end
-
     end
   end
 end

data/lib/validic/summary.rb

@@ -3,6 +3,7 @@ module Validic
     attr_reader :timestamp, :start_date, :end_date, :offset, :message,
       :results, :limit, :previous, :next, :status
     def initialize(sum_hash)
+      sum_hash = Hash(sum_hash)
       @timestamp = sum_hash["timestamp"]
       @status = sum_hash["status"]
       @offset = sum_hash["offset"]

data/lib/validic/version.rb

@@ -1,3 +1,3 @@
 module Validic
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

data/spec/fixtures/invalid_date.json

@@ -0,0 +1 @@
+{"code": 406, "message": "Not Acceptable", "errors": ["Invalid date"]}

data/spec/fixtures/routines.json

@@ -8,7 +8,7 @@
     "offset": 0,
     "limit": 100,
     "previous": null,
-    "next": null,
+    "next": "https://api.validic.com/v1/organizations/1/routine.json?access_token=1&paginated=true&start_date=2013-01-01&page=2",
     "params": {
       "start_date": null,
       "end_date": null,
@@ -44,4 +44,3 @@
   }
   ]
 }
-

data/spec/fixtures/routines2.json

@@ -0,0 +1,46 @@
+{
+  "summary": {
+    "status": 200,
+    "message": "OK",
+    "results": 3,
+    "start_date": "2013-03-27T00:00:00+00:00",
+    "end_date": "2013-03-27T23:59:59+00:00",
+    "offset": 0,
+    "limit": 100,
+    "previous": "https://api.validic.com/v1/organizations/1/routine.json?access_token=1&paginated=true&start_date=2013-01-01&page=1",
+    "next": null,
+    "params": {
+      "start_date": null,
+      "end_date": null,
+      "offset": null,
+      "limit": null
+    }
+  },"routine": [
+    {
+    "_id": "51552cdbfded0807c4000062",
+    "timestamp": "2013-03-10T07:12:16+00:00",
+    "utc_offset": "+00:00",
+    "steps": 9355,
+    "distance": 7290.33,
+    "floors": 23,
+    "elevation": 3.4,
+    "calories_burned": 2874,
+    "source": "sample_app",
+    "source_name": "Sample App",
+    "last_updated": "2013-03-10T07:12:16+00:00"
+  },
+  {
+    "_id": "51552cdbfded0807c4000062",
+    "timestamp": "2013-03-10T07:12:16+00:00",
+    "utc_offset": "+00:00",
+    "steps": 9355,
+    "distance": 7290.33,
+    "floors": 23,
+    "elevation": 3.4,
+    "calories_burned": 2874,
+    "source": "sample_app",
+    "source_name": "Sample App",
+    "last_updated": "2013-03-10T07:12:16+00:00"
+  }
+  ]
+}

data/spec/validic/client_spec.rb

@@ -2,9 +2,44 @@
 require 'spec_helper'
 
 describe Validic::Client do
-  let(:client) { Validic::Client.new }
+
+  describe '#initialize' do
+    before(:each) do
+      Validic.configure do |config|
+        config.access_token = '1234'
+        config.organization_id = 1
+      end
+    end
+
+    it 'uses defaults' do
+      client = Validic::Client.new
+
+      expect(client.api_url).to eq 'https://api.validic.com'
+      expect(client.api_version).to eq 'v1'
+      expect(client.access_token).to eq '1234'
+      expect(client.organization_id).to eq 1
+    end
+
+    it 'uses options' do
+      opts = {
+                api_url: 'http://test.example.com',
+                api_version: 'v2',
+                access_token: 'abcd',
+                organization_id: 2
+              }
+
+      client = Validic::Client.new(opts)
+
+      expect(client.api_url).to eq 'http://test.example.com'
+      expect(client.api_version).to eq 'v2'
+      expect(client.access_token).to eq 'abcd'
+      expect(client.organization_id).to eq 2
+    end
+  end
 
   describe '#connection' do
+    let(:client) { Validic::Client.new }
+
     it 'returns a Faraday::Connection object' do
       expect(client.connection).to be_kind_of Faraday::Connection
     end

data/spec/validic/error_spec.rb

@@ -70,4 +70,20 @@ describe Validic::Error do
       expect { client.get_profile }.to raise_error(Validic::Error::Unauthorized)
     end
   end
+
+  context 'Invalid date' do
+    before do
+      stub_request(:get, /fitness/)
+        .to_return(status: 406, body: fixture('invalid_date.json'),
+                   headers: { content_type: 'application/json; charset=utf-8' })
+    end
+    it 'raises an InvalidDate error' do
+      start_date = DateTime.new(2015, 07, 15, 12)
+      end_date = DateTime.new(2015, 07, 15, 13)
+
+      expect {
+        client.get_fitness(start_date: start_date, end_date: end_date)
+      }.to raise_error Validic::Error::InvalidDate
+    end
+  end
 end

data/spec/validic/response_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Validic::Response do
+  let(:client) { Validic::Client.new }
+
+  describe "Validic::Response next/previous" do
+    before do
+      stub_get('/organizations/1/routine.json')
+        .with(query: { access_token: '1' })
+        .to_return(body: fixture('routines.json'),
+      headers: { content_type: 'application/json; charset=utf-8' })
+      stub_get('/organizations/1/routine.json')
+        .with(query: { access_token: '1', page: '2', paginated: 'true', start_date: '2013-01-01' })
+        .to_return(body: fixture('routines2.json'),
+      headers: { content_type: 'application/json; charset=utf-8' })
+      stub_get('/organizations/1/routine.json')
+        .with(query: { access_token: '1', page: '1', paginated: 'true', start_date: '2013-01-01'  })
+        .to_return(body: fixture('routines.json'),
+      headers: { content_type: 'application/json; charset=utf-8' })
+    end
+    it "makes a #next call" do
+      routine = client.get_routine
+      expect(routine).to be_a Validic::Response
+
+      next_call = routine.next
+      expect(next_call).to be_a Validic::Response
+      expect(next_call.records.size).to eq 2
+    end
+    it "makes a #previous call" do
+      routine = client.get_routine
+      expect(routine).to be_a Validic::Response
+      next_call = routine.next
+      previous_call = next_call.previous
+
+      expect(previous_call).to be_a Validic::Response
+      expect(previous_call.records.size).to eq 2
+    end
+  end
+end

data/spec/validic/rest/apps_spec.rb

@@ -4,19 +4,38 @@ describe Validic::REST::Apps do
   let(:client) { Validic::Client.new }
 
   describe "#get_apps" do
-    before do
-      stub_get("/organizations/1/apps.json")
-        .with(query: { access_token: '1' })
-        .to_return(body: fixture('apps.json'),
-      headers: { content_type: 'application/json; charset=utf-8' })
-        @apps = client.get_org_apps
-    end
-    it 'returns a response object' do
-      expect(@apps).to be_a Validic::Response
+    context 'non-expanded' do
+      before do
+        stub_get("/organizations/1/apps.json")
+          .with(query: { access_token: '1' })
+          .to_return(body: fixture('apps.json'),
+        headers: { content_type: 'application/json; charset=utf-8' })
+          @apps = client.get_org_apps
+      end
+
+      it 'returns a response object' do
+        expect(@apps).to be_a Validic::Response
+      end
+      it 'makes an apps request to the correct url' do
+        expect(a_get('/organizations/1/apps.json')
+          .with(query: { access_token: '1' })).to have_been_made
+      end
     end
-    it 'makes an apps request to the correct url' do
-      expect(a_get('/organizations/1/apps.json')
-        .with(query: { access_token: '1' })).to have_been_made
+    context 'expanded' do
+      before do
+        stub_get("/organizations/1/apps.json")
+          .with(query: { access_token: '1', expanded: 1 })
+          .to_return(body: fixture('apps.json'),
+        headers: { content_type: 'application/json; charset=utf-8' })
+          @apps = client.get_org_apps(expanded: 1)
+      end
+      it 'returns a response object' do
+        expect(@apps).to be_a Validic::Response
+      end
+      it 'makes an apps request to the correct url' do
+        expect(a_get('/organizations/1/apps.json')
+          .with(query: { access_token: '1', expanded: '1' })).to have_been_made
+      end
     end
   end
 
@@ -26,7 +45,7 @@ describe Validic::REST::Apps do
         .with(query: { authentication_token: '2', access_token: '1' })
         .to_return(body: fixture('synced_apps.json'),
       headers: { content_type: 'application/json; charset=utf-8' })
-      @synced_apps = client.get_user_synced_apps(authentication_token: '2')
+        @synced_apps = client.get_user_synced_apps(authentication_token: '2')
     end
     it 'returns a response object' do
       expect(@synced_apps).to be_a Validic::Response

data/spec/validic/summary_spec.rb

@@ -1,3 +1,16 @@
 describe Validic::Summary do
 
+  describe "#initialize" do
+    it "does not raise error with nil sum_hash" do
+      expect { Validic::Summary.new(nil) }.to_not raise_error
+    end
+
+    it "sets all attributes to nil if initialized with nil sum_hash" do
+      summary = Validic::Summary.new(nil)
+
+      %w(timestamp start_date end_date offset message results limit previous next status).each do |message|
+        expect(summary.send(message)).to be_nil
+      end
+    end
+  end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: validic
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Julius Francisco & Jay Balanay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: API Wrapper for Validic
@@ -60,8 +60,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -87,11 +88,11 @@ files:
 - lib/validic/rest/organizations.rb
 - lib/validic/rest/profile.rb
 - lib/validic/rest/request.rb
+- lib/validic/rest/response.rb
 - lib/validic/rest/routine.rb
 - lib/validic/rest/sleep.rb
 - lib/validic/rest/tobacco_cessation.rb
 - lib/validic/rest/users.rb
-- lib/validic/rest/utils.rb
 - lib/validic/rest/weight.rb
 - lib/validic/routine.rb
 - lib/validic/sleep.rb
@@ -123,6 +124,7 @@ files:
 - spec/fixtures/fitnesses.json
 - spec/fixtures/forbidden.json
 - spec/fixtures/internal_server.json
+- spec/fixtures/invalid_date.json
 - spec/fixtures/me.json
 - spec/fixtures/not_found.json
 - spec/fixtures/nutrition-expanded.json
@@ -137,6 +139,7 @@ files:
 - spec/fixtures/routine-extras.json
 - spec/fixtures/routine.json
 - spec/fixtures/routines.json
+- spec/fixtures/routines2.json
 - spec/fixtures/sleep-expanded.json
 - spec/fixtures/sleep-extras.json
 - spec/fixtures/sleep.json
@@ -160,6 +163,7 @@ files:
 - spec/validic/client_spec.rb
 - spec/validic/error_spec.rb
 - spec/validic/expanded_spec.rb
+- spec/validic/response_spec.rb
 - spec/validic/rest/apps_spec.rb
 - spec/validic/rest/biometrics_spec.rb
 - spec/validic/rest/diabetes_spec.rb
@@ -185,17 +189,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: API Wrapper for Validic
@@ -222,6 +226,7 @@ test_files:
 - spec/fixtures/fitnesses.json
 - spec/fixtures/forbidden.json
 - spec/fixtures/internal_server.json
+- spec/fixtures/invalid_date.json
 - spec/fixtures/me.json
 - spec/fixtures/not_found.json
 - spec/fixtures/nutrition-expanded.json
@@ -236,6 +241,7 @@ test_files:
 - spec/fixtures/routine-extras.json
 - spec/fixtures/routine.json
 - spec/fixtures/routines.json
+- spec/fixtures/routines2.json
 - spec/fixtures/sleep-expanded.json
 - spec/fixtures/sleep-extras.json
 - spec/fixtures/sleep.json
@@ -259,6 +265,7 @@ test_files:
 - spec/validic/client_spec.rb
 - spec/validic/error_spec.rb
 - spec/validic/expanded_spec.rb
+- spec/validic/response_spec.rb
 - spec/validic/rest/apps_spec.rb
 - spec/validic/rest/biometrics_spec.rb
 - spec/validic/rest/diabetes_spec.rb

data/lib/validic/rest/utils.rb

@@ -1,28 +0,0 @@
-require 'validic/response'
-require 'validic/summary'
-
-module Validic
-  module REST
-    module Utils
-      private
-
-      def build_response_attr(resp)
-        summary = Validic::Summary.new(resp.delete("summary"))
-        Validic::Response.new(summary, response_object(resp))
-      end
-
-      def response_object(resp)
-        return resp.values.first if resp.values.first.is_a? Hash
-        klass = Validic.const_get(camelize_response_key(resp))
-        resp.values.flatten.collect { |obj| klass.new(obj) }
-      end
-
-      def camelize_response_key(resp)
-        key = resp.keys.first
-        key = key.include?('_') ? key.split('_').map(&:capitalize).join : key.capitalize
-        key.chop! if %w(Users Apps).include?(key) #strip last letter off to match ::User or ::App
-        key
-      end
-    end
-  end
-end