my_john_deere_api 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f611ef5d6785246196c22bc5e453374da5a4a513a689ad649ba1907de39c93f
-  data.tar.gz: 773b32b36229740d1d7885f4e8728cff83f32cb7b19d1ae65847b1bbdd8bea4a
+  metadata.gz: eb14a8c4e0fb2065e96d8a7f9bcff1502c2af26f3d312992765aecf36d15000f
+  data.tar.gz: 6d4095d5d77723b5b0e3e14dac54f414b28b998b6653fe85eecd7d2141de7aeb
 SHA512:
-  metadata.gz: 7cd73bbcea8e2615b5bbf4bbf4c91531a991b5c09566f1e7917fbb77d26309b9d4b8f5c532f081c3dd0f463e004ea716f687b2a953420798a7f71f98ee5de16e
-  data.tar.gz: 316d9852d79c9f86c6ec55b6bf5417dcaf47ca06da5eb391b79e19d18c9e20541c625aaa098102dec981ade2e503c673f10267a263069d2f355fcdd06ff46a11
+  metadata.gz: 31c66ca8dad9ce28792a20c61323c967cffb704f006ff752f11492d60ab458e81f462b5aee043bab130d0941c9ac37f9c667a4f57bf77e4885930502d2952bb6
+  data.tar.gz: f2dda7cbed562b64376dc86609048a2b55eef468a4b745ca1bc785da7fea38741b2adc8f396832419078758801369e4c2a03a95661b60728b7d814c29b6fdb12

data/lib/my_john_deere_api/model/base.rb

@@ -8,14 +8,14 @@ module MyJohnDeereApi
     ##
     # arguments:
     #
-    # [record] a JSON object of type 'Field', returned from the API.
-    #
     # [client] the client, because it contains all the config info.
     #          The alternative would be a true Config block, but then
     #          settings would be app-wide. This allows one app to have
     #          multiple clients with different settings.
+    #
+    # [record] a JSON object of type 'Field', returned from the API.
 
-    def initialize(record, client = nil)
+    def initialize(client, record)
       verify_record_type(record['@type'])
 
       @id = record['id']

data/lib/my_john_deere_api/request/collection/base.rb

@@ -77,7 +77,7 @@ module MyJohnDeereApi
     end
 
     def add_items_from_page(page)
-      @items += page['values'].map{|record| model.new(record, client) }
+      @items += page['values'].map{|record| model.new(client, record) }
     end
 
     def set_next_page(page)

data/lib/my_john_deere_api/request/create/base.rb

@@ -39,7 +39,7 @@ module MyJohnDeereApi
 
       request unless response
 
-      @object = model.new(fetch_record, client)
+      @object = model.new(client, fetch_record)
     end
 
     ##

data/lib/my_john_deere_api/request/individual/base.rb

@@ -12,10 +12,10 @@ module MyJohnDeereApi::Request
       @id = id
       @associations = associations
     end
-    
+
     ##
     # client accessor
-    
+
     def accessor
       return @accessor if defined?(@accessor)
       @accessor = client&.accessor
@@ -28,7 +28,7 @@ module MyJohnDeereApi::Request
       return @object if defined?(@object)
 
       request unless response
-      @object = model.new(JSON.parse(response.body), client)
+      @object = model.new(client, JSON.parse(response.body))
     end
 
     private

data/lib/my_john_deere_api/version.rb

@@ -1,3 +1,3 @@
 module MyJohnDeereApi
-  VERSION='2.2.0'
+  VERSION='2.2.1'
 end

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

@@ -20,9 +20,10 @@ describe 'MyJohnDeereApi::Model::AssetLocation' do
     end
 
     it 'sets the attributes from the given record' do
-      location = klass.new(record)
+      location = klass.new(client, record)
 
-      assert_nil location.accessor
+      assert_equal client, location.client
+      assert_equal accessor, location.accessor
 
       # basic attributes
       assert_equal record['timestamp'], location.timestamp
@@ -33,10 +34,5 @@ describe 'MyJohnDeereApi::Model::AssetLocation' do
       assert_kind_of Hash, location.links
       assert_equal 0, location.links.size
     end
