reso_api 0.4.6 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e36e84a9836dcd15e9fd545c3b4eb4b42759771dc9593d410de6ed8d6558ff4
-  data.tar.gz: ff23c4f1a94ee411f42a8d2f25e05e39d20a1e47a13ea2f5a0314b2a31a36b45
+  metadata.gz: 429940488232e917ca2fec8f1c5bbdd8d3bff37fb50f5b2d47d9ff817067abac
+  data.tar.gz: 7f0736cd242987fc19c0b6a0286b2ceef11f0dc363b31d8a161e02756d5456b1
 SHA512:
-  metadata.gz: abd9c1f86ec78924c29b13a23c52b27e5f0ebfdcc888d52e3391a4d25ba606ccd3b49d4e4fba36339ebd14f22c5415244a81ab7201afbc9e5a9de5ec597c5a03
-  data.tar.gz: a3f09fb8c92dd56d1b8f1d0c5e24d5321d33d2d218de2172f50999ea5be02e46264e335bbb33dde12a806ea3e2ebb51a1381f4448c1ca4f771c1de998a6b1f8c
+  metadata.gz: 3e5a50322a425cbde496039eaaa36bfdf255d08a49df1f148871fd01d3b809ff55e60bd070d74dc5c47bae5e80d45005ea7e0453c17fb981d665317d2804b23c
+  data.tar.gz: 89871becd21ea774f8763fb5e2e25e8b0c922a28bfe747709ad29c39b4e2d7e353fbfcc85dc85cf6d0474ff408ef380fab64caada98fa68613f01738e5d43cd4

data/README.md

@@ -145,7 +145,7 @@ client.properties(expand: "Media")
 
 #### Automatically iterate over all results
 
-By passing a block to Media, Member, Office, and Property resource calls, subsequent paginated calls will automatically be made until the whole result set has been traversed. The block provided is executed for each returned object hash.
+By passing a block to Media, Member, Office, and Property resource calls, subsequent paginated calls will automatically be made until the whole result set has been traversed. The block provided is executed for each returned object hash. The `batch` option can be used to return the full array of results. 
 
 Here are a couple of examples of how that can be used:
 
@@ -157,6 +157,10 @@ end
 client.properties(filter: "StandardStatus eq 'Active'") do |hash|
   Listing.create(listing_key: hash['ListingKey'], data: hash)
 end
+
+client.properties(filter: "StandardStatus eq 'Active'", batch: true) do |results|
+  Listing.insert_all(results) # Perform some batch operation
+end
 ```
 
 

data/lib/reso_api/app/models/reso/api/client.rb

@@ -50,6 +50,7 @@ module RESO
         define_method method_name do |*args, &block|
           hash = args.first.is_a?(Hash) ? args.first : {}
           endpoint = FILTERABLE_ENDPOINTS[method_name]
+          response = {}
           params = {
             "$select": hash[:select],
             "$filter": hash[:filter],
@@ -63,10 +64,17 @@ module RESO
           }.compact
           if !block.nil?
             response = perform_call(endpoint, params)
-            response["value"].each{|hash| block.call(hash)} if response["value"].class.eql?(Array)
+            
+            if response["value"].class.eql?(Array)
+              hash[:batch] ? block.call(response["value"]) : response["value"].each{|hash| block.call(hash)} 
+            end
+
             while (next_link = response["@odata.nextLink"]).present?
               response = perform_call(next_link, nil)
-              response["value"].each{|hash| block.call(hash)} if response["value"].class.eql?(Array)
+              
+              if response["value"].class.eql?(Array)
+                hash[:batch] ? block.call(response["value"]) : response["value"].each{|hash| block.call(hash)} 
+              end
             end
           else
             return perform_call(endpoint, params)
@@ -106,12 +114,17 @@ module RESO
         if expiration > DateTime.now.utc
           return payload.token
         else
-          @oauth2_payload = oauth2_client.client_credentials.get_token
-          File.write(oauth2_token_path, @oauth2_payload.to_hash.to_json)
+          @oauth2_payload = fresh_oauth2_payload
           return @oauth2_payload.token
         end
       end
 
+      def fresh_oauth2_payload
+        @oauth2_payload = oauth2_client.client_credentials.get_token
+        File.write(oauth2_token_path, @oauth2_payload.to_hash.to_json)
+        return @oauth2_payload
+      end
+
       def oauth2_token_path
         File.join(Dir.tmpdir, [base_url.parameterize, "-oauth-token.json"].join)
       end
@@ -137,18 +150,36 @@ module RESO
 
       def perform_call(endpoint, params)
         uri = uri_for_endpoint(endpoint)
+        retries = 0
         if params.present?
           query = params.present? ? URI.encode_www_form(params).gsub("+", " ") : ""
           uri.query && uri.query.length > 0 ? uri.query += '&' + query : uri.query = query
           return URI::decode(uri.request_uri) if params.dig(:$debug).present?
         end
-        request = Net::HTTP::Get.new(uri.request_uri)
-        request['Authorization'] = "Bearer #{oauth2_token}"
-        response = Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
-          http.max_retries = 10
-          http.request(request)
+        begin
+          req = Net::HTTP::Get.new(uri.request_uri)
+          req['Authorization'] = "Bearer #{oauth2_token}"
+          res = Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
+            http.request(req)
+          end
+          response = JSON(res.body) rescue res.body
+          if response.is_a?(String) && response.include?('Bad Gateway')
+            raise StandardError
+          elsif response.is_a?(String) && response.include?('Unauthorized')
+            fresh_oauth2_payload
+            raise StandardError
+          elsif response.is_a?(Hash) && response.has_key?("error")
+            raise StandardError
+          end
+        rescue Net::ReadTimeout, StandardError
+          if (retries += 1) <= 5
+            sleep 10
+            retry
+          else
+            raise
+          end
         end
-        return JSON(response.body) rescue response.body
+        return response
       end
 
     end

data/lib/reso_api/version.rb

@@ -1,3 +1,3 @@
 module ResoApi
-  VERSION = "0.4.6"
+  VERSION = "0.4.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reso_api
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.9
 platform: ruby
 authors:
 - Michael Edlund
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2022-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler