myjohndeere 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf19bfd75f39dd56df3bf76013af1c23605b4de7
-  data.tar.gz: a5912e8687c628ea0daceebc669fdc753bf13870
+  metadata.gz: 02a777b7787f90d5e37dc4e4b74953e95381d92d
+  data.tar.gz: 378a2721904af871dbd3a824cbd2bafa68589131
 SHA512:
-  metadata.gz: 1dbc3b33287a73bb4521e5f339441edeef4ca0c157879bca0b6cd9c8be74134f98959411e907e8a7a3bc2f6f5cdf373769e621bdc9d880b6087fd3297d7b0e07
-  data.tar.gz: 869ce4c2882bd818883675b752a6b7d903aa28ef34006589b84d11c893b7d34894e2bb6d3f1ac9925cef27ebffa1314783f54460852fbdaaefd90c69fed53138
+  metadata.gz: 53ab4da655908df5b9fba3fa956bda2485aa4e30be6a10a4793b7adf271e70449935607afa9ac82e4b8f0ce2ae70eb585e00de436e981d021f81fb144c52282b
+  data.tar.gz: ef1643bf28600368f5ba3abbf26411e45585813abbb0ad4ebf5284e29722c347f8caaf5a3bec309d0a79dd80c0d989c1622f31130e79d395bbc6fd2658fc7a66

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    myjohndeere (0.0.5)
+    myjohndeere (0.0.7)
       oauth (>= 0.5.3)
 
 GEM

data/lib/myjohndeere/errors.rb

@@ -33,6 +33,10 @@ module MyJohnDeere
     end
   end
 
+  # You're attempting to perform a request against a resource that is unsupported
+  class UnsupportedRequestError < MyJohnDeereError
+  end
+
   # Configuration error is raised when configuration hasn't been properly done
   class ConfigurationError < MyJohnDeereError
   end

data/lib/myjohndeere/file_resource.rb

@@ -1,5 +1,6 @@
 module MyJohnDeere
   class FileResource < OrganizationOwnedResource
+    self.supports_delete = true
     self.base_jd_resource = "fileResources"
     self.list_resource_path = "mapLayers/%{map_layer_id}/#{self.base_jd_resource}"
     self.retrieve_resource_path = self.base_jd_resource
@@ -36,6 +37,9 @@ 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 a valid file_resource_id") if file_resource_id.nil?
+
       File.open(file_path, "rb:UTF-8") do |f|
           body = f.read()
           response = access_token.execute_request(:put,

data/lib/myjohndeere/map_layer.rb

@@ -1,5 +1,6 @@
 module MyJohnDeere
   class MapLayer < OrganizationOwnedResource
+    self.supports_delete = true
     self.base_jd_resource = "mapLayers"
     self.list_resource_path = "mapLayerSummaries/%{map_layer_summary_id}/#{self.base_jd_resource}"
     self.retrieve_resource_path = self.base_jd_resource

data/lib/myjohndeere/map_layer_summary.rb

@@ -1,5 +1,6 @@
 module MyJohnDeere
   class MapLayerSummary < OrganizationOwnedResource
+    self.supports_delete = true
     self.base_jd_resource = "mapLayerSummaries"
     self.list_resource_path = "organizations/%{organization_id}/fields/%{field_id}/#{self.base_jd_resource}"
     self.retrieve_resource_path = self.base_jd_resource
@@ -18,7 +19,7 @@ module MyJohnDeere
             owning_organization_link_item(organization_id),
             {
                rel: "contributionDefinition",
-               uri: "#{MyJohnDeere.configuration.endpoint}/#{MyJohnDeere.configuration.contribution_definition_id}"
+               uri: "#{MyJohnDeere.configuration.endpoint}/contributionDefinitions/#{MyJohnDeere.configuration.contribution_definition_id}"
             }
          ],
         metadata: metadata.map { |md| md.to_hash },

data/lib/myjohndeere/rest_methods.rb

@@ -1,6 +1,7 @@
 module MyJohnDeere 
   module RESTMethods
     module ClassMethods
+      attr_accessor :supports_delete
       attr_accessor :base_jd_resource
       attr_accessor :retrieve_resource_path
       attr_accessor :list_resource_path
