activeresource 5.1.1 → 6.0.0

data/lib/active_resource/connection.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "active_support/core_ext/benchmark"
-require "active_support/core_ext/uri"
 require "active_support/core_ext/object/inclusion"
 require "net/https"
 require "date"
@@ -44,8 +43,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.parser.unescape(@site.user) if @site.user
-      @password = URI.parser.unescape(@site.password) if @site.password
+      @user = URI::DEFAULT_PARSER.unescape(@site.user) if @site.user
+      @password = URI::DEFAULT_PARSER.unescape(@site.password) if @site.password
     end
 
     # Set the proxy for remote service.
@@ -151,8 +150,12 @@ module ActiveResource
           raise(ResourceConflict.new(response))
         when 410
           raise(ResourceGone.new(response))
+        when 412
+          raise(PreconditionFailed.new(response))
         when 422
           raise(ResourceInvalid.new(response))
+        when 429
+          raise(TooManyRequests.new(response))
         when 401...500
           raise(ClientError.new(response))
         when 500...600
@@ -170,8 +173,8 @@ module ActiveResource
 
       def new_http
         if @proxy
-          user = URI.parser.unescape(@proxy.user) if @proxy.user
-          password = URI.parser.unescape(@proxy.password) if @proxy.password
+          user = URI::DEFAULT_PARSER.unescape(@proxy.user) if @proxy.user
+          password = URI::DEFAULT_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

@@ -10,7 +10,9 @@ module ActiveResource
     end
 
     def to_s
-      message = "Failed.".dup
+      return @message if @message
+
+      message = +"Failed."
       message << "  Response code = #{response.code}." if response.respond_to?(:code)
       message << "  Response message = #{response.message}." if response.respond_to?(:message)
       message
@@ -22,7 +24,7 @@ module ActiveResource
     def initialize(message)
       @message = message
     end
-    def to_s; @message ;end
+    def to_s; @message ; end
   end
 
   # Raised when a OpenSSL::SSL::SSLError occurs.
@@ -30,7 +32,7 @@ module ActiveResource
     def initialize(message)
       @message = message
     end
-    def to_s; @message ;end
+    def to_s; @message ; end
   end
 
   # 3xx Redirection
@@ -71,6 +73,14 @@ module ActiveResource
   class ResourceGone < ClientError # :nodoc:
   end
 
+  # 412 Precondition Failed
+  class PreconditionFailed < ClientError # :nodoc:
+  end
+
+  # 429 Too Many Requests
+  class TooManyRequests < ClientError # :nodoc:
+  end
+
   # 5xx Server Error
   class ServerError < ConnectionError # :nodoc:
   end

data/lib/active_resource/http_mock.rb

@@ -4,7 +4,7 @@ require "active_support/core_ext/kernel/reporting"
 require "active_support/core_ext/object/inclusion"
 
 module ActiveResource
-  class InvalidRequestError < StandardError; end #:nodoc:
+  class InvalidRequestError < StandardError; end # :nodoc:
 
   # One thing that has always been a pain with remote web services is testing. The HttpMock
   # class makes it easy to test your Active Resource models by creating a set of mock responses to specific
@@ -52,7 +52,7 @@ module ActiveResource
   #   end
   #
   class HttpMock
-    class Responder #:nodoc:
+    class Responder # :nodoc:
       def initialize(responses)
         @responses = responses
       end
@@ -74,7 +74,6 @@ module ActiveResource
       end
 
     private
-
       def delete_duplicate_responses(request)
         @responses.delete_if { |r| r[0] == request }
       end
@@ -190,7 +189,7 @@ module ActiveResource
       #   ActiveResource::HttpMock.respond_to(pairs, false)
       #   ActiveResource::HttpMock.responses.length #=> 2
       #
-      def respond_to(*args) #:yields: mock
+      def respond_to(*args) # :yields: mock
         pairs = args.first || {}
         reset! if args.last.class != FalseClass
 
@@ -268,11 +267,11 @@ module ActiveResource
       end
     end
 
-    def initialize(site) #:nodoc:
+    def initialize(site) # :nodoc:
       @site = site
     end
 
-    def inspect_responses #:nodoc:
+    def inspect_responses # :nodoc:
       self.class.responses.map { |r| r[0].to_s }.inspect
     end
   end
@@ -293,7 +292,6 @@ module ActiveResource
     end
 
     private
-
       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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ActiveResource
+  class InheritingHash < Hash
+    def initialize(parent_hash = {})
+      # Default hash value must be nil, which allows fallback lookup on parent hash
+      super(nil)
+      @parent_hash = parent_hash
+    end
+
+    def [](key)
+      super || @parent_hash[key]
+    end
+  end
+end

data/lib/active_resource/railtie.rb

@@ -16,7 +16,7 @@ module ActiveResource
     end
 
     initializer "active_resource.add_active_job_serializer" do |app|
-      if defined? app.config.active_job.custom_serializers
+      if app.config.try(:active_job).try(:custom_serializers)
         require "active_resource/active_job_serializer"
         app.config.active_job.custom_serializers << ActiveResource::ActiveJobSerializer
       end

