activeresource 3.2.22.5 → 5.1.1

data/lib/active_resource/associations/builder/association.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module ActiveResource::Associations::Builder
+  class Association #:nodoc:
+    # providing a Class-Variable, which will have a different store of subclasses
+    class_attribute :valid_options
+    self.valid_options = [:class_name]
+
+    # would identify subclasses of association
+    class_attribute :macro
+
+    attr_reader :model, :name, :options, :klass
+
+    def self.build(model, name, options)
+      new(model, name, options).build
+    end
+
+    def initialize(model, name, options)
+      @model, @name, @options = model, name, options
+    end
+
+    def build
+      validate_options
+      model.create_reflection(self.class.macro, name, options)
+    end
+
+    private
+
+      def validate_options
+        options.assert_valid_keys(self.class.valid_options)
+      end
+  end
+end

data/lib/active_resource/associations/builder/belongs_to.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module ActiveResource::Associations::Builder
+  class BelongsTo < Association
+    self.valid_options += [:foreign_key]
+
+    self.macro = :belongs_to
+
+    def build
+      validate_options
+      reflection = model.create_reflection(self.class.macro, name, options)
+      model.defines_belongs_to_finder_method(reflection)
+      reflection
+    end
+  end
+end

data/lib/active_resource/associations/builder/has_many.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module ActiveResource::Associations::Builder
+  class HasMany < Association
+    self.macro = :has_many
+
+    def build
+      validate_options
+      model.create_reflection(self.class.macro, name, options).tap do |reflection|
+        model.defines_has_many_finder_method(reflection)
+      end
+    end
+  end
+end

data/lib/active_resource/associations/builder/has_one.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module ActiveResource::Associations::Builder
+  class HasOne < Association
+    self.macro = :has_one
+
+    def build
+      validate_options
+      model.create_reflection(self.class.macro, name, options).tap do |reflection|
+        model.defines_has_one_finder_method(reflection)
+      end
+    end
+  end
+end

data/lib/active_resource/base.rb

@@ -1,21 +1,28 @@
-require 'active_support'
-require 'active_support/core_ext/class/attribute_accessors'
-require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/core_ext/kernel/reporting'
-require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/module/aliasing'
-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_support/core_ext/uri'
-require 'active_resource/connection'
-require 'active_resource/formats'
-require 'active_resource/schema'
-require 'active_resource/log_subscriber'
+# frozen_string_literal: true
+
+require "active_support"
+require "active_support/core_ext/class/attribute_accessors"
+require "active_support/core_ext/class/attribute"
+require "active_support/core_ext/hash/indifferent_access"
+require "active_support/core_ext/kernel/reporting"
+require "active_support/core_ext/module/delegation"
+require "active_support/core_ext/module/aliasing"
+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_support/core_ext/uri"
+require "active_resource/connection"
+require "active_resource/formats"
+require "active_resource/schema"
+require "active_resource/log_subscriber"
+require "active_resource/associations"
+require "active_resource/reflection"
+require "active_resource/threadsafe_attributes"
+
+require "active_model/serializers/xml"
 
 module ActiveResource
   # ActiveResource::Base is the main class for mapping RESTful resources as models in a Rails application.
@@ -24,29 +31,29 @@ module ActiveResource
   #
   # == Automated mapping
   #
-  # Active Resource objects represent your RESTful resources as manipulatable Ruby objects.  To map resources
+  # Active Resource objects represent your RESTful resources as manipulatable Ruby objects. To map resources
   # to Ruby objects, Active Resource only needs a class name that corresponds to the resource name (e.g., the class
   # Person maps to the resources people, very similarly to Active Record) and a +site+ value, which holds the
   # URI of the resources.
   #
   #   class Person < ActiveResource::Base
-  #     self.site = "http://api.people.com:3000/"
+  #     self.site = "https://api.people.com"
   #   end
   #
-  # Now the Person class is mapped to RESTful resources located at <tt>http://api.people.com:3000/people/</tt>, and
+  # Now the Person class is mapped to RESTful resources located at <tt>https://api.people.com/people/</tt>, and
   # you can now use Active Resource's life cycle methods to manipulate resources. In the case where you already have
   # an existing model with the same name as the desired RESTful resource you can set the +element_name+ value.
   #
   #   class PersonResource < ActiveResource::Base
-  #     self.site = "http://api.people.com:3000/"
+  #     self.site = "https://api.people.com"
   #     self.element_name = "person"
   #   end
   #
   # If your Active Resource object is required to use an HTTP proxy you can set the +proxy+ value which holds a URI.
   #
   #   class PersonResource < ActiveResource::Base
-  #     self.site = "http://api.people.com:3000/"
-  #     self.proxy = "http://user:password@proxy.people.com:8080"
+  #     self.site = "https://api.people.com"
+  #     self.proxy = "https://user:password@proxy.people.com:8080"
   #   end
   #
   #
@@ -76,7 +83,7 @@ module ActiveResource
   #
   # Since simple CRUD/life cycle methods can't accomplish every task, Active Resource also supports
   # defining your own custom REST methods. To invoke them, Active Resource provides the <tt>get</tt>,
-  # <tt>post</tt>, <tt>put</tt> and <tt>\delete</tt> methods where you can specify a custom REST method
+  # <tt>post</tt>, <tt>put</tt> and <tt>delete</tt> methods where you can specify a custom REST method
   # name to invoke.
   #
   #   # POST to the custom 'register' REST method, i.e. POST /people/new/register.json.
@@ -102,7 +109,7 @@ module ActiveResource
   # You can validate resources client side by overriding validation methods in the base class.
   #
   #   class Person < ActiveResource::Base
-  #      self.site = "http://api.people.com:3000/"
+  #      self.site = "https://api.people.com"
   #      protected
   #        def validate
   #          errors.add("last", "has invalid characters") unless last =~ /[a-zA-Z]*/
@@ -113,47 +120,64 @@ module ActiveResource
   #
   # == Authentication
   #
-  # Many REST APIs will require authentication, usually in the form of basic
-  # HTTP authentication.  Authentication can be specified by:
+  # Many REST APIs require authentication. The HTTP spec describes two ways to
+  # make requests with a username and password (see RFC 2617).
   #
