my_john_deere_api 2.5.0 → 3.0.0

data/lib/my_john_deere_api/net_http_retry/invalid_response_error.rb

@@ -11,8 +11,8 @@ module MyJohnDeereApi
 
       def initialize(response)
         message = {
-          code: response.code,
-          message: response.message,
+          code: response.status,
+          message: response.response.reason_phrase,
           body: response.body,
         }.to_json
 

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

@@ -6,7 +6,7 @@ module MyJohnDeereApi::Request
     # The resource path for the first page in the collection
 
     def resource
-      "/assets/#{associations[:asset]}/locations"
+      "/platform/assets/#{associations[:asset]}/locations"
     end
 
     ##

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

@@ -6,7 +6,7 @@ module MyJohnDeereApi::Request
     # The resource path for the first page in the collection
 
     def resource
-      "/organizations/#{associations[:organization]}/assets"
+      "/platform/organizations/#{associations[:organization]}/assets"
     end
 
     ##

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

@@ -15,14 +15,6 @@ module MyJohnDeereApi
       @items = []
     end
 
-    ##
-    # client accessor
-
-    def accessor
-      return @accessor if defined?(@accessor)
-      @accessor = client&.accessor
-    end
-
     ##
     # Iterate lazily through all records in the collection, fetching
     # additional pages as needed.
@@ -54,7 +46,7 @@ module MyJohnDeereApi
     def first_page
       return @first_page if defined?(@first_page)
 
-      @first_page = JSON.parse(accessor.get(resource, headers).body)
+      @first_page = client.get(resource)
       extract_page_contents(@first_page)
 
       @first_page
@@ -63,14 +55,10 @@ module MyJohnDeereApi
     def fetch
       return unless @next_page
 
-      page = JSON.parse(accessor.get(@next_page, headers).body)
+      page = client.get(@next_page)
       extract_page_contents(page)
     end
 
-    def headers
-      @headers ||= {accept: 'application/vnd.deere.axiom.v3+json'}
-    end
-
     def extract_page_contents(page)
       add_items_from_page(page)
       set_next_page(page)

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

@@ -6,7 +6,7 @@ module MyJohnDeereApi::Request
     # The resource path for the first page in the collection
 
     def resource
-      "/contributionProducts/#{associations[:contribution_product]}/contributionDefinitions"
+      "/platform/contributionProducts/#{associations[:contribution_product]}/contributionDefinitions"
     end
 
     ##

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

@@ -6,7 +6,7 @@ module MyJohnDeereApi::Request
     # The resource path for the first page in the collection
 
     def resource
-      "/contributionProducts?clientControlled=true"
+      "/platform/contributionProducts?clientControlled=true"
     end
 
     ##

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

@@ -6,7 +6,7 @@ module MyJohnDeereApi::Request
     # The resource path for the first page in the collection
 
     def resource
-      "/organizations/#{associations[:organization]}/fields"
+      "/platform/organizations/#{associations[:organization]}/fields"
     end
 
     ##

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

@@ -6,7 +6,7 @@ module MyJohnDeereApi::Request
     # The resource path for the first page in the collection
 
     def resource
-      "/organizations/#{associations[:organization]}/fields/#{associations[:field]}/flags"
+      "/platform/organizations/#{associations[:organization]}/fields/#{associations[:field]}/flags"
     end
 
     ##

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

@@ -6,7 +6,7 @@ module MyJohnDeereApi::Request
     # The resource path for the first page in the collection
 
     def resource
-      '/organizations'
+      '/platform/organizations'
     end
 
     ##

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

@@ -8,27 +8,24 @@ module MyJohnDeereApi
     private
 
     ##
-    # Retrieve newly created record
+    # id of newly created record
 
-    def fetch_record
-      path = response['location'].split('/platform').last
-      result = accessor.get(path, headers)
-
-      JSON.parse(result.body)
+    def record_id
+      response.headers['location'].split('/').last
     end
 
     ##
