RubyGems - myjohndeere - Versions diffs - 0.1.4 → 0.1.5 - Mend

myjohndeere 0.1.4 → 0.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

checksums.yaml +4 -4
data/lib/myjohndeere/field.rb +16 -2
data/lib/myjohndeere/list_object.rb +8 -5
data/lib/myjohndeere/organization.rb +2 -2
data/lib/myjohndeere/requestable.rb +4 -0
data/lib/myjohndeere/rest_methods.rb +8 -4
data/lib/myjohndeere/version.rb +1 -1
data/spec/fixtures.json +513 -1
data/test/test_field.rb +35 -1
data/test/test_list_object.rb +6 -5
data/test/test_requestable.rb +11 -0
data/test/test_rest_methods.rb +6 -2
metadata +3 -3

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62aa42cf8f9b2465187da59e3c5c908290b85d92
-  data.tar.gz: 79b6420cd8026137f4d4d3d81d2af302559f64ea
+  metadata.gz: 0600e03c73fe1849281e0eaa4da74c376f4e9e31
+  data.tar.gz: 35ef8400afccb26a497be17bed63fd9c20365a78
 SHA512:
-  metadata.gz: 3d8c541c780ba8ddf37f9e1304b6ed79e350b7a9d687b1effa0cd1602a77c33bbda50fea8b8e00b5467252ecf639da1a59b62c9ce8eb4d7f757b67aa28cb0a7f
-  data.tar.gz: 5e41c50eb56e2536731e8f7e881e9943a709e1ebc6f62854bbe221357229dc741006bd928e07d67d2d2fd00df2fb73648acb41ce35e03ccbf2d5fcf90b6e8bf5
+  metadata.gz: df107d11f531cdf8fa5c8fc6be1ab8d47177c9a4d9545db6fe3afe75a2c5282d5847ce1dd209ae77b6301e285024f771cef59bd9553fc7553aa53244473e137a
+  data.tar.gz: 5628ca820a9388f451afc569d5fe46795f904b3c962ae4c1adbc1bce85f599342b8860e47e1709f1dcfadf17865db37c4d6d978f7d32a6f8b979f53d4dbd6ee2

data/lib/myjohndeere/field.rb CHANGED Viewed

@@ -11,7 +11,8 @@ module MyJohnDeere
       boundaries = json_object["boundaries"]
       if boundaries && boundaries.length > 0 then
         # If we embed, then we'll need to pass our id
-        self.boundary = Boundary.new(boundaries[0], access_token, self.id)
+        possible_boundaries = boundaries.map { |b_json| Boundary.new(b_json, access_token, self.id) }
+        self.boundary = find_first_active_boundary(possible_boundaries)
       end
     end
@@ -23,7 +24,8 @@ module MyJohnDeere
     def boundary
       if self.boundary_unset? then
-        @boundary = Boundary.retrieve(self.access_token, field_id: self.id, organization_id: self.organization_id)
+        boundaries = Boundary.list(self.access_token, field_id: self.id, organization_id: self.organization_id)
+        @boundary = find_first_active_boundary(boundaries.data)
       end
       return @boundary
     end
@@ -31,5 +33,17 @@ module MyJohnDeere
     def boundary=(val)
       @boundary = val
     end
+    private
+      def find_first_active_boundary(possible_boundaries)
+        active_boundaries = possible_boundaries.select { |b| b.active && !b.deleted }
+        if active_boundaries.count > 1 then
+          raise MyJohnDeereError.new("There was more than one boundary in the field, this is currently unexpected")
+        elsif active_boundaries.count == 1 then
+          return active_boundaries.first
+        else
+          return possible_boundaries.first
+        end
+      end
   end
 end

data/lib/myjohndeere/list_object.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 module MyJohnDeere
   class ListObject < Requestable
     OPTION_ATTRIBUTES = [:count, :start, :etag]
-    attr_reader :data, :listable, :total, :options, :last_response_code
+    attr_reader :data, :listable, :total, :options, :last_response_code, :base_resources
     include Enumerable
     OPTION_ATTRIBUTES.each do |attribute|