-  # === HTTP Basic Authentication
-  # * putting the credentials in the URL for the +site+ variable.
+  # Basic authentication simply sends a username and password along with HTTP
+  # requests. These sensitive credentials are sent unencrypted, visible to
+  # any onlooker, so this scheme should only be used with SSL.
+  #
+  # Digest authentication sends a crytographic hash of the username, password,
+  # HTTP method, URI, and a single-use secret key provided by the server.
+  # Sensitive credentials aren't visible to onlookers, so digest authentication
+  # doesn't require SSL. However, this doesn't mean the connection is secure!
+  # Just the username and password.
+  #
+  # (You really, really want to use SSL. There's little reason not to.)
+  #
+  # === Picking an authentication scheme
+  #
+  # Basic authentication is the default. To switch to digest authentication,
+  # set +auth_type+ to +:digest+:
   #
   #    class Person < ActiveResource::Base
-  #      self.site = "http://ryan:password@api.people.com:3000/"
+  #      self.auth_type = :digest
   #    end
   #
-  # * defining +user+ and/or +password+ variables
+  # === Setting the username and password
+  #
+  # Set +user+ and +password+ on the class, or include them in the +site+ URL.
   #
   #    class Person < ActiveResource::Base
-  #      self.site = "http://api.people.com:3000/"
+  #      # Set user and password directly:
   #      self.user = "ryan"
   #      self.password = "password"
-  #    end
   #
-  # For obvious security reasons, it is probably best if such services are available
-  # over HTTPS.
-  #
-  # Note: Some values cannot be provided in the URL passed to site.  e.g. email addresses
-  # as usernames.  In those situations you should use the separate user and password option.
+  #      # Or include them in the site:
+  #      self.site = "https://ryan:password@api.people.com"
+  #    end
   #
   # === Certificate Authentication
   #
-  # * End point uses an X509 certificate for authentication. <tt>See ssl_options=</tt> for all options.
+  # You can also authenticate using an X509 certificate. <tt>See ssl_options=</tt> for all options.
   #
   #    class Person < ActiveResource::Base
   #      self.site = "https://secure.api.people.com/"
-  #      self.ssl_options = {:cert         => OpenSSL::X509::Certificate.new(File.open(pem_file))
-  #                          :key          => OpenSSL::PKey::RSA.new(File.open(pem_file)),
-  #                          :ca_path      => "/path/to/OpenSSL/formatted/CA_Certs",
-  #                          :verify_mode  => OpenSSL::SSL::VERIFY_PEER}
+  #
+  #      File.open(pem_file_path, 'rb') do |pem_file|
+  #        self.ssl_options = {
+  #          cert:        OpenSSL::X509::Certificate.new(pem_file),
+  #          key:         OpenSSL::PKey::RSA.new(pem_file),
+  #          ca_path:     "/path/to/OpenSSL/formatted/CA_Certs",
+  #          verify_mode: OpenSSL::SSL::VERIFY_PEER }
+  #      end
   #    end
   #
   #
   # == Errors & Validation
   #
   # Error handling and validation is handled in much the same manner as you're used to seeing in
-  # Active Record.  Both the response code in the HTTP response and the body of the response are used to
+  # Active Record. Both the response code in the HTTP response and the body of the response are used to
   # indicate that an error occurred.
   #
   # === Resource errors
@@ -162,7 +186,7 @@ module ActiveResource
   # response code will be returned from the server which will raise an ActiveResource::ResourceNotFound
   # exception.
   #
-  #   # GET http://api.people.com:3000/people/999.json
+  #   # GET https://api.people.com/people/999.json
   #   ryan = Person.find(999) # 404, raises ActiveResource::ResourceNotFound
   #
   #
@@ -184,7 +208,7 @@ module ActiveResource
   # * Other - ActiveResource::ConnectionError
   #
   # These custom exceptions allow you to deal with resource errors more naturally and with more precision
-  # rather than returning a general HTTP error.  For example:
+  # rather than returning a general HTTP error. For example:
   #
   #   begin
   #     ryan = Person.find(my_id)
@@ -198,7 +222,7 @@ module ActiveResource
   # an ActiveResource::MissingPrefixParam will be raised.
   #
   #  class Comment < ActiveResource::Base
-  #    self.site = "http://someip.com/posts/:post_id/"
+  #    self.site = "https://someip.com/posts/:post_id"
   #  end
   #
   #  Comment.find(1)
@@ -207,8 +231,8 @@ module ActiveResource
   # === Validation errors
   #
   # Active Resource supports validations on resources and will return errors if any of these validations fail
-  # (e.g., "First name can not be blank" and so on).  These types of errors are denoted in the response by
-  # a response code of <tt>422</tt> and an XML or JSON representation of the validation errors.  The save operation will
+  # (e.g., "First name can not be blank" and so on). These types of errors are denoted in the response by
+  # a response code of <tt>422</tt> and an JSON or XML representation of the validation errors. The save operation will
   # then fail (with a <tt>false</tt> return value) and the validation errors can be accessed on the resource in question.
   #
   #   ryan = Person.find(1)
@@ -216,20 +240,29 @@ module ActiveResource
   #   ryan.save  # => false
   #
   #   # When
-  #   # PUT http://api.people.com:3000/people/1.json
+  #   # PUT https://api.people.com/people/1.xml
   #   # or
-  #   # PUT http://api.people.com:3000/people/1.json
+  #   # PUT https://api.people.com/people/1.json
   #   # is requested with invalid values, the response is:
   #   #
   #   # Response (422):
   #   # <errors><error>First cannot be empty</error></errors>
   #   # or
-  #   # {"errors":["First cannot be empty"]}
+  #   # {"errors":{"first":["cannot be empty"]}}
   #   #
   #
   #   ryan.errors.invalid?(:first)  # => true
   #   ryan.errors.full_messages     # => ['First cannot be empty']
   #
