my_john_deere_api 0.12.4 → 0.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 272b78cd5d3c194ea5ca6362a9a8f64b1d5be22b4ec79968c4575d7be5497699
-  data.tar.gz: 7b77df8259ab5c41696339835f4c3cdcea26ebf6e0473936f18348a14ca675d1
+  metadata.gz: d79f9ae5d1b5b960422791626144c4ef7f5d812668c6b55ac0c08ee75c06ddc3
+  data.tar.gz: ac5d0b960dfd945dcf4c6a7f70824db56f6592acdf760fd43663b7b9d6506a1a
 SHA512:
-  metadata.gz: 8b4b8aef5761dff7936fe113a44af60b53182e28c907b07bd37444ede8461ea9439ccd53c39b7e9ad177ff2723069d475fc7964f6343f8004fd75ba3d159c7f8
-  data.tar.gz: 937e79548f856c03aac06bed21986590ff24cda529284d43763ae5b1784926b614476d53a10ebe85b0cdec8abce63bc1506f038017919144cce985a026001fb3
+  metadata.gz: 758d942d65896071bc7ac6340f83731faa02b53d9d96d56881d1adb0c3b5bc24dd1a613dd1d162a4be07bfcde8b99be3ec2375b476b958472e674bdaed4e6711
+  data.tar.gz: a21fa3beac2fe3cce6bbb7e33f7eda267fe6bd6f89a4a9e4f235b4106724d2efe73fddb46b9b6b9c1d84983db054bedc19a26b62ca8ec0a69be0abdf43fd71d2

data/lib/my_john_deere_api/client.rb

@@ -55,7 +55,7 @@ module MyJohnDeereApi
       if response.body.size > 0
         JSON.parse(response.body)
       else
-        {}
+        response
       end
     end
 
@@ -70,7 +70,7 @@ module MyJohnDeereApi
       if response.body && response.body.size > 0
         JSON.parse(response.body)
       else
-        {}
+        response
       end
     end
 
@@ -79,7 +79,14 @@ module MyJohnDeereApi
 
     def organizations
       return @organizations if defined?(@organizations)
-      @organizations = MyJohnDeereApi::Request::Collection::Organizations.new(accessor).all
+      @organizations = MyJohnDeereApi::Request::Collection::Organizations.new(accessor)
+    end
+
+    ##
+    # contribution products associated with this app (not user-specific)
+
+    def contribution_products
+      []
     end
 
     private

data/lib/my_john_deere_api/model/contribution_product.rb

@@ -0,0 +1,24 @@
+module MyJohnDeereApi
+  class Model::ContributionProduct < Model::Base
+    attr_reader :market_place_name, :market_place_description, :default_locale,
+                :current_status, :activation_callback, :preview_images,
+                :supported_regions, :supported_operation_centers
+
+    private
+
+    def map_attributes(record)
+      @market_place_name =            record['marketPlaceName']
+      @market_place_description =     record['marketPlaceDescription']
+      @default_locale =               record['defaultLocale']
+      @current_status =               record['currentStatus']
+      @activation_callback =          record['activationCallback']
+      @preview_images =               record['previewImages']
+      @supported_regions =            record['supportedRegions']
+      @supported_operation_centers =  record['supportedOperationCenters']
+    end
+
+    def expected_record_type
+      'ContributionProduct'
+    end
+  end
+end

data/lib/my_john_deere_api/model/field.rb

@@ -17,7 +17,7 @@ module MyJohnDeereApi
       raise AccessTokenError unless accessor
 
       return @flags if defined?(@flags)
-      @flags = Request::Collection::Flags.new(accessor, organization: organization_id, field: id).all
+      @flags = Request::Collection::Flags.new(accessor, organization: organization_id, field: id)
     end
 
     private

data/lib/my_john_deere_api/model/organization.rb

@@ -19,7 +19,7 @@ module MyJohnDeereApi
       raise AccessTokenError unless accessor
 
       return @fields if defined?(@fields)