@@ -13,8 +13,9 @@ module MyJohnDeere
       end
     end
-    def initialize(listable, access_token, json_data, last_response_code,
+    def initialize(listable, access_token, json_data, last_response_code, base_resources,
       options: {})
+      @base_resources = base_resources
       @last_response_code = last_response_code
       @options = options
       # Confirm object is listable?
@@ -40,11 +41,13 @@ module MyJohnDeere
     end
     def next_page!()
-      return if !self.has_more?()
-      new_list = @listable.list(self.access_token,
+      list_options = base_resources.merge({
         count: self.count,
         start: self.start + self.count,
-        etag: self.etag)
+        etag: self.etag
+      })
+      return if !self.has_more?()
+      new_list = @listable.list(self.access_token, list_options)
       new_list.instance_variables.each do |iv|
         self.instance_variable_set(iv, new_list.instance_variable_get(iv))
       end

data/lib/myjohndeere/organization.rb CHANGED Viewed

@@ -10,11 +10,11 @@ module MyJohnDeere
     end
     def has_access_to_boundaries?
-      self.links.any? {|i| i["rel"] == "boundaries"}
+      self.has_access_to?("boundaries")
     end
     def has_access_to_fields?
-      self.links.any? {|i| i["rel"] == "fields"}
+      self.has_access_to?("fields")
     end
     def fields

data/lib/myjohndeere/requestable.rb CHANGED Viewed

@@ -11,6 +11,10 @@ module MyJohnDeere
       end
     end
+    def has_access_to?(rel_link_name)
+      self.links.any? {|i| i["rel"] == rel_link_name}
+    end
     def extract_link_with_rel_from_list(rel_target, regex_to_capture_item)
       link = self.links.detect { |l| l["rel"] == rel_target }
       if link then

data/lib/myjohndeere/rest_methods.rb CHANGED Viewed

@@ -21,7 +21,8 @@ module MyJohnDeere
           options[:body][sbp] = options[sbp]
         end
-        response = access_token.execute_request(:get, build_resource_base_path!(self.list_resource_path, options),
+        path, base_resources = build_resource_base_path!(self.list_resource_path, options)
+        response = access_token.execute_request(:get, path,
           options
         )
         return ListObject.new(
@@ -29,6 +30,7 @@ module MyJohnDeere
           access_token,
           response.data,
           response.code,
+          base_resources,
           options: options.merge(
             etag: response.http_headers[MyJohnDeere::ETAG_HEADER_KEY]
           )
@@ -37,8 +39,9 @@ module MyJohnDeere
       def retrieve(access_token, id, options={})
         validate_access_token(access_token)
+        path, = build_resource_base_path!(self.retrieve_resource_path, options)
         response = access_token.execute_request(:get,
-          "#{build_resource_base_path!(self.retrieve_resource_path, options)}/#{id}",
+          "#{path}/#{id}",
           options)
         return new(response.data, access_token)
@@ -60,7 +63,7 @@ module MyJohnDeere
         end
         MyJohnDeere.logger.info("Building resource path: #{resource_path}, with ids: #{base_resources}")
         begin
-          return resource_path % base_resources
+          return resource_path % base_resources, base_resources
         rescue KeyError
           raise ArgumentError.new("You must specify #{expected_definitions.join(", ")} as part of this request path")
         end
@@ -71,8 +74,9 @@ module MyJohnDeere
       end
       def send_create(access_token, body, path_builder_options = {})
+        path, = build_resource_base_path!(self.list_resource_path, path_builder_options)
         response = access_token.execute_request(:post,
-          build_resource_base_path!(self.list_resource_path, path_builder_options),
+          path,
           body: body
         )
         #{"Content-Type"=>"text/plain", "X-Deere-Handling-Server"=>"ldxtc3", "X-Frame-Options"=>"SAMEORIGIN", "Location"=>"https://sandboxapi.deere.com/platform/mapLayers/e2711205-c5df-445e-aad5-81eaf9090e6c", "X-Deere-Elapsed-Ms"=>"162", "Vary"=>"Accept-Encoding", "Expires"=>"Thu, 14 Sep 2017 15:52:24 GMT", "Cache-Control"=>"max-age=0, no-cache", "Pragma"=>"no-cache", "Date"=>"Thu, 14 Sep 2017 15:52:24 GMT", "Transfer-Encoding"=>"chunked", "Connection"=>"close, Transfer-Encoding"}

data/lib/myjohndeere/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module MyJohnDeere
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/spec/fixtures.json CHANGED Viewed

@@ -467,6 +467,518 @@
         }
       ]
     },