+  # For backwards-compatibility with older endpoints, the following formats are also supported in JSON responses:
+  #
+  #   # {"errors":['First cannot be empty']}
+  #   #   This was the required format for previous versions of ActiveResource
+  #   # {"first":["cannot be empty"]}
+  #   #   This was the default format produced by respond_with in ActionController <3.2.1
+  #
+  # Parsing either of these formats will result in a deprecation warning.
+  #
   # Learn more about Active Resource's validation features in the ActiveResource::Validations documentation.
   #
   # === Timeouts
@@ -239,7 +272,7 @@ module ActiveResource
   # amount of time before Active Resource times out with the +timeout+ variable.
   #
   #   class Person < ActiveResource::Base
-  #     self.site = "http://api.people.com:3000/"
+  #     self.site = "https://api.people.com"
   #     self.timeout = 5
   #   end
   #
@@ -255,15 +288,39 @@ 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:
     # The logger for diagnosing and tracing Active Resource calls.
-    cattr_accessor :logger
+    cattr_reader :logger
+
+    def self.logger=(logger)
+      self._connection = nil
+      @@logger = logger
+    end
 
     class_attribute :_format
+    class_attribute :_collection_parser
+    class_attribute :include_format_in_path
+    self.include_format_in_path = true
+
+    class_attribute :connection_class
+    self.connection_class = Connection
 
     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.
       #
@@ -276,39 +333,39 @@ module ActiveResource
       # remote system.
       #
       # example:
-      # class Person < ActiveResource::Base
-      #   schema do
-      #     # define each attribute separately
-      #     attribute 'name', :string
-      #
-      #     # or use the convenience methods and pass >=1 attribute names
-      #     string  'eye_color', 'hair_color'
-      #     integer 'age'
-      #     float   'height', 'weight'
-      #
-      #     # unsupported types should be left as strings
-      #     # overload the accessor methods if you need to convert them
-      #     attribute 'created_at', 'string'
+      #   class Person < ActiveResource::Base
+      #     schema do
+      #       # define each attribute separately
+      #       attribute 'name', :string
+      #
+      #       # or use the convenience methods and pass >=1 attribute names
+      #       string  'eye_color', 'hair_color'
+      #       integer 'age'
+      #       float   'height', 'weight'
+      #
+      #       # unsupported types should be left as strings
+      #       # overload the accessor methods if you need to convert them
+      #       attribute 'created_at', 'string'
+      #     end
       #   end
-      # end
       #
-      # p = Person.new
-      # p.respond_to? :name   # => true
-      # p.respond_to? :age    # => true
-      # p.name                # => nil
-      # p.age                 # => nil
+      #   p = Person.new
+      #   p.respond_to? :name   # => true
+      #   p.respond_to? :age    # => true
+      #   p.name                # => nil
+      #   p.age                 # => nil
       #
-      # j = Person.find_by_name('John') # <person><name>John</name><age>34</age><num_children>3</num_children></person>
-      # j.respond_to? :name   # => true
-      # j.respond_to? :age    # => true
-      # j.name                # => 'John'
-      # j.age                 # => '34'  # note this is a string!
-      # j.num_children        # => '3'  # note this is a string!
+      #   j = Person.find_by_name('John')
+      #   <person><name>John</name><age>34</age><num_children>3</num_children></person>
+      #   j.respond_to? :name   # => true
+      #   j.respond_to? :age    # => true
+      #   j.name                # => 'John'
+      #   j.age                 # => '34'  # note this is a string!
+      #   j.num_children        # => '3'  # note this is a string!
       #
-      # p.num_children        # => NoMethodError
+      #   p.num_children        # => NoMethodError
       #
-      # Attribute-types must be one of:
-      #  string, integer, float
+      # 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...
@@ -328,12 +385,12 @@ module ActiveResource
           @schema ||= {}.with_indifferent_access
           @known_attributes ||= []
 
-          schema_definition.attrs.each do |k,v|
+          schema_definition.attrs.each do |k, v|
             @schema[k] = v
             @known_attributes << k
           end
 
-          schema
+          @schema
         else
           @schema ||= nil
         end
@@ -349,9 +406,9 @@ module ActiveResource
       #
       # example:
       #
-      # class Person < ActiveResource::Base
-      #   schema = {'name' => :string, 'age' => :integer }
-      # end
+      #   class Person < ActiveResource::Base
+      #     schema = {'name' => :string, 'age' => :integer }
+      #   end
       #
       # The keys/values can be strings or symbols. They will be converted to
       # strings.
@@ -367,7 +424,7 @@ module ActiveResource
         raise ArgumentError, "Expected a hash" unless the_schema.kind_of? Hash
 
         schema do
-          the_schema.each {|k,v| attribute(k,v) }
+          the_schema.each { |k, v| attribute(k, v) }
         end
       end
 
@@ -375,33 +432,33 @@ module ActiveResource
       # from the provided <tt>schema</tt>
       # Attributes that are known will cause your resource to return 'true'
       # when <tt>respond_to?</tt> is called on them. A known attribute will
-      # return nil if not set (rather than <t>MethodNotFound</tt>); thus
+      # return nil if not set (rather than <tt>MethodNotFound</tt>); thus
       # known attributes can be used with <tt>validates_presence_of</tt>
       # without a getter-method.
       def known_attributes
         @known_attributes ||= []
       end
 
-      # Gets the URI of the REST resources to map for this class.  The site variable is required for
+      # Gets the URI of the REST resources to map for this class. The site variable is required for
       # Active Resource's mapping to work.
       def site
         # Not using superclass_delegating_reader because don't want subclasses to modify superclass instance
         #
         # With superclass_delegating_reader
         #
-        #   Parent.site = 'http://anonymous@test.com'
-        #   Subclass.site # => 'http://anonymous@test.com'
+        #   Parent.site = 'https://anonymous@test.com'
+        #   Subclass.site # => 'https://anonymous@test.com'
         #   Subclass.site.user = 'david'
-        #   Parent.site # => 'http://david@test.com'
+        #   Parent.site # => 'https://david@test.com'
         #
         # Without superclass_delegating_reader (expected behavior)
         #
-        #   Parent.site = 'http://anonymous@test.com'
-        #   Subclass.site # => 'http://anonymous@test.com'
+        #   Parent.site = 'https://anonymous@test.com'
+        #   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
@@ -410,21 +467,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
@@ -432,15 +489,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
@@ -448,15 +505,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
@@ -464,8 +521,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
@@ -475,7 +532,7 @@ module ActiveResource
       end
 
       def auth_type=(auth_type)
-        @connection = nil
+        self._connection = nil
         @auth_type = auth_type
       end
 
@@ -501,12 +558,34 @@ module ActiveResource
         self._format || ActiveResource::Formats::JsonFormat
       end
 
+      # Sets the parser to use when a collection is returned.  The parser must be Enumerable.
+      def collection_parser=(parser_instance)
+        parser_instance = parser_instance.constantize if parser_instance.is_a?(String)
+        self._collection_parser = parser_instance
+      end
+
+      def collection_parser
+        self._collection_parser || ActiveResource::Collection
+      end
+
       # 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)
@@ -516,6 +595,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.
@@ -527,9 +624,9 @@ module ActiveResource
       # * <tt>:verify_depth</tt> - The maximum depth for the certificate chain verification.
       # * <tt>:cert_store</tt> - OpenSSL::X509::Store to verify peer certificate.
       # * <tt>:ssl_timeout</tt> -The SSL timeout in seconds.
-      def ssl_options=(opts={})
-        @connection   = nil
-        @ssl_options  = opts
+      def ssl_options=(options)
+        self._connection = nil
+        @ssl_options = options
       end
 
       # Returns the SSL options hash.
@@ -545,22 +642,31 @@ 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_class.new(
+            site, format, logger: logger
+          ) 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 ||= {}
+        headers_state = self._headers || {}
+        if superclass != Object
+          self._headers = superclass.headers.merge(headers_state)
+        else
+          headers_state
+        end
       end
 
       attr_writer :element_name
@@ -578,20 +684,28 @@ module ActiveResource
       attr_writer :primary_key
 
       def primary_key
-        @primary_key ||= 'id'
+        if defined?(@primary_key)
+          @primary_key
+        elsif superclass != Object && superclass.primary_key
+          primary_key = superclass.primary_key
+          return primary_key if primary_key.is_a?(Symbol)
+          primary_key.dup.freeze
+        else
+          "id"
+        end
       end
 
       # Gets the \prefix for a resource's nested URL (e.g., <tt>prefix/collectionname/1.json</tt>)
       # This method is regenerated at runtime based on what the \prefix is set to.
-      def prefix(options={})
+      def prefix(options = {})
         default = site.path
-        default << '/' unless default[-1..-1] == '/'
+        default << "/" unless default[-1..-1] == "/"
         # generate the actual method based on the current site path
         self.prefix = default
         prefix(options)
       end
 
-      # An attribute reader for the source string for the resource path \prefix.  This
+      # An attribute reader for the source string for the resource path \prefix. This
       # method is regenerated at runtime based on what the \prefix is set to.
       def prefix_source
         prefix # generate #prefix and #prefix_source methods first
@@ -600,7 +714,7 @@ module ActiveResource
 
       # Sets the \prefix for a resource's nested URL (e.g., <tt>prefix/collectionname/1.json</tt>).
       # Default value is <tt>site.path</tt>.
-      def prefix=(value = '/')
+      def prefix=(value = "/")
         # Replace :placeholders with '#{embedded options[:lookups]}'
         prefix_call = value.gsub(/:\w+/) { |key| "\#{URI.parser.escape options[#{key}].to_s}" }
 
@@ -624,12 +738,17 @@ module ActiveResource
       alias_method :set_element_name, :element_name=  #:nodoc:
       alias_method :set_collection_name, :collection_name=  #:nodoc:
 
-      # Gets the element path for the given ID in +id+.  If the +query_options+ parameter is omitted, Rails
+      def format_extension
+        include_format_in_path ? ".#{format.extension}" : ""
+      end
+
+      # Gets the element path for the given ID in +id+. If the +query_options+ parameter is omitted, Rails
       # will split from the \prefix options.
       #
       # ==== Options
       # +prefix_options+ - A \hash to add a \prefix to the request for nested URLs (e.g., <tt>:account_id => 19</tt>
-      #                    would yield a URL like <tt>/accounts/19/purchases.json</tt>).
+      # would yield a URL like <tt>/accounts/19/purchases.json</tt>).
+      #
       # +query_options+ - A \hash to add items to the query string for the request.
       #
       # ==== Examples
@@ -637,7 +756,7 @@ module ActiveResource
       #   # => /posts/1.json
       #
       #   class Comment < ActiveResource::Base
-      #     self.site = "http://37s.sunrise.i/posts/:post_id/"
+      #     self.site = "https://37s.sunrise.com/posts/:post_id"
       #   end
       #
       #   Comment.element_path(1, :post_id => 5)
@@ -653,30 +772,60 @@ module ActiveResource
         check_prefix_options(prefix_options)
 
         prefix_options, query_options = split_options(prefix_options) if query_options.nil?
-        "#{prefix(prefix_options)}#{collection_name}/#{URI.parser.escape id.to_s}.#{format.extension}#{query_string(query_options)}"
+        "#{prefix(prefix_options)}#{collection_name}/#{URI.encode_www_form_component(id.to_s)}#{format_extension}#{query_string(query_options)}"
+      end
+
+      # Gets the element url for the given ID in +id+. If the +query_options+ parameter is omitted, Rails
+      # will split from the \prefix options.
+      #
+      # ==== Options
+      # +prefix_options+ - A \hash to add a \prefix to the request for nested URLs (e.g., <tt>:account_id => 19</tt>
+      # would yield a URL like <tt>https://37s.sunrise.com/accounts/19/purchases.json</tt>).
+      #
+      # +query_options+ - A \hash to add items to the query string for the request.
+      #
+      # ==== Examples
+      #   Post.element_url(1)
+      #   # => https://37s.sunrise.com/posts/1.json
+      #
+      #   class Comment < ActiveResource::Base
+      #     self.site = "https://37s.sunrise.com/posts/:post_id"
+      #   end
+      #
+      #   Comment.element_url(1, :post_id => 5)
+      #   # => https://37s.sunrise.com/posts/5/comments/1.json
+      #
+      #   Comment.element_url(1, :post_id => 5, :active => 1)
+      #   # => https://37s.sunrise.com/posts/5/comments/1.json?active=1
+      #
+      #   Comment.element_url(1, {:post_id => 5}, {:active => 1})
+      #   # => https://37s.sunrise.com/posts/5/comments/1.json?active=1
+      #
+      def element_url(id, prefix_options = {}, query_options = nil)
+        URI.join(site, element_path(id, prefix_options, query_options)).to_s
       end
 
       # Gets the new element path for REST resources.
       #
       # ==== Options
       # * +prefix_options+ - A hash to add a prefix to the request for nested URLs (e.g., <tt>:account_id => 19</tt>
