activeresource 6.0.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2a0c925e2619c4a4204eebdaea70776a57fec944e9eefeb98982ed8cf425bbc
-  data.tar.gz: b77c66a74c3fe0d32e16d0ce4eaaec1c772200bda9ea36b2bfba1a3cc4f58b5d
+  metadata.gz: 95f17d4e9c32ac07705fd268b64bc8d2dbdff491b948c87339ab8b7bd054163e
+  data.tar.gz: 9b7ec268d567d641a25608f31d29e8a5675c8436b89448eaecd7a1e179dff587
 SHA512:
-  metadata.gz: 9116078833a262f5a4d184a9cd080f3a29bfc5c07481cf352dd87baa735ba0dfae6159a35ac37ea1ad2e121348a33d958151a048af8dbb6e85e3a387076de3b5
-  data.tar.gz: 02e8b7e3aa1fd89f70f67b2696d778bf0c4a5d89c4b6f779ec3ecffc6a099374c06515ec2bfcb4e7175a518f00543f16b1b691670378c2533fcf353ce82cb96f
+  metadata.gz: 789a6c7d3dd6044c806e8496ebcdf422f0c8c21e64dc42d6e0352781b96070b8f190b0a42ce8171f920bd9d1057969f4599ef150c7be334da59e89c2d4ac10fb
+  data.tar.gz: 29df5673ea2374cfa8a282b47bce5ca4d800744add388ddd8baaab0d3fd157a835361049213b4640aeac5697a86b94247c407c1b19dcedd552c4d77bb15fa6bc

data/README.md

@@ -112,7 +112,7 @@ end
 Active Resource is built on a standard JSON or XML format for requesting and submitting resources
 over HTTP. It mirrors the RESTful routing built into Action Controller but will also work with any
 other REST service that properly implements the protocol. REST uses HTTP, but unlike "typical" web
-applications, it makes use of all the verubys available in the HTTP specification:
+applications, it makes use of all the verbs available in the HTTP specification:
 
 * GET requests are used for finding and retrieving resources.
 * POST requests are used to create new resources.

data/lib/active_resource/base.rb

@@ -11,7 +11,6 @@ require "active_support/core_ext/object/blank"
 require "active_support/core_ext/object/to_query"
 require "active_support/core_ext/object/duplicable"
 require "set"
-require "uri"
 
 require "active_resource/connection"
 require "active_resource/formats"
@@ -490,8 +489,8 @@ module ActiveResource
           self._site = nil
         else
           self._site = create_site_uri_from(site)
-          self._user = URI::DEFAULT_PARSER.unescape(_site.user) if _site.user
-          self._password = URI::DEFAULT_PARSER.unescape(_site.password) if _site.password
+          self._user = URI_PARSER.unescape(_site.user) if _site.user
+          self._password = URI_PARSER.unescape(_site.password) if _site.password
         end
       end
 
@@ -750,7 +749,7 @@ module ActiveResource
       # Default value is <tt>site.path</tt>.
       def prefix=(value = "/")
         # Replace :placeholders with '#{embedded options[:lookups]}'
-        prefix_call = value.gsub(/:\w+/) { |key| "\#{URI::DEFAULT_PARSER.escape options[#{key}].to_s}" }
+        prefix_call = value.gsub(/:\w+/) { |key| "\#{URI_PARSER.escape options[#{key}].to_s}" }
 
         # Clear prefix parameters in case they have been cached
         @prefix_parameters = nil
@@ -1072,13 +1071,13 @@ module ActiveResource
       #
       #   Note.exists(1349) # => false
       def exists?(id, options = {})
-        if id
-          prefix_options, query_options = split_options(options[:params])
-          path = element_path(id, prefix_options, query_options)
-          response = connection.head(path, headers)
-          (200..206).include? response.code.to_i
-        end
-        # id && !find_single(id, options).nil?
+        return false unless id
+
+        prefix_options, query_options = split_options(options[:params])
+        path = element_path(id, prefix_options, query_options)
+        response = connection.head(path, headers)
+
+        (200..206).include?(response.code.to_i)
       rescue ActiveResource::ResourceNotFound, ActiveResource::ResourceGone
         false
       end

