my_john_deere_api 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c526296200ecd51d61d4bb113a1f224791ce52d4cacd1456be97b6c847404d45
-  data.tar.gz: 46e1aed00e81a3b14be252fdf206d8e33aa93ed7ccaff2766378fa3770f23e10
+  metadata.gz: 242077415772b4bb77b74351f3f98a50f5f4c593e12677ec500a2fb2dc13dced
+  data.tar.gz: bd92b88d075ccd0cf741011426c27ce594b6021ead50f98c05e4426f53f614cd
 SHA512:
-  metadata.gz: 19f044e3ae20c63c28dcc4c30f28b79ba27159fd49b7bda254958707c6602e1c5418f8d7e328f520876ad5677958551c923eb3502044e61a3598363f868d8a84
-  data.tar.gz: dce51ce51507f141c1248fb5fe0e22f0a61aaecaa8fad56faa1a65f29748a9bb14827917ad34dceba1c51489f1b4e40a0aa225f64dd1009910fe265b6ef4b96c
+  metadata.gz: e6e5d1d1240261d1d987053f365ed1299f9c1b9d64b8194f19d4d95c155fceebd79b2bae1e039e7f755d831b40a34b461575a2c64267e257408d76d73deb4b00
+  data.tar.gz: f0df1ab91d6fd93a74636a555bacc5ebca37ae1a8723c88884bf03f0244eb2a4576b26b2f112a3cd093ad602abedbd3ce54c0696cc82ce51ae688645ec66db4e

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

@@ -84,30 +84,17 @@ module MyJohnDeereApi
     # Retrieve newly created record
 
     def fetch_record
-      # There is no way to fetch a single location by id, because locations
-      # don't have IDs. You have to fetch them in bulk via the asset, but
-      # there could be thousands. We limit to just the record created with
-      # our timestamp, which must be unique.
+      # 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
-
-      # 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(attributes[:timestamp], -1)
-      end_date = timestamp_add(attributes[:timestamp], 1)
-      path += "?startDate=#{start_date}&endDate=#{end_date}"
+      path += "?count=1"
 
       result = accessor.get(path, headers)
 
-      # 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(attributes[:timestamp])
-
-      JSON.parse(result.body)['values'].detect do |record|
-        parsed_stamp == DateTime.parse(record['timestamp'])
-      end
+      JSON.parse(result.body)['values'].first
     end
 
     ##

data/lib/my_john_deere_api/version.rb

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

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

@@ -34,7 +34,7 @@ describe 'MyJohnDeereApi::Request::Collection::AssetLocations' do
 
   describe '#all' do
     it 'returns all records' do
-      all = VCR.use_cassette('get_asset_locations', record: :new_episodes) { collection.all }
+      all = VCR.use_cassette('get_asset_locations') { collection.all }
 
       assert_kind_of Array, all
       assert_equal collection.count, all.size
@@ -49,12 +49,19 @@ describe 'MyJohnDeereApi::Request::Collection::AssetLocations' do
   describe '#create(attributes)' do
     let(:asset_id) { ENV['ASSET_ID'] }
     let(:timestamp) { DateTime.parse(timestamp_string) }
-    let(:timestamp_string) { '2020-01-18T00:31:00Z' }
+    let(:timestamp_string) { '2020-01-21T10:49:00Z' }
+    let(:coordinates) { [-103.115633, 41.670166] }
 
     let(:geometry) do
       {
-        type: 'Point',
-        coordinates: [-103.115633, 41.670166]
+        type: 'Feature',
+        geometry: {
+          geometries: [
+            coordinates: coordinates,
+            type: 'Point'
+          ],
+          type: 'GeometryCollection'
+        }
       }
     end
 
@@ -116,7 +123,7 @@ describe 'MyJohnDeereApi::Request::Collection::AssetLocations' do
 
     it 'returns all records as a single enumerator' do
       count = VCR.use_cassette('get_asset_locations') { collection.count }
-      timestamps = VCR.use_cassette('get_asset_locations', record: :new_episodes) { collection.map(&:timestamp) }
+      timestamps = VCR.use_cassette('get_asset_locations') { collection.map(&:timestamp) }
 
       assert_kind_of Array, timestamps
       assert_equal count, timestamps.size

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

@@ -34,7 +34,7 @@ describe 'MyJohnDeereApi::Request::Collection::Assets' do
 
   describe '#all' do
     it 'returns all records' do
