activeresource 6.1.0 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb092fb2d853c88525dc4f656733f5ba9c4865d1092ee376f598c1ec944c0e02
-  data.tar.gz: c907a425824ed9227dbc9b48195bf38c0ffb9d6312ab13a63270b973450482b8
+  metadata.gz: aa6762874a2653d8a08929aa62b286ee759384949026c7229f792208a18e1a4e
+  data.tar.gz: b1bbe54d2cd8937cb58ba46ebd6c38bae69d937c8663f2f77e2d266011c68216
 SHA512:
-  metadata.gz: b287742d4867cef996a87ce8a0ef285eb2012cfa23f9c47cf149f9086ea4df620fa945952a24e160bc07201601672702edb43bd4d6279a95a58734118d9c457f
-  data.tar.gz: b9a74b86bcc934044ebf06df35b0a48729fdba4947785583c2c403901729b6d7133657e4131db13b8d3229502896afa8db7ef0ac87aa5c6762dafbcb1b0a326a
+  metadata.gz: 4bfa1af456b2b740e5472f2ce9c5a6138cbfb5449ec3480a6f637c2f75495d66da591fdd80f4e6c5092afeba3af6439545c7c5e7a75af187a981ef922ece053a
+  data.tar.gz: 17d6eb6cd168d7c5613a9ef594648529f9fc6b6bdec7927d7940d62012c0b75e9adb92c3c22f6790f725049bf2d6dbd86bd6082eb25d7145a9b2bcedd4f0e80b

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"
@@ -213,6 +212,7 @@ module ActiveResource
   # * 301, 302, 303, 307 - ActiveResource::Redirection
   # * 400 - ActiveResource::BadRequest
   # * 401 - ActiveResource::UnauthorizedAccess
+  # * 402 - ActiveResource::PaymentRequired
   # * 403 - ActiveResource::ForbiddenAccess
   # * 404 - ActiveResource::ResourceNotFound
   # * 405 - ActiveResource::MethodNotAllowed
@@ -490,8 +490,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 +750,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

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.
@@ -140,6 +139,8 @@ module ActiveResource
           raise(BadRequest.new(response))
         when 401
           raise(UnauthorizedAccess.new(response))
+        when 402
+          raise(PaymentRequired.new(response))
         when 403
           raise(ForbiddenAccess.new(response))
         when 404
@@ -173,8 +174,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)

data/lib/active_resource/exceptions.rb

@@ -57,6 +57,10 @@ module ActiveResource
   class UnauthorizedAccess < ClientError # :nodoc:
   end
 
+  # 402 Payment Required
+  class PaymentRequired < ClientError # :nodoc:
+  end
+
   # 403 Forbidden
   class ForbiddenAccess < ClientError # :nodoc:
   end

data/lib/active_resource/railtie.rb

@@ -21,5 +21,9 @@ module ActiveResource
         app.config.active_job.custom_serializers << ActiveResource::ActiveJobSerializer
       end
     end
+
+    initializer "active_resource.deprecator" do |app|
+      app.deprecators[:active_resource] = ActiveResource.deprecator
+    end
   end
 end

data/lib/active_resource/validations.rb

@@ -57,7 +57,7 @@ module ActiveResource
         errors = decoded["errors"] || {}
         if errors.kind_of?(Array)
           # 3.2.1-style with array of strings
-          ActiveSupport::Deprecation.warn("Returning errors as an array of strings is deprecated.")
+          ActiveResource.deprecator.warn("Returning errors as an array of strings is deprecated.")
           from_array errors, save_cache
         else
           # 3.2.2+ style
@@ -65,7 +65,7 @@ module ActiveResource
         end
       else
         # <3.2-style respond_with - lacks 'errors' key
-        ActiveSupport::Deprecation.warn('Returning errors as a hash without a root "errors" key is deprecated.')
+        ActiveResource.deprecator.warn('Returning errors as a hash without a root "errors" key is deprecated.')
         from_hash decoded, save_cache
       end
     end

data/lib/active_resource/version.rb

@@ -4,7 +4,7 @@ module ActiveResource
   module VERSION # :nodoc:
     MAJOR = 6
     MINOR = 1
-    TINY  = 0
+    TINY  = 2
     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
@@ -42,6 +46,16 @@ module ActiveResource
   autoload :InheritingHash
   autoload :Validations
   autoload :Collection
+
+  if ActiveSupport::VERSION::STRING >= "7.2"
+    def self.deprecator
+      @deprecator ||= ActiveSupport::Deprecation.new(VERSION::STRING, "ActiveResource")
+    end
+  else
+    def self.deprecator
+      ActiveSupport::Deprecation
+    end
+  end
 end
 
 require "active_resource/railtie" if defined?(Rails.application)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeresource
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-24 00:00:00.000000000 Z
+date: 2024-10-03 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.1.0
+  changelog_uri: https://github.com/rails/activeresource/releases/tag/v6.1.2
   documentation_uri: http://rubydoc.info/gems/activeresource
-  source_code_uri: https://github.com/rails/activeresource/tree/v6.1.0
+  source_code_uri: https://github.com/rails/activeresource/tree/v6.1.2
   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.4.10
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: REST modeling framework (part of Rails).
 test_files: []