data/lib/active_resource/connection.rb

@@ -5,7 +5,6 @@ require "active_support/core_ext/object/inclusion"
 require "net/https"
 require "date"
 require "time"
-require "uri"
 
 module ActiveResource
   # Class to handle connections to remote web services.
@@ -43,8 +42,8 @@ module ActiveResource
     def site=(site)
       @site = site.is_a?(URI) ? site : URI.parse(site)
       @ssl_options ||= {} if @site.is_a?(URI::HTTPS)
-      @user = URI::DEFAULT_PARSER.unescape(@site.user) if @site.user
-      @password = URI::DEFAULT_PARSER.unescape(@site.password) if @site.password
+      @user = URI_PARSER.unescape(@site.user) if @site.user
+      @password = URI_PARSER.unescape(@site.password) if @site.password
     end
 
     # Set the proxy for remote service.
@@ -173,8 +172,8 @@ module ActiveResource
 
       def new_http
         if @proxy
-          user = URI::DEFAULT_PARSER.unescape(@proxy.user) if @proxy.user
-          password = URI::DEFAULT_PARSER.unescape(@proxy.password) if @proxy.password
+          user = URI_PARSER.unescape(@proxy.user) if @proxy.user
+          password = URI_PARSER.unescape(@proxy.password) if @proxy.password
           Net::HTTP.new(@site.host, @site.port, @proxy.host, @proxy.port, user, password)
         else
           Net::HTTP.new(@site.host, @site.port)
@@ -211,7 +210,7 @@ module ActiveResource
 
       # Builds headers for request to remote service.
       def build_request_headers(headers, http_method, uri)
-        authorization_header(http_method, uri).update(default_header).update(http_format_header(http_method)).update(headers)
+        authorization_header(http_method, uri).update(default_header).update(http_format_header(http_method)).update(headers.to_hash)
       end
 
       def response_auth_header

data/lib/active_resource/custom_methods.rb

@@ -119,7 +119,7 @@ module ActiveResource
 
     private
       def custom_method_element_url(method_name, options = {})
-        "#{self.class.prefix(prefix_options)}#{self.class.collection_name}/#{id}/#{method_name}#{self.class.format_extension}#{self.class.__send__(:query_string, options)}"
+        "#{self.class.prefix(prefix_options)}#{self.class.collection_name}/#{URI.encode_www_form_component(id.to_s)}/#{method_name}#{self.class.format_extension}#{self.class.__send__(:query_string, options)}"
       end
 
       def custom_method_new_element_url(method_name, options = {})

data/lib/active_resource/http_mock.rb

@@ -58,12 +58,12 @@ module ActiveResource
       end
 
       [ :post, :patch, :put, :get, :delete, :head ].each do |method|
-        # def post(path, request_headers = {}, body = nil, status = 200, response_headers = {})
-        #   @responses[Request.new(:post, path, nil, request_headers)] = Response.new(body || "", status, response_headers)
+        # def post(path, request_headers = {}, body = nil, status = 200, response_headers = {}, options: {})
+        #   @responses[Request.new(:post, path, nil, request_headers, options)] = Response.new(body || "", status, response_headers)
         # end
         module_eval <<-EOE, __FILE__, __LINE__ + 1