-      all = VCR.use_cassette('get_assets', record: :new_episodes) { collection.all }
+      all = VCR.use_cassette('get_assets') { collection.all }
 
       assert_kind_of Array, all
       assert_equal collection.count, all.size
@@ -95,7 +95,7 @@ describe 'MyJohnDeereApi::Request::Collection::Assets' do
 
     it 'returns all records as a single enumerator' do
       count = VCR.use_cassette('get_assets') { collection.count }
-      titles = VCR.use_cassette('get_assets', record: :new_episodes) { collection.map(&:title) }
+      titles = VCR.use_cassette('get_assets') { collection.map(&:title) }
 
       assert_kind_of Array, titles
       assert_equal count, titles.size

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

@@ -34,7 +34,7 @@ describe 'MyJohnDeereApi::Request::Collection::Fields' do
 
   describe '#all' do
     it 'returns all records' do
-      all = VCR.use_cassette('get_fields', record: :new_episodes) { collection.all }
+      all = VCR.use_cassette('get_fields') { collection.all }
 
       assert_kind_of Array, all
       assert_equal collection.count, all.size
@@ -70,7 +70,7 @@ describe 'MyJohnDeereApi::Request::Collection::Fields' do
 
     it 'returns all records as a single enumerator' do
       count = VCR.use_cassette('get_fields') { collection.count }
-      names = VCR.use_cassette('get_fields', record: :new_episodes) { collection.map{|item| item.name} }
+      names = VCR.use_cassette('get_fields') { collection.map{|item| item.name} }
 
       assert_kind_of Array, names
       assert_equal count, names.size

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

@@ -41,7 +41,7 @@ describe 'MyJohnDeereApi::Request::Collection::Flags' do
 
   describe '#all' do
     it 'returns all records' do
-      all = VCR.use_cassette('get_flags', record: :new_episodes) { collection.all }
+      all = VCR.use_cassette('get_flags') { collection.all }
 
       assert_kind_of Array, all
       assert_equal collection.count, all.size
@@ -77,7 +77,7 @@ describe 'MyJohnDeereApi::Request::Collection::Flags' do
 
     it 'returns all records as a single enumerator' do
       count = VCR.use_cassette('get_flags') { collection.count }
-      geometries = VCR.use_cassette('get_flags', record: :new_episodes) { collection.map{|item| item.geometry} }
+      geometries = VCR.use_cassette('get_flags') { collection.map{|item| item.geometry} }
 
       assert_kind_of Array, geometries
       assert_equal count, geometries.size

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

@@ -21,7 +21,7 @@ describe 'MyJohnDeereApi::Request::Collection::Organizations' do
 
   describe '#all' do
     it 'returns all records' do
-      all = VCR.use_cassette('get_organizations', record: :new_episodes) { collection.all }
+      all = VCR.use_cassette('get_organizations') { collection.all }
 
       assert_kind_of Array, all
       assert_equal collection.count, all.size
@@ -57,7 +57,7 @@ describe 'MyJohnDeereApi::Request::Collection::Organizations' do
 
     it 'returns all records as a single enumerator' do
       count = VCR.use_cassette('get_organizations') { collection.count }
-      names = VCR.use_cassette('get_organizations', record: :new_episodes) { collection.map{|item| item.name} }
+      names = VCR.use_cassette('get_organizations') { collection.map{|item| item.name} }
 
       assert_kind_of Array, names
       assert_equal count, names.size
@@ -68,7 +68,7 @@ describe 'MyJohnDeereApi::Request::Collection::Organizations' do
     end
 
     it 'passes the accessor to all organizations' do
-      organizations = VCR.use_cassette('get_organizations', record: :new_episodes) { collection.all }
+      organizations = VCR.use_cassette('get_organizations') { collection.all }
 
       organizations.each do |organization|
         assert_equal accessor, organization.accessor

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

@@ -12,12 +12,19 @@ describe 'MyJohnDeereApi::Request::Create::AssetLocation' do
 
   let(:asset_id) { ENV['ASSET_ID'] }
   let(:timestamp) { DateTime.parse(timestamp_string) }
-  let(:timestamp_string) { '2020-01-18T00:31:00Z' }
+  let(:timestamp_string) { '2020-01-21T10:49:00Z' }
+  let(:coordinates) { [-103.115633, 41.670166] }
 
   let(:geometry) do
     {
-      type: 'Point',
-      coordinates: [-103.115633, 41.670166]
+      type: 'Feature',
+      geometry: {
+        geometries: [
+          coordinates: coordinates,
+          type: 'Point'
+        ],
+        type: 'GeometryCollection'
+      }
     }
   end
 