-
-    it 'accepts an optional client' do
-      location = klass.new(record, client)
-      assert_equal client, location.client
-    end
   end
 end

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

@@ -26,9 +26,10 @@ describe 'MyJohnDeereApi::Model::Asset' do
     end
 
     it 'sets the attributes from the given record' do
-      asset = klass.new(record)
+      asset = klass.new(client, record)
 
-      assert_nil asset.accessor
+      assert_equal client, asset.client
+      assert_equal accessor, asset.accessor
 
       # basic attributes
       assert_equal record['id'], asset.id
@@ -45,16 +46,11 @@ describe 'MyJohnDeereApi::Model::Asset' do
         assert_equal link_for(association), asset.links[association]
       end
     end
-
-    it 'accepts an optional client' do
-      asset = klass.new(record, client)
-      assert_equal client, asset.client
-    end
   end
 
   describe '#attributes' do
     it 'converts properties back to an attributes hash' do
-      asset = klass.new(record, client)
+      asset = klass.new(client, record)
       attributes = asset.attributes
 
       assert_equal asset.id, attributes[:id]
@@ -67,7 +63,7 @@ describe 'MyJohnDeereApi::Model::Asset' do
 
   describe '#save' do
     it 'sends any recent updates to John Deere' do
-      asset = klass.new(record, client)
+      asset = klass.new(client, record)
       new_title = 'i REALLY like turtles!'
 
       asset.title = new_title
@@ -78,14 +74,14 @@ describe 'MyJohnDeereApi::Model::Asset' do
     end
 
     it 'does not make a JD request if nothing has changed' do
-      asset = klass.new(record, client)
+      asset = klass.new(client, record)
       response = asset.save
 
       assert_nil response
     end
 
     it 'marks the record as saved' do
-      asset = klass.new(record, client)
+      asset = klass.new(client, record)
       asset.title = 'i REALLY like turtles!'
 
       response = VCR.use_cassette('put_asset') { asset.save }
@@ -98,7 +94,7 @@ describe 'MyJohnDeereApi::Model::Asset' do
 
   describe '#update' do
     it 'updates the attributes' do
-      asset = klass.new(record, client)
+      asset = klass.new(client, record)
 
       new_title = 'i REALLY like turtles!'
       VCR.use_cassette('put_asset') { asset.update(title: new_title) }
@@ -108,7 +104,7 @@ describe 'MyJohnDeereApi::Model::Asset' do
     end
 
     it 'sends the update to John Deere' do
-      asset = klass.new(record, client)
+      asset = klass.new(client, record)
 
       new_title = 'i REALLY like turtles!'
       response = VCR.use_cassette('put_asset') { asset.update(title: new_title) }
@@ -133,12 +129,5 @@ describe 'MyJohnDeereApi::Model::Asset' do
         assert_kind_of JD::Model::AssetLocation, location
       end
     end
-
-    it 'raises an exception if an accessor is not available' do
-      asset = klass.new(record)
-
-      exception = assert_raises(JD::AccessTokenError) { asset.locations }
-      assert_includes exception.message, 'Access Token must be supplied'
-    end
   end
 end

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

@@ -10,7 +10,7 @@ end
 
 describe 'MyJohnDeereApi::Model::Base' do
   let(:klass) { JD::Model::Base }
