my_john_deere_api 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc9478ddbe0b4aa4f4e1d20f822db028cbc13154cd158b2cf937be9a18d4279a
-  data.tar.gz: ca8f3397f9d3ec5156c7a346d77c719e3ef427c166c6aa8d6db1a8ba8269c35f
+  metadata.gz: c526296200ecd51d61d4bb113a1f224791ce52d4cacd1456be97b6c847404d45
+  data.tar.gz: 46e1aed00e81a3b14be252fdf206d8e33aa93ed7ccaff2766378fa3770f23e10
 SHA512:
-  metadata.gz: 8f910a45e19494e09476f2cb506403e94df8eb86eb6816db23d6d2aeabe02a6ddff7ec5e4bdc35a59b3d2a53857a2cf86949ed1109c19490149ca5857d158bbe
-  data.tar.gz: a10d6662be6a6fd3d63acc2e8e5c6bbd41fe4e74243c5f0ad3c41aef6dcf65f740be5507e761723da879a380fcfbe9b9744dac8a79024882632c1f1300371229
+  metadata.gz: 19f044e3ae20c63c28dcc4c30f28b79ba27159fd49b7bda254958707c6602e1c5418f8d7e328f520876ad5677958551c923eb3502044e61a3598363f868d8a84
+  data.tar.gz: dce51ce51507f141c1248fb5fe0e22f0a61aaecaa8fad56faa1a65f29748a9bb14827917ad34dceba1c51489f1b4e40a0aa225f64dd1009910fe265b6ef4b96c

data/lib/my_john_deere_api/model/asset.rb

@@ -9,7 +9,7 @@ module MyJohnDeereApi
       raise AccessTokenError unless accessor
 
       return @locations if defined?(@locations)
-      @locations = MyJohnDeereApi::Request::Collection::AssetLocations.new(accessor, asset: id).all
+      @locations = MyJohnDeereApi::Request::Collection::AssetLocations.new(accessor, asset: id)
     end
 
     private

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

@@ -4,6 +4,15 @@ module MyJohnDeereApi
   class Request::Create::AssetLocation < Request::Create::Base
     private
 
+    ##
+    # Set defaults and generate some attributes from others.
+    # Overridden from parent class.
+
+    def process_attributes
+      process_timestamp
+      process_geometry
+    end
+
     ##
     # Request body
 
@@ -11,32 +20,28 @@ module MyJohnDeereApi
       return @body if defined?(@body)
 
       @body = [{
-        timestamp: timestamp,
-        geometry: geometry,
+        timestamp: attributes[:timestamp],
+        geometry: attributes[:geometry],
         measurementData: attributes[:measurement_data]
       }]
     end
 
     ##
-    # Parsed timestamp
-
-    def timestamp
-      return @timestamp if defined?(@timestamp)
+    # Custom-process timestamp
 
+    def process_timestamp
       attributes[:timestamp] ||= Time.now.utc
 
-      @timestamp = attributes[:timestamp].is_a?(String) ?
+      attributes[:timestamp] = attributes[:timestamp].is_a?(String) ?
         attributes[:timestamp] :
         attributes[:timestamp].strftime('%Y-%m-%dT%H:%M:%SZ')
     end
 
     ##
-    # Parse geometry
-
-    def geometry
-      return @geometry if defined?(@geometry)
+    # Custom-process geometry
 
-      @geometry = if attributes[:geometry]
+    def process_geometry
+      attributes[:geometry] = if attributes[:geometry]
         attributes[:geometry].is_a?(String) ?
           attributes[:geometry] :
           attributes[:geometry].to_json
@@ -89,8 +94,8 @@ module MyJohnDeereApi
       # API will only accept a timestamp *range*, and the start must be lower
       # than the end. We buffer start/end times by one second, then find the
       # exact match.
-      start_date = timestamp_add(timestamp, -1)
-      end_date = timestamp_add(timestamp, 1)
+      start_date = timestamp_add(attributes[:timestamp], -1)
+      end_date = timestamp_add(attributes[:timestamp], 1)
       path += "?startDate=#{start_date}&endDate=#{end_date}"
 
       result = accessor.get(path, headers)