-      @fields = MyJohnDeereApi::Request::Collection::Fields.new(accessor, organization: id).all
+      @fields = MyJohnDeereApi::Request::Collection::Fields.new(accessor, organization: id)
     end
 
     ##

data/lib/my_john_deere_api/model.rb

@@ -2,6 +2,7 @@ module MyJohnDeereApi::Model
   autoload :Base,                'my_john_deere_api/model/base'
   autoload :Asset,               'my_john_deere_api/model/asset'
   autoload :AssetLocation,       'my_john_deere_api/model/asset_location'
+  autoload :ContributionProduct, 'my_john_deere_api/model/contribution_product'
   autoload :Organization,        'my_john_deere_api/model/organization'
   autoload :Field,               'my_john_deere_api/model/field'
   autoload :Flag,                'my_john_deere_api/model/flag'

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

@@ -20,8 +20,8 @@ module MyJohnDeereApi::Request
     # Create a new asset location
 
     def create(attributes)
-      attributes.merge!(asset_id: associations[:asset])
-      Create::AssetLocation.new(accessor, attributes).object
+      merged_attributes = attributes.merge(asset_id: associations[:asset])
+      Create::AssetLocation.new(accessor, merged_attributes).object
     end
   end
 end

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

@@ -20,8 +20,8 @@ module MyJohnDeereApi::Request
     # Create a new asset
 
     def create(attributes)
-      attributes.merge!(organization_id: associations[:organization])
-      Create::Asset.new(accessor, attributes).object
+      merged_attributes = attributes.merge(organization_id: associations[:organization])
+      Create::Asset.new(accessor, merged_attributes).object
     end
 
     ##

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

@@ -0,0 +1,26 @@
+require 'json'
+
+module MyJohnDeereApi::Request
+  class Collection::ContributionProducts < Collection::Base
+    ##
+    # The resource path for the first page in the collection
+
+    def resource
+      "/contributionProducts?clientControlled=true"
+    end
+
+    ##
+    # This is the class used to model the data
+
+    def model
+      MyJohnDeereApi::Model::ContributionProduct
+    end
+
+    ##
+    # Retrieve an item from JD
+
+    def find(item_id)
+      Individual::ContributionProduct.new(accessor, item_id).object
+    end
+  end
+end

data/lib/my_john_deere_api/request/collection.rb

@@ -2,6 +2,7 @@ module MyJohnDeereApi::Request::Collection
   autoload :Base,                 'my_john_deere_api/request/collection/base'
   autoload :Assets,               'my_john_deere_api/request/collection/assets'
   autoload :AssetLocations,       'my_john_deere_api/request/collection/asset_locations'
+  autoload :ContributionProducts, 'my_john_deere_api/request/collection/contribution_products'
   autoload :Organizations,        'my_john_deere_api/request/collection/organizations'
   autoload :Fields,               'my_john_deere_api/request/collection/fields'
   autoload :Flags,                'my_john_deere_api/request/collection/flags'

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

@@ -0,0 +1,19 @@
+require 'json'
+
+module MyJohnDeereApi::Request
+  class Individual::ContributionProduct < Individual::Base
+    ##
+    # The resource path for the first page in the collection
+
+    def resource
+      "/contributionProducts/#{id}"
+    end
+
+    ##
+    # This is the class used to model the data
+
+    def model
+      MyJohnDeereApi::Model::ContributionProduct
+    end
+  end
+end

data/lib/my_john_deere_api/request/individual.rb

@@ -1,4 +1,5 @@
 module MyJohnDeereApi::Request::Individual
-  autoload :Base,             'my_john_deere_api/request/individual/base'
-  autoload :Asset,            'my_john_deere_api/request/individual/asset'
+  autoload :Base,                 'my_john_deere_api/request/individual/base'
+  autoload :Asset,                'my_john_deere_api/request/individual/asset'
+  autoload :ContributionProduct,  'my_john_deere_api/request/individual/contribution_product'
 end

data/lib/my_john_deere_api/version.rb