@@ -59,24 +66,13 @@ describe 'MyJohnDeereApi::Request::Create::AssetLocation' do
       attributes = {
         asset_id: asset_id,
         timestamp: timestamp,
-        coordinates: geometry[:coordinates],
+        coordinates: 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.attributes[:geometry]
+      assert_equal geometry.to_json, object.attributes[:geometry]
     end
 
     it 'defaults timestamp to current time' do

data/test/support/vcr/post_asset_locations-bak.yml

@@ -0,0 +1,95 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://sandboxapi.deere.com/platform/assets/029c288a-14d9-459f-8ee6-b4e840e672a1/locations
+    body:
+      encoding: UTF-8
+      string: '[{"timestamp":"2020-01-18T00:31:00Z","geometry":"{\"type\":\"Feature\",\"geometry\":{\"geometries\":[{\"coordinates\":[-103.115633,41.670166],\"type\":\"Point\"}],\"type\":\"GeometryCollection\"}}","measurementData":[{"name":"Temperature","value":"68.0","unit":"F"}]}]'
+    headers:
+      Accept:
+      - application/vnd.deere.axiom.v3+json
+      Content-Type:
+      - application/vnd.deere.axiom.v3+json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      User-Agent:
+      - OAuth gem v0.5.4
+      Content-Length:
+      - '181'
+      Authorization:
+      - OAuth oauth_body_hash="iiLtEEcE%2B8AM8XC5NLttAeL92i4%3D", oauth_consumer_key="johndeere-wgmADngYCRmfpEbVgSyc709wnyRux5J7PAv8SE7B",
+        oauth_nonce="hMwIfcVWHIyjE51AQcMztDSCm0AWilBe4LTFZvuI", oauth_signature="ibSHPRsXfeazw1%2F5I%2BZlcipIZRk%3D",
+        oauth_signature_method="HMAC-SHA1", oauth_timestamp="1579308624", oauth_token="47bbb9c9-41a8-4bec-8127-e3c5760af2f6",
+        oauth_version="1.0"
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Date:
+      - Sat, 18 Jan 2020 00:50:24 GMT
+      Content-Type:
+      - application/vnd.deere.axiom.v3+json
+      X-Deere-Handling-Server:
+      - ip-10-214-45-182
+      X-Frame-Options:
+      - SAMEORIGIN
+      Location:
+      - https://sandboxapi.deere.com/platform/assets/029c288a-14d9-459f-8ee6-b4e840e672a1/locations
+      X-Deere-Elapsed-Ms:
+      - '59'
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: ASCII-8BIT
+      string: ''
+    http_version:
+  recorded_at: Sat, 18 Jan 2020 00:50:24 GMT
+- request:
+    method: get
+    uri: https://sandboxapi.deere.com/platform/assets/029c288a-14d9-459f-8ee6-b4e840e672a1/locations?endDate=2020-01-18T00:31:01Z&startDate=2020-01-18T00:30:59Z
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/vnd.deere.axiom.v3+json
+      Content-Type:
+      - application/vnd.deere.axiom.v3+json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      User-Agent:
+      - OAuth gem v0.5.4
+      Authorization:
+      - OAuth oauth_consumer_key="johndeere-wgmADngYCRmfpEbVgSyc709wnyRux5J7PAv8SE7B",
+        oauth_nonce="hStGJCzcb5OY7HwmEsQwNX253TTZ85FurItAwDuxvdQ", oauth_signature="LEKTEGOy%2FmqrsGuEqvASGBYk7gY%3D",
+        oauth_signature_method="HMAC-SHA1", oauth_timestamp="1579308624", oauth_token="47bbb9c9-41a8-4bec-8127-e3c5760af2f6",
+        oauth_version="1.0"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Sat, 18 Jan 2020 00:50:25 GMT
+      Content-Type:
+      - application/vnd.deere.axiom.v3+json;charset=UTF-8
+      X-Deere-Handling-Server:
+      - ip-10-214-45-182
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Deere-Elapsed-Ms:
+      - '44'
+      Cache-Control:
+      - no-store
+      Content-Language:
+      - en-US
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: ASCII-8BIT
+      string: '{"links":[{"rel":"self","uri":"https://sandboxapi.deere.com/platform/assets/029c288a-14d9-459f-8ee6-b4e840e672a1/locations?startDate=2020-01-18T00:30:59Z&endDate=2020-01-18T00:31:01Z"}],"total":1,"values":[{"@type":"ContributedAssetLocation","timestamp":"2020-01-18T00:31:00.000Z","geometry":"{\"type\":\"Feature\",\"geometry\":{\"geometries\":[{\"coordinates\":[-103.115633,41.670166],\"type\":\"Point\"}],\"type\":\"GeometryCollection\"}}","measurementData":[{"@type":"BasicMeasurement","name":"Temperature","value":"68.0","unit":"F"}],"links":[]}]}'
+    http_version:
+  recorded_at: Sat, 18 Jan 2020 00:50:25 GMT
+recorded_with: VCR 5.0.0

data/test/support/vcr/post_asset_locations.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: https://sandboxapi.deere.com/platform/assets/029c288a-14d9-459f-8ee6-b4e840e672a1/locations
     body:
       encoding: UTF-8
-      string: '[{"timestamp":"2020-01-18T00:31:00Z","geometry":"{\"type\":\"Point\",\"coordinates\":[-103.115633,41.670166]}","measurementData":[{"name":"Temperature","value":"68.0","unit":"F"}]}]'
+      string: '[{"timestamp":"2020-01-21T10:49:00Z","geometry":"{\"type\":\"Feature\",\"geometry\":{\"geometries\":[{\"coordinates\":[-103.115633,41.670166],\"type\":\"Point\"}],\"type\":\"GeometryCollection\"}}","measurementData":[{"name":"Temperature","value":"68.0","unit":"F"}]}]'
     headers:
       Accept:
       - application/vnd.deere.axiom.v3+json
@@ -16,11 +16,11 @@ http_interactions:
       User-Agent:
       - OAuth gem v0.5.4
       Content-Length:
-      - '181'
+      - '268'
       Authorization:
-      - OAuth oauth_body_hash="iiLtEEcE%2B8AM8XC5NLttAeL92i4%3D", oauth_consumer_key="johndeere-wgmADngYCRmfpEbVgSyc709wnyRux5J7PAv8SE7B",
-        oauth_nonce="hMwIfcVWHIyjE51AQcMztDSCm0AWilBe4LTFZvuI", oauth_signature="ibSHPRsXfeazw1%2F5I%2BZlcipIZRk%3D",
-        oauth_signature_method="HMAC-SHA1", oauth_timestamp="1579308624", oauth_token="47bbb9c9-41a8-4bec-8127-e3c5760af2f6",
+      - OAuth oauth_body_hash="%2F3ff%2FY3gkVUR0uOgxhtjw57sXaA%3D", oauth_consumer_key="johndeere-wgmADngYCRmfpEbVgSyc709wnyRux5J7PAv8SE7B",
+        oauth_nonce="XeaNgLOptfMT2ttfRMkliaPaC6SeCHlRRp3er4Lw1DQ", oauth_signature="vUuvFvIDJVkKYhI1EUUFyYYQtV4%3D",
+        oauth_signature_method="HMAC-SHA1", oauth_timestamp="1579625367", oauth_token="47bbb9c9-41a8-4bec-8127-e3c5760af2f6",
         oauth_version="1.0"
   response:
     status:
@@ -28,27 +28,27 @@ http_interactions:
       message: Created
     headers:
       Date:
-      - Sat, 18 Jan 2020 00:50:24 GMT
+      - Tue, 21 Jan 2020 16:49:29 GMT
       Content-Type:
       - application/vnd.deere.axiom.v3+json
       X-Deere-Handling-Server:
-      - ip-10-214-45-182
+      - ip-10-214-44-246
       X-Frame-Options:
       - SAMEORIGIN
       Location:
       - https://sandboxapi.deere.com/platform/assets/029c288a-14d9-459f-8ee6-b4e840e672a1/locations
       X-Deere-Elapsed-Ms:
-      - '59'
+      - '65'
       Transfer-Encoding:
       - chunked
     body:
       encoding: ASCII-8BIT
       string: ''
     http_version: 
-  recorded_at: Sat, 18 Jan 2020 00:50:24 GMT
+  recorded_at: Tue, 21 Jan 2020 16:49:29 GMT
 - request:
     method: get
-    uri: https://sandboxapi.deere.com/platform/assets/029c288a-14d9-459f-8ee6-b4e840e672a1/locations?endDate=2020-01-18T00:31:01Z&startDate=2020-01-18T00:30:59Z
+    uri: https://sandboxapi.deere.com/platform/assets/029c288a-14d9-459f-8ee6-b4e840e672a1/locations?count=1
     body:
       encoding: US-ASCII
       string: ''
@@ -63,8 +63,8 @@ http_interactions:
       - OAuth gem v0.5.4
       Authorization:
       - OAuth oauth_consumer_key="johndeere-wgmADngYCRmfpEbVgSyc709wnyRux5J7PAv8SE7B",
-        oauth_nonce="hStGJCzcb5OY7HwmEsQwNX253TTZ85FurItAwDuxvdQ", oauth_signature="LEKTEGOy%2FmqrsGuEqvASGBYk7gY%3D",
-        oauth_signature_method="HMAC-SHA1", oauth_timestamp="1579308624", oauth_token="47bbb9c9-41a8-4bec-8127-e3c5760af2f6",
+        oauth_nonce="VHHC3rHWsn8ncdKOXp6TQMbfxl0WX4MDSSuKfl5Cw", oauth_signature="k5KAgVcvV%2FhjnpSHPTB1l4HdApc%3D",
+        oauth_signature_method="HMAC-SHA1", oauth_timestamp="1579625475", oauth_token="47bbb9c9-41a8-4bec-8127-e3c5760af2f6",
         oauth_version="1.0"
   response:
     status:
@@ -72,15 +72,15 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Sat, 18 Jan 2020 00:50:25 GMT
+      - Tue, 21 Jan 2020 16:51:15 GMT
       Content-Type:
       - application/vnd.deere.axiom.v3+json;charset=UTF-8
       X-Deere-Handling-Server:
-      - ip-10-214-45-182
+      - ip-10-214-45-199
       X-Frame-Options:
       - SAMEORIGIN
       X-Deere-Elapsed-Ms:
-      - '44'
+      - '54'
       Cache-Control:
       - no-store
       Content-Language:
@@ -89,7 +89,7 @@ http_interactions:
       - chunked
     body:
       encoding: ASCII-8BIT
-      string: '{"links":[{"rel":"self","uri":"https://sandboxapi.deere.com/platform/assets/029c288a-14d9-459f-8ee6-b4e840e672a1/locations?startDate=2020-01-18T00:30:59Z&endDate=2020-01-18T00:31:01Z"}],"total":1,"values":[{"@type":"ContributedAssetLocation","timestamp":"2020-01-18T00:31:00.000Z","geometry":"{\"type\":\"Point\",\"coordinates\":[-103.115633,41.670166]}","measurementData":[{"@type":"BasicMeasurement","name":"Temperature","value":"68.0","unit":"F"}],"links":[]}]}'
+      string: '{"links":[{"rel":"self","uri":"https://sandboxapi.deere.com/platform/assets/029c288a-14d9-459f-8ee6-b4e840e672a1/locations?count=1"},{"rel":"nextPage","uri":"https://sandboxapi.deere.com/platform/assets/029c288a-14d9-459f-8ee6-b4e840e672a1/locations?count=1&pageKey=029c288a-14d9-459f-8ee6-b4e840e672a1,2020-01-21T10:49:00Z"}],"total":1,"values":[{"@type":"ContributedAssetLocation","timestamp":"2020-01-21T10:49:00.000Z","geometry":"{\"type\":\"Feature\",\"geometry\":{\"geometries\":[{\"coordinates\":[-103.115633,41.670166],\"type\":\"Point\"}],\"type\":\"GeometryCollection\"}}","measurementData":[{"@type":"BasicMeasurement","name":"Temperature","value":"68.0","unit":"F"}],"links":[]}]}'
     http_version: 
-  recorded_at: Sat, 18 Jan 2020 00:50:25 GMT
+  recorded_at: Tue, 21 Jan 2020 16:51:16 GMT
 recorded_with: VCR 5.0.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_john_deere_api
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Jaime. Bellmyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2020-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vcr
@@ -167,6 +167,7 @@ files:
 - test/support/vcr/get_flags.yml
 - test/support/vcr/get_organizations.yml
 - test/support/vcr/get_request_token.yml
+- test/support/vcr/post_asset_locations-bak.yml
 - test/support/vcr/post_asset_locations.yml
 - test/support/vcr/post_assets.yml
 - test/support/vcr/post_flag_categories.yml