activeresource 5.0.0 → 5.1.1

data/lib/active_resource/threadsafe_attributes.rb

@@ -1,4 +1,6 @@
-require 'active_support/core_ext/object/duplicable'
+# frozen_string_literal: true
+
+require "active_support/core_ext/object/duplicable"
 
 module ThreadsafeAttributes
   def self.included(klass)
@@ -27,39 +29,38 @@ module ThreadsafeAttributes
 
   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)
-    elsif threadsafe_attribute_defined_by_thread?(name, main_thread)
-      value = get_threadsafe_attribute_by_thread(name, main_thread)
-      value = value.dup if value.duplicable?
-      set_threadsafe_attribute_by_thread(name, value, Thread.current)
-      value
+    def get_threadsafe_attribute(name, main_thread)
+      if threadsafe_attribute_defined_by_thread?(name, Thread.current)
+        get_threadsafe_attribute_by_thread(name, Thread.current)
+      elsif threadsafe_attribute_defined_by_thread?(name, main_thread)
+        value = get_threadsafe_attribute_by_thread(name, main_thread)
+        value = value.dup if value.duplicable?
+        set_threadsafe_attribute_by_thread(name, value, Thread.current)
+        value
+      end
     end
-  end
 
-  def set_threadsafe_attribute(name, value, main_thread)
-    set_threadsafe_attribute_by_thread(name, value, Thread.current)
-    unless threadsafe_attribute_defined_by_thread?(name, main_thread)
-      set_threadsafe_attribute_by_thread(name, value, main_thread)
+    def set_threadsafe_attribute(name, value, main_thread)
+      set_threadsafe_attribute_by_thread(name, value, Thread.current)
+      unless threadsafe_attribute_defined_by_thread?(name, main_thread)
+        set_threadsafe_attribute_by_thread(name, value, main_thread)
+      end
     end
-  end
-
-  def threadsafe_attribute_defined?(name, main_thread)
-    threadsafe_attribute_defined_by_thread?(name, Thread.current) || ((Thread.current != main_thread) && threadsafe_attribute_defined_by_thread?(name, main_thread))
-  end
 
-  def get_threadsafe_attribute_by_thread(name, thread)
-    thread["active.resource.#{name}.#{self.object_id}"]
-  end
+    def threadsafe_attribute_defined?(name, main_thread)
+      threadsafe_attribute_defined_by_thread?(name, Thread.current) || ((Thread.current != main_thread) && threadsafe_attribute_defined_by_thread?(name, main_thread))
+    end
 
-  def set_threadsafe_attribute_by_thread(name, value, thread)
-    thread["active.resource.#{name}.#{self.object_id}.defined"] = true
-    thread["active.resource.#{name}.#{self.object_id}"] = value
-  end
+    def get_threadsafe_attribute_by_thread(name, thread)
+      thread.thread_variable_get "active.resource.#{name}.#{self.object_id}"
+    end
 
-  def threadsafe_attribute_defined_by_thread?(name, thread)
-    thread["active.resource.#{name}.#{self.object_id}.defined"]
-  end
+    def set_threadsafe_attribute_by_thread(name, value, thread)
+      thread.thread_variable_set "active.resource.#{name}.#{self.object_id}.defined", true
+      thread.thread_variable_set "active.resource.#{name}.#{self.object_id}", value
+    end
 
+    def threadsafe_attribute_defined_by_thread?(name, thread)
+      thread.thread_variable_get "active.resource.#{name}.#{self.object_id}.defined"
+    end
 end

data/lib/active_resource/validations.rb

@@ -1,5 +1,7 @@
-require 'active_support/core_ext/array/wrap'
-require 'active_support/core_ext/object/blank'
+# frozen_string_literal: true
+
+require "active_support/core_ext/array/wrap"
+require "active_support/core_ext/object/blank"
 
 module ActiveResource
   class ResourceInvalid < ClientError  #:nodoc:
@@ -33,11 +35,11 @@ module ActiveResource
     def from_hash(messages, save_cache = false)
       clear unless save_cache
 
-      messages.each do |(key,errors)|
+      messages.each do |(key, errors)|
         errors.each do |error|
           if @base.known_attributes.include?(key)
             add key, error
-          elsif key == 'base'
+          elsif key == "base"
             self[:base] << error
           else
             # reporting an error on an attribute not in attributes
@@ -51,11 +53,11 @@ module ActiveResource
     # Grabs errors from a json response.
     def from_json(json, save_cache = false)
       decoded = ActiveSupport::JSON.decode(json) || {} rescue {}
-      if decoded.kind_of?(Hash) && (decoded.has_key?('errors') || decoded.empty?)
-        errors = decoded['errors'] || {}
+      if decoded.kind_of?(Hash) && (decoded.has_key?("errors") || decoded.empty?)
+        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.')
+          ActiveSupport::Deprecation.warn("Returning errors as an array of strings is deprecated.")
           from_array errors, save_cache
         else
           # 3.2.2+ style
@@ -70,7 +72,7 @@ module ActiveResource
 
     # Grabs errors from an XML response.
     def from_xml(xml, save_cache = false)
-      array = Array.wrap(Hash.from_xml(xml)['errors']['error']) rescue []
+      array = Array.wrap(Hash.from_xml(xml)["errors"]["error"]) rescue []
       from_array array, save_cache
     end
   end
@@ -106,7 +108,7 @@ module ActiveResource
 
     # Validate a resource and save (POST) it to the remote web service.
     # If any local validations fail - the save (POST) will not be attempted.
-    def save_with_validation(options={})
+    def save_with_validation(options = {})
       perform_validation = options[:validate] != false
 
       # clear the remote validations so they don't interfere with the local
@@ -131,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,12 @@
+# frozen_string_literal: true
+
 module ActiveResource
   module VERSION #:nodoc:
     MAJOR = 5
-    MINOR = 0
-    TINY  = 0
+    MINOR = 1
+    TINY  = 1
     PRE   = nil
 
-    STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
+    STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
 end

data/lib/active_resource.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Copyright (c) 2006-2012 David Heinemeier Hansson
 #
@@ -21,10 +23,10 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-require 'active_support'
-require 'active_model'
-require 'active_resource/exceptions'
-require 'active_resource/version'
+require "active_support"
+require "active_model"
+require "active_resource/exceptions"
+require "active_resource/version"
 
 module ActiveResource
   extend ActiveSupport::Autoload
@@ -41,4 +43,4 @@ module ActiveResource
   autoload :Collection
 end
 
-require 'active_resource/railtie' if defined?(Rails.application)
+require "active_resource/railtie" if defined?(Rails.application)

data/lib/activeresource.rb

@@ -1 +1,3 @@
-require 'active_resource'
+# frozen_string_literal: true
+
+require "active_resource"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeresource
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2020-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: activemodel-serializers-xml
   requirement: !ruby/object:Gem::Requirement
@@ -100,8 +100,10 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- MIT-LICENSE
 - README.rdoc
 - lib/active_resource.rb
+- lib/active_resource/active_job_serializer.rb
 - lib/active_resource/associations.rb
 - lib/active_resource/associations/builder/association.rb
 - lib/active_resource/associations/builder/belongs_to.rb
@@ -148,8 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.2.0.pre1
 signing_key: 
 specification_version: 4
 summary: REST modeling framework (part of Rails).