@@ -1,3 +1,3 @@
 module MyJohnDeereApi
-  VERSION='0.12.4'
+  VERSION='0.12.6'
 end

data/test/lib/my_john_deere_api/authorize_test.rb

@@ -7,7 +7,7 @@ def contains_parameters?(uri)
 end
 
 def create_authorize
-  VCR.use_cassette('catalog'){ JD::Authorize.new(API_KEY, API_SECRET, environment: :sandbox) }
+  VCR.use_cassette('catalog'){ JD::Authorize.new(api_key, api_secret, environment: :sandbox) }
 end
 
 def fancy_url
@@ -17,16 +17,16 @@ end
 describe 'MyJohnDeereApi::Authorize' do
   describe 'initialization' do
     it 'sets the api key/secret' do
-      authorize = VCR.use_cassette('catalog') { JD::Authorize.new(API_KEY, API_SECRET) }
+      authorize = VCR.use_cassette('catalog') { JD::Authorize.new(api_key, api_secret) }
 
-      assert_equal API_KEY, authorize.api_key
-      assert_equal API_SECRET, authorize.api_secret
+      assert_equal api_key, authorize.api_key
+      assert_equal api_secret, authorize.api_secret
     end
 
     it 'accepts the environment' do
       environment = :sandbox
 
-      authorize = VCR.use_cassette('catalog') { JD::Authorize.new(API_KEY, API_SECRET, environment: environment) }
+      authorize = VCR.use_cassette('catalog') { JD::Authorize.new(api_key, api_secret, environment: environment) }
       assert_equal environment, authorize.environment
     end
   end
@@ -46,7 +46,7 @@ describe 'MyJohnDeereApi::Authorize' do
       authorize = create_authorize
 
       url = VCR.use_cassette('get_request_token') { authorize.authorize_url }
-      links = VCR.use_cassette('catalog') { JD::Consumer.new(API_KEY, API_SECRET, environment: :sandbox).send(:links) }
+      links = VCR.use_cassette('catalog') { JD::Consumer.new(api_key, api_secret, environment: :sandbox).send(:links) }
 
       assert_includes url, "#{links[:authorize_request_token]}"
 

data/test/lib/my_john_deere_api/client_test.rb

@@ -3,17 +3,17 @@ require 'support/helper'
 describe 'MyJohnDeereApi::Client' do
   describe '#initialize(api_key, api_secret)' do
     it 'sets the api key/secret' do
-      client = JD::Client.new(API_KEY, API_SECRET)
+      client = JD::Client.new(api_key, api_secret)
 
-      assert_equal API_KEY, client.api_key
-      assert_equal API_SECRET, client.api_secret
+      assert_equal api_key, client.api_key
+      assert_equal api_secret, client.api_secret
     end
 
     it 'accepts access token/secret' do
       access_token = 'token'
       access_secret = 'secret'
 
-      client = JD::Client.new(API_KEY, API_SECRET, access: [access_token, access_secret])
+      client = JD::Client.new(api_key, api_secret, access: [access_token, access_secret])
 
       assert_equal access_token, client.access_token
       assert_equal access_secret, client.access_secret
@@ -22,14 +22,13 @@ describe 'MyJohnDeereApi::Client' do
     it 'accepts the environment' do
       environment = :sandbox
 
-      client = JD::Client.new(API_KEY, API_SECRET, environment: environment)
+      client = JD::Client.new(api_key, api_secret, environment: environment)
       assert_equal environment, client.environment
     end
   end
 
   describe '#get' do
     it 'returns the response as a Hash' do
-      client = JD::Client.new(API_KEY, API_SECRET, environment: :sandbox, access: [ACCESS_TOKEN, ACCESS_SECRET])
       VCR.use_cassette('catalog') { client.send(:accessor) }
       response = VCR.use_cassette('get_organizations') { client.get('/organizations') }
 
@@ -40,7 +39,6 @@ describe 'MyJohnDeereApi::Client' do
     end
 
     it 'prepends the leading slash if needed' do