+    "field_with_multiple_active_boundaries" : {
+      "@type":"Field",
+      "name":"AndersonFarms",
+      "boundaries":[
+        {
+          "@type":"Boundary",
+          "name":"a",
+          "modifiedTime":"2017-08-04T21:45:51.469Z",
+          "area":{
+            "@type":"MeasurementAsDouble",
+            "valueAsDouble":15.892707870809991,
+            "unit":"ha"
+          },
+          "multipolygons":[
+            {
+              "@type":"Polygon",
+              "rings":[
+                {
+                  "@type":"Ring",
+                  "points":[
+                    {
+                      "@type":"Point",
+                      "lat":40.095079098,
+                      "lon":-105.032172203
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.095111927,
+                      "lon":-105.023052692
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.096425084,
+                      "lon":-105.023825169
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.096802611,
+                      "lon":-105.024554729
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.096457912,
+                      "lon":-105.025134087
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.097245793,
+                      "lon":-105.029489994
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.097492004,
+                      "lon":-105.030562878
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.097787456,
+                      "lon":-105.031678677
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.097771042,
+                      "lon":-105.032193661
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.095079098,
+                      "lon":-105.032172203
+                    }
+                  ],
+                  "type":"exterior",
+                  "passable":true
+                }
+              ]
+            }
+          ],
+          "extent":{
+            "@type":"Extent",
+            "topLeft":{
+              "@type":"Point",
+              "lat":40.097787456,
+              "lon":-105.032193661
+            },
+            "bottomRight":{
+              "@type":"Point",
+              "lat":40.095079098,
+              "lon":-105.023052692
+            }
+          },
+          "id":"f4828b25-2a92-12a4-bf3e-a107c39ecb84",
+          "links":[
+            {
+              "@type":"Link",
+              "rel":"self",
+              "uri":"https://sandboxapi.deere.com/platform/organizations/1234/boundaries/f4828b25-2a92-4f2d-bf3e-a107c39ecb84"
+            },
+            {
+              "@type":"Link",
+              "rel":"owningOrganization",
+              "uri":"https://sandboxapi.deere.com/platform/organizations/1234"
+            }
+          ],
+          "active":true
+        },
+        {
+          "@type":"Boundary",
+          "name":"b",
+          "modifiedTime":"2017-08-04T21:45:51.469Z",
+          "area":{
+            "@type":"MeasurementAsDouble",
+            "valueAsDouble":15.892707870809991,
+            "unit":"ha"
+          },
+          "multipolygons":[
+            {
+              "@type":"Polygon",
+              "rings":[
+                {
+                  "@type":"Ring",
+                  "points":[
+                    {
+                      "@type":"Point",
+                      "lat":40.095079098,
+                      "lon":-105.032172203
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.095111927,
+                      "lon":-105.023052692
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.096425084,
+                      "lon":-105.023825169
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.096802611,
+                      "lon":-105.024554729
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.096457912,
+                      "lon":-105.025134087
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.097245793,
+                      "lon":-105.029489994
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.097492004,
+                      "lon":-105.030562878
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.097787456,
+                      "lon":-105.031678677
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.097771042,
+                      "lon":-105.032193661
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.095079098,
+                      "lon":-105.032172203
+                    }
+                  ],
+                  "type":"exterior",
+                  "passable":true
+                }
+              ]
+            }
+          ],
+          "extent":{
+            "@type":"Extent",
+            "topLeft":{
+              "@type":"Point",
+              "lat":40.097787456,
+              "lon":-105.032193661
+            },
+            "bottomRight":{
+              "@type":"Point",
+              "lat":40.095079098,
+              "lon":-105.023052692
+            }
+          },
+          "id":"f4828b25-2a92-12a4-bf3e-a107c39ecb85",
+          "links":[
+            {
+              "@type":"Link",
+              "rel":"self",
+              "uri":"https://sandboxapi.deere.com/platform/organizations/1234/boundaries/f4828b25-2a92-4f2d-bf3e-a107c39ecb84"
+            },
+            {
+              "@type":"Link",
+              "rel":"owningOrganization",
+              "uri":"https://sandboxapi.deere.com/platform/organizations/1234"
+            }
+          ],
+          "active":true
+        }
+      ],
+      "id":"2516aa2c-2c0d-4dae-ba63-5c64fd172d01",
+      "links":[
+        {
+          "@type":"Link",
+          "rel":"self",
+          "uri":"https://sandboxapi.deere.com/platform/organizations/1234/fields/2516aa2c-2c0d-4dae-ba63-5c64fd172d01"
+        },
+        {
+          "@type":"Link",
+          "rel":"clients",
+          "uri":"https://sandboxapi.deere.com/platform/organizations/1234/fields/2516aa2c-2c0d-4dae-ba63-5c64fd172d01/clients"
+        },
+        {
+          "@type":"Link",
+          "rel":"notes",
+          "uri":"https://sandboxapi.deere.com/platform/organizations/1234/fields/2516aa2c-2c0d-4dae-ba63-5c64fd172d01/notes"
+        },
+        {
+          "@type":"Link",
+          "rel":"farms",
+          "uri":"https://sandboxapi.deere.com/platform/organizations/1234/fields/2516aa2c-2c0d-4dae-ba63-5c64fd172d01/farms"
+        },
+        {
+          "@type":"Link",
+          "rel":"owningOrganization",
+          "uri":"https://sandboxapi.deere.com/platform/organizations/1234"
+        },
+        {
+          "@type":"Link",
+          "rel":"simplifiedBoundaries",
+          "uri":"https://sandboxapi.deere.com/platform/organizations/1234/fields/2516aa2c-2c0d-4dae-ba63-5c64fd172d01/boundaries?simple=true"
+        },
+        {
+          "@type":"Link",
+          "rel":"addBoundary",
+          "uri":"https://sandboxapi.deere.com/platform/organizations/1234/fields/2516aa2c-2c0d-4dae-ba63-5c64fd172d01/boundaries"
+        },
+        {
+          "@type":"Link",
+          "rel":"activeBoundary",
+          "uri":"https://sandboxapi.deere.com/platform/organizations/1234/boundaries/f4828b25-2a92-4f2d-bf3e-a107c39ecb84"
+        },
+        {
+          "@type":"Link",
+          "rel":"fieldOperation",
+          "uri":"https://sandboxapi.deere.com/platform/organizations/1234/fields/2516aa2c-2c0d-4dae-ba63-5c64fd172d01/fieldOperations"
+        }
+      ]
+    },
+    "field_with_multiple_boundaries" : {
+      "@type":"Field",
+      "name":"AndersonFarms",
+      "boundaries":[
+        {
+          "@type":"Boundary",
+          "name":"a",
+          "modifiedTime":"2017-08-04T21:45:51.469Z",
+          "area":{
+            "@type":"MeasurementAsDouble",
+            "valueAsDouble":15.892707870809991,
+            "unit":"ha"
+          },
+          "multipolygons":[
+            {
+              "@type":"Polygon",
+              "rings":[
+                {
+                  "@type":"Ring",
+                  "points":[
+                    {
+                      "@type":"Point",
+                      "lat":40.095079098,
+                      "lon":-105.032172203
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.095111927,
+                      "lon":-105.023052692
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.096425084,
+                      "lon":-105.023825169
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.096802611,
+                      "lon":-105.024554729
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.096457912,
+                      "lon":-105.025134087
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.097245793,
+                      "lon":-105.029489994
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.097492004,
+                      "lon":-105.030562878
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.097787456,
+                      "lon":-105.031678677
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.097771042,
+                      "lon":-105.032193661
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.095079098,
+                      "lon":-105.032172203
+                    }
+                  ],
+                  "type":"exterior",
+                  "passable":true
+                }
+              ]
+            }
+          ],
+          "extent":{
+            "@type":"Extent",
+            "topLeft":{
+              "@type":"Point",
+              "lat":40.097787456,
+              "lon":-105.032193661
+            },
+            "bottomRight":{
+              "@type":"Point",
+              "lat":40.095079098,
+              "lon":-105.023052692
+            }
+          },
+          "id":"f4828b25-2a92-12a4-bf3e-a107c39ecb84",
+          "links":[
+            {
+              "@type":"Link",
+              "rel":"self",
+              "uri":"https://sandboxapi.deere.com/platform/organizations/1234/boundaries/f4828b25-2a92-4f2d-bf3e-a107c39ecb84"
+            },
+            {
+              "@type":"Link",
+              "rel":"owningOrganization",
+              "uri":"https://sandboxapi.deere.com/platform/organizations/1234"
+            }
+          ],
+          "active":false
+        },
+        {
+          "@type":"Boundary",
+          "name":"b",
+          "modifiedTime":"2017-08-04T21:45:51.469Z",
+          "area":{
+            "@type":"MeasurementAsDouble",
+            "valueAsDouble":15.892707870809991,
+            "unit":"ha"
+          },
+          "multipolygons":[
+            {
+              "@type":"Polygon",
+              "rings":[
+                {
+                  "@type":"Ring",
+                  "points":[
+                    {
+                      "@type":"Point",
+                      "lat":40.095079098,
+                      "lon":-105.032172203
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.095111927,
+                      "lon":-105.023052692
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.096425084,
+                      "lon":-105.023825169
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.096802611,
+                      "lon":-105.024554729
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.096457912,
+                      "lon":-105.025134087
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.097245793,
+                      "lon":-105.029489994
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.097492004,
+                      "lon":-105.030562878
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.097787456,
+                      "lon":-105.031678677
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.097771042,
+                      "lon":-105.032193661
+                    },
+                    {
+                      "@type":"Point",
+                      "lat":40.095079098,
+                      "lon":-105.032172203
+                    }
+                  ],
+                  "type":"exterior",
+                  "passable":true
+                }
+              ]
+            }
+          ],
+          "extent":{
+            "@type":"Extent",
+            "topLeft":{
+              "@type":"Point",
+              "lat":40.097787456,
+              "lon":-105.032193661
+            },
+            "bottomRight":{
+              "@type":"Point",
+              "lat":40.095079098,
+              "lon":-105.023052692
+            }
+          },
+          "id":"f4828b25-2a92-12a4-bf3e-a107c39ecb85",
+          "links":[
+            {
+              "@type":"Link",
+              "rel":"self",
+              "uri":"https://sandboxapi.deere.com/platform/organizations/1234/boundaries/f4828b25-2a92-4f2d-bf3e-a107c39ecb84"
+            },
+            {
+              "@type":"Link",
+              "rel":"owningOrganization",
+              "uri":"https://sandboxapi.deere.com/platform/organizations/1234"
+            }
+          ],
+          "active":true
+        }
+      ],
+      "id":"2516aa2c-2c0d-4dae-ba63-5c64fd172d01",
+      "links":[
+        {
+          "@type":"Link",
+          "rel":"self",
+          "uri":"https://sandboxapi.deere.com/platform/organizations/1234/fields/2516aa2c-2c0d-4dae-ba63-5c64fd172d01"
+        },
+        {
+          "@type":"Link",
+          "rel":"clients",
+          "uri":"https://sandboxapi.deere.com/platform/organizations/1234/fields/2516aa2c-2c0d-4dae-ba63-5c64fd172d01/clients"
+        },
+        {
+          "@type":"Link",
+          "rel":"notes",
+          "uri":"https://sandboxapi.deere.com/platform/organizations/1234/fields/2516aa2c-2c0d-4dae-ba63-5c64fd172d01/notes"
+        },
+        {
+          "@type":"Link",
+          "rel":"farms",
+          "uri":"https://sandboxapi.deere.com/platform/organizations/1234/fields/2516aa2c-2c0d-4dae-ba63-5c64fd172d01/farms"
+        },
+        {
+          "@type":"Link",
+          "rel":"owningOrganization",
+          "uri":"https://sandboxapi.deere.com/platform/organizations/1234"
+        },
+        {
+          "@type":"Link",
+          "rel":"simplifiedBoundaries",
+          "uri":"https://sandboxapi.deere.com/platform/organizations/1234/fields/2516aa2c-2c0d-4dae-ba63-5c64fd172d01/boundaries?simple=true"
+        },
+        {
+          "@type":"Link",
+          "rel":"addBoundary",
+          "uri":"https://sandboxapi.deere.com/platform/organizations/1234/fields/2516aa2c-2c0d-4dae-ba63-5c64fd172d01/boundaries"
+        },
+        {
+          "@type":"Link",
+          "rel":"activeBoundary",
+          "uri":"https://sandboxapi.deere.com/platform/organizations/1234/boundaries/f4828b25-2a92-4f2d-bf3e-a107c39ecb84"
+        },
+        {
+          "@type":"Link",
+          "rel":"fieldOperation",
+          "uri":"https://sandboxapi.deere.com/platform/organizations/1234/fields/2516aa2c-2c0d-4dae-ba63-5c64fd172d01/fieldOperations"
+        }
+      ]
+    },
     "field_with_embedded_boundary" : {
       "@type":"Field",
       "name":"AndersonFarms",
@@ -802,7 +1314,7 @@
              "uri": "https://sandboxapi.deere.com/platform/organizations/1234/fields"
           }
        ],