-    # This is the class used to model the data
+    # This is the class used to fetch an individual item
 
-    def model
-      Model::Asset
+    def individual_class
+      Request::Individual::Asset
     end
 
     ##
     # Path supplied to API
 
     def resource
-      @resource ||= "/organizations/#{attributes[:organization_id]}/assets"
+      @resource ||= "/platform/organizations/#{attributes[:organization_id]}/assets"
     end
 
     ##
@@ -48,7 +45,7 @@ module MyJohnDeereApi
           {
             '@type' => 'Link',
             'rel' => 'contributionDefinition',
-            'uri' => "#{accessor.consumer.site}/contributionDefinitions/#{client.contribution_definition_id}"
+            'uri' => client.contribution_definition_uri,
           }
         ]
       }

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

@@ -3,6 +3,29 @@ require 'date'
 module MyJohnDeereApi
   class Request::Create::AssetLocation < Request::Create::Base
     include Validators::AssetLocation
+    include Helpers::UriHelpers
+
+    ##
+    # Object created by request
+    #
+    # There is no endpoint to fetch a single location by id, so we have to
+    # override the `object` method from the base class.
+    #
+    # We have to fetch locations in bulk via the asset, but there could be
+    # thousands. We limit the request to just the first record from the 
+    # location list endpoint, since locations are returned newest to oldest.
+
+    def object
+      return @object if defined?(@object)
+
+      request unless response
+
+      path = uri_path(response.headers['location']) + '?count=1'
+      result = client.get(path)
+      record = result['values'].first
+
+      @object = Model::AssetLocation.new(client, record)
+    end
 
     private
 
@@ -72,24 +95,7 @@ module MyJohnDeereApi
     # Path supplied to API
 
     def resource
-      @resource ||= "/assets/#{attributes[:asset_id]}/locations"
-    end
-
-    ##
-    # Retrieve newly created record
-
-    def fetch_record
-      # There is no endpoint to fetch a single location by id. We have to fetch
-      # them in bulk via the asset, but there could be thousands. We limit the 
-      # request to just the first record from the location list endpoint, since
-      # locations are returned newest to oldest.
-
-      path = response['location'].split('/platform').last
-      path += "?count=1"
-
-      result = accessor.get(path, headers)
-
-      JSON.parse(result.body)['values'].first
+      @resource ||= "/platform/assets/#{attributes[:asset_id]}/locations"
     end
 
     ##
@@ -99,12 +105,5 @@ module MyJohnDeereApi
       stamp = DateTime.parse(timestamp).to_time + seconds
       stamp.to_datetime.strftime('%Y-%m-%dT%H:%M:%SZ')
     end
-
-    ##
-    # This is the class used to model the data
-
-    def model
-      Model::AssetLocation
-    end
   end
 end

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

@@ -16,21 +16,13 @@ module MyJohnDeereApi
       process_attributes
     end
 
-    ##
-    # client accessor
-
-    def accessor
-      return @accessor if defined?(@accessor)
-      @accessor = client&.accessor
-    end
-
     ##
     # Make the request, if the instance is valid
 
     def request
       validate!
 
-      @response = accessor.post(resource, request_body.to_json, headers)
+      @response = client.post(resource, request_body)
     end
 
     ##
@@ -41,7 +33,7 @@ module MyJohnDeereApi
 
       request unless response
 
-      @object = model.new(client, fetch_record)
+      @object = individual_class.new(client, record_id).object
     end
 
     private
@@ -53,15 +45,5 @@ module MyJohnDeereApi
 
     def process_attributes
     end
-
-    ##
-    # Headers for POST request
-
-    def headers
-      @headers ||= {
-        'Accept'        => 'application/vnd.deere.axiom.v3+json',
-        'Content-Type'  => 'application/vnd.deere.axiom.v3+json'
-      }
-    end
   end
 end

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

@@ -3,10 +3,10 @@ require 'json'
 module MyJohnDeereApi::Request
   class Individual::Asset < Individual::Base
     ##
