my_john_deere_api 2.5.0 → 3.0.0

data/test/lib/my_john_deere_api/model/contribution_product_test.rb

@@ -1,6 +1,8 @@
 require 'support/helper'
 
 describe 'MyJohnDeereApi::Model::ContributionProduct' do
+  include JD::LinkHelpers
+
   let(:klass) { JD::Model::ContributionProduct }
 
   let(:record) do
@@ -32,14 +34,9 @@ describe 'MyJohnDeereApi::Model::ContributionProduct' do
   end
 
   describe '#initialize' do
-    def link_for label
-      camel_label = label.gsub(/_(.)/){|m| m[1].upcase}
-      record['links'].detect{|link| link['rel'] == camel_label}['uri'].gsub('https://sandboxapi.deere.com/platform', '')
-    end
-
     it 'sets the attributes from the given record' do
       product = klass.new(client, record)
-      
+
       assert_equal client, product.client
       assert_equal accessor, product.accessor
 
@@ -59,7 +56,7 @@ describe 'MyJohnDeereApi::Model::ContributionProduct' do
       product = klass.new(client, record)
 
       ['self', 'contribution_definition'].each do |association|
-        assert_equal link_for(association), product.links[association]
+        assert_link_for product, association
       end
     end
   end

data/test/lib/my_john_deere_api/model/field_test.rb

@@ -1,6 +1,8 @@
 require 'support/helper'
 
 describe 'MyJohnDeereApi::Model::Field' do
+  include JD::LinkHelpers
+
   let(:klass) { JD::Model::Field }
 
   let(:record) do
@@ -18,10 +20,6 @@ describe 'MyJohnDeereApi::Model::Field' do
   end
 
   describe '#initialize' do
-    def link_for label
-      record['links'].detect{|link| link['rel'] == label}['uri'].gsub('https://sandboxapi.deere.com/platform', '')
-    end
-
     it 'sets the attributes from the given record' do
       field = klass.new(client, record)
 
@@ -36,8 +34,8 @@ describe 'MyJohnDeereApi::Model::Field' do
       # links to other things
       assert_kind_of Hash, field.links
 
-      ['clients', 'notes'].each do |association|
-        assert_equal link_for(association), field.links[association]
+      [:clients, :notes].each do |association|
+        assert_link_for field, association
       end
     end
   end

data/test/lib/my_john_deere_api/model/flag_test.rb

@@ -2,6 +2,8 @@ require 'support/helper'
 require 'json'
 
 describe 'MyJohnDeereApi::Model::Flag' do
+  include JD::LinkHelpers
+
   let(:klass) { JD::Model::Flag }
 
   let(:record) do
@@ -21,10 +23,6 @@ describe 'MyJohnDeereApi::Model::Flag' do
   end
 
   describe '#initialize' do
-    def link_for label
-      record['links'].detect{|link| link['rel'] == label}['uri'].gsub('https://sandboxapi.deere.com/platform', '')
-    end
-
     it 'sets the attributes from the given record' do
       flag = klass.new(client, record)
 
@@ -40,9 +38,10 @@ describe 'MyJohnDeereApi::Model::Flag' do
 
       # links to other things
       assert_kind_of Hash, flag.links
-      assert_equal link_for('field'), flag.links['field']
-      assert_equal link_for('createdBy'), flag.links['created_by']
-      assert_equal link_for('lastModifiedBy'), flag.links['last_modified_by']
+
+      [:field, :created_by, :last_modified_by].each do |attribute|
+        assert_link_for(flag, attribute)
+      end
     end
   end
 end

data/test/lib/my_john_deere_api/model/organization_test.rb

@@ -1,6 +1,8 @@
 require 'support/helper'
 
 describe 'MyJohnDeereApi::Model::Organization' do
+  include JD::LinkHelpers
+
   let(:klass) { JD::Model::Organization }
 
   let(:record) do
@@ -31,10 +33,6 @@ describe 'MyJohnDeereApi::Model::Organization' do
   end
 
   describe '#initialize(record, client = nil)' do
-    def link_for label
-      record['links'].detect{|link| link['rel'] == label}['uri'].gsub('https://sandboxapi.deere.com/platform', '')
-    end
-
     it 'sets the attributes from the given record' do
       organization = klass.new(client, record)
 
@@ -51,7 +49,7 @@ describe 'MyJohnDeereApi::Model::Organization' do
       assert_kind_of Hash, organization.links
 
       ['fields', 'machines', 'files', 'assets', 'farms', 'boundaries', 'clients', 'controllers'].each do |association|
-        assert_equal link_for(association), organization.links[association]
+        assert_link_for(organization, association)
       end
     end
   end