-  let(:object) { klass.new(record, client) }
+  let(:object) { klass.new(client, record) }
 
   let(:record) do
     {
@@ -30,22 +30,29 @@ describe 'MyJohnDeereApi::Model::Base' do
     assert_includes object.private_methods, :id_from_uri
   end
 
-  describe '#initialize(record, client)' do
+  describe '#initialize(client, record)' do
     def link_for label
       record['links'].detect{|link| link['rel'] == label}['uri'].gsub('https://sandboxapi.deere.com/platform', '')
     end
 
-    it 'raises an error if there is a record type mismatch' do
-      record = {
-        '@type'=>'WrongType',
-        'links'=>[]
-      }
+    describe 'when the wrong record type is passed' do
+      let(:record) do
+        {
+          '@type'=>'WrongType',
+          'links'=>[]
+        }
+      end
 
-      exception = assert_raises(JD::TypeMismatchError) { klass.new(record) }
-      assert_equal "Expected record of type 'Base', but received type 'WrongType'", exception.message
+      it 'raises a TypeMismatch error' do
+        exception = assert_raises(JD::TypeMismatchError) { object }
+        assert_equal "Expected record of type 'Base', but received type 'WrongType'", exception.message
+      end
     end
 
     it 'sets the base attributes' do
+      assert_equal client, object.client
+      assert_equal accessor, object.accessor
+
       assert_equal record['id'], object.id
       assert_equal record['@type'], object.record_type
       assert_equal client, object.client
@@ -62,13 +69,8 @@ describe 'MyJohnDeereApi::Model::Base' do
     end
 
     it 'maps additional fields in subclasses' do
-      object = SampleModel.new(record)
+      object = SampleModel.new(client, record)
       assert_equal 'somevalue', object.somefield
     end
-
-    it 'does not require client' do
-      object = klass.new(record)
-      assert_nil object.client
-    end
   end
 end

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

@@ -31,7 +31,10 @@ describe 'MyJohnDeereApi::Model::ContributionDefinition' do
     end
 
     it 'sets the attributes from the given record' do
-      definition = klass.new(record)
+      definition = klass.new(client, record)
+
+      assert_equal client, definition.client
+      assert_equal accessor, definition.accessor
 
       # basic attributes
       assert_equal record['id'], definition.id
@@ -39,16 +42,11 @@ describe 'MyJohnDeereApi::Model::ContributionDefinition' do
     end
 
     it 'links to other things' do
-      product = klass.new(record)
+      product = klass.new(client, record)
 
       ['self', 'contribution_product'].each do |association|
         assert_equal link_for(association), product.links[association]
       end
     end
-
-    it 'accepts an optional client' do
-      asset = klass.new(record, client)
-      assert_equal client, asset.client
-    end
   end
 end

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

@@ -38,7 +38,10 @@ describe 'MyJohnDeereApi::Model::ContributionProduct' do
     end
 
     it 'sets the attributes from the given record' do
-      product = klass.new(record)
+      product = klass.new(client, record)
+      
+      assert_equal client, product.client
+      assert_equal accessor, product.accessor
 
       # basic attributes
       assert_equal record['id'], product.id
@@ -53,22 +56,17 @@ describe 'MyJohnDeereApi::Model::ContributionProduct' do
     end
 
     it 'links to other things' do
-      product = klass.new(record)
+      product = klass.new(client, record)
 
       ['self', 'contribution_definition'].each do |association|
         assert_equal link_for(association), product.links[association]
       end
     end
-
-    it 'accepts an optional client' do
-      asset = klass.new(record, client)
-      assert_equal client, asset.client
-    end
   end
 
   describe '#contribution_definitions' do
     it 'returns a collection of contribution definitions for this contributon product' do
-      product = klass.new(record, client)
+      product = klass.new(client, record)
 
       contribution_definitions = VCR.use_cassette('get_contribution_definitions') do
         product.contribution_definitions.all; product.contribution_definitions

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

@@ -23,9 +23,10 @@ describe 'MyJohnDeereApi::Model::Field' do
     end
 
     it 'sets the attributes from the given record' do
-      field = klass.new(record)
+      field = klass.new(client, record)
 
-      assert_nil field.client
+      assert_equal client, field.client
+      assert_equal accessor, field.accessor
 
       # basic attributes
       assert_equal record['name'], field.name
@@ -39,11 +40,6 @@ describe 'MyJohnDeereApi::Model::Field' do
         assert_equal link_for(association), field.links[association]
       end
     end
-
-    it 'accepts an optional accessor' do
-      field = klass.new(record, client)
-      assert_equal client, field.client
-    end
   end
 
   describe '#flags' do
@@ -58,19 +54,11 @@ describe 'MyJohnDeereApi::Model::Field' do
         assert_kind_of JD::Model::Flag, flag
       end
     end
-
-    it 'raises an exception if an accessor is not available' do
-      field = klass.new(record)
-
-      exception = assert_raises(JD::AccessTokenError) { field.flags }
-
-      assert_includes exception.message, 'Access Token must be supplied'
-    end
   end
 
   describe 'private #organization_id' do
     it "infers the organization_id from links" do
-      field = klass.new(record)
+      field = klass.new(client, record)
       assert_equal organization_id, field.send(:organization_id)
     end
   end

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

@@ -3,7 +3,7 @@ require 'json'
 
 describe 'MyJohnDeereApi::Model::Flag' do
   let(:klass) { JD::Model::Flag }
-  
+
   let(:record) do
     {
       "@type"=>"Flag",
@@ -26,27 +26,23 @@ describe 'MyJohnDeereApi::Model::Flag' do
     end
 
     it 'sets the attributes from the given record' do
-      field = klass.new(record)
+      flag = klass.new(client, record)
 
-      assert_nil field.accessor
+      assert_equal client, flag.client
+      assert_equal accessor, flag.accessor
 
       # basic attributes
-      assert_equal JSON.parse(record['geometry']), field.geometry
-      assert_equal record['archived'], field.archived?
-      assert_equal record['proximityAlertEnabled'], field.proximity_alert_enabled?
-      assert_equal record['notes'], field.notes
-      assert_equal record['id'], field.id
+      assert_equal JSON.parse(record['geometry']), flag.geometry
+      assert_equal record['archived'], flag.archived?
+      assert_equal record['proximityAlertEnabled'], flag.proximity_alert_enabled?
+      assert_equal record['notes'], flag.notes
+      assert_equal record['id'], flag.id
 
       # links to other things
-      assert_kind_of Hash, field.links
-      assert_equal link_for('field'), field.links['field']
-      assert_equal link_for('createdBy'), field.links['created_by']
-      assert_equal link_for('lastModifiedBy'), field.links['last_modified_by']
-    end
-
-    it 'accepts an optional client' do
-      field = klass.new(record, client)
-      assert_equal client, field.client
+      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']
     end
   end
 end

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

@@ -36,14 +36,16 @@ describe 'MyJohnDeereApi::Model::Organization' do
     end
 
     it 'sets the attributes from the given record' do
-      organization = klass.new(record)
+      organization = klass.new(client, record)
+
+      assert_equal client, organization.client
+      assert_equal accessor, organization.accessor
 
       # basic attributes
       assert_equal record['name'], organization.name
       assert_equal record['type'], organization.type
       assert_equal record['member'], organization.member?
       assert_equal record['id'], organization.id
-      assert_nil organization.accessor
 
       # links to other things
       assert_kind_of Hash, organization.links
@@ -52,11 +54,6 @@ describe 'MyJohnDeereApi::Model::Organization' do
         assert_equal link_for(association), organization.links[association]
       end
     end
-
-    it 'accepts an optional client' do
-      organization = klass.new(record, client)
-      assert_equal client, organization.client
-    end
   end
 
   describe '#fields' do
@@ -70,14 +67,6 @@ describe 'MyJohnDeereApi::Model::Organization' do
         assert_kind_of JD::Model::Field, field
       end
     end
-
-    it 'raises an exception if an accessor is not available' do
-      organization = klass.new(record)
-
-      exception = assert_raises(JD::AccessTokenError) { organization.fields }
-
-      assert_includes exception.message, 'Access Token must be supplied'
-    end
   end
 
   describe '#assets' do
@@ -91,12 +80,5 @@ describe 'MyJohnDeereApi::Model::Organization' do
         assert_kind_of JD::Model::Asset, assets
       end
     end
-
-    it 'raises an exception if an accessor is not available' do
-      organization = klass.new(record)
-
-      exception = assert_raises(JD::AccessTokenError) { organization.assets }
-      assert_includes exception.message, 'Access Token must be supplied'
-    end
   end
 end

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

@@ -3,7 +3,7 @@ require 'support/helper'
 describe 'MyJohnDeereApi::Request::Update::Asset' do
   let(:klass) { JD::Request::Update::Asset }
   let(:object) { klass.new(client, item, attributes) }
-  let(:item) { JD::Model::Asset.new(record, client) }
+  let(:item) { JD::Model::Asset.new(client, record) }
 
   let(:attributes) do
     {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: my_john_deere_api
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Jaime Bellmyer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-15 00:00:00.000000000 Z
+date: 2020-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vcr