-      #   would yield a URL like <tt>/accounts/19/purchases/new.json</tt>).
+      # would yield a URL like <tt>/accounts/19/purchases/new.json</tt>).
       #
       # ==== Examples
       #   Post.new_element_path
       #   # => /posts/new.json
       #
       #   class Comment < ActiveResource::Base
-      #     self.site = "http://37s.sunrise.i/posts/:post_id/"
+      #     self.site = "https://37s.sunrise.com/posts/:post_id"
       #   end
       #
       #   Comment.collection_path(:post_id => 5)
       #   # => /posts/5/comments/new.json
       def new_element_path(prefix_options = {})
-        "#{prefix(prefix_options)}#{collection_name}/new.#{format.extension}"
+        "#{prefix(prefix_options)}#{collection_name}/new#{format_extension}"
       end
 
-      # Gets the collection path for the REST resources.  If the +query_options+ parameter is omitted, Rails
+      # Gets the collection path for the REST resources. If the +query_options+ parameter is omitted, Rails
       # will split from the +prefix_options+.
       #
       # ==== Options
@@ -700,7 +849,7 @@ module ActiveResource
       def collection_path(prefix_options = {}, query_options = nil)
         check_prefix_options(prefix_options)
         prefix_options, query_options = split_options(prefix_options) if query_options.nil?
-        "#{prefix(prefix_options)}#{collection_name}.#{format.extension}#{query_string(query_options)}"
+        "#{prefix(prefix_options)}#{collection_name}#{format_extension}#{query_string(query_options)}"
       end
 
       alias_method :set_primary_key, :primary_key=  #:nodoc:
@@ -714,7 +863,7 @@ module ActiveResource
       # Returns the new resource instance.
       #
       def build(attributes = {})
-        attrs = self.format.decode(connection.get("#{new_element_path}").body).merge(attributes)
+        attrs = self.format.decode(connection.get("#{new_element_path(attributes)}", headers).body).merge(attributes)
         self.new(attrs)
       end
 
@@ -724,8 +873,8 @@ module ActiveResource
       #   ryan = Person.new(:first => 'ryan')
       #   ryan.save
       #
-      # Returns the newly created resource.  If a failure has occurred an
-      # exception will be raised (see <tt>save</tt>).  If the resource is invalid and
+      # Returns the newly created resource. If a failure has occurred an
+      # exception will be raised (see <tt>save</tt>). If the resource is invalid and
       # has not been saved then <tt>valid?</tt> will return <tt>false</tt>,
       # while <tt>new?</tt> will still return <tt>true</tt>.
       #
@@ -746,11 +895,22 @@ module ActiveResource
         self.new(attributes).tap { |resource| resource.save }
       end
 
-      # Core method for finding resources.  Used similarly to Active Record's +find+ method.
+      # Creates a new resource (just like <tt>create</tt>) and makes a request to the
+      # remote service that it be saved, but runs validations and raises
+      # <tt>ActiveResource::ResourceInvalid</tt>, making it equivalent to the following
+      # simultaneous calls:
+      #
+      #   ryan = Person.new(:first => 'ryan')
+      #   ryan.save!
+      def create!(attributes = {})
+        self.new(attributes).tap { |resource| resource.save! }
+      end
+
+      # Core method for finding resources. Used similarly to Active Record's +find+ method.
       #
       # ==== Arguments
-      # The first argument is considered to be the scope of the query.  That is, how many
-      # resources are returned from the request.  It can be one of the following.
+      # The first argument is considered to be the scope of the query. That is, how many
+      # resources are returned from the request. It can be one of the following.
       #
       # * <tt>:one</tt> - Returns a single resource.
       # * <tt>:first</tt> - Returns the first resource found.
@@ -794,9 +954,9 @@ module ActiveResource
       #   # => GET /people/1/street_addresses/1.json
       #
       # == Failure or missing data
-      #   A failure to find the requested object raises a ResourceNotFound
-      #   exception if the find was called with an id.
-      #   With any other scope, find returns nil when no data is returned.
+      # A failure to find the requested object raises a ResourceNotFound
+      # exception if the find was called with an id.
+      # With any other scope, find returns nil when no data is returned.
       #
       #   Person.find(1)
       #   # => raises ResourceNotFound
@@ -810,11 +970,18 @@ module ActiveResource
         options = arguments.slice!(0) || {}
 
         case scope
-          when :all   then find_every(options)
-          when :first then find_every(options).first
-          when :last  then find_every(options).last
-          when :one   then find_one(options)
-          else             find_single(scope, options)
+        when :all
+          find_every(options)
+        when :first
+          collection = find_every(options)
+          collection && collection.first
+        when :last
+          collection = find_every(options)
+          collection && collection.last
+        when :one
+          find_one(options)
+        else
+          find_single(scope, options)
         end
       end
 
@@ -833,12 +1000,17 @@ module ActiveResource
         find(:last, *args)
       end
 
-      # This is an alias for find(:all).  You can pass in all the same
+      # This is an alias for find(:all). You can pass in all the same
       # arguments to this method as you can to <tt>find(:all)</tt>
       def all(*args)
         find(:all, *args)
       end
 
