activeresource 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82b2154f86c57749c08bad97d435fcb1cdde0408
-  data.tar.gz: 1c514b63dc4ea568665f161079adff26d9cdb611
+  metadata.gz: 5ec4c5f35bfca437beeae8e7acb8763bc0ce1f96
+  data.tar.gz: 9ce68f2e6a206530f05c57ce23aaa0f240bc74f8
 SHA512:
-  metadata.gz: 477756e26f0d705234fd0c1d7511d0850e569691ccb8bdbb8974fec70445e10d6d607cc852b2652e1a6335baf1b3400f23380b392c1fc203346f2344eb503326
-  data.tar.gz: ccad2db0464de0b474d4d3dc1a36d1b86aa19d2ad20c6b68b5fe6170b4663567c07d445b8a1c0811e384fca02637f1f0631af0cf1e5b2842f86ebbad88d1c6f6
+  metadata.gz: e8faca6d64850e4eb46e54d829c90355b7d18538b618032498e747dd27fc12861fac7e5e0d5ba53f4bf7eb7203f85c2dd092f0ad1a3badc3ed290a958558e820
+  data.tar.gz: 23fd61de41602794182b27df1703ae3e7a82dba3249c285524f6a5d681b792b9ea38ab782d1a4731b8ddf7a09eb3b78acf5ce0ea04cca8bf0f2d573129da1a9f

data/README.rdoc