-      client = JD::Client.new(API_KEY, API_SECRET, environment: :sandbox, access: [ACCESS_TOKEN, ACCESS_SECRET])
       VCR.use_cassette('catalog') { client.send(:accessor) }
       response = VCR.use_cassette('get_organizations') { client.get('organizations') }
 
@@ -51,7 +49,6 @@ describe 'MyJohnDeereApi::Client' do
     end
 
     it 'allows symbols for simple resources' do
-      client = JD::Client.new(API_KEY, API_SECRET, environment: :sandbox, access: [ACCESS_TOKEN, ACCESS_SECRET])
       VCR.use_cassette('catalog') { client.send(:accessor) }
       response = VCR.use_cassette('get_organizations') { client.get(:organizations) }
 
@@ -63,83 +60,50 @@ describe 'MyJohnDeereApi::Client' do
   end
 
   describe '#post' do
-    let(:client) { JD::Client.new(API_KEY, API_SECRET, environment: :sandbox, access: [ACCESS_TOKEN, ACCESS_SECRET]) }
-
-    let(:body) do
-      {
-        "@type": "FlagCategory",
-        "categoryTitle": "Mountain Dew",
-        "sourceNode": "7ba95d7a-f798-46d0-9bf9-c39c31bcf984",
-        "links": [
-          {
-            "rel": "contributionDefinition",
-            "uri": "https://sandboxapi.deere.com/platform/contributionDefinitions/#{ENV['CONTRIBUTION_DEFINITION_ID']}"
-          }
-        ],
-        "preferred": true
-      }
-    end
-
     it 'returns the response as a Hash' do
-      VCR.use_cassette('catalog') { client.send(:accessor) }
-
-      response = VCR.use_cassette('post_flag_categories') { client.post("/organizations/#{ENV['ORGANIZATION_ID']}/flagCategories", body) }
+      response = VCR.use_cassette('post_assets') do
+        client.post("/organizations/#{organization_id}/assets", CONFIG.asset_attributes)
+      end
 
-      assert_equal Hash.new, response
+      assert_equal '201', response.code
+      assert_equal 'Created', response.message
+      assert_includes response['Location'], "/assets/#{asset_id}"
     end
 
     it 'prepends the leading slash if needed' do
-      client = JD::Client.new(API_KEY, API_SECRET, environment: :sandbox, access: [ACCESS_TOKEN, ACCESS_SECRET])
-      VCR.use_cassette('catalog') { client.send(:accessor) }
-      response = VCR.use_cassette('get_organizations') { client.get('organizations') }
-
-      assert_kind_of Hash, response
-      assert_kind_of Integer, response['total']
-      assert response['values'].all?{|value| value['@type'] == 'Organization'}
-      assert response['values'].all?{|value| value.has_key?('links')}
-    end
-
-    it 'allows symbols for simple resources' do
-      client = JD::Client.new(API_KEY, API_SECRET, environment: :sandbox, access: [ACCESS_TOKEN, ACCESS_SECRET])
-      VCR.use_cassette('catalog') { client.send(:accessor) }
-      response = VCR.use_cassette('get_organizations') { client.get(:organizations) }
+      response = VCR.use_cassette('post_assets') do
+        client.post("organizations/#{organization_id}/assets", CONFIG.asset_attributes)
+      end
 
-      assert_kind_of Hash, response
-      assert_kind_of Integer, response['total']
-      assert response['values'].all?{|value| value['@type'] == 'Organization'}
-      assert response['values'].all?{|value| value.has_key?('links')}
+      assert_equal '201', response.code
+      assert_equal 'Created', response.message
+      assert_includes response['Location'], "/assets/#{asset_id}"
     end
   end
 
   describe '#delete' do
     it 'sends the request' do
-      client = JD::Client.new(API_KEY, API_SECRET, environment: :sandbox, access: [ACCESS_TOKEN, ACCESS_SECRET])
-      VCR.use_cassette('catalog') { client.send(:accessor) }
-      response = VCR.use_cassette('delete_asset') { client.delete("/assets/123") }
+      response = VCR.use_cassette('delete_asset') { client.delete("/assets/#{asset_id}") }
 