+      def where(clauses = {})
+        raise ArgumentError, "expected a clauses Hash, got #{clauses.inspect}" unless clauses.is_a? Hash
+        find(:all, params: clauses)
+      end
+
 
       # Deletes the resources with the ID in the +id+ parameter.
       #
@@ -855,7 +1027,7 @@ module ActiveResource
       #   # Let's assume a request to events/5/cancel.json
       #   Event.delete(params[:id]) # sends DELETE /events/5
       def delete(id, options = {})
-        connection.delete(element_path(id, options))
+        connection.delete(element_path(id, options), headers)
       end
 
       # Asserts the existence of a resource, returning <tt>true</tt> if the resource is found.
@@ -870,7 +1042,7 @@ module ActiveResource
           prefix_options, query_options = split_options(options[:params])
           path = element_path(id, prefix_options, query_options)
           response = connection.head(path, headers)
-          response.code.to_i == 200
+          (200..206).include? response.code.to_i
         end
         # id && !find_single(id, options).nil?
       rescue ActiveResource::ResourceNotFound, ActiveResource::ResourceGone
@@ -891,14 +1063,14 @@ module ActiveResource
           begin
             case from = options[:from]
             when Symbol
-              instantiate_collection(get(from, options[:params]))
+              instantiate_collection(get(from, options[:params]), options[:params])
             when String
               path = "#{from}#{query_string(options[:params])}"
-              instantiate_collection(format.decode(connection.get(path, headers).body) || [])
+              instantiate_collection(format.decode(connection.get(path, headers).body) || [], options[:params])
             else
               prefix_options, query_options = split_options(options[:params])
               path = collection_path(prefix_options, query_options)
-              instantiate_collection( (format.decode(connection.get(path, headers).body) || []), prefix_options )
+              instantiate_collection((format.decode(connection.get(path, headers).body) || []), query_options, prefix_options)
             end
           rescue ActiveResource::ResourceNotFound
             # Swallowing ResourceNotFound exceptions and return nil - as per
@@ -925,8 +1097,11 @@ module ActiveResource
           instantiate_record(format.decode(connection.get(path, headers).body), prefix_options)
         end
 
-        def instantiate_collection(collection, prefix_options = {})
-          collection.collect! { |record| instantiate_record(record, prefix_options) }
+        def instantiate_collection(collection, original_params = {}, prefix_options = {})
+          collection_parser.new(collection).tap do |parser|
+            parser.resource_class  = self
+            parser.original_params = original_params
+          end.collect! { |record| instantiate_record(record, prefix_options) }
         end
 
         def instantiate_record(record, prefix_options = {})
@@ -938,12 +1113,12 @@ module ActiveResource
 
         # Accepts a URI and creates the site URI from that.
         def create_site_uri_from(site)
-          site.is_a?(URI) ? site.dup : URI.parser.parse(site)
+          site.is_a?(URI) ? site.dup : URI.parse(site)
         end
 
         # Accepts a URI and creates the proxy URI from that.
         def create_proxy_uri_from(proxy)
-          proxy.is_a?(URI) ? proxy.dup : URI.parser.parse(proxy)
+          proxy.is_a?(URI) ? proxy.dup : URI.parse(proxy)
         end
 
         # contains a set of the current prefix parameters.
@@ -962,8 +1137,8 @@ module ActiveResource
           prefix_options, query_options = {}, {}
 
           (options || {}).each do |key, value|
-            next if key.blank? || !key.respond_to?(:to_sym)
-            (prefix_parameters.include?(key.to_sym) ? prefix_options : query_options)[key.to_sym] = value
+            next if key.blank?
+            (prefix_parameters.include?(key.to_s.to_sym) ? prefix_options : query_options)[key.to_s.to_sym] = value
           end
 
           [ prefix_options, query_options ]
@@ -984,7 +1159,7 @@ module ActiveResource
     # gathered from the provided <tt>schema</tt>, or from the attributes
     # set on this instance after it has been fetched from the remote system.
     def known_attributes
-      self.class.known_attributes + self.attributes.keys.map(&:to_s)
+      (self.class.known_attributes + self.attributes.keys.map(&:to_s)).uniq
     end
 
 
@@ -1003,7 +1178,7 @@ module ActiveResource
       @attributes     = {}.with_indifferent_access
       @prefix_options = {}
       @persisted = persisted
-      load(attributes)
+      load(attributes, false, persisted)
     end
 
     # Returns a \clone of the resource that hasn't been assigned an +id+ yet and
@@ -1014,7 +1189,7 @@ module ActiveResource
     #   not_ryan.new?  # => true
     #
     # Any active resource member attributes will NOT be cloned, though all other
-    # attributes are.  This is to prevent the conflict between any +prefix_options+
+    # attributes are. This is to prevent the conflict between any +prefix_options+
     # that refer to the original parent resource and the newly cloned parent
     # resource that does not exist.
     #
@@ -1028,13 +1203,13 @@ module ActiveResource
     #   not_ryan.hash            # => {:not => "an ARes instance"}
     def clone
       # Clone all attributes except the pk and any nested ARes
-      cloned = Hash[attributes.reject {|k,v| k == self.class.primary_key || v.is_a?(ActiveResource::Base)}.map { |k, v| [k, v.clone] }]
+      cloned = Hash[attributes.reject { |k, v| k == self.class.primary_key || v.is_a?(ActiveResource::Base) }.map { |k, v| [k, v.clone] }]
       # Form the new resource - bypass initialize of resource with 'new' as that will call 'load' which
-      # attempts to convert hashes into member objects and arrays into collections of objects.  We want
+      # attempts to convert hashes into member objects and arrays into collections of objects. We want
       # the raw objects to be cloned so we bypass load by directly setting the attributes hash.
       resource = self.class.new({})
       resource.prefix_options = self.prefix_options
-      resource.send :instance_variable_set, '@attributes', cloned
+      resource.send :instance_variable_set, "@attributes", cloned
       resource
     end
 
@@ -1082,7 +1257,7 @@ module ActiveResource
       attributes[self.class.primary_key] = id
     end
 
-    # Test for equality.  Resource are equal if and only if +other+ is the same object or
+    # Test for equality. Resource are equal if and only if +other+ is the same object or
     # is an instance of the same class, is not <tt>new?</tt>, and has the same +id+.
     #
     # ==== Examples