@@ -98,7 +103,7 @@ module MyJohnDeereApi
       # Timestamps are returned with seconds in decimals, even though these 
       # are always zero. So we compare actual DateTime objects parsed from
       # the timestamp strings.
-      parsed_stamp = DateTime.parse(timestamp)
+      parsed_stamp = DateTime.parse(attributes[:timestamp])
 
       JSON.parse(result.body)['values'].detect do |record|
         parsed_stamp == DateTime.parse(record['timestamp'])

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

@@ -21,6 +21,8 @@ module MyJohnDeereApi
       @accessor = accessor
       @attributes = attributes
 
+      process_attributes
+
       @errors = {}
     end
 
@@ -29,6 +31,7 @@ module MyJohnDeereApi
 
     def request
       validate!
+
       @response = accessor.post(resource, request_body.to_json, headers)
     end
 
@@ -73,6 +76,14 @@ module MyJohnDeereApi
 
     private
 
+    ##
+    # Convert inputs into working attributes. This allows us to auto-create
+    # some attributes from others, or set defaults, on a class-by-class basis.
+    # See Request::Create::AssetLocation for an example.
+
+    def process_attributes
+    end
+
     ##
     # Attributes that must be specified, override in child class
 
@@ -85,7 +96,7 @@ module MyJohnDeereApi
 
     def validate_required
       required_attributes.each do |attr|
-        errors[attr] = 'is required' unless attributes.keys.include?(attr)
+        errors[attr] = 'is required' unless attributes[attr]
       end
     end
 

data/lib/my_john_deere_api/version.rb

@@ -1,3 +1,3 @@
 module MyJohnDeereApi
-  VERSION='0.8.0'
+  VERSION='0.8.1'
 end

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

@@ -60,9 +60,13 @@ describe 'MyJohnDeereApi::Model::Asset' do
       accessor
       organization = VCR.use_cassette('get_organizations') { client.organizations.first }
       asset = VCR.use_cassette('get_assets') { organization.assets.first }
-      locations = VCR.use_cassette('get_asset_locations') { asset.locations }
 
-      assert_kind_of Array, locations
+      locations = VCR.use_cassette('get_asset_locations') do
+        asset.locations.all
+        asset.locations
+      end
+
+      assert_kind_of Array, locations.all
 
       locations.each do |location|
         assert_kind_of JD::Model::AssetLocation, location

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

@@ -76,7 +76,7 @@ describe 'MyJohnDeereApi::Request::Create::AssetLocation' do
         }
       }.to_json
 
-      assert_equal expected_geometry, object.send(:geometry)
+      assert_equal expected_geometry, object.attributes[:geometry]
     end
 
     it 'defaults timestamp to current time' do
@@ -84,7 +84,7 @@ describe 'MyJohnDeereApi::Request::Create::AssetLocation' do
       object = JD::Request::Create::AssetLocation.new(accessor, attributes)
 
       expected_stamp = Time.now.utc.to_i
-      actual_stamp = DateTime.parse(object.send(:timestamp)).to_time.to_i
+      actual_stamp = DateTime.parse(object.attributes[:timestamp]).to_time.to_i
 
       assert_in_delta expected_stamp, actual_stamp, 1
     end
@@ -105,13 +105,6 @@ describe 'MyJohnDeereApi::Request::Create::AssetLocation' do
       assert_equal 'is required', object.errors[:asset_id]
     end
 
-    it 'requires timestamp' do
-      object = JD::Request::Create::AssetLocation.new(accessor, attributes_without(:timestamp))
-
-      refute object.valid?
-      assert_equal 'is required', object.errors[:timestamp]
-    end
-
     it 'requires geometry' do
       object = JD::Request::Create::AssetLocation.new(accessor, attributes_without(:geometry))
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: my_john_deere_api
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Jaime. Bellmyer