-       "total": 1,
+       "total": 2,
        "values": [
           {
              "name": "Nautilus",

data/test/test_field.rb CHANGED Viewed

@@ -42,13 +42,47 @@ class TestField < Minitest::Test
     assert !field.boundary_unset?
   end
+  def test_retrieval_with_multiple_boundaries
+    fixture = API_FIXTURES["field_with_multiple_boundaries"]
+    stub_request(:get, /\/organizations\/#{ORGANIZATION_FIXTURE["id"]}\/fields\/#{fixture["id"]}/).
+      with(query: {embed: "boundaries"}).
+      to_return(status: 200, body: fixture.to_json)
+    field = MyJohnDeere::Field.retrieve(default_access_token,
+      fixture["id"], organization_id: ORGANIZATION_FIXTURE["id"],
+      body: {embed: "boundaries"})
+    assert_equal fixture["boundaries"][1]["id"], field.boundary.id
+  end
+  def test_retrieval_with_multiple_active_boundaries
+    fixture = API_FIXTURES["field_with_multiple_active_boundaries"]
+    stub_request(:get, /\/organizations\/#{ORGANIZATION_FIXTURE["id"]}\/fields\/#{fixture["id"]}/).
+      with(query: {embed: "boundaries"}).
+      to_return(status: 200, body: fixture.to_json)
+    assert_raises MyJohnDeere::MyJohnDeereError, "At the moment I don't have a use case where this would happen" do
+      field = MyJohnDeere::Field.retrieve(default_access_token,
+        fixture["id"], organization_id: ORGANIZATION_FIXTURE["id"],
+        body: {embed: "boundaries"})
+    end
+  end
   def test_list()
     stub_request(:get, /organizations\/#{ORGANIZATION_FIXTURE["id"]}\/fields/).
       to_return(status: 200, body: FIXTURE_FOR_LIST.to_json)
-    fields = MyJohnDeere::Field.list(default_access_token, count: 1, organization_id: ORGANIZATION_FIXTURE["id"])
+    fields = MyJohnDeere::Field.list(default_access_token,
+      count: 1, organization_id: ORGANIZATION_FIXTURE["id"])
     assert_equal 1, fields.data.length
+    assert fields.has_more?
     assert_equal MyJohnDeere::Field, fields.data[0].class
+    fields.next_page!
+    assert_equal 1, fields.data
   end
 end

data/test/test_list_object.rb CHANGED Viewed

@@ -6,7 +6,8 @@ class TestListObject < Minitest::Test
     list = MyJohnDeere::ListObject.new(MyJohnDeere::Organization,
       default_access_token,
       {"values" => data},
-      200)
+      200,
+      {})
     list.each_with_index do |x, i|
       assert_equal data[i]["id"], x.id
@@ -21,14 +22,14 @@ class TestListObject < Minitest::Test
       default_access_token, {
         "total" => expected_total,
         "values" => Array.new(1, API_FIXTURES["organization"])
-      }, options: {start: 0})
+      }, {}, options: {start: 0})
     assert list.has_more?
     list.start = expected_total
     assert !list.has_more?
     list = MyJohnDeere::ListObject.new(MyJohnDeere::Organization,
-      default_access_token, {"values" =>[]}, options: {start: 0})
+      default_access_token, {"values" =>[]}, {}, options: {start: 0})
     assert !list.has_more?, "The data is equal to the total"
   end