data/test/lib/my_john_deere_api/net_http_retry/decorator_test.rb

@@ -2,10 +2,10 @@ require 'support/helper'
 
 describe 'JD::NetHttpRetry::Decorator' do
   REQUESTS = {
-    get:    '/',
-    post:   '/organizations/000000/assets',
-    put:    '/assets/00000000-0000-0000-0000-000000000000',
-    delete: '/assets/00000000-0000-0000-0000-000000000000'
+    get:    '/platform/',
+    post:   '/platform/organizations/000000/assets',
+    put:    '/platform/assets/00000000-0000-0000-0000-000000000000',
+    delete: '/platform/assets/00000000-0000-0000-0000-000000000000'
   }
 
   REQUEST_METHODS = REQUESTS.keys
@@ -33,7 +33,7 @@ describe 'JD::NetHttpRetry::Decorator' do
   let(:exponential_retries) { (0..klass::DEFAULTS[:max_retries]-1).map{|i| 2 ** i} }
 
   it 'wraps a "net-http"-responsive object' do
-    assert_kind_of OAuth::AccessToken, accessor.object
+    assert_kind_of OAuth2::AccessToken, accessor.object
   end
 
   describe '#initialize' do
@@ -82,16 +82,16 @@ describe 'JD::NetHttpRetry::Decorator' do
     describe 'when retry_codes are specified' do
       let(:retry_codes) { ['200', '201'] }
 
-      it 'uses the supplied values' do
-        assert_equal retry_codes, object.retry_codes
+      it 'uses the integer versions of the supplied values' do
+        assert_equal retry_codes.map(&:to_i), object.retry_codes
       end
     end
 
     describe 'when retry_codes are specified as integers' do
       let(:retry_codes) { [200, 201] }
 
-      it 'uses the stringified versions of the supplied values' do
-        assert_equal retry_codes.map(&:to_s), object.retry_codes
+      it 'uses the supplied values' do
+        assert_equal retry_codes, object.retry_codes
       end
     end
 
@@ -104,16 +104,16 @@ describe 'JD::NetHttpRetry::Decorator' do
     describe 'when valid_codes are specified' do
       let(:valid_codes) { ['123', '234'] }
 
-      it 'uses the supplied values' do
-        assert_equal valid_codes, object.valid_codes
+      it 'uses the integer versions of the supplied values' do
+        assert_equal valid_codes.map(&:to_i), object.valid_codes
       end
     end
 
     describe 'when valid_codes are specified as integers' do
       let(:valid_codes) { [123, 234] }
 
-      it 'uses the stringified versions of the supplied values' do
-        assert_equal valid_codes.map(&:to_s), object.valid_codes
+      it 'uses the supplied values' do
+        assert_equal valid_codes, object.valid_codes
       end
     end
 
@@ -199,7 +199,7 @@ describe 'JD::NetHttpRetry::Decorator' do
 
         exception_json = JSON.parse(exception.message)
 
-        assert_equal '500', exception_json['code']
+        assert_equal 500, exception_json['code']
         assert_equal 'Internal Error', exception_json['message']
         assert_equal 'You Have Died of Dysentery', exception_json['body']
       end

data/test/lib/my_john_deere_api/net_http_retry/invalid_response_error_test.rb

@@ -3,7 +3,22 @@ require 'support/helper'
 describe 'JD::NetHttpRetry::InvalidResponseError' do
   let(:klass) { JD::NetHttpRetry::InvalidResponseError }
   let(:response) { stub(response_content) }
-  let(:response_content) { {code: '123', message: 'failed', body: 'body'} }
+
+  let(:faraday_response) do
+    stub(
+      status: '123',
+      reason_phrase: 'failed',
+      body: 'body'
+    )
+  end
+
+  let(:response_content) do
+    {
+      status: faraday_response.status,
+      body: faraday_response.body,
+      response: faraday_response
+    }
+  end
 
   it 'inherits from StandardError' do
     error = klass.new(response)
@@ -11,7 +26,12 @@ describe 'JD::NetHttpRetry::InvalidResponseError' do
   end
 
   it 'accepts a response object, and includes pertinent info' do
-    expected_message = response_content.to_json
+    expected_message = {
+      code: faraday_response.status,
+      message: faraday_response.reason_phrase,
+      body: faraday_response.body
+    }.to_json
+
     actual_message = klass.new(response).message
 
     assert_equal expected_message, actual_message

data/test/lib/my_john_deere_api/request/collection/asset_locations_test.rb

@@ -23,8 +23,8 @@ describe 'MyJohnDeereApi::Request::Collection::AssetLocations' do
   end
 
   describe '#resource' do
