myjohndeere 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6f1396f290f034c7d9bc96100a798d5e3a653e7
-  data.tar.gz: f0815526e2742dae974c1ed89745265e60a5a433
+  metadata.gz: 8b4556fe6533cae23c117ffd3d72d809f8c8bf2c
+  data.tar.gz: 86f46e02faf114baecf904059a1b333cedfb731e
 SHA512:
-  metadata.gz: 6e09bf7d4e04d3a9d2b2093fdff043d5653c86d246fe5db098b6fc117db90f111cbf240b99a56f63ef41b81decae090338689843ec953a08ac66b34e283c4d05
-  data.tar.gz: ae920d40bdcb973f0fa8ecfe7a5bf3c8185f212c80578a0ccb975f6e1e6925183a63501d4c16a01a71e512766fdd2a28223c744fdead6df105cfbf80dd5fba37
+  metadata.gz: f08775c36e5979e14558cb53feba7682c73aa0f43b6b7aec8054965891b7b224026559dfb1c44aba5aea5b2a8def4051aaf70ed1f81c132c5f9e79d9adae0f4f
+  data.tar.gz: efe276478ee3868e6c4a23509d01de0e2b8756f96b6671d272e1a90c18900f44708195c42a6f0507d936a3b734eebeba41ef558ad63adcd4c3e38a73c7cba788

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    myjohndeere (0.1.8)
+    myjohndeere (0.1.9)
       oauth (>= 0.5.3)
 
 GEM
@@ -14,7 +14,7 @@ GEM
       safe_yaml (~> 1.0.0)
     hashdiff (0.3.2)
     minitest (5.8.4)
-    oauth (0.5.3)
+    oauth (0.5.4)
     public_suffix (2.0.5)
     rake (11.3.0)
     safe_yaml (1.0.4)
@@ -34,4 +34,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.13.2
+   1.16.1

data/lib/myjohndeere.rb

@@ -81,13 +81,18 @@ module MyJohnDeere
 
   class Configuration
     attr_accessor :endpoint
-    attr_writer :shared_secret, :app_id, :contribution_definition_id
+    attr_writer :shared_secret, :app_id, :contribution_definition_id, :use_last_active_boundary
     attr_reader :environment
 
     def log_level=(val)
       @log_level = val
     end
 
+    def use_last_active_boundary
+      @use_last_active_boundary ||= false
+      return @use_last_active_boundary
+    end
+
     def log_level
       @log_level ||= :fatal
       return @log_level

data/lib/myjohndeere/field.rb

@@ -39,7 +39,12 @@ module MyJohnDeere
         active_boundaries = possible_boundaries.select { |b| b.active && !b.deleted }.
           uniq { |b| b.id }
         if active_boundaries.count > 1 then
-          raise MyJohnDeereError.new("There was more than one boundary in the field ID: #{self.id}, this is currently unexpected")
+          if MyJohnDeere.configuration.use_last_active_boundary then
+            MyJohnDeere.logger.info("Multiple boundaries found for field ID: #{self.id}. Using last active")
+            return active_boundaries.last
+          else
+            raise MyJohnDeereError.new("There was more than one boundary in the field ID: #{self.id}, this is currently unexpected")
+          end
         elsif active_boundaries.count == 1 then
           return active_boundaries.first
         else

data/lib/myjohndeere/file_resource.rb

@@ -37,7 +37,7 @@ module MyJohnDeere
     end
 
     def self.upload_file(access_token, file_resource_id, file_path)
-      raise ArgumentError.new("You must pass an existing file") if !::File.exists?(file_path)
+      raise ArgumentError.new("You must pass an existing file") if !::File.exist?(file_path)
       raise ArgumentError.new("You must pass a valid file_resource_id") if file_resource_id.nil?
 
       ::File.open(file_path, "rb:UTF-8") do |f|

data/lib/myjohndeere/version.rb

@@ -1,3 +1,3 @@
 module MyJohnDeere
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/spec/fixtures.json

@@ -467,6 +467,262 @@
         }
       ]
     },
+    "field_with_multiple_active_boundaries_unique_ids" : {  
+      "@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_active_boundaries" : {  
       "@type":"Field",
       "name":"AndersonFarms",

data/test/test_field.rb

@@ -42,6 +42,33 @@ class TestField < Minitest::Test
     assert !field.boundary_unset?
   end
 
+  def test_retrieval_with_multiple_active_boundaries_and_config_change
+    begin
+      fixture = API_FIXTURES["field_with_multiple_active_boundaries_unique_ids"]
+
+      stub_request(:get, /\/organizations\/#{ORGANIZATION_FIXTURE["id"]}\/fields\/#{fixture["id"]}/).
+        with(query: {embed: "boundaries"}).
+        to_return(status: 200, body: fixture.to_json)
+
+      MyJohnDeere.configuration.use_last_active_boundary = false
+
+      assert_raises MyJohnDeere::MyJohnDeereError do
+        MyJohnDeere::Field.retrieve(default_access_token, 
+          fixture["id"], organization_id: ORGANIZATION_FIXTURE["id"],
+          body: {embed: "boundaries"})
+      end
+
+      MyJohnDeere.configuration.use_last_active_boundary = true
+
+      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
+    ensure
+      MyJohnDeere.configuration.use_last_active_boundary = false
+    end
+  end
+
   def test_retrieval_with_multiple_boundaries
     fixture = API_FIXTURES["field_with_multiple_boundaries"]
 

metadata

@@ -1,38 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: myjohndeere
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Paul Susmarski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.3
-description: ' MyJohnDeere allows you to access your John Deere Financial account,
+description: " MyJohnDeere allows you to access your John Deere Financial account,
   JDLink, Operations Center and many other applications from one convenient place.
-  This Ruby Gem is provided as a convenient way to access their API.'
+  This Ruby Gem is provided as a convenient way to access their API."
 email: paul@susmarski.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -94,17 +94,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the MyJohnDeere API