@@ -1138,7 +1313,7 @@ module ActiveResource
       end
     end
 
-    # Saves (+POST+) or \updates (+PUT+) a resource.  Delegates to +create+ if the object is \new,
+    # Saves (+POST+) or \updates (+PUT+) a resource. Delegates to +create+ if the object is \new,
     # +update+ if it exists. If the response to the \save includes a body, it will be assumed that this body
     # is Json for the final object as it looked after the \save (which would include attributes like +created_at+
     # that weren't part of the original submit).
@@ -1152,7 +1327,9 @@ module ActiveResource
     #   my_company.size = 10
     #   my_company.save # sends PUT /companies/1 (update)
     def save
-      new? ? create : update
+      run_callbacks :save do
+        new? ? create : update
+      end
     end
 
     # Saves the resource.
@@ -1185,11 +1362,13 @@ module ActiveResource
     #   new_person.destroy
     #   Person.find(new_id) # 404 (Resource Not Found)
     def destroy
-      connection.delete(element_path, self.class.headers)
+      run_callbacks :destroy do
+        connection.delete(element_path, self.class.headers)
+      end
     end
 
     # Evaluates to <tt>true</tt> if this resource is not <tt>new?</tt> and is
-    # found on the remote service.  Using this method, you can check for
+    # found on the remote service. Using this method, you can check for
     # resources that may have been deleted between the object's instantiation
     # and actions on it.
     #
@@ -1205,13 +1384,13 @@ module ActiveResource
     #   Person.delete(guys_id)
     #   that_guy.exists? # => false
     def exists?
-      !new? && self.class.exists?(to_param, :params => prefix_options)
+      !new? && self.class.exists?(to_param, params: prefix_options)
     end
 
     # Returns the serialized string representation of the resource in the configured
     # serialization format specified in ActiveResource::Base.format. The options
     # applicable depend on the configured encoding format.
-    def encode(options={})
+    def encode(options = {})
       send("to_#{self.class.format.extension}", options)
     end
 
@@ -1227,11 +1406,11 @@ module ActiveResource
     #   my_branch.reload
     #   my_branch.name # => "Wilson Road"
     def reload
-      self.load(self.class.find(to_param, :params => @prefix_options).attributes)
+      self.load(self.class.find(to_param, params: @prefix_options).attributes, false, true)
     end
 
     # A method to manually load attributes from a \hash. Recursively loads collections of
-    # resources.  This method is called in +initialize+ and +create+ when a \hash of attributes
+    # resources. This method is called in +initialize+ and +create+ when a \hash of attributes
     # is provided.
     #
     # ==== Examples
@@ -1251,8 +1430,12 @@ module ActiveResource
     #   your_supplier = Supplier.new
     #   your_supplier.load(my_attrs)
     #   your_supplier.save
-    def load(attributes, remove_root = false)
-      raise ArgumentError, "expected an attributes Hash, got #{attributes.inspect}" unless attributes.is_a?(Hash)
+    def load(attributes, remove_root = false, persisted = false)
+      unless attributes.respond_to?(:to_hash)
+        raise ArgumentError, "expected attributes to be able to convert to Hash, got #{attributes.inspect}"
+      end
+
+      attributes = attributes.to_hash
       @prefix_options, attributes = split_options(attributes)
 
       if attributes.keys.size == 1
@@ -1264,21 +1447,21 @@ module ActiveResource
       attributes.each do |key, value|
         @attributes[key.to_s] =
           case value
-            when Array
-              resource = nil
-              value.map do |attrs|
-                if attrs.is_a?(Hash)
-                  resource ||= find_or_create_resource_for_collection(key)
-                  resource.new(attrs)
-                else
-                  attrs.duplicable? ? attrs.dup : attrs
-                end
+          when Array
+            resource = nil
+            value.map do |attrs|
+              if attrs.is_a?(Hash)
+                resource ||= find_or_create_resource_for_collection(key)
+                resource.new(attrs, persisted)
+              else
+                attrs.duplicable? ? attrs.dup : attrs
               end
-            when Hash
-              resource = find_or_create_resource_for(key)
-              resource.new(value)
-            else
-              value.duplicable? ? value.dup : value
+            end
+          when Hash
+            resource = find_or_create_resource_for(key)
+            resource.new(value, persisted)
+          else
+            value.duplicable? ? value.dup : value
           end
       end
       self
@@ -1286,14 +1469,14 @@ module ActiveResource
 
     # Updates a single attribute and then saves the object.
     #
-    # Note: Unlike ActiveRecord::Base.update_attribute, this method <b>is</b>
+    # Note: <tt>Unlike ActiveRecord::Base.update_attribute</tt>, this method <b>is</b>
     # subject to normal validation routines as an update sends the whole body
-    # of the resource in the request.  (See Validations).
+    # of the resource in the request. (See Validations).
     #
     # As such, this method is equivalent to calling update_attributes with a single attribute/value pair.
     #
     # If the saving fails because of a connection or remote service error, an
-    # exception will be raised.  If saving fails because the resource is
+    # exception will be raised. If saving fails because the resource is
     # invalid then <tt>false</tt> will be returned.
     def update_attribute(name, value)
       self.send("#{name}=".to_sym, value)
@@ -1304,7 +1487,7 @@ module ActiveResource
     # and requests that the record be saved.
     #
     # If the saving fails because of a connection or remote service error, an
-    # exception will be raised.  If saving fails because the resource is
+    # exception will be raised. If saving fails because the resource is
     # invalid then <tt>false</tt> will be returned.
     #
     # Note: Though this request can be made with a partial set of the
@@ -1320,7 +1503,7 @@ module ActiveResource
     # A method to determine if an object responds to a message (e.g., a method call). In Active Resource, a Person object with a
     # +name+ attribute can answer <tt>true</tt> to <tt>my_person.respond_to?(:name)</tt>, <tt>my_person.respond_to?(:name=)</tt>, and
     # <tt>my_person.respond_to?(:name?)</tt>.