data/lib/active_resource/reflection.rb

@@ -62,12 +62,12 @@ module ActiveResource
 
       # Returns the foreign_key for the macro.
       def foreign_key
-        @foreign_key ||= self.options[:foreign_key] || "#{self.name.to_s.downcase}_id"
+        @foreign_key ||= derive_foreign_key
       end
 
       private
         def derive_class_name
-          (options[:class_name] ? options[:class_name].to_s.camelize : name.to_s.classify)
+          options[:class_name] ? options[:class_name].to_s.camelize : name.to_s.classify
         end
 
         def derive_foreign_key

data/lib/active_resource/schema.rb

@@ -47,6 +47,7 @@ module ActiveResource # :nodoc:
       #   attr_names.each { |name| attribute(name, 'string', options) }
       # end
       class_eval <<-EOV, __FILE__, __LINE__ + 1
+        # frozen_string_literal: true
         def #{attr_type}(*args)
           options = args.extract_options!
           attr_names = args

data/lib/active_resource/singleton.rb

@@ -88,7 +88,6 @@ module ActiveResource
 
 
     protected
-
       # Update the resource on the remote service
       def update
         connection.put(singleton_path(prefix_options), encode, self.class.headers).tap do |response|
@@ -105,7 +104,6 @@ module ActiveResource
       end
 
     private
-
       def singleton_path(options = nil)
         self.class.singleton_path(options || prefix_options)
       end

data/lib/active_resource/threadsafe_attributes.rb

@@ -28,7 +28,6 @@ module ThreadsafeAttributes
   end
 
   private
-
     def get_threadsafe_attribute(name, main_thread)
       if threadsafe_attribute_defined_by_thread?(name, Thread.current)
         get_threadsafe_attribute_by_thread(name, Thread.current)

data/lib/active_resource/validations.rb

@@ -4,7 +4,7 @@ require "active_support/core_ext/array/wrap"
 require "active_support/core_ext/object/blank"
 
 module ActiveResource
-  class ResourceInvalid < ClientError  #:nodoc:
+  class ResourceInvalid < ClientError  # :nodoc:
   end
 
   # Active Resource validation is reported to and from this object, which is used by Base#save
@@ -22,7 +22,7 @@ module ActiveResource
             add humanized_attributes[attr_name], message[(attr_name.size + 1)..-1]
           end
         end
-        self[:base] << message if attr_message.nil?
+        add(:base, message) if attr_message.nil?
       end
     end
 
@@ -40,11 +40,11 @@ module ActiveResource
           if @base.known_attributes.include?(key)
             add key, error
           elsif key == "base"
-            self[:base] << error
+            add(:base, error)
           else
             # reporting an error on an attribute not in attributes
             # format and add them to base
-            self[:base] << "#{key.humanize} #{error}"
+            add(:base, "#{key.humanize} #{error}")
           end
         end
       end
@@ -133,7 +133,7 @@ module ActiveResource
 
     # Loads the set of remote errors into the object's Errors based on the
     # content-type of the error-block received.
-    def load_remote_errors(remote_errors, save_cache = false) #:nodoc:
+    def load_remote_errors(remote_errors, save_cache = false) # :nodoc:
       case self.class.format
       when ActiveResource::Formats[:xml]
         errors.from_xml(remote_errors.response.body, save_cache)

data/lib/active_resource/version.rb

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

data/lib/active_resource.rb

@@ -39,6 +39,7 @@ module ActiveResource
   autoload :HttpMock
   autoload :Schema
   autoload :Singleton
+  autoload :InheritingHash
   autoload :Validations
   autoload :Collection
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeresource
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 6.0.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,40 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activemodel-serializers-xml
   requirement: !ruby/object:Gem::Requirement
@@ -92,16 +80,29 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.0
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: REST on Rails. Wrap your RESTful web app with Ruby classes and work with
   them like Active Record models.
 email: david@loudthinking.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.rdoc
+extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- README.rdoc
+- README.md
 - lib/active_resource.rb
 - lib/active_resource/active_job_serializer.rb
 - lib/active_resource/associations.rb
@@ -119,8 +120,8 @@ files:
 - lib/active_resource/formats/json_format.rb
 - lib/active_resource/formats/xml_format.rb
 - lib/active_resource/http_mock.rb
+- lib/active_resource/inheriting_hash.rb
 - lib/active_resource/log_subscriber.rb
-- lib/active_resource/observing.rb
 - lib/active_resource/railtie.rb
 - lib/active_resource/reflection.rb
 - lib/active_resource/schema.rb
@@ -132,25 +133,28 @@ files:
 homepage: http://www.rubyonrails.org
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/rails/activeresource/issues
+  changelog_uri: https://github.com/rails/activeresource/releases/tag/v6.0.0
+  documentation_uri: http://rubydoc.info/gems/activeresource
+  source_code_uri: https://github.com/rails/activeresource/tree/v6.0.0
+  rubygems_mfa_required: 'true'
 post_install_message: 
-rdoc_options:
-- "--main"
-- README.rdoc
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.pre1
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: REST modeling framework (part of Rails).