my_john_deere_api 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2baeafd63d0b06c78bd534c4e88938620bb2d0baa0c19f69493303a02159db8d
-  data.tar.gz: 4f1f09b26eff60c313d377c61971a96262d25ccf3c3a5e143a9bcf7ec13b5374
+  metadata.gz: dc9478ddbe0b4aa4f4e1d20f822db028cbc13154cd158b2cf937be9a18d4279a
+  data.tar.gz: ca8f3397f9d3ec5156c7a346d77c719e3ef427c166c6aa8d6db1a8ba8269c35f
 SHA512:
-  metadata.gz: a5c87ff1c342ab2e1d363efb72cda2a40fdb465e98be34a22d1a22f0ae9014da13134a808fc88e3800fae1203e94ad7b772fd2346ae97245daafeb8c1cda50a4
-  data.tar.gz: bc8b999834e472b36656bcb70c55671e4962ae4a70ac68f3ba4ca04fedee7f678d658b2ad1f744e57a476a6e8733bb56cdff7fed91bd88fe1f1ac364e4cc2d26
+  metadata.gz: 8f910a45e19494e09476f2cb506403e94df8eb86eb6816db23d6d2aeabe02a6ddff7ec5e4bdc35a59b3d2a53857a2cf86949ed1109c19490149ca5857d158bbe
+  data.tar.gz: a10d6662be6a6fd3d63acc2e8e5c6bbd41fe4e74243c5f0ad3c41aef6dcf65f740be5507e761723da879a380fcfbe9b9744dac8a79024882632c1f1300371229

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

@@ -10,13 +10,11 @@ module MyJohnDeereApi
     def request_body
       return @body if defined?(@body)
 
-      @body = [
-        {
-          timestamp: timestamp,
-          geometry: geometry,
-          measurementData: attributes[:measurement_data]
-        }
-      ]
+      @body = [{
+        timestamp: timestamp,
+        geometry: geometry,
+        measurementData: attributes[:measurement_data]
+      }]
     end
 
     ##
@@ -25,6 +23,8 @@ module MyJohnDeereApi
     def timestamp
       return @timestamp if defined?(@timestamp)
 
+      attributes[:timestamp] ||= Time.now.utc
+
       @timestamp = attributes[:timestamp].is_a?(String) ?
         attributes[:timestamp] :
         attributes[:timestamp].strftime('%Y-%m-%dT%H:%M:%SZ')
@@ -36,9 +36,29 @@ module MyJohnDeereApi
     def geometry
       return @geometry if defined?(@geometry)
 
-      @geometry = attributes[:geometry].is_a?(String) ?
-        attributes[:geometry] :
-        attributes[:geometry].to_json
+      @geometry = if attributes[:geometry]
+        attributes[:geometry].is_a?(String) ?
+          attributes[:geometry] :
+          attributes[:geometry].to_json
+      elsif attributes[:coordinates]
+        geometry_from_coordinates
+      end
+    end
+
+    ##
+    # Convert just coordinates into valid geometry hash
+
+    def geometry_from_coordinates
+      {
+        type: 'Feature',
+        geometry: {
+          geometries: [
+            coordinates: attributes[:coordinates],
+            type: 'Point'
+          ],
+          type: 'GeometryCollection'
+        }
+      }.to_json
     end
 
     ##

data/lib/my_john_deere_api/version.rb

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

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

@@ -54,6 +54,40 @@ describe 'MyJohnDeereApi::Request::Create::AssetLocation' do
       object = JD::Request::Create::AssetLocation.new(accessor, {})
       assert_equal({}, object.errors)
     end
+
+    it 'accepts simple coordinates and generates the geometry' do
+      attributes = {
+        asset_id: asset_id,
+        timestamp: timestamp,
+        coordinates: geometry[:coordinates],
+        measurement_data: measurement_data
+      }
+
+      object = JD::Request::Create::AssetLocation.new(accessor, attributes)
+
+      expected_geometry = {
+        type: 'Feature',
+        geometry: {
+          geometries: [
+            coordinates: geometry[:coordinates],
+            type: 'Point'
+          ],
+          type: 'GeometryCollection'
+        }
+      }.to_json
+
+      assert_equal expected_geometry, object.send(:geometry)
+    end
+
+    it 'defaults timestamp to current time' do
+      attributes = valid_attributes.slice(:asset_id, :geometry, :measurement_data)
+      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
+
+      assert_in_delta expected_stamp, actual_stamp, 1
+    end
   end
 
   describe '#valid?' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_john_deere_api
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Jaime. Bellmyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-18 00:00:00.000000000 Z
+date: 2020-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vcr