-      assert_kind_of Hash, response
+      assert_equal '204', response.code
+      assert_equal 'No Content', response.message
     end
 
     it 'prepends the leading slash if needed' do
-      client = JD::Client.new(API_KEY, API_SECRET, environment: :sandbox, access: [ACCESS_TOKEN, ACCESS_SECRET])
-      VCR.use_cassette('catalog') { client.send(:accessor) }
-      response = VCR.use_cassette('get_organizations') { client.get('organizations') }
+      response = VCR.use_cassette('delete_asset') { client.delete("assets/#{asset_id}") }
 
-      assert_kind_of Hash, response
+      assert_equal '204', response.code
+      assert_equal 'No Content', response.message
     end
   end
 
   describe '#organizations' do
     it 'returns a collection of organizations for this account' do
-      client = JD::Client.new(API_KEY, API_SECRET, environment: :sandbox, access: [ACCESS_TOKEN, ACCESS_SECRET])
-      VCR.use_cassette('catalog') { client.send(:accessor) }
-
-      # force full loading of organizations
-      VCR.use_cassette('get_organizations') { client.organizations }
+      organizations = VCR.use_cassette('get_organizations') { client.organizations.all; client.organizations }
 
-      assert_kind_of Array, client.organizations
+      assert_kind_of JD::Request::Collection::Organizations, organizations
 
-      client.organizations.each do |organization|
+      organizations.each do |organization|
         assert_kind_of JD::Model::Organization, organization
       end
     end
@@ -149,25 +113,22 @@ describe 'MyJohnDeereApi::Client' do
     it 'receives the api key/secret and environment of the client' do
       environment = :sandbox
 
-      client = JD::Client.new(API_KEY, API_SECRET, environment: environment)
+      client = JD::Client.new(api_key, api_secret, environment: environment)
       consumer = client.send :consumer
 
       assert_kind_of JD::Consumer, consumer
-      assert_equal API_KEY, consumer.api_key
-      assert_equal API_SECRET, consumer.api_secret
+      assert_equal api_key, consumer.api_key
+      assert_equal api_secret, consumer.api_secret
       assert_equal environment, consumer.environment
     end
   end
 
   describe '#accessor' do
     it 'returns an object that can make user-specific requests' do
-      client = JD::Client.new(API_KEY, API_SECRET, environment: :sandbox, access: [ACCESS_TOKEN, ACCESS_SECRET])
-      accessor = VCR.use_cassette('catalog') { client.send :accessor }
-
       assert_kind_of OAuth::AccessToken, accessor
       assert_kind_of OAuth::Consumer, accessor.consumer
-      assert_equal ACCESS_TOKEN, accessor.token
-      assert_equal ACCESS_SECRET, accessor.secret
+      assert_equal access_token, accessor.token
+      assert_equal access_secret, accessor.secret
     end
   end
 end

data/test/lib/my_john_deere_api/consumer_test.rb

@@ -3,15 +3,15 @@ require 'support/helper'
 describe 'JD::Consumer' do
   describe '#initialize' do
     it 'requires an api key and secret' do
-      consumer = JD::Consumer.new(API_KEY, API_SECRET)
+      consumer = JD::Consumer.new(api_key, api_secret)
 
-      assert_equal API_KEY, consumer.api_key
-      assert_equal API_SECRET, consumer.api_secret
+      assert_equal api_key, consumer.api_key
+      assert_equal api_secret, consumer.api_secret
     end
 
     it 'accepts the environment' do
       environment = :sandbox
-      consumer = JD::Consumer.new(API_KEY, API_SECRET, environment: environment)
+      consumer = JD::Consumer.new(api_key, api_secret, environment: environment)
 
       assert_equal environment, consumer.environment
       assert_equal JD::Consumer::URLS[environment], consumer.base_url
