myjohndeere 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88190ee84652334c16e9feabec2d7b247fab5d50
-  data.tar.gz: 74175a45f890e7676e087291de5648b5ee829c6b
+  metadata.gz: b5764e00147e38d5c7c39529bab16636c2c21e18
+  data.tar.gz: 41edd73dbc9702062cfa032d1d0d0fe0297a022d
 SHA512:
-  metadata.gz: 1c8818275027188a03e60fce2703553d8533ff85455ee25fe033feb84dda1c682f62e539531bbb2898d81588876efaa83a1d7bb01b74e08b9177b0c37947f877
-  data.tar.gz: 29f2ff820b98ab782ebccda2ccf6a7a76559d18bc6dc26bc8aa62f2284df847a5276f9e98590d8b240fea979a7c9ab5514bd6f4b9b873e372d9da3ccf6b12f4e
+  metadata.gz: 013bb1c5a4f0bec6c514c7e36f8da925d67c37b1baab996af584c8c7472d30fc2bc74dbab315aec191cb5fa45ace6005c2972f36dac1825886c051a46dfcd4c7
+  data.tar.gz: d388153e644e20bd0bff01a04f566aaf68a303c1c128ff0a7cf37633ccff30f2e86f4563f41f998e4473f34c142a9b5cd2157cc738c781be20b5f152f022184a

data/Gemfile.lock

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

data/lib/myjohndeere/list_object.rb

@@ -1,7 +1,7 @@
 module MyJohnDeere
   class ListObject < Requestable
     OPTION_ATTRIBUTES = [:count, :start, :etag]
-    attr_reader :data, :listable, :total, :options
+    attr_reader :data, :listable, :total, :options, :last_response_code
     include Enumerable
 
     OPTION_ATTRIBUTES.each do |attribute|
@@ -13,12 +13,14 @@ module MyJohnDeere
       end    
     end
 
-    def initialize(listable, access_token, json_data,
+    def initialize(listable, access_token, json_data, last_response_code,
       options: {})
+      @last_response_code = last_response_code
       @options = options
       # Confirm object is listable? 
       @listable = listable
-      @data = json_data["values"].collect { |i| listable.new(i, access_token) }
+      json_data = {} if not_modified?
+      @data = (json_data["values"] || []).collect { |i| listable.new(i, access_token) }
       if self.using_etag?
         MyJohnDeere.logger.info("Using etag, ignoring any specification about start/count")
         self.start = 0
@@ -52,43 +54,13 @@ module MyJohnDeere
       return !self.using_etag? && self.start + self.data.length < self.total
     end
 
+    def not_modified?
+      return self.last_response_code == 304
+    end
+
     def using_etag?
       # will be equal "" or some other string
       return !self.etag.nil?
     end
   end
-end
-  # def iterate_through_john_deere_resource(john_deere_resource_path, options={})
-  #   options = {
-  #     headers: nil,
-  #     body: ""
-  #     }.merge(options)
-  #   loop do
-  #     response = self.request_against_access_token(:get, john_deere_resource_path, options)
-
-  #     case response.code.to_s
-  #     when "304" # Not modified, the headers won't change either
-  #       logger.info("JohnDeere iteration not modified: #{john_deere_resource_path}")
-  #       break
-  #     when "200" # Success
-  #       # now make the json and yield it to the block
-  #       response_json = JSON.parse(response.body)
-
-  #       yield(response_json, response.to_hash)
-
-  #       # see if we have another page, will either be nil or the hash, which will have ["uri"]
-  #       next_uri = response_json["links"].find { |link| link["rel"] == "nextPage" }
-  #       full_resource_uri = next_uri.try(:[], "uri")
-  #       break if full_resource_uri.nil?
-
-  #       # convert it to a regular path so we don't have to mess with the 
-  #       # full route
-  #       john_deere_resource_path = URI.parse(full_resource_uri).path
-
-  #       # one final check
-  #       break if john_deere_resource_path.nil?
-  #     else
-  #       break
-  #     end
-  #   end
-  # end
+end

data/lib/myjohndeere/rest_methods.rb

@@ -28,6 +28,7 @@ module MyJohnDeere
           self,
           access_token,
           response.data,
+          response.code,
           options: options.merge(
             etag: response.http_headers[MyJohnDeere::ETAG_HEADER_KEY]
           )

data/lib/myjohndeere/version.rb

@@ -1,3 +1,3 @@
 module MyJohnDeere
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/test/test_list_object.rb

@@ -5,7 +5,8 @@ class TestListObject < Minitest::Test
     data = Array.new(3, API_FIXTURES["organization"])
     list = MyJohnDeere::ListObject.new(MyJohnDeere::Organization, 
       default_access_token, 
-      {"values" => data})
+      {"values" => data},
+      200)
 
     list.each_with_index do |x, i|
       assert_equal data[i]["id"], x.id
@@ -31,12 +32,25 @@ class TestListObject < Minitest::Test
     assert !list.has_more?, "The data is equal to the total"
   end
 
+  def test_not_modified_with_etag
+    etag_val = "something"
+    new_etag = "something2"
+    # Validate that the etag header is getting propagated to the next request
+    stub_request(:get, /organizations/).
+      with(headers: {MyJohnDeere::ETAG_HEADER_KEY=>etag_val}).
+      to_return(status: 304, body: '', headers: {MyJohnDeere::ETAG_HEADER_KEY=>new_etag})
+    organizations = MyJohnDeere::Organization.list(default_access_token, etag: etag_val)
+
+    assert_equal 0, organizations.data.count
+    assert organizations.not_modified?
+  end
+
   def test_get_next_page_with_etag
     # etag behavior gets the entire list.
     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}, options: {
+      {"values" => existing_data}, 200, options: {
         start: 0, count: existing_data.length, etag: ""})
     assert list.using_etag?
     assert !list.has_more?
@@ -54,12 +68,11 @@ 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, options: {start: 0,
+      test_json, 200, options: {start: 0,
       count: existing_data.length})
     assert list.has_more?
     assert !list.using_etag?
 
-    # Validate that the etag header is getting propagated to the next request
     stub_request(:get, /organizations;start=#{existing_data.count};count=#{existing_data.count}/).
       with(headers: {'Accept'=>'application/vnd.deere.axiom.v3+json'}).
       to_return(status: 200, body: test_json.to_json())

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myjohndeere
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Paul Susmarski