-    def respond_to?(method, include_priv = false)
+    def respond_to_missing?(method, include_priv = false)
       method_name = method.to_s
       if attributes.nil?
         super
@@ -1335,12 +1518,20 @@ module ActiveResource
       end
     end
 
-    def to_json(options={})
-      super(include_root_in_json ? { :root => self.class.element_name }.merge(options) : options)
+    def to_json(options = {})
+      super(include_root_in_json ? { root: self.class.element_name }.merge(options) : options)
     end
 
-    def to_xml(options={})
-      super({ :root => self.class.element_name }.merge(options))
+    def to_xml(options = {})
+      super({ root: self.class.element_name }.merge(options))
+    end
+
+    def read_attribute_for_serialization(n)
+      if !attributes[n].nil?
+        attributes[n]
+      elsif respond_to?(n)
+        send(n)
+      end
     end
 
     protected
@@ -1350,37 +1541,45 @@ module ActiveResource
 
       # Update the resource on the remote service.
       def update
-        connection.put(element_path(prefix_options), encode, self.class.headers).tap do |response|
-          load_attributes_from_response(response)
+        run_callbacks :update do
+          connection.put(element_path(prefix_options), encode, self.class.headers).tap do |response|
+            load_attributes_from_response(response)
+          end
         end
       end
 
       # Create (i.e., \save to the remote service) the \new resource.
       def create
-        connection.post(collection_path, encode, self.class.headers).tap do |response|
-          self.id = id_from_response(response)
-          load_attributes_from_response(response)
+        run_callbacks :create do
+          connection.post(collection_path, encode, self.class.headers).tap do |response|
+            self.id = id_from_response(response)
+            load_attributes_from_response(response)
+          end
         end
       end
 
       def load_attributes_from_response(response)
-        if (response_code_allows_body?(response.code) &&
-            (response['Content-Length'].nil? || response['Content-Length'] != "0") &&
-            !response.body.nil? && response.body.strip.size > 0)
-          load(self.class.format.decode(response.body), true)
+        if response_code_allows_body?(response.code.to_i) &&
+            (response["Content-Length"].nil? || response["Content-Length"] != "0") &&
+            !response.body.nil? && response.body.strip.size > 0
+          load(self.class.format.decode(response.body), true, true)
           @persisted = true
         end
       end
 
       # Takes a response from a typical create post and pulls the ID out
       def id_from_response(response)
-        response['Location'][/\/([^\/]*?)(\.\w+)?$/, 1] if response['Location']
+        response["Location"][/\/([^\/]*?)(\.\w+)?$/, 1] if response["Location"]
       end
 
       def element_path(options = nil)
         self.class.element_path(to_param, options || prefix_options)
       end
 
+      def element_url(options = nil)
+        self.class.element_url(to_param, options || prefix_options)
+      end
+
       def new_element_path
         self.class.new_element_path(prefix_options)
       end
@@ -1391,17 +1590,14 @@ module ActiveResource
 
     private
 
-      def read_attribute_for_serialization(n)
-        attributes[n]
-      end
-
       # Determine whether the response is allowed to have a body per HTTP 1.1 spec section 4.4.1
       def response_code_allows_body?(c)
-        !((100..199).include?(c) || [204,304].include?(c))
+        !((100..199).include?(c) || [204, 304].include?(c))
       end
 
       # Tries to find a resource for a given collection name; if it fails, then the resource is created
       def find_or_create_resource_for_collection(name)
+        return reflections[name.to_sym].klass if reflections.key?(name.to_sym)
         find_or_create_resource_for(ActiveSupport::Inflector.singularize(name.to_s))
       end
 
@@ -1409,10 +1605,10 @@ module ActiveResource
       # if it fails, then the resource is created
       def find_or_create_resource_in_modules(resource_name, module_names)
         receiver = Object
-        namespaces = module_names[0, module_names.size-1].map do |module_name|
+        namespaces = module_names[0, module_names.size - 1].map do |module_name|
           receiver = receiver.const_get(module_name)
         end
-        const_args = RUBY_VERSION < "1.9" ? [resource_name] : [resource_name, false]
+        const_args = [resource_name, false]
         if namespace = namespaces.reverse.detect { |ns| ns.const_defined?(*const_args) }
           namespace.const_get(*const_args)
         else
@@ -1422,13 +1618,18 @@ module ActiveResource
 
       # Tries to find a resource for a given name; if it fails, then the resource is created
       def find_or_create_resource_for(name)
+        return reflections[name.to_sym].klass if reflections.key?(name.to_sym)
         resource_name = name.to_s.camelize
 
-        const_args = RUBY_VERSION < "1.9" ? [resource_name] : [resource_name, false]
-        if self.class.const_defined?(*const_args)
+        const_args = [resource_name, false]
+
+        if !const_valid?(*const_args)
+          # resource_name is not a valid ruby module name and cannot be created normally
+          find_or_create_resource_for(:UnnamedResource)
+        elsif self.class.const_defined?(*const_args)
           self.class.const_get(*const_args)
         else
-          ancestors = self.class.name.split("::")
+          ancestors = self.class.name.to_s.split("::")
           if ancestors.size > 1
             find_or_create_resource_in_modules(resource_name, ancestors)
           else
@@ -1441,6 +1642,13 @@ module ActiveResource
         end
       end
 
+      def const_valid?(*const_args)
+        self.class.const_defined?(*const_args)
+        true
+      rescue NameError
+        false
+      end
+
       # Create and return a class definition for a resource inside the current resource
       def create_resource_for(resource_name)
         resource = self.class.const_set(resource_name, Class.new(ActiveResource::Base))
@@ -1474,9 +1682,14 @@ module ActiveResource
 
   class Base
     extend ActiveModel::Naming
-    include CustomMethods, Observing, Validations
+    extend ActiveResource::Associations
+
+    include Callbacks, CustomMethods, Validations
     include ActiveModel::Conversion
     include ActiveModel::Serializers::JSON
     include ActiveModel::Serializers::Xml
+    include ActiveResource::Reflection
   end
+
+  ActiveSupport.run_load_hooks(:active_resource, Base)
 end