-    it 'returns /assets/{asset_id}/locations' do
-      assert_equal "/assets/#{asset_id}/locations", collection.resource
+    it 'returns /platform/assets/{asset_id}/locations' do
+      assert_equal "/platform/assets/#{asset_id}/locations", collection.resource
     end
   end
 

data/test/lib/my_john_deere_api/request/collection/assets_test.rb

@@ -23,8 +23,8 @@ describe 'MyJohnDeereApi::Request::Collection::Assets' do
   end
 
   describe '#resource' do
-    it 'returns /organizations/{org_id}/assets' do
-      assert_equal "/organizations/#{organization_id}/assets", collection.resource
+    it 'returns /platform/organizations/{org_id}/assets' do
+      assert_equal "/platform/organizations/#{organization_id}/assets", collection.resource
     end
   end
 

data/test/lib/my_john_deere_api/request/collection/contribution_definitions_test.rb

@@ -24,8 +24,8 @@ describe 'MyJohnDeereApi::Request::Collection::ContributionDefinitions' do
   end
 
   describe '#resource' do
-    it 'returns /contributionProducts/<contribution_product_id>/contributionDefinitions' do
-      assert_equal "/contributionProducts/#{contribution_product_id}/contributionDefinitions", collection.resource
+    it 'returns /platform/contributionProducts/<contribution_product_id>/contributionDefinitions' do
+      assert_equal "/platform/contributionProducts/#{contribution_product_id}/contributionDefinitions", collection.resource
     end
   end
 

data/test/lib/my_john_deere_api/request/collection/contribution_products_test.rb

@@ -24,8 +24,8 @@ describe 'MyJohnDeereApi::Request::Collection::ContributionProducts' do
   end
 
   describe '#resource' do
-    it 'returns /contributionProducts' do
-      assert_equal "/contributionProducts?clientControlled=true", collection.resource
+    it 'returns /platform/contributionProducts' do
+      assert_equal "/platform/contributionProducts?clientControlled=true", collection.resource
     end
   end
 

data/test/lib/my_john_deere_api/request/collection/fields_test.rb

@@ -23,8 +23,8 @@ describe 'MyJohnDeereApi::Request::Collection::Fields' do
   end
 
   describe '#resource' do
-    it 'returns /organizations/{org_id}/fields' do
-      assert_equal "/organizations/#{organization_id}/fields", collection.resource
+    it 'returns /platform/organizations/{org_id}/fields' do
+      assert_equal "/platform/organizations/#{organization_id}/fields", collection.resource
     end
   end
 

data/test/lib/my_john_deere_api/request/collection/flags_test.rb

@@ -24,8 +24,8 @@ describe 'MyJohnDeereApi::Request::Collection::Flags' do
   end
 
   describe '#resource' do
-    it 'returns /organizations/{org_id}/fields/{field_id}/flags' do
-      assert_equal "/organizations/#{organization_id}/fields/#{field_id}/flags", collection.resource
+    it 'returns /platform/organizations/{org_id}/fields/{field_id}/flags' do
+      assert_equal "/platform/organizations/#{organization_id}/fields/#{field_id}/flags", collection.resource
     end
   end
 

data/test/lib/my_john_deere_api/request/collection/organizations_test.rb

@@ -16,8 +16,8 @@ describe 'MyJohnDeereApi::Request::Collection::Organizations' do
   end
 
   describe '#resource' do
-    it 'returns /organization' do
-      assert_equal '/organizations', collection.resource
+    it 'returns /platform/organization' do
+      assert_equal '/platform/organizations', collection.resource
     end
   end
 

data/test/lib/my_john_deere_api/request/create/asset_location_test.rb

@@ -2,6 +2,8 @@ require 'support/helper'
 require 'date'
 
 describe 'MyJohnDeereApi::Request::Create::AssetLocation' do
+  include JD::ResponseHelpers
+
   def attributes_without(*keys)
     keys = keys.to_a
     attributes.reject{|k,v| keys.include?(k)}
@@ -23,7 +25,6 @@ describe 'MyJohnDeereApi::Request::Create::AssetLocation' do
   describe '#initialize(client, attributes)' do
     it 'accepts a client and attributes' do
       assert_equal client, object.client
-      assert_equal accessor, object.accessor
       assert_equal attributes, object.attributes
     end
 
@@ -138,7 +139,7 @@ describe 'MyJohnDeereApi::Request::Create::AssetLocation' do
     it 'makes the request' do
       VCR.use_cassette('post_asset_locations') { object.request }
 
-      assert_kind_of Net::HTTPCreated, object.response
+      assert_created(object.response)
     end
   end
 