-    # The resource path for the first page in the collection
+    # The resource path for the object
 
     def resource
-      "/assets/#{id}"
+      "/platform/assets/#{id}"
     end
 
     ##

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

@@ -2,7 +2,7 @@ require 'json'
 
 module MyJohnDeereApi::Request
   class Individual::Base
-    attr_reader :client, :id, :associations, :response
+    attr_reader :client, :id, :associations
 
     ##
     # Initialize with a client, and asset id
@@ -13,40 +13,22 @@ module MyJohnDeereApi::Request
       @associations = associations
     end
 
-    ##
-    # client accessor
-
-    def accessor
-      return @accessor if defined?(@accessor)
-      @accessor = client&.accessor
-    end
-
     ##
     # The object being requested, an asset in this case
 
     def object
       return @object if defined?(@object)
-
-      request unless response
-      @object = model.new(client, JSON.parse(response.body))
+      @object = model.new(client, response)
     end
 
     private
 
     ##
-    # Make the request
-
-    def request
-      @response = accessor.get(resource, headers)
-    end
-
-    ##
-    # Headers for GET request
+    # response from object request
 
-    def headers
-      @headers ||= {
-        'Accept'        => 'application/vnd.deere.axiom.v3+json',
-      }
+    def response
+      return @response if defined?(@response)
+      @response = client.get(resource)
     end
   end
 end

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

@@ -6,7 +6,7 @@ module MyJohnDeereApi::Request
     # The resource path for the first page in the collection
 
     def resource
-      "/contributionDefinitions/#{id}"
+      "/platform/contributionDefinitions/#{id}"
     end
 
     ##

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

@@ -6,7 +6,7 @@ module MyJohnDeereApi::Request
     # The resource path for the first page in the collection
 
     def resource
-      "/contributionProducts/#{id}"
+      "/platform/contributionProducts/#{id}"
     end
 
     ##

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

@@ -6,7 +6,7 @@ module MyJohnDeereApi::Request
     # The resource path for the first page in the collection
 
     def resource
-      "/organizations/#{associations[:organization]}/fields/#{id}"
+      "/platform/organizations/#{associations[:organization]}/fields/#{id}"
     end
 
     ##

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

@@ -6,7 +6,7 @@ module MyJohnDeereApi::Request
     # The resource path for the first page in the collection
 
     def resource
-      "/organizations/#{id}"
+      "/platform/organizations/#{id}"
     end
 
     ##

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

@@ -11,7 +11,7 @@ module MyJohnDeereApi
     # Path supplied to API
 
     def resource
-      @resource ||= "/assets/#{attributes[:id]}"
+      @resource ||= "/platform/assets/#{attributes[:id]}"
     end
 
     ##
@@ -31,7 +31,7 @@ module MyJohnDeereApi
           {
             '@type' => 'Link',
             'rel' => 'contributionDefinition',
-            'uri' => "#{accessor.consumer.site}/contributionDefinitions/#{client.contribution_definition_id}"
+            'uri' => client.contribution_definition_uri,
           }
         ]
       }

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

@@ -20,21 +20,13 @@ module MyJohnDeereApi
       process_attributes
     end
 
-    #
-    # client accessor
-
-    def accessor
-      return @accessor if defined?(@accessor)
-      @accessor = client&.accessor
-    end
-
     ##
     # Make the request, if the instance is valid
 
     def request
       validate!
 
-      @response = accessor.put(resource, request_body.to_json, headers)
+      @response = client.put(resource, request_body.to_json)
     end
 
     ##
@@ -53,15 +45,5 @@ module MyJohnDeereApi
 
     def process_attributes
     end
-
-    ##
-    # Headers for PUT request
-
-    def headers
-      @headers ||= {
-        'Accept'        => 'application/vnd.deere.axiom.v3+json',
-        'Content-Type'  => 'application/vnd.deere.axiom.v3+json'
-      }
-    end
   end
 end