@@ -19,14 +19,14 @@ describe 'JD::Consumer' do
 
     it 'accepts an arbitrary base_url' do
       base_url = 'https://example.com'
-      consumer = JD::Consumer.new(API_KEY, API_SECRET, base_url: base_url)
+      consumer = JD::Consumer.new(api_key, api_secret, base_url: base_url)
 
       assert_equal base_url, consumer.base_url
     end
 
     it 'uses specified base_url regardless of specified environment' do
       base_url = 'https://example.com'
-      consumer = JD::Consumer.new(API_KEY, API_SECRET, base_url: base_url, environment: :sandbox)
+      consumer = JD::Consumer.new(api_key, api_secret, base_url: base_url, environment: :sandbox)
 
       assert_equal base_url, consumer.base_url
     end
@@ -34,24 +34,24 @@ describe 'JD::Consumer' do
 
   describe '#app_get' do
     it 'creates a working oAuth consumer for non-user-specific GET requests' do
-      consumer = JD::Consumer.new(API_KEY, API_SECRET, environment: :sandbox)
-      app_get = VCR.use_cassette('app_consumer') { consumer.app_get }
+      consumer = JD::Consumer.new(api_key, api_secret, environment: :sandbox)
+      app_get = VCR.use_cassette('catalog') { consumer.app_get }
 
       assert_kind_of OAuth::Consumer, app_get
-      assert_equal API_KEY, app_get.key
-      assert_equal API_SECRET, app_get.secret
+      assert_equal api_key, app_get.key
+      assert_equal api_secret, app_get.secret
       assert_equal JD::Consumer::URLS[:sandbox], app_get.site
     end
   end
 
   describe '#user_get' do
     it 'creates a working oAuth consumer for user-specific GET requests' do
-      consumer = JD::Consumer.new(API_KEY, API_SECRET, environment: :sandbox)
-      user_get = VCR.use_cassette('app_consumer') { consumer.user_get }
+      consumer = JD::Consumer.new(api_key, api_secret, environment: :sandbox)
+      user_get = VCR.use_cassette('catalog') { consumer.user_get }
 
       assert_kind_of OAuth::Consumer, user_get
-      assert_equal API_KEY, user_get.key
-      assert_equal API_SECRET, user_get.secret
+      assert_equal api_key, user_get.key
+      assert_equal api_secret, user_get.secret
       assert_equal "#{JD::Consumer::URLS[:sandbox]}/platform", user_get.site
     end
   end

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

@@ -4,29 +4,14 @@ require 'json'
 describe 'MyJohnDeereApi::Model::AssetLocation' do
   let(:record) do
     {
-      "@type"=>"ContributedAssetLocation",
-      "timestamp"=>"2017-09-20T21:30:59.000Z",
-      "geometry"=>"{\"type\": \"Feature\",\"geometry\": {\"geometries\": [{\"coordinates\": [ -103.115633, 41.670166],\"type\": \"Point\"}],\"type\": \"GeometryCollection\"}}",
-      "measurementData"=>[
-        {
-          "@type"=>"BasicMeasurement",
-          "name"=>"[1 Foot](https://app.realmfive.com/map?device=0x0080CDEF)",
-          "value"=>"82",
-          "unit"=>"cB"
-        }, {
-          "@type"=>"BasicMeasurement",
-          "name"=>"[2 Feet](https://app.realmfive.com/map?device=0x0080CDEF)",
-          "value"=>"31",
-          "unit"=>"cB"
-        }
-      ],
-      "links"=>[]
+      '@type' => 'ContributedAssetLocation',
+      'timestamp' => CONFIG.timestamp,
+      'geometry' => CONFIG.geometry.to_json,
+      'measurementData' => CONFIG.measurement_data,
+      'links' => []
     }
   end
 
-  let(:client) { JD::Client.new(API_KEY, API_SECRET, environment: :sandbox, access: [ACCESS_TOKEN, ACCESS_SECRET]) }
-  let(:accessor) { VCR.use_cassette('catalog') { client.send(:accessor) } }
-
   describe '#initialize' do
     def link_for label
       record['links'].detect{|link| link['rel'] == label}['uri'].gsub('https://sandboxapi.deere.com/platform', '')