-          def #{method}(path, request_headers = {}, body = nil, status = 200, response_headers = {})
-            request  = Request.new(:#{method}, path, nil, request_headers)
+          def #{method}(path, request_headers = {}, body = nil, status = 200, response_headers = {}, options = {})
+            request  = Request.new(:#{method}, path, nil, request_headers, options)
             response = Response.new(body || "", status, response_headers)
 
             delete_duplicate_responses(request)
@@ -244,8 +244,8 @@ module ActiveResource
     { true  => %w(post patch put),
       false => %w(get delete head) }.each do |has_body, methods|
       methods.each do |method|
-        # def post(path, body, headers)
-        #   request = ActiveResource::Request.new(:post, path, body, headers)
+        # def post(path, body, headers, options = {})
+        #   request = ActiveResource::Request.new(:post, path, body, headers, options)
         #   self.class.requests << request
         #   if response = self.class.responses.assoc(request)
         #     response[1]
@@ -254,8 +254,8 @@ module ActiveResource
         #   end
         # end
         module_eval <<-EOE, __FILE__, __LINE__ + 1
-          def #{method}(path, #{'body, ' if has_body}headers)
-            request = ActiveResource::Request.new(:#{method}, path, #{has_body ? 'body, ' : 'nil, '}headers)
+          def #{method}(path, #{'body, ' if has_body}headers, options = {})
+            request = ActiveResource::Request.new(:#{method}, path, #{has_body ? 'body, ' : 'nil, '}headers, options)
             self.class.requests << request
             if response = self.class.responses.assoc(request)
               response[1]
@@ -279,19 +279,34 @@ module ActiveResource
   class Request
     attr_accessor :path, :method, :body, :headers
 
-    def initialize(method, path, body = nil, headers = {})
-      @method, @path, @body, @headers = method, path, body, headers
+    def initialize(method, path, body = nil, headers = {}, options = {})
+      @method, @path, @body, @headers, @options = method, path, body, headers, options
     end
 
     def ==(req)
-      path == req.path && method == req.method && headers_match?(req)
+      same_path?(req) && method == req.method && headers_match?(req)
     end
 
     def to_s
       "<#{method.to_s.upcase}: #{path} [#{headers}] (#{body})>"
     end
 
+    # Removes query parameters from the path.
+    #
+    # @return [String] the path without query parameters
+    def remove_query_params_from_path
+      path.split("?").first
+    end
+
     private
+      def same_path?(req)
+        if @options && @options[:omit_query_in_path]
+          remove_query_params_from_path == req.remove_query_params_from_path
+        else
+          path == req.path
+        end
+      end
+
       def headers_match?(req)
         # Ignore format header on equality if it's not defined
         format_header = ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[method]

data/lib/active_resource/inheriting_hash.rb

@@ -11,5 +11,24 @@ module ActiveResource
     def [](key)
       super || @parent_hash[key]
     end
+
+    # Merges the flattened parent hash (if it's an InheritingHash)
+    # with ourself
+    def to_hash
+      @parent_hash.to_hash.merge(self)
+    end
+
+    # So we can see the merged object in IRB or the Rails console
+    def pretty_print(pp)
+      pp.pp_hash to_hash
+    end
+
+    def inspect
+      to_hash.inspect
+    end
+
+    def to_s
+      inspect
+    end
   end
 end

data/lib/active_resource/validations.rb

@@ -160,7 +160,7 @@ module ActiveResource
     #   my_person.valid?
     #   # => false
     #
-    def valid?
+    def valid?(context = nil)
       run_callbacks :validate do
         super
         load_remote_errors(@remote_errors, true) if defined?(@remote_errors) && @remote_errors.present?

data/lib/active_resource/version.rb

@@ -3,8 +3,8 @@
 module ActiveResource
   module VERSION # :nodoc:
     MAJOR = 6
-    MINOR = 0
-    TINY  = 0
+    MINOR = 1
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

data/lib/active_resource.rb

@@ -23,6 +23,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
+require "uri"
+
 require "active_support"
 require "active_model"
 require "active_resource/exceptions"
@@ -31,6 +33,8 @@ require "active_resource/version"
 module ActiveResource
   extend ActiveSupport::Autoload
 
+  URI_PARSER = defined?(URI::RFC2396_PARSER) ? URI::RFC2396_PARSER : URI::RFC2396_Parser.new
+
   autoload :Base
   autoload :Callbacks
   autoload :Connection

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeresource
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2024-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -135,11 +135,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/activeresource/issues
-  changelog_uri: https://github.com/rails/activeresource/releases/tag/v6.0.0
+  changelog_uri: https://github.com/rails/activeresource/releases/tag/v6.1.1
   documentation_uri: http://rubydoc.info/gems/activeresource
-  source_code_uri: https://github.com/rails/activeresource/tree/v6.0.0
+  source_code_uri: https://github.com/rails/activeresource/tree/v6.1.1
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -154,8 +154,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: REST modeling framework (part of Rails).
 test_files: []