data/test/lib/my_john_deere_api/request/create/asset_test.rb

@@ -1,6 +1,8 @@
 require 'support/helper'
 
 describe 'MyJohnDeereApi::Request::Create::Asset' do
+  include JD::ResponseHelpers
+
   def attributes_without(*keys)
     keys = keys.to_a
     attributes.reject{|k,v| keys.include?(k)}
@@ -22,7 +24,6 @@ describe 'MyJohnDeereApi::Request::Create::Asset' do
   describe '#initialize(client, attributes)' do
     it 'accepts a client and attributes' do
       assert_equal client, object.client
-      assert_equal accessor, object.accessor
       assert_equal attributes, object.attributes
     end
   end
@@ -121,7 +122,7 @@ describe 'MyJohnDeereApi::Request::Create::Asset' do
   describe '#resource' do
     it 'is built from the organization id' do
       object = klass.new(client, attributes)
-      assert_equal "/organizations/#{organization_id}/assets", object.send(:resource)
+      assert_equal "/platform/organizations/#{organization_id}/assets", object.send(:resource)
     end
   end
 
@@ -159,7 +160,7 @@ describe 'MyJohnDeereApi::Request::Create::Asset' do
     it 'makes the request' do
       VCR.use_cassette('post_assets') { object.request }
 
-      assert_kind_of Net::HTTPCreated, object.response
+      assert_created object.response
     end
   end
 
@@ -170,7 +171,7 @@ describe 'MyJohnDeereApi::Request::Create::Asset' do
 
       assert_kind_of JD::Model::Asset, result
 
-      expected_id = object.response['location'].split('/').last
+      expected_id = object.response.headers['location'].split('/').last
 
       assert_equal expected_id, result.id
       assert_equal attributes[:title], result.title

data/test/lib/my_john_deere_api/request/create/base_test.rb

@@ -9,21 +9,7 @@ describe 'MyJohnDeereApi::Request::Create::Base' do
       object = klass.new(client, attributes)
 
       assert_equal client, object.client
-      assert_equal accessor, object.accessor
       assert_equal attributes, object.attributes
     end
   end
-
-  describe '#headers' do
-    it 'sets the accept and content-type headers' do
-      object = klass.new(client, attributes)
-      headers = object.send(:headers)
-
-      expected = 'application/vnd.deere.axiom.v3+json'
-
-      assert_kind_of Hash, headers
-      assert_equal expected, headers['Accept']
-      assert_equal expected, headers['Content-Type']
-    end
-  end
 end

data/test/lib/my_john_deere_api/request/individual/asset_test.rb

@@ -10,7 +10,6 @@ describe 'MyJohnDeereApi::Request::Individual::Asset' do
   describe '#initialize(client, asset_id)' do
     it 'accepts a client' do
       assert_equal client, object.client
-      assert_equal accessor, object.accessor
     end
 
     it 'accepts asset_id as id' do
@@ -19,8 +18,8 @@ describe 'MyJohnDeereApi::Request::Individual::Asset' do
   end
 
   describe '#resource' do
-    it 'returns /assets/<asset_id>' do
-      assert_equal "/assets/#{asset_id}", object.resource
+    it 'returns /platform/assets/<asset_id>' do
+      assert_equal "/platform/assets/#{asset_id}", object.resource
     end
   end
 

data/test/lib/my_john_deere_api/request/individual/base_test.rb

@@ -8,7 +8,6 @@ describe 'MyJohnDeereApi::Request::Individual::Base' do
   describe '#initialize(client, asset_id)' do
     it 'accepts a client' do
       assert_equal client, object.client
-      assert_equal accessor, object.accessor
     end
 
     it 'accepts asset_id as id' do

data/test/lib/my_john_deere_api/request/individual/contribution_definition_test.rb

@@ -10,7 +10,6 @@ describe 'MyJohnDeereApi::Request::Individual::ContributionDefinition' do
   describe '#initialize(client, contribution_definition_id)' do
     it 'accepts a client' do
       assert_equal client, object.client
-      assert_equal accessor, object.accessor
     end
 
     it 'accepts contribution_definition_id as id' do
@@ -19,8 +18,8 @@ describe 'MyJohnDeereApi::Request::Individual::ContributionDefinition' do
   end
 
   describe '#resource' do
-    it 'returns /contributionDefinitions/<definition_id>' do
-      assert_equal "/contributionDefinitions/#{contribution_definition_id}", object.resource
+    it 'returns /platform/contributionDefinitions/<definition_id>' do
+      assert_equal "/platform/contributionDefinitions/#{contribution_definition_id}", object.resource
     end
   end