@@ -37,6 +38,13 @@ module MyJohnDeere
         return new(response.data, access_token)
       end
 
+      def delete(access_token, id)
+        raise UnsupportedRequestError.new("Delete is not supported by this resource") if !self.supports_delete
+
+        response = access_token.execute_request(:delete, "#{self.base_jd_resource}/#{id}")
+        return response.code == 204
+      end
+
       def build_resource_base_path!(resource_path, options = {})
         expected_definitions = resource_path.scan(/%{(.+?)}/)
         return resource_path if expected_definitions.empty?

data/lib/myjohndeere/version.rb

@@ -1,3 +1,3 @@
 module MyJohnDeere
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/test/test_file_resource.rb

@@ -74,4 +74,15 @@ class TestFileResource < Minitest::Test
     assert_equal FILE_RESOURCE_ID, response.id
     assert_equal ORGANIZATION_ID, response.organization_id
   end
+
+  def test_upload_file
+    stub_request(:put, /fileResources\/#{FILE_RESOURCE_ID}/).
+      with(headers: {'Content-Length'=>'4407', 'Content-Type'=>'application/octet-stream'}).
+      to_return(status: 204)
+    
+    success = MyJohnDeere::FileResource.upload_file(default_access_token, FILE_RESOURCE_ID,
+      "#{PROJECT_ROOT}/spec/colored.png")
+
+    assert success
+  end
 end

data/test/test_map_layer_summary.rb

@@ -33,7 +33,16 @@ class TestMapLayerSummary < Minitest::Test
   end
 
   def test_create
-    expected_body = "{\"title\":\"Test number 2\",\"text\":\"Hello from farm lens again\",\"links\":[{\"rel\":\"owningOrganization\",\"uri\":\"https://sandboxapi.deere.com/platform/organizations/1234\"},{\"rel\":\"contributionDefinition\",\"uri\":\"https://sandboxapi.deere.com/platform/foobar\"}],\"metadata\":[{\"key\":\"key\",\"value\":\"val\"}],\"dateCreated\":\"2016-01-02T16:14:23.421Z\"}"
+    expected_body = {"title"=>"Test number 2",
+     "text"=>"Hello from farm lens again",
+     "links"=>
+      [{"rel"=>"owningOrganization",
+        "uri"=>"https://sandboxapi.deere.com/platform/organizations/1234"},
+       {"rel"=>"contributionDefinition",
+        "uri"=>
+         "https://sandboxapi.deere.com/platform/contributionDefinitions/foobar"}],
+     "metadata"=>[{"key"=>"key", "value"=>"val"}],
+     "dateCreated"=>"2016-01-02T16:14:23.421Z"}.to_json
     stub_request(:post, /\/organizations\/#{ORGANIZATION_ID}\/fields\/#{FIELD_ID}\/mapLayerSummaries/).
       with(body: expected_body,
        headers: {'Accept'=>'application/vnd.deere.axiom.v3+json', 'Content-Length'=>expected_body.length, 'Content-Type'=>'application/vnd.deere.axiom.v3+json'}).

data/test/test_rest_methods.rb

@@ -14,6 +14,17 @@ class TestRestMethods < Minitest::Test
     end
   end
 
+  def test_delete
+    stub_request(:delete, /mapLayerSummaries/).
+      to_return(status: 204)
+
+    assert MyJohnDeere::MapLayerSummary.delete(default_access_token, "foobar")
+
+    assert_raises MyJohnDeere::UnsupportedRequestError do
+      MyJohnDeere::Organization.delete(default_access_token, "foobar")
+    end
+  end
+
   def test_list_with_etag
     stub_request(:get, /organizations/).
       with(headers: {MyJohnDeere::ETAG_HEADER_KEY => ""}).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: myjohndeere
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Paul Susmarski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -62,6 +62,7 @@ files:
 - lib/myjohndeere/util.rb
 - lib/myjohndeere/version.rb
 - myjohndeere.gemspec
+- spec/colored.png
 - spec/fixtures.json
 - test/api_fixtures.rb
 - test/test_access_token.rb