@@ -48,10 +33,10 @@ describe 'MyJohnDeereApi::Model::AssetLocation' do
     end
 
     it 'accepts an optional accessor' do
-      accessor = 'mock-accessor'
+      mock_accessor = 'mock-accessor'
 
-      location = JD::Model::AssetLocation.new(record, accessor)
-      assert_equal accessor, location.accessor
+      location = JD::Model::AssetLocation.new(record, mock_accessor)
+      assert_equal mock_accessor, location.accessor
     end
   end
 end

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

@@ -11,16 +11,13 @@ describe 'MyJohnDeereApi::Model::Asset' do
       "id"=>"123456",
       "lastModifiedDate"=>"2018-01-31T20:36:16.727Z",
       "links"=>[
-        {"@type"=>"Link", "rel"=>"self", "uri"=>"https://sandboxapi.deere.com/platform/assets/123456"},
-        {"@type"=>"Link", "rel"=>"organization", "uri"=>"https://sandboxapi.deere.com/platform/organizations/234567"},
-        {"@type"=>"Link", "rel"=>"locations", "uri"=>"https://sandboxapi.deere.com/platform/assets/123456/locations"},
+        {"@type"=>"Link", "rel"=>"self", "uri"=>"https://sandboxapi.deere.com/platform/assets/#{asset_id}"},
+        {"@type"=>"Link", "rel"=>"organization", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}"},
+        {"@type"=>"Link", "rel"=>"locations", "uri"=>"https://sandboxapi.deere.com/platform/assets/#{asset_id}/locations"},
       ]
     }
   end
 
-  let(:client) { JD::Client.new(API_KEY, API_SECRET, environment: :sandbox, access: [ACCESS_TOKEN, ACCESS_SECRET]) }
-  let(:accessor) { VCR.use_cassette('catalog') { client.send(:accessor) } }
-
   describe '#initialize' do
     def link_for label
       record['links'].detect{|link| link['rel'] == label}['uri'].gsub('https://sandboxapi.deere.com/platform', '')
@@ -48,10 +45,10 @@ describe 'MyJohnDeereApi::Model::Asset' do
     end
 
     it 'accepts an optional accessor' do
-      accessor = 'mock-accessor'
+      mock_accessor = 'mock-accessor'
 
-      asset = JD::Model::Asset.new(record, accessor)
-      assert_equal accessor, asset.accessor
+      asset = JD::Model::Asset.new(record, mock_accessor)
+      assert_equal mock_accessor, asset.accessor
     end
   end
 

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

@@ -10,7 +10,6 @@ end
 
 describe 'MyJohnDeereApi::Model::Base' do
   let(:object) { JD::Model::Base.new(record, accessor) }
-  let(:accessor) { 'accessor' }
 
   let(:record) do
     {
@@ -18,9 +17,9 @@ describe 'MyJohnDeereApi::Model::Base' do
       'id'=>'123',
       'somefield'=>'somevalue',
       "links"=>[
-        {"@type"=>"Link", "rel"=>"self", "uri"=>"https://sandboxapi.deere.com/platform/assets/123456"},
-        {"@type"=>"Link", "rel"=>"organization", "uri"=>"https://sandboxapi.deere.com/platform/organizations/234567"},
-        {"@type"=>"Link", "rel"=>"locations", "uri"=>"https://sandboxapi.deere.com/platform/assets/123456/locations"},
+        {"@type"=>"Link", "rel"=>"self", "uri"=>"https://sandboxapi.deere.com/platform/assets/#{asset_id}"},
+        {"@type"=>"Link", "rel"=>"organization", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}"},
+        {"@type"=>"Link", "rel"=>"locations", "uri"=>"https://sandboxapi.deere.com/platform/assets/#{asset_id}/locations"},
       ]
     }
   end