@@ -50,7 +51,7 @@ class TestListObject < Minitest::Test
     test_json = API_FIXTURES["organizations"]
     existing_data = Array.new(test_json["total"]-1, test_json["values"][0])
     list = MyJohnDeere::ListObject.new(MyJohnDeere::Organization, default_access_token,
-      {"values" => existing_data}, 200, options: {
+      {"values" => existing_data}, 200, {}, options: {
         start: 0, count: existing_data.length, etag: ""})
     assert list.using_etag?
     assert !list.has_more?
@@ -68,7 +69,7 @@ class TestListObject < Minitest::Test
     test_json = API_FIXTURES["organizations"]
     existing_data = (1..(test_json["total"]-1)).to_a
     list = MyJohnDeere::ListObject.new(MyJohnDeere::Organization, default_access_token,
-      test_json, 200, options: {start: 0,
+      test_json, 200, {}, options: {start: 0,
       count: existing_data.length})
     assert list.has_more?
     assert !list.using_etag?

data/test/test_requestable.rb CHANGED Viewed

@@ -12,4 +12,15 @@ class TestAccessToken < Minitest::Test
       MyJohnDeere::Requestable.new({}, "something")
     end
   end
+  def test_has_access_to
+    r = MyJohnDeere::Requestable.new({"links" => [
+    {
+     "rel" => "addresses",
+     "uri" => "https://sandboxapi.deere.com/platform/organizations/1234/addresses"
+    }]})
+    assert r.has_access_to?("addresses")
+    assert !r.has_access_to?("something_else")
+  end
 end

data/test/test_rest_methods.rb CHANGED Viewed

@@ -51,11 +51,15 @@ class TestRestMethods < Minitest::Test
   def test_build_resource_base_path
     resource_path = "blah"
-    assert_equal "blah", MyJohnDeere::Organization.build_resource_base_path!("blah", {})
+    path, base_resources = MyJohnDeere::Organization.build_resource_base_path!("blah", {})
+    assert_equal "blah", path
+    assert_nil base_resources
     resource_path = "blah%{x_id}"
     options = {x: 5, x_id: 1}
-    assert_equal "blah1", MyJohnDeere::Organization.build_resource_base_path!(resource_path, options)
+    path, base_resources = MyJohnDeere::Organization.build_resource_base_path!(resource_path, options)
+    assert_equal "blah1", path
     assert_equal({x: 5}, options)
+    assert_equal({x_id: 1}, base_resources)
     assert_raises ArgumentError do
       MyJohnDeere::Organization.build_resource_base_path!(resource_path, {})

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: myjohndeere
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Paul Susmarski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Ruby bindings for the MyJohnDeere API