reso_api 1.8.5 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a80f6b9174a1efece4648a3f95fd2bf1b8c9479ec9bb39d1ec8690180ef8ea4e
-  data.tar.gz: 67759fa70652278e8a905f40e69cc546f356d73ec2e24db2ef8c9034a7eeb699
+  metadata.gz: cec3a7afb6f4509ff07af86b56de711ac1be47590266c4fac143898d6126d816
+  data.tar.gz: 9bffcb828c656eb321259ea2eebcd0b59aacb6b7c499da5e22a5f50837fe7a51
 SHA512:
-  metadata.gz: 874101c3e8871647ba4937ce922053771e7b692a8fe6f647a0f8ba01a9809d0d74c7fe9f278e1c681bd7717844f1ec774c6f935ceade6961ced1ff4983b441f9
-  data.tar.gz: 22d0469a5f32f024f5b86a3c8cd856744b6010bda5fa11e92e33d8bf53de49d3e2c82413e6a01c4947fa1349b3f039f34d71317735d2eb4c9528cbcca5146b47
+  metadata.gz: 20363d580a798a53991b0c6f7f13132a9f9078cdf54e92f8bd5f50cf251f7f7b67fd9baa8d3921745b7d28bc373c2373e7829fc87377764d690e6b0d5570efbd
+  data.tar.gz: 51ed10865cdd78a3e27743e70e935b043b53fa5d5492ab065d2fe520c4f376ab006445694742ef3cd558221066cfac6056c19c1cb7e1d186a723873436d84af6

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

@@ -57,8 +57,11 @@ module RESO
         define_method method_name do |*args, &block|
           hash = args.first.is_a?(Hash) ? args.first : {}
 
-          filter = hash[:filter]
-          filter = [filter, "OriginatingSystemName eq '#{osn}'"].compact.join(' and ') if osn.present?
+          filter = hash[:filter].to_s
+          if !filter.include?('OriginatingSystemName') && osn.present?
+            osn_filter = format("OriginatingSystemName eq '%s'", osn.to_s)
+            filter = [filter, osn_filter].compact.join(' and ')
+          end
 
           endpoint = FILTERABLE_ENDPOINTS[method_name]
           response = {}
@@ -76,11 +79,9 @@ module RESO
           }.compact
           if !block.nil?
             response = perform_call(endpoint, params)
-
             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)
               if response["value"].class.eql?(Array)
@@ -165,14 +166,15 @@ module RESO
 
       def perform_call(endpoint, params, max_retries = 5, debug = false)
         uri = uri_for_endpoint(endpoint)
-        params = params.presence || {}
         retries = 0
 
-        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?
+        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
 
-          begin
+        begin
           req = Net::HTTP::Get.new(uri.request_uri)
           req['Authorization'] = "Bearer #{auth_token}"
           res = Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|

data/lib/reso_api/version.rb

@@ -1,3 +1,3 @@
 module ResoApi
-  VERSION = "1.8.5"
+  VERSION = "1.8.7"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: reso_api
 version: !ruby/object:Gem::Version
-  version: 1.8.5
+  version: 1.8.7
 platform: ruby
 authors:
 - Michael Edlund
 bindir: exe
 cert_chain: []
-date: 2025-03-10 00:00:00.000000000 Z
+date: 2025-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler