my_john_deere_api 1.3.7 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 347239b756637538b1565dac76ef8d922b11fe4d473811b14a9e8f7edf134902
-  data.tar.gz: 670ee3f6c1ad3f8845166f9c82d8f46ad21a1c5faf4f0cd05da6b24ffc3a4fd5
+  metadata.gz: 12dd779b0061a90ac8b9d20b3a5111fe1b8f76ebf4153817480abe886a4d45f0
+  data.tar.gz: 8d4bf6db2d2dd9a720c500c0300ff9409766ed639f3191154de6319bae5d171e
 SHA512:
-  metadata.gz: 4ee286908de1b144b7d00687e28025e6d92a9d19bf7468bfbf3e4489a8c0340b69cb92f1177b2738d13ab16e6c6b908f2cfcd57be4e00c03d954a62679dd36a8
-  data.tar.gz: 73308deefd549de1ff76220b14a0a267b2583fe2c2f5216a423091faaff9cebe9ea06cf20b02df63407af3f7a916de9198c21152e92eed60f8812ae10d5e3058
+  metadata.gz: 5af6c3d0843479c8c05cdc36f3cbb1645b26a76e41de187ff513ba78089586c1a890c229918a39ffc3599b4f989b718a288a78f208f72fcd8027dccb2381861b
+  data.tar.gz: 59e8a16606a6b002b91970745894759af3e69d0a674dd1e01f2099acf4836ed61afabcaba9ffbe298f40ac71ca078a5d614923a095864db6ecc9998a1ad2a669

data/lib/my_john_deere_api/client.rb

@@ -3,14 +3,15 @@ module MyJohnDeereApi
     include Helpers::EnvironmentHelper
     include Helpers::CaseConversion
 
-    attr_reader :api_key, :api_secret, :access_token, :access_secret, :environment
+    attr_reader :api_key, :api_secret, :access_token, :access_secret,
+                :contribution_definition_id
 
     DEFAULTS = {
       environment: :live
     }
 
     ##
-    # Creates the client with everthing it needs to perform API requests.
+    # Creates the client with everything it needs to perform API requests.
     # User-specific credentials are optional, but user-specific API
     # requests are only possible if they are supplied.
     #
@@ -18,6 +19,9 @@ module MyJohnDeereApi
     #
     # [:environment] :sandbox or :live
     #
+    # [:contribution_definition_id] optional, but needed for some requests
+    #                               like asset create/update.
+    #
     # [:access] an array with two elements, the access_token
     #           and the access_secret of the given user
 
@@ -32,6 +36,7 @@ module MyJohnDeereApi
       end
 
       self.environment = options[:environment]
+      @contribution_definition_id = options[:contribution_definition_id]
     end
 
     ##

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

@@ -45,7 +45,7 @@ module MyJohnDeereApi
           {
             '@type' => 'Link',
             'rel' => 'contributionDefinition',
-            'uri' => "#{accessor.consumer.site}/contributionDefinitions/#{attributes[:contribution_definition_id]}"
+            'uri' => "#{accessor.consumer.site}/contributionDefinitions/#{client.contribution_definition_id}"
           }
         ]
       }

data/lib/my_john_deere_api/request/update/asset.rb

@@ -28,7 +28,7 @@ module MyJohnDeereApi
           {
             '@type' => 'Link',
             'rel' => 'contributionDefinition',
-            'uri' => "#{accessor.consumer.site}/contributionDefinitions/#{attributes[:contribution_definition_id]}"
+            'uri' => "#{accessor.consumer.site}/contributionDefinitions/#{client.contribution_definition_id}"
           }
         ]
       }

data/lib/my_john_deere_api/validators/asset.rb

@@ -16,7 +16,7 @@ module MyJohnDeereApi::Validators
     private
 
     def required_attributes
-      [:organization_id, :contribution_definition_id, :title]
+      [:organization_id, :title]
     end
 
     def validate_attributes

data/lib/my_john_deere_api/version.rb

@@ -1,3 +1,3 @@
 module MyJohnDeereApi
-  VERSION='1.3.7'
+  VERSION='2.0.0'
 end

data/test/lib/my_john_deere_api/client_test.rb

@@ -30,6 +30,11 @@ describe 'MyJohnDeereApi::Client' do
       client = JD::Client.new(api_key, api_secret, environment: environment)
       assert_equal environment, client.environment
     end
+
+    it 'accepts a contribution_definition_id' do
+      client = JD::Client.new(api_key, api_secret, contribution_definition_id: contribution_definition_id)
+      assert_equal contribution_definition_id, client.contribution_definition_id
+    end
   end
 
   describe '#get' do
@@ -63,12 +68,12 @@ describe 'MyJohnDeereApi::Client' do
 
   describe '#post' do
     let(:attributes) do
-      CONFIG.sanitized_asset_attributes.merge(
+      CONFIG.asset_attributes.merge(
         links: [
           {
             '@type' => 'Link',
             'rel' => 'contributionDefinition',
-            'uri' => "#{CONFIG.url}/contributionDefinitions/#{CONFIG.sanitized_asset_attributes[:contribution_definition_id]}"
+            'uri' => "#{CONFIG.url}/contributionDefinitions/#{contribution_definition_id}"
           }
         ]
       )
@@ -99,7 +104,7 @@ describe 'MyJohnDeereApi::Client' do
     let(:new_title) { 'i REALLY like turtles!' }
 
     let(:attributes) do
-      CONFIG.sanitized_asset_attributes.slice(
+      CONFIG.asset_attributes.slice(
         :asset_category, :asset_type, :asset_sub_type, :links
       ).merge(
         title: new_title,
@@ -107,7 +112,7 @@ describe 'MyJohnDeereApi::Client' do
           {
             '@type' => 'Link',
             'rel' => 'contributionDefinition',
-            'uri' => "#{CONFIG.url}/contributionDefinitions/#{CONFIG.sanitized_asset_attributes[:contribution_definition_id]}"
+            'uri' => "#{CONFIG.url}/contributionDefinitions/#{contribution_definition_id}"
           }
         ]
       )

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

@@ -43,7 +43,7 @@ describe 'MyJohnDeereApi::Request::Collection::Assets' do
 
   describe '#create(attributes)' do
     it 'creates a new asset with the given attributes' do
-      attributes = CONFIG.sanitized_asset_attributes
+      attributes = CONFIG.asset_attributes
       object = VCR.use_cassette('post_assets') { collection.create(attributes) }
 
       assert_kind_of JD::Model::Asset, object

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

@@ -7,9 +7,8 @@ describe 'MyJohnDeereApi::Request::Create::Asset' do
   end
 
   let(:valid_attributes) do
-    CONFIG.sanitized_asset_attributes.merge(
+    CONFIG.asset_attributes.merge(
       organization_id: organization_id,
-      contribution_definition_id: contribution_definition_id,
     )
   end
 
@@ -41,13 +40,6 @@ describe 'MyJohnDeereApi::Request::Create::Asset' do
       assert_equal 'is required', object.errors[:organization_id]
     end
 
-    it 'requires contribution_definition_id' do
-      object = klass.new(client, attributes_without(:contribution_definition_id))
-
-      refute object.valid?
-      assert_equal 'is required', object.errors[:contribution_definition_id]
-    end
-
     it 'requires title' do
       object = klass.new(client, attributes_without(:title))
 
@@ -137,7 +129,6 @@ describe 'MyJohnDeereApi::Request::Create::Asset' do
     it 'properly forms the request body' do
       object = klass.new(client, attributes)
       body = object.send(:request_body)
-
       assert_equal attributes[:title], body[:title]
       assert_equal attributes[:asset_category], body[:assetCategory]
       assert_equal attributes[:asset_type], body[:assetType]

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

@@ -8,7 +8,6 @@ describe 'MyJohnDeereApi::Request::Update::Asset' do
   let(:attributes) do
     {
       organization_id: organization_id,
-      contribution_definition_id: contribution_definition_id
     }
   end
 

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

@@ -18,7 +18,6 @@ describe 'MyJohnDeereApi::Validators::Asset' do
   let(:valid_attributes) do
     {
       organization_id: '000000',
-      contribution_definition_id: '00000000-0000-0000-0000-000000000000',
       title: "Bob's Stuff"
     }
   end
@@ -32,7 +31,7 @@ describe 'MyJohnDeereApi::Validators::Asset' do
   end
 
   it 'requires several attributes' do
-    [:organization_id, :contribution_definition_id, :title].each do |attr|
+    [:organization_id, :title].each do |attr|
       object = klass.new(valid_attributes.merge(attr => nil))
 
       refute object.valid?

data/test/support/vcr_setup.rb

@@ -87,7 +87,13 @@ class VcrSetup
 
   # provide a client with sanitized credentials
   def client
-    JD::Client.new(api_key, api_secret, environment: :sandbox, access: [access_token, access_secret])
+    JD::Client.new(
+      api_key,
+      api_secret,
+      contribution_definition_id: contribution_definition_id,
+      environment: :sandbox,
+      access: [access_token, access_secret]
+    )
   end
 
   def timestamp
@@ -138,17 +144,6 @@ class VcrSetup
 
   def asset_attributes
     @asset_attributes ||= {
-      contribution_definition_id: ENV['CONTRIBUTION_DEFINITION_ID'],
-      title: 'Asset Title',
-      asset_category: 'DEVICE',
-      asset_type: 'SENSOR',
-      asset_sub_type: 'ENVIRONMENTAL'
-    }.freeze
-  end
-
-  def sanitized_asset_attributes
-    @sanitized_asset_attributes ||= {
-      contribution_definition_id: contribution_definition_id,
       title: 'Asset Title',
       asset_category: 'DEVICE',
       asset_type: 'SENSOR',
@@ -195,6 +190,7 @@ class VcrSetup
       ENV['API_KEY'],
       ENV['API_SECRET'],
       environment: :sandbox,
+      contribution_definition_id: ENV['CONTRIBUTION_DEFINITION_ID'],
       access: [ENV['ACCESS_TOKEN'], ENV['ACCESS_SECRET']]
     )
   end

metadata

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