@@ -1,4 +1,4 @@
-= Active Resource {<img src="https://secure.travis-ci.org/rails/activeresource.png" />}[http://travis-ci.org/rails/activeresource]
+= Active Resource
 
 Active Resource (ARes) connects business objects and Representational State Transfer (REST)
 web services.  It implements object-relational mapping for REST web services to provide transparent
@@ -28,7 +28,7 @@ The latest version of Active Resource can be installed with RubyGems:
 
 Or added to a Gemfile:
 
-  gem 'activeresource', :require => 'active_resource'
+  gem 'activeresource'
 
 Source code can be downloaded on GitHub
 
@@ -119,10 +119,12 @@ a 'Location' header in the response with the RESTful URL location of the newly c
 id of the newly created resource is parsed out of the Location response header and automatically set
 as the id of the ARes object.
 
-  # {"person":{"first":"Tyler","last":"Durden"}}
+  # {"first":"Tyler","last":"Durden"}
   #
   # is submitted as the body on
   #
+  # if include_root_in_json is set to true => {"person":{"first":"Tyler"}}
+  #
   # POST http://api.people.com:3000/people.json
   #
   # when save is called on a new Person object.  An empty response is
@@ -142,10 +144,12 @@ as the id of the ARes object.
 with the exception that no response headers are needed -- just an empty response when the update on the
 server side was successful.
 
-  # {"person":{"first":"Tyler"}}
+  # {"first":"Tyler"}
   #
   # is submitted as the body on
   #
+  # if include_root_in_json is set to true => {"person":{"first":"Tyler"}}
+  #
   # PUT http://api.people.com:3000/people/1.json
   #
   # when save is called on an existing Person object.  An empty response is
@@ -207,11 +211,18 @@ Active Resource is released under the MIT license:
 
 * http://www.opensource.org/licenses/MIT
 
+== Contributing to Active Resource
+
+Active Resource is work of many contributors. You're encouraged to submit pull requests, propose
+features and discuss issues.
+
+See {CONTRIBUTING}[https://github.com/rails/activeresource/blob/master/CONTRIBUTING.md].
+
 == Support
 
 API documentation is at
 
-* http://api.rubyonrails.org
+* http://rubydoc.info/gems/activeresource/4.0.0/frames
 
 Bug reports and feature requests can be filed with the rest for the Ruby on Rails project here:
 

data/lib/active_resource.rb

@@ -41,3 +41,6 @@ module ActiveResource
   autoload :Validations
   autoload :Collection
 end
+
+require 'active_resource/railtie' if defined? Rails
+

data/lib/active_resource/associations.rb

@@ -14,7 +14,7 @@ module ActiveResource::Associations
   # === Options
   # [:class_name]
   #   Specify the class name of the association. This class name would
-  #   be used for resolving the association class. 
+  #   be used for resolving the association class.
   #
   # ==== Example for [:class_name] - option
   # GET /posts/123.json delivers following response body:
@@ -48,7 +48,7 @@ module ActiveResource::Associations
   # === Options
   # [:class_name]
   #   Specify the class name of the association. This class name would
-  #   be used for resolving the association class. 
+  #   be used for resolving the association class.
   #
   # ==== Example for [:class_name] - option
   # GET /posts/1.json delivers following response body:
@@ -67,14 +67,14 @@ module ActiveResource::Associations
   # If the response body does not contain an attribute matching the association name
   # a request is sent to a singelton path under the current resource.
   # For example, if a Product class <tt>has_one :inventory</tt> calling <tt>Product#inventory</tt>
-  # will generate a request on /product/:product_id/inventory.json.
+  # will generate a request on /products/:product_id/inventory.json.
   #
   def has_one(name, options = {})
     Builder::HasOne.build(self, name, options)
   end
 
   # Specifies a one-to-one association with another class. This class should only be used
-  # if this class contains the foreign key. 
+  # if this class contains the foreign key.
   #
   # Methods will be added for retrieval and query for a single associated object, for which
   # this object holds an id:
@@ -83,7 +83,7 @@ module ActiveResource::Associations
   #   Returns the associated object. +nil+ is returned if the foreign key is +nil+.
   #   Throws a ActiveResource::ResourceNotFound exception if the foreign key is not +nil+
   #   and the resource is not found.
-  # 
+  #
   # (+association+ is replaced with the symbol passed as the first argument, so
   # <tt>belongs_to :post</tt> would add among others <tt>post.nil?</tt>.
   #
@@ -130,8 +130,8 @@ module ActiveResource::Associations
         instance_variable_get(ivar_name)
       elsif attributes.include?(method_name)
         attributes[method_name]
-      else
-        instance_variable_set(ivar_name, association_model.find(send(finder_key)))
+      elsif association_id = send(finder_key)
+        instance_variable_set(ivar_name, association_model.find(association_id))
       end
     end
   end
@@ -144,12 +144,14 @@ module ActiveResource::Associations
         instance_variable_get(ivar_name)
       elsif attributes.include?(method_name)
         attributes[method_name]
-      else
+      elsif !new_record?
         instance_variable_set(ivar_name, association_model.find(:all, :params => {:"#{self.class.element_name}_id" => self.id}))
+      else
+        instance_variable_set(ivar_name, self.class.collection_parser.new)
       end
     end
   end
-  
+
   # Defines the has_one association
   def defines_has_one_finder_method(method_name, association_model)
     ivar_name = :"@#{method_name}"
@@ -159,8 +161,10 @@ module ActiveResource::Associations
         instance_variable_get(ivar_name)
       elsif attributes.include?(method_name)
         attributes[method_name]
-      else
+      elsif association_model.respond_to?(:singleton_name)
         instance_variable_set(ivar_name, association_model.find(:params => {:"#{self.class.element_name}_id" => self.id}))
+      else
+        instance_variable_set(ivar_name, association_model.find(:one, :from => "/#{self.class.collection_name}/#{self.id}/#{method_name}#{self.class.format_extension}"))
       end
     end
   end

data/lib/active_resource/base.rb

@@ -18,6 +18,7 @@ require 'active_resource/schema'
 require 'active_resource/log_subscriber'
 require 'active_resource/associations'
 require 'active_resource/reflection'
+require 'active_resource/threadsafe_attributes'
 
 module ActiveResource
   # ActiveResource::Base is the main class for mapping RESTful resources as models in a Rails application.
@@ -283,6 +284,16 @@ module ActiveResource
   # Internally, Active Resource relies on Ruby's Net::HTTP library to make HTTP requests. Setting +timeout+
   # sets the <tt>read_timeout</tt> of the internal Net::HTTP instance to the same value. The default
   # <tt>read_timeout</tt> is 60 seconds on most Ruby implementations.
+  #
+  # Active Resource also supports distinct +open_timeout+ (time to connect) and +read_timeout+ (how long to
+  # wait for an upstream response). This is inline with supported +Net::HTTP+ timeout configuration and allows
+  # for finer control of client timeouts depending on context.
+  #
+  #   class Person < ActiveResource::Base
+  #     self.site = "https://api.people.com"
+  #     self.open_timeout = 2
+  #     self.read_timeout = 10
+  #   end
   class Base
     ##
     # :singleton-method:
@@ -294,7 +305,11 @@ module ActiveResource
     class_attribute :include_format_in_path
     self.include_format_in_path = true
 
+
     class << self
+      include ThreadsafeAttributes
+      threadsafe_attribute :_headers, :_connection, :_user, :_password, :_site, :_proxy
+
       # Creates a schema for this resource - setting the attributes that are
       # known prior to fetching an instance from the remote system.
       #
@@ -339,7 +354,7 @@ module ActiveResource
       #
       #   p.num_children        # => NoMethodError
       #
-      # Attribute-types must be one of: <tt>string, integer, float</tt>
+      # Attribute-types must be one of: <tt>string, text, integer, float, decimal, datetime, timestamp, time, date, binary, boolean</tt>
       #
       # Note: at present the attribute-type doesn't do anything, but stay
       # tuned...
@@ -431,8 +446,8 @@ module ActiveResource
         #   Subclass.site # => 'https://anonymous@test.com'
         #   Subclass.site.user = 'david' # => TypeError: can't modify frozen object
         #
-        if defined?(@site)
-          @site
+        if _site_defined?
+          _site
         elsif superclass != Object && superclass.site
           superclass.site.dup.freeze
         end
@@ -441,21 +456,21 @@ module ActiveResource
       # Sets the URI of the REST resources to map for this class to the value in the +site+ argument.
       # The site variable is required for Active Resource's mapping to work.
       def site=(site)
-        @connection = nil
+        self._connection = nil
         if site.nil?
-          @site = nil
+          self._site = nil
         else
-          @site = create_site_uri_from(site)
-          @user = URI.parser.unescape(@site.user) if @site.user
-          @password = URI.parser.unescape(@site.password) if @site.password
+          self._site = create_site_uri_from(site)
+          self._user = URI.parser.unescape(_site.user) if _site.user
+          self._password = URI.parser.unescape(_site.password) if _site.password
         end
       end
 
       # Gets the \proxy variable if a proxy is required
       def proxy
         # Not using superclass_delegating_reader. See +site+ for explanation
-        if defined?(@proxy)
-          @proxy
+        if _proxy_defined?
+          _proxy
         elsif superclass != Object && superclass.proxy
           superclass.proxy.dup.freeze
         end
@@ -463,15 +478,15 @@ module ActiveResource
 
       # Sets the URI of the http proxy to the value in the +proxy+ argument.
       def proxy=(proxy)
-        @connection = nil
-        @proxy = proxy.nil? ? nil : create_proxy_uri_from(proxy)
+        self._connection = nil
+        self._proxy = proxy.nil? ? nil : create_proxy_uri_from(proxy)
       end
 
       # Gets the \user for REST HTTP authentication.
       def user
         # Not using superclass_delegating_reader. See +site+ for explanation
-        if defined?(@user)
-          @user
+        if _user_defined?
+          _user
         elsif superclass != Object && superclass.user
           superclass.user.dup.freeze
         end
@@ -479,15 +494,15 @@ module ActiveResource
 
       # Sets the \user for REST HTTP authentication.
       def user=(user)
-        @connection = nil
-        @user = user
+        self._connection = nil
+        self._user = user
       end
 
       # Gets the \password for REST HTTP authentication.
       def password
         # Not using superclass_delegating_reader. See +site+ for explanation
-        if defined?(@password)
-          @password
+        if _password_defined?
+          _password
         elsif superclass != Object && superclass.password
           superclass.password.dup.freeze
         end
@@ -495,8 +510,8 @@ module ActiveResource
 
       # Sets the \password for REST HTTP authentication.
       def password=(password)
-        @connection = nil
-        @password = password
+        self._connection = nil
+        self._password = password
       end
 
       def auth_type
@@ -506,7 +521,7 @@ module ActiveResource
       end
 
       def auth_type=(auth_type)
-        @connection = nil
+        self._connection = nil
         @auth_type = auth_type
       end
 
@@ -544,10 +559,22 @@ module ActiveResource
 
       # Sets the number of seconds after which requests to the REST API should time out.
       def timeout=(timeout)
-        @connection = nil
+        self._connection = nil
         @timeout = timeout
       end
 
+      # Sets the number of seconds after which connection attempts to the REST API should time out.
+      def open_timeout=(timeout)
+        self._connection = nil
+        @open_timeout = timeout
+      end
+
+      # Sets the number of seconds after which reads to the REST API should time out.
+      def read_timeout=(timeout)
+        self._connection = nil
+        @read_timeout = timeout
+      end
+
       # Gets the number of seconds after which requests to the REST API should time out.
       def timeout
         if defined?(@timeout)
@@ -557,6 +584,24 @@ module ActiveResource
         end
       end
 
+      # Gets the number of seconds after which connection attempts to the REST API should time out.
+      def open_timeout
+        if defined?(@open_timeout)
+          @open_timeout
+        elsif superclass != Object && superclass.open_timeout
+          superclass.open_timeout
+        end
+      end
+
+      # Gets the number of seconds after which reads to the REST API should time out.
+      def read_timeout
+        if defined?(@read_timeout)
+          @read_timeout
+        elsif superclass != Object && superclass.read_timeout
+          superclass.read_timeout
+        end
+      end
+
       # Options that will get applied to an SSL connection.
       #
       # * <tt>:key</tt> - An OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object.
@@ -569,7 +614,7 @@ module ActiveResource
       # * <tt>:cert_store</tt> - OpenSSL::X509::Store to verify peer certificate.
       # * <tt>:ssl_timeout</tt> -The SSL timeout in seconds.
       def ssl_options=(options)
-        @connection   = nil
+        self._connection = nil
         @ssl_options  = options
       end
 
@@ -586,27 +631,28 @@ module ActiveResource
       # The +refresh+ parameter toggles whether or not the \connection is refreshed at every request
       # or not (defaults to <tt>false</tt>).
       def connection(refresh = false)
-        if defined?(@connection) || superclass == Object
-          @connection = Connection.new(site, format) if refresh || @connection.nil?
-          @connection.proxy = proxy if proxy
-          @connection.user = user if user
-          @connection.password = password if password
-          @connection.auth_type = auth_type if auth_type
-          @connection.timeout = timeout if timeout
-          @connection.ssl_options = ssl_options if ssl_options
-          @connection
+        if _connection_defined? || superclass == Object
+          self._connection = Connection.new(site, format) if refresh || _connection.nil?
+          _connection.proxy = proxy if proxy
+          _connection.user = user if user
+          _connection.password = password if password
+          _connection.auth_type = auth_type if auth_type
+          _connection.timeout = timeout if timeout
+          _connection.open_timeout = open_timeout if open_timeout
+          _connection.read_timeout = read_timeout if read_timeout
+          _connection.ssl_options = ssl_options if ssl_options
+          _connection
         else
           superclass.connection
         end
       end
 
       def headers
-        @headers ||= {}
-
+        self._headers ||= {}
         if superclass != Object && superclass.headers
-          @headers = superclass.headers.merge(@headers)
+          self._headers = superclass.headers.merge(_headers)
         else
-          @headers
+          _headers
         end
       end
 
@@ -774,7 +820,7 @@ module ActiveResource
       # Returns the new resource instance.
       #
       def build(attributes = {})
-        attrs = self.format.decode(connection.get("#{new_element_path(attributes)}", headers).body)
+        attrs = self.format.decode(connection.get("#{new_element_path(attributes)}", headers).body).merge(attributes)
         self.new(attrs)
       end
 
@@ -871,8 +917,8 @@ module ActiveResource
 
         case scope
           when :all   then find_every(options)
-          when :first then find_every(options).first
-          when :last  then find_every(options).last
+          when :first then find_every(options).to_a.first
+          when :last  then find_every(options).to_a.last
           when :one   then find_one(options)
           else             find_single(scope, options)
         end
@@ -1560,4 +1606,7 @@ module ActiveResource
     include ActiveModel::Serializers::Xml
     include ActiveResource::Reflection
   end
+
+  ActiveSupport.run_load_hooks(:active_resource, Base)
 end
+

data/lib/active_resource/collection.rb

@@ -4,7 +4,7 @@ require 'active_support/inflector'
 module ActiveResource # :nodoc:
   class Collection # :nodoc:
     include Enumerable
-    delegate :to_xml, :to_yaml, :length, :collect, :map, :each, :all?, :include?, :to_ary, :size, :last, :first, :[], :to => :to_a
+    delegate :to_yaml, :all?, *Array.instance_methods(false), :to => :to_a
 
     # The array of actual elements returned by index actions
     attr_accessor :elements, :resource_class, :original_params
@@ -31,7 +31,7 @@ module ActiveResource # :nodoc:
     #
     #   class Post < ActiveResource::Base
     #     self.site = "http://example.com"
-    #     self.collection_parser = PostParser
+    #     self.collection_parser = PostCollection
     #   end
     #
     # And the collection parser:

data/lib/active_resource/connection.rb

@@ -20,7 +20,7 @@ module ActiveResource
       :head => 'Accept'
     }
 
-    attr_reader :site, :user, :password, :auth_type, :timeout, :proxy, :ssl_options
+    attr_reader :site, :user, :password, :auth_type, :timeout, :open_timeout, :read_timeout, :proxy, :ssl_options
     attr_accessor :format
 
     class << self
@@ -33,7 +33,7 @@ module ActiveResource
     # attribute to the URI for the remote resource service.
     def initialize(site, format = ActiveResource::Formats::JsonFormat)
       raise ArgumentError, 'Missing site URI' unless site
-      @user = @password = nil
+      @proxy = @user = @password = nil
       self.site = site
       self.format = format
     end
@@ -71,6 +71,16 @@ module ActiveResource
       @timeout = timeout
     end
 
+    # Sets the number of seconds after which HTTP connects to the remote service should time out.
+    def open_timeout=(timeout)
+      @open_timeout = timeout
+    end
+
+    # Sets the number of seconds after which HTTP read requests to the remote service should time out.
+    def read_timeout=(timeout)
+      @read_timeout = timeout
+    end
+
     # Hash of options applied to Net::HTTP instance when +site+ protocol is 'https'.
     def ssl_options=(options)
       @ssl_options = options
@@ -180,6 +190,8 @@ module ActiveResource
             https.open_timeout = @timeout
             https.read_timeout = @timeout
           end
+          https.open_timeout = @open_timeout if defined?(@open_timeout)
+          https.read_timeout = @read_timeout if defined?(@read_timeout)
         end
       end
 
@@ -260,16 +272,19 @@ module ActiveResource
       end
 
       def auth_attributes_for(uri, request_digest, params)
-        [
-          %Q(username="#{@user}"),
-          %Q(realm="#{params['realm']}"),
-          %Q(qop="#{params['qop']}"),
-          %Q(uri="#{uri.path}"),
-          %Q(nonce="#{params['nonce']}"),
-          %Q(nc="0"),
-          %Q(cnonce="#{params['cnonce']}"),
-          %Q(opaque="#{params['opaque']}"),
-          %Q(response="#{request_digest}")].join(", ")
+        auth_attrs =
+          [
+            %Q(username="#{@user}"),
+            %Q(realm="#{params['realm']}"),
+            %Q(qop="#{params['qop']}"),
+            %Q(uri="#{uri.path}"),
+            %Q(nonce="#{params['nonce']}"),
+            %Q(nc="0"),
+            %Q(cnonce="#{params['cnonce']}"),
+            %Q(response="#{request_digest}")]
+
+        auth_attrs << %Q(opaque="#{params['opaque']}") unless params['opaque'].blank?
+        auth_attrs.join(", ")
       end
 
       def http_format_header(http_method)

data/lib/active_resource/http_mock.rb

@@ -214,6 +214,31 @@ module ActiveResource
         requests.clear
         responses.clear
       end
+
+      # Enables all ActiveResource::Connection instances to use real
+      # Net::HTTP instance instead of a mock.
+      def enable_net_connection!
+        @@net_connection_enabled = true
+      end
+
+      # Sets all ActiveResource::Connection to use HttpMock instances.
+      def disable_net_connection!
+        @@net_connection_enabled = false
+      end
+
+      # Checks if real requests can be used instead of the default mock used in tests.
+      def net_connection_enabled?
+        if defined?(@@net_connection_enabled)
+          @@net_connection_enabled
+        else
+          @@net_connection_enabled = false
+        end
+      end
+
+      def net_connection_disabled?
+        !net_connection_enabled?
+      end
+
     end
 
     # body?       methods
@@ -325,8 +350,26 @@ module ActiveResource
     private
       silence_warnings do
         def http
-          @http ||= HttpMock.new(@site)
+          if unstub_http?
+            @http = configure_http(new_http)
+          elsif stub_http?
+            @http = http_stub
+          end
+          @http ||= http_stub
         end
+
+        def http_stub
+          HttpMock.new(@site)
+        end
+
+        def unstub_http?
+          HttpMock.net_connection_enabled? && defined?(@http) && @http.kind_of?(HttpMock)
+        end
+
+        def stub_http?
+          HttpMock.net_connection_disabled? && defined?(@http) && @http.kind_of?(Net::HTTP)
+        end
+
       end
   end
 end

data/lib/active_resource/railtie.rb

@@ -10,5 +10,16 @@ module ActiveResource
         ActiveResource::Base.send "#{k}=", v
       end
     end
+
+    config.after_initialize do |app|
+      ActiveSupport.on_load(:active_resource) do
+        ActiveResource::Base.instantiate_observers
+
+        ActionDispatch::Reloader.to_prepare do
+          ActiveResource::Base.instantiate_observers
+        end
+      end
+    end
   end
-end
+end
+

data/lib/active_resource/singleton.rb

@@ -71,7 +71,7 @@ module ActiveResource
 
         path = singleton_path(prefix_options, query_options)
         resp = self.format.decode(self.connection.get(path, self.headers).body)
-        instantiate_record(resp, {})
+        instantiate_record(resp, prefix_options)
       end
 
     end

data/lib/active_resource/threadsafe_attributes.rb

@@ -0,0 +1,61 @@
+module ThreadsafeAttributes
+  def self.included(klass)
+    klass.extend(ClassMethods)
+  end
+
+  module ClassMethods
+    def threadsafe_attribute(*attrs)
+      attrs.each do |attr|
+        define_method attr do
+          get_threadsafe_attribute(attr)
+        end
+
+        define_method "#{attr}=" do |value|
+          set_threadsafe_attribute(attr, value)
+        end
+
+        define_method "#{attr}_defined?" do
+          threadsafe_attribute_defined?(attr)
+        end
+      end
+    end
+  end
+
+  private
+
+  def get_threadsafe_attribute(name)
+    if threadsafe_attribute_defined_by_thread?(name, Thread.current)
+      get_threadsafe_attribute_by_thread(name, Thread.current)
+    elsif threadsafe_attribute_defined_by_thread?(name, Thread.main)
+      value = get_threadsafe_attribute_by_thread(name, Thread.main)
+      value = value.dup if value
+      set_threadsafe_attribute_by_thread(name, value, Thread.current)
+      value
+    end
+  end
+
+  def set_threadsafe_attribute(name, value)
+    set_threadsafe_attribute_by_thread(name, value, Thread.current)
+    unless threadsafe_attribute_defined_by_thread?(name, Thread.main)
+      set_threadsafe_attribute_by_thread(name, value, Thread.main)
+    end
+  end
+
+  def threadsafe_attribute_defined?(name)
+    threadsafe_attribute_defined_by_thread?(name, Thread.current) || ((Thread.current != Thread.main) && threadsafe_attribute_defined_by_thread?(name, Thread.main))
+  end
+
+  def get_threadsafe_attribute_by_thread(name, thread)
+    thread["active.resource.#{name}.#{self.object_id}"]
+  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 threadsafe_attribute_defined_by_thread?(name, thread)
+    thread["active.resource.#{name}.#{self.object_id}.defined"]
+  end
+
+end

data/lib/active_resource/validations.rb

@@ -13,7 +13,7 @@ module ActiveResource
     # or not (by passing true).
     def from_array(messages, save_cache = false)
       clear unless save_cache
-      humanized_attributes = Hash[@base.attributes.keys.map { |attr_name| [attr_name.humanize, attr_name] }]
+      humanized_attributes = Hash[@base.known_attributes.map { |attr_name| [attr_name.humanize, attr_name] }]
       messages.each do |message|
         attr_message = humanized_attributes.keys.sort_by { |a| -a.length }.detect do |attr_name|
           if message[0, attr_name.size + 1] == "#{attr_name} "
@@ -35,7 +35,7 @@ module ActiveResource
 
       messages.each do |(key,errors)|
         errors.each do |error|
-          if @base.attributes.keys.include?(key)
+          if @base.known_attributes.include?(key)
             add key, error
           elsif key == 'base'
             self[:base] << error

data/lib/active_resource/version.rb

@@ -1,7 +1,7 @@
 module ActiveResource
   module VERSION #:nodoc:
     MAJOR = 4
-    MINOR = 0
+    MINOR = 1
     TINY  = 0
     PRE   = nil
 

data/lib/activeresource.rb

@@ -0,0 +1 @@
+require 'active_resource'

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: activeresource
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rails-observers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.0
 description: REST on Rails. Wrap your RESTful web app with Ruby classes and work with
@@ -89,20 +89,21 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - README.rdoc
+- lib/active_resource.rb
+- lib/active_resource/associations.rb
 - lib/active_resource/associations/builder/association.rb
 - lib/active_resource/associations/builder/belongs_to.rb
 - lib/active_resource/associations/builder/has_many.rb
 - lib/active_resource/associations/builder/has_one.rb
-- lib/active_resource/associations.rb
 - lib/active_resource/base.rb
 - lib/active_resource/callbacks.rb
 - lib/active_resource/collection.rb
 - lib/active_resource/connection.rb
 - lib/active_resource/custom_methods.rb
 - lib/active_resource/exceptions.rb
+- lib/active_resource/formats.rb
 - lib/active_resource/formats/json_format.rb
 - lib/active_resource/formats/xml_format.rb
-- lib/active_resource/formats.rb
 - lib/active_resource/http_mock.rb
 - lib/active_resource/log_subscriber.rb
 - lib/active_resource/observing.rb
@@ -110,32 +111,33 @@ files:
 - lib/active_resource/reflection.rb
 - lib/active_resource/schema.rb
 - lib/active_resource/singleton.rb
+- lib/active_resource/threadsafe_attributes.rb
 - lib/active_resource/validations.rb
 - lib/active_resource/version.rb
-- lib/active_resource.rb
+- lib/activeresource.rb
 homepage: http://www.rubyonrails.org
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: REST modeling framework (part of Rails).