activeresource 3.0.20 → 3.1.0.beta1

data/CHANGELOG

@@ -1,70 +1,14 @@
-## Rails 3.0.20 (unreleased)
+*Rails 3.1.0 (unreleased)*
 
-## Rails 3.0.19 (Jan 8, 2013)
+* No changes
 
-* No changes.
-
-## Rails 3.0.18 (Jan 2, 2013)
-
-* No changes.
-
-## Rails 3.0.14 (Jun 12, 2012)
-
-* No changes.
-
-* Rails 3.0.13 (May 31, 2012)
-
-* No changes.
-
-*Rails 3.0.10 (August 16, 2011)*
-
-* No changes.
-
-
-*Rails 3.0.9 (June 16, 2011)*
-
-*No changes.
-
-
-*Rails 3.0.8 (June 7, 2011)*
-
-*No changes.
-
-
-*Rails 3.0.7 (April 18, 2011)*
-
-*No changes.
-
-
-*Rails 3.0.6 (April 5, 2011)
-
-* No changes.
-
-
-*Rails 3.0.5 (February 26, 2011)*
-
-* No changes.
-
-
-*Rails 3.0.4 (February 8, 2011)*
-
-* No changes.
-
-
-*Rails 3.0.3 (November 16, 2010)*
-
-* No changes.
-
-
-*Rails 3.0.2 (November 15, 2010)*
-
-* No changes.
+*Rails 3.0.2 (unreleased)*
 
+* No changes
 
 *Rails 3.0.1 (October 15, 2010)*
 
-* No changes.
-
+* No Changes, just a version bump.
 
 *Rails 3.0.0 (August 29, 2010)*
 

data/README.rdoc

@@ -95,7 +95,7 @@ Collections can also be requested in a similar fashion
    #
    # for GET http://api.people.com:3000/people.xml
    #
-   people = Person.find(:all)
+   people = Person.all
    people.first  # => <Person::xxx 'first' => 'Ryan' ...>
    people.last  # => <Person::xxx 'first' => 'Jim' ...>
 

data/examples/performance.rb

@@ -0,0 +1,70 @@
+require 'rubygems'
+require 'active_resource'
+require 'benchmark'
+
+TIMES = (ENV['N'] || 10_000).to_i
+
+# deep nested resource
+attrs = {
+  :id => 1,
+  :name => 'Luis',
+  :age => 21,
+  :friends => [
+    {
+      :name => 'JK',
+      :age => 24,
+      :colors => ['red', 'green', 'blue'],
+      :brothers => [
+        {
+          :name => 'Mateo',
+          :age => 35,
+          :children => [{ :name => 'Edith', :age => 5 }, { :name => 'Martha', :age => 4 }]
+        },
+        {
+          :name => 'Felipe',
+          :age => 33,
+          :children => [{ :name => 'Bryan', :age => 1 }, { :name => 'Luke', :age => 0 }]
+        }
+      ]
+    },
+    {
+      :name => 'Eduardo',
+      :age => 20,
+      :colors => [],
+      :brothers => [
+        {
+          :name => 'Sebas',
+          :age => 23,
+          :children => [{ :name => 'Andres', :age => 0 }, { :name => 'Jorge', :age => 2 }]
+        },
+        {
+          :name => 'Elsa',
+          :age => 19,
+          :children => [{ :name => 'Natacha', :age => 1 }]
+        },
+        {
+          :name => 'Milena',
+          :age => 16,
+          :children => []
+        }
+      ]
+    }
+  ]
+}
+
+class Customer < ActiveResource::Base
+  self.site = "http://37s.sunrise.i:3000"
+end
+
+module Nested
+  class Customer < ActiveResource::Base
+    self.site = "http://37s.sunrise.i:3000"
+  end
+end
+
+Benchmark.bm(40) do |x|
+  x.report('Model.new (instantiation)')              { TIMES.times { Customer.new } }
+  x.report('Nested::Model.new (instantiation)')      { TIMES.times { Nested::Customer.new } }
+  x.report('Model.new (setting attributes)')         { TIMES.times { Customer.new attrs } }
+  x.report('Nested::Model.new (setting attributes)') { TIMES.times { Nested::Customer.new attrs } }
+end

data/lib/active_resource/base.rb

@@ -1,6 +1,6 @@
 require 'active_support'
 require 'active_support/core_ext/class/attribute_accessors'
-require 'active_support/core_ext/class/inheritable_attributes'
+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/attr_accessor_with_default'
@@ -12,6 +12,7 @@ require 'active_support/core_ext/object/duplicable'
 require 'set'
 require 'uri'
 
+require 'active_support/core_ext/uri'
 require 'active_resource/exceptions'
 require 'active_resource/connection'
 require 'active_resource/formats'
@@ -166,6 +167,7 @@ module ActiveResource
   #   # GET http://api.people.com:3000/people/999.xml
   #   ryan = Person.find(999) # 404, raises ActiveResource::ResourceNotFound
   #
+  #
   # <tt>404</tt> is just one of the HTTP error response codes that Active Resource will handle with its own exception. The
   # following HTTP response codes will also result in these exceptions:
   #
@@ -194,6 +196,16 @@ module ActiveResource
   #     redirect_to :action => 'new'
   #   end
   #
+  # When a GET is requested for a nested resource and you don't provide the prefix_param
+  # an ActiveResource::MissingPrefixParam will be raised.
+  #
+  #  class Comment < ActiveResource::Base
+  #    self.site = "http://someip.com/posts/:post_id/"
+  #  end
+  #
+  #  Comment.find(1)
+  #  # => ActiveResource::MissingPrefixParam: post_id prefix_option is missing
+  #
   # === Validation errors
   #
   # Active Resource supports validations on resources and will return errors if any of these validations fail
@@ -251,6 +263,8 @@ module ActiveResource
     # The logger for diagnosing and tracing Active Resource calls.
     cattr_accessor :logger
 
+    class_attribute :_format
+
     class << self
       # Creates a schema for this resource - setting the attributes that are
       # known prior to fetching an instance from the remote system.
@@ -403,8 +417,8 @@ module ActiveResource
           @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
+          @user = URI.parser.unescape(@site.user) if @site.user
+          @password = URI.parser.unescape(@site.password) if @site.password
         end
       end
 
@@ -480,13 +494,13 @@ module ActiveResource
         format = mime_type_reference_or_format.is_a?(Symbol) ?
           ActiveResource::Formats[mime_type_reference_or_format] : mime_type_reference_or_format
 
-        write_inheritable_attribute(:format, format)
+        self._format = format
         connection.format = format if site
       end
 
       # Returns the current format, default is ActiveResource::Formats::XmlFormat.
       def format
-        read_inheritable_attribute(:format) || ActiveResource::Formats::XmlFormat
+        self._format || ActiveResource::Formats::XmlFormat
       end
 
       # Sets the number of seconds after which requests to the REST API should time out.
@@ -508,9 +522,9 @@ module ActiveResource
       #
       # * <tt>:key</tt> - An OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object.
       # * <tt>:cert</tt> - An OpenSSL::X509::Certificate object as client certificate
-      # * <tt>:ca_file</tt> - Path to a CA certification file in PEM format. The file can contrain several CA certificates.
+      # * <tt>:ca_file</tt> - Path to a CA certification file in PEM format. The file can contain several CA certificates.
       # * <tt>:ca_path</tt> - Path of a CA certification directory containing certifications in PEM format.
-      # * <tt>:verify_mode</tt> - Flags for server the certification verification at begining of SSL/TLS session. (OpenSSL::SSL::VERIFY_NONE or OpenSSL::SSL::VERIFY_PEER is acceptable)
+      # * <tt>:verify_mode</tt> - Flags for server the certification verification at beginning of SSL/TLS session. (OpenSSL::SSL::VERIFY_NONE or OpenSSL::SSL::VERIFY_PEER is acceptable)
       # * <tt>:verify_callback</tt> - The verify callback for the server certification verification.
       # * <tt>:verify_depth</tt> - The maximum depth for the certificate chain verification.
       # * <tt>:cert_store</tt> - OpenSSL::X509::Store to verify peer certificate.
@@ -577,7 +591,7 @@ module ActiveResource
       # Default value is <tt>site.path</tt>.
       def prefix=(value = '/')
         # Replace :placeholders with '#{embedded options[:lookups]}'
-        prefix_call = value.gsub(/:\w+/) { |key| "\#{URI.escape options[#{key}].to_s}" }
+        prefix_call = value.gsub(/:\w+/) { |key| "\#{URI.parser.escape options[#{key}].to_s}" }
 
         # Clear prefix parameters in case they have been cached
         @prefix_parameters = nil
@@ -621,8 +635,10 @@ module ActiveResource
       #   # => /posts/5/comments/1.xml?active=1
       #
       def element_path(id, 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}/#{URI.escape id.to_s}.#{format.extension}#{query_string(query_options)}"
+        "#{prefix(prefix_options)}#{collection_name}/#{URI.parser.escape id.to_s}.#{format.extension}#{query_string(query_options)}"
       end
 
       # Gets the new element path for REST resources.
@@ -663,6 +679,7 @@ module ActiveResource
       #   # => /posts/5/comments.xml?active=1
       #
       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)}"
       end
@@ -678,7 +695,7 @@ module ActiveResource
       # Returns the new resource instance.
       #
       def build(attributes = {})
-        attrs = connection.get("#{new_element_path}").merge(attributes)
+        attrs = self.format.decode(connection.get("#{new_element_path}").body).merge(attributes)
         self.new(attrs)
       end
 
@@ -842,6 +859,14 @@ module ActiveResource
       end
 
       private
+
+        def check_prefix_options(prefix_options)
+          p_options = HashWithIndifferentAccess.new(prefix_options)
+          prefix_parameters.each do |p|
+            raise(MissingPrefixParam, "#{p} prefix_option is missing") if p_options[p].blank?
+          end
+        end
+
         # Find every resource
         def find_every(options)
           begin
@@ -850,11 +875,11 @@ module ActiveResource
               instantiate_collection(get(from, options[:params]))
             when String
               path = "#{from}#{query_string(options[:params])}"
-              instantiate_collection(connection.get(path, headers) || [])
+              instantiate_collection(format.decode(connection.get(path, headers).body) || [])
             else
               prefix_options, query_options = split_options(options[:params])
               path = collection_path(prefix_options, query_options)
-              instantiate_collection( (connection.get(path, headers) || []), prefix_options )
+              instantiate_collection( (format.decode(connection.get(path, headers).body) || []), prefix_options )
             end
           rescue ActiveResource::ResourceNotFound
             # Swallowing ResourceNotFound exceptions and return nil - as per
@@ -870,7 +895,7 @@ module ActiveResource
             instantiate_record(get(from, options[:params]))
           when String
             path = "#{from}#{query_string(options[:params])}"
-            instantiate_record(connection.get(path, headers))
+            instantiate_record(format.decode(connection.get(path, headers).body))
           end
         end
 
@@ -878,7 +903,7 @@ module ActiveResource
         def find_single(scope, options)
           prefix_options, query_options = split_options(options[:params])
           path = element_path(scope, prefix_options, query_options)
-          instantiate_record(connection.get(path, headers), prefix_options)
+          instantiate_record(format.decode(connection.get(path, headers).body), prefix_options)
         end
 
         def instantiate_collection(collection, prefix_options = {})
@@ -886,7 +911,7 @@ module ActiveResource
         end
 
         def instantiate_record(record, prefix_options = {})
-          new(record).tap do |resource|
+          new(record, true).tap do |resource|
             resource.prefix_options = prefix_options
           end
         end
@@ -894,12 +919,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.parser.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.parser.parse(proxy)
         end
 
         # contains a set of the current prefix parameters.
@@ -924,10 +949,6 @@ module ActiveResource
 
           [ prefix_options, query_options ]
         end
-
-        def uri_parser
-          @uri_parser ||= URI.const_defined?(:Parser) ? URI::Parser.new : URI
-        end
     end
 
     attr_accessor :attributes #:nodoc:
@@ -959,9 +980,10 @@ module ActiveResource
     #
     #   my_other_course = Course.new(:name => "Philosophy: Reason and Being", :lecturer => "Ralph Cling")
     #   my_other_course.save
-    def initialize(attributes = {})
+    def initialize(attributes = {}, persisted = false)
       @attributes     = {}.with_indifferent_access
       @prefix_options = {}
+      @persisted = persisted
       load(attributes)
     end
 
@@ -987,10 +1009,7 @@ module ActiveResource
     #   not_ryan.hash            # => {:not => "an ARes instance"}
     def clone
       # Clone all attributes except the pk and any nested ARes
-      cloned = attributes.reject {|k,v| k == self.class.primary_key || v.is_a?(ActiveResource::Base)}.inject({}) do |attrs, (k, v)|
-        attrs[k] = v.clone
-        attrs
-      end
+      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
       # the raw objects to be cloned so we bypass load by directly setting the attributes hash.
@@ -1014,7 +1033,7 @@ module ActiveResource
     #   is_new.new? # => false
     #
     def new?
-      id.nil?
+      !persisted?
     end
     alias :new_record? :new?
 
@@ -1031,7 +1050,7 @@ module ActiveResource
     #   not_persisted.persisted? # => true
     #
     def persisted?
-      !new?
+      @persisted
     end
 
     # Gets the <tt>\id</tt> attribute of the resource.
@@ -1076,7 +1095,7 @@ module ActiveResource
     end
 
     # Delegates to id in order to allow two resources of the same type and \id to work with something like:
-    #   [Person.find(1), Person.find(2)] & [Person.find(1), Person.find(4)] # => [Person.find(1)]
+    #   [(a = Person.find 1), (b = Person.find 2)] & [(c = Person.find 1), (d = Person.find 4)] # => [a]
     def hash
       id.hash
     end
@@ -1220,9 +1239,10 @@ module ActiveResource
         @attributes[key.to_s] =
           case value
             when Array
-              resource = find_or_create_resource_for_collection(key)
+              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
@@ -1232,7 +1252,7 @@ module ActiveResource
               resource = find_or_create_resource_for(key)
               resource.new(value)
             else
-              value.dup rescue value
+              value.duplicable? ? value.dup : value
           end
       end
       self
@@ -1318,8 +1338,9 @@ module ActiveResource
       end
 
       def load_attributes_from_response(response)
-        if response['Content-Length'] != "0" && response.body.strip.size > 0
+        if !response['Content-Length'].blank? && response['Content-Length'] != "0" && !response.body.nil? && response.body.strip.size > 0
           load(self.class.format.decode(response.body))
+          @persisted = true
         end
       end
 
@@ -1347,34 +1368,44 @@ module ActiveResource
       end
 
       # Tries to find a resource in a non empty list of nested modules
-      # Raises a NameError if it was not found in any of the given nested modules
-      def find_resource_in_modules(resource_name, module_names)
+      # 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|
           receiver = receiver.const_get(module_name)
         end
-        if namespace = namespaces.reverse.detect { |ns| ns.const_defined?(resource_name) }
-          return namespace.const_get(resource_name)
+        const_args = RUBY_VERSION < "1.9" ? [resource_name] : [resource_name, false]
+        if namespace = namespaces.reverse.detect { |ns| ns.const_defined?(*const_args) }
+          namespace.const_get(*const_args)
         else
-          raise NameError
+          create_resource_for(resource_name)
         end
       end
 
       # Tries to find a resource for a given name; if it fails, then the resource is created
       def find_or_create_resource_for(name)
         resource_name = name.to_s.camelize
-        ancestors = self.class.name.split("::")
-        if ancestors.size > 1
-          find_resource_in_modules(resource_name, ancestors)
-        else
-          self.class.const_get(resource_name)
-        end
-      rescue NameError
-        if self.class.const_defined?(resource_name)
-          resource = self.class.const_get(resource_name)
+
+        const_args = RUBY_VERSION < "1.9" ? [resource_name] : [resource_name, false]
+        if self.class.const_defined?(*const_args)
+          self.class.const_get(*const_args)
         else
-          resource = self.class.const_set(resource_name, Class.new(ActiveResource::Base))
+          ancestors = self.class.name.split("::")
+          if ancestors.size > 1
+            find_or_create_resource_in_modules(resource_name, ancestors)
+          else
+            if Object.const_defined?(*const_args)
+              Object.const_get(*const_args)
+            else
+              create_resource_for(resource_name)
+            end
+          end
         end
+      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))
         resource.prefix = self.class.prefix
         resource.site   = self.class.site
         resource

data/lib/active_resource/connection.rb

@@ -1,4 +1,6 @@
 require 'active_support/core_ext/benchmark'
+require 'active_support/core_ext/uri'
+require 'active_support/core_ext/object/inclusion'
 require 'net/https'
 require 'date'
 require 'time'
@@ -31,21 +33,20 @@ module ActiveResource
     def initialize(site, format = ActiveResource::Formats::XmlFormat)
       raise ArgumentError, 'Missing site URI' unless site
       @user = @password = nil
-      @uri_parser = URI.const_defined?(:Parser) ? URI::Parser.new : URI
       self.site = site
       self.format = format
     end
 
     # Set URI for remote service.
     def site=(site)
-      @site = site.is_a?(URI) ? site : @uri_parser.parse(site)
-      @user = @uri_parser.unescape(@site.user) if @site.user
-      @password = @uri_parser.unescape(@site.password) if @site.password
+      @site = site.is_a?(URI) ? site : URI.parser.parse(site)
+      @user = URI.parser.unescape(@site.user) if @site.user
+      @password = URI.parser.unescape(@site.password) if @site.password
     end
 
     # Set the proxy for remote service.
     def proxy=(proxy)
-      @proxy = proxy.is_a?(URI) ? proxy : @uri_parser.parse(proxy)
+      @proxy = proxy.is_a?(URI) ? proxy : URI.parser.parse(proxy)
     end
 
     # Sets the user for remote service.
@@ -76,7 +77,7 @@ module ActiveResource
     # Executes a GET request.
     # Used to get (find) resources.
     def get(path, headers = {})
-      with_auth { format.decode(request(:get, path, build_request_headers(headers, :get, self.site.merge(path))).body) }
+      with_auth { request(:get, path, build_request_headers(headers, :get, self.site.merge(path))) }
     end
 
     # Executes a DELETE request (see HTTP protocol documentation if unfamiliar).
@@ -277,7 +278,7 @@ module ActiveResource
       def legitimize_auth_type(auth_type)
         return :basic if auth_type.nil?
         auth_type = auth_type.to_sym
-        [:basic, :digest].include?(auth_type) ? auth_type : :basic
+        auth_type.in?([:basic, :digest]) ? auth_type : :basic
       end
   end
 end

data/lib/active_resource/custom_methods.rb

@@ -54,7 +54,7 @@ module ActiveResource
         #
         #   Person.find(:all, :from => :active)
         def get(custom_method_name, options = {})
-          connection.get(custom_method_collection_url(custom_method_name, options), headers)
+          format.decode(connection.get(custom_method_collection_url(custom_method_name, options), headers).body)
         end
 
         def post(custom_method_name, options = {}, body = '')
@@ -85,7 +85,7 @@ module ActiveResource
 
     module InstanceMethods
       def get(method_name, options = {})
-        connection.get(custom_method_element_url(method_name, options), self.class.headers)
+        self.class.format.decode(connection.get(custom_method_element_url(method_name, options), self.class.headers).body)
       end
 
       def post(method_name, options = {}, body = nil)

data/lib/active_resource/exceptions.rb

@@ -36,6 +36,9 @@ module ActiveResource
     def to_s; response['Location'] ? "#{super} => #{response['Location']}" : super; end
   end
 
+  # Raised when ...
+  class MissingPrefixParam < ArgumentError; end # :nodoc:
+
   # 4xx Client Error
   class ClientError < ConnectionError; end # :nodoc:
 

data/lib/active_resource/http_mock.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/kernel/reporting'
+require 'active_support/core_ext/object/inclusion'
 
 module ActiveResource
   class InvalidRequestError < StandardError; end #:nodoc:
@@ -8,8 +9,8 @@ module ActiveResource
   # requests.
   #
   # To test your Active Resource model, you simply call the ActiveResource::HttpMock.respond_to
-  # method with an attached block.  The block declares a set of URIs with expected input, and the output
-  # each request should return.  The passed in block has any number of entries in the following generalized
+  # method with an attached block. The block declares a set of URIs with expected input, and the output
+  # each request should return. The passed in block has any number of entries in the following generalized
   # format:
   #
   #   mock.http_method(path, request_headers = {}, body = nil, status = 200, response_headers = {})
@@ -28,7 +29,7 @@ module ActiveResource
   #   <tt>request_headers</tt> listed above.
   #
   # In order for a mock to deliver its content, the incoming request must match by the <tt>http_method</tt>,
-  # +path+ and <tt>request_headers</tt>.  If no match is found an InvalidRequestError exception
+  # +path+ and <tt>request_headers</tt>. If no match is found an +InvalidRequestError+ exception
   # will be raised showing you what request it could not find a response for and also what requests and response
   # pairs have been recorded so you can create a new mock for that request.
   #
@@ -60,15 +61,26 @@ module ActiveResource
         # end
         module_eval <<-EOE, __FILE__, __LINE__ + 1
           def #{method}(path, request_headers = {}, body = nil, status = 200, response_headers = {})
-            @responses << [Request.new(:#{method}, path, nil, request_headers), Response.new(body || "", status, response_headers)]
+            request  = Request.new(:#{method}, path, nil, request_headers)
+            response = Response.new(body || "", status, response_headers)
+
+            delete_duplicate_responses(request)
+
+            @responses << [request, response]
           end
         EOE
       end
+
+    private
+
+      def delete_duplicate_responses(request)
+        @responses.delete_if {|r| r[0] == request }
+      end
     end
 
     class << self
 
-      # Returns an array of all request objects that have been sent to the mock.  You can use this to check
+      # Returns an array of all request objects that have been sent to the mock. You can use this to check
       # if your model actually sent an HTTP request.
       #
       # ==== Example
@@ -93,18 +105,18 @@ module ActiveResource
       end
 
       # Returns the list of requests and their mocked responses. Look up a
-      # response for a request using responses.assoc(request).
+      # response for a request using <tt>responses.assoc(request)</tt>.
       def responses
         @@responses ||= []
       end
 
       # Accepts a block which declares a set of requests and responses for the HttpMock to respond to in
       # the following format:
-      # 
+      #
       #   mock.http_method(path, request_headers = {}, body = nil, status = 200, response_headers = {})
-      # 
+      #
       # === Example
-      # 
+      #
       #   @matz  = { :id => 1, :name => "Matz" }.to_xml(:root => "person")
       #   ActiveResource::HttpMock.respond_to do |mock|
       #     mock.post   "/people.xml",   {}, @matz, 201, "Location" => "/people/1.xml"
@@ -112,73 +124,91 @@ module ActiveResource
       #     mock.put    "/people/1.xml", {}, nil, 204
       #     mock.delete "/people/1.xml", {}, nil, 200
       #   end
-      # 
+      #
       # Alternatively, accepts a hash of <tt>{Request => Response}</tt> pairs allowing you to generate
       # these the following format:
-      # 
+      #
       #   ActiveResource::Request.new(method, path, body, request_headers)
       #   ActiveResource::Response.new(body, status, response_headers)
-      # 
+      #
       # === Example
-      # 
+      #
       # Request.new(:#{method}, path, nil, request_headers)
-      # 
+      #
       #   @matz  = { :id => 1, :name => "Matz" }.to_xml(:root => "person")
       #
       #   create_matz      = ActiveResource::Request.new(:post, '/people.xml', @matz, {})
       #   created_response = ActiveResource::Response.new("", 201, {"Location" => "/people/1.xml"})
       #   get_matz         = ActiveResource::Request.new(:get, '/people/1.xml', nil)
       #   ok_response      = ActiveResource::Response.new("", 200, {})
-      # 
+      #
       #   pairs = {create_matz => created_response, get_matz => ok_response}
-      # 
+      #
       #   ActiveResource::HttpMock.respond_to(pairs)
       #
       # Note, by default, every time you call +respond_to+, any previous request and response pairs stored
       # in HttpMock will be deleted giving you a clean slate to work on.
-      # 
+      #
       # If you want to override this behaviour, pass in +false+ as the last argument to +respond_to+
-      # 
+      #
       # === Example
-      # 
+      #
       #   ActiveResource::HttpMock.respond_to do |mock|
       #     mock.send(:get, "/people/1", {}, "XML1")
       #   end
       #   ActiveResource::HttpMock.responses.length #=> 1
-      #   
+      #
       #   ActiveResource::HttpMock.respond_to(false) do |mock|
       #     mock.send(:get, "/people/2", {}, "XML2")
       #   end
       #   ActiveResource::HttpMock.responses.length #=> 2
-      # 
+      #
       # This also works with passing in generated pairs of requests and responses, again, just pass in false
       # as the last argument:
-      # 
+      #
       # === Example
-      # 
+      #
       #   ActiveResource::HttpMock.respond_to do |mock|
       #     mock.send(:get, "/people/1", {}, "XML1")
       #   end
       #   ActiveResource::HttpMock.responses.length #=> 1
-      # 
+      #
       #   get_matz         = ActiveResource::Request.new(:get, '/people/1.xml', nil)
       #   ok_response      = ActiveResource::Response.new("", 200, {})
-      # 
+      #
       #   pairs = {get_matz => ok_response}
       #
       #   ActiveResource::HttpMock.respond_to(pairs, false)
       #   ActiveResource::HttpMock.responses.length #=> 2
+      #
+      #   # If you add a response with an existing request, it will be replaced
+      #
+      #   fail_response      = ActiveResource::Response.new("", 404, {})
+      #   pairs = {get_matz => fail_response}
+      #
+      #   ActiveResource::HttpMock.respond_to(pairs, false)
+      #   ActiveResource::HttpMock.responses.length #=> 2
+      #
       def respond_to(*args) #:yields: mock
         pairs = args.first || {}
         reset! if args.last.class != FalseClass
-        responses.concat pairs.to_a
+
         if block_given?
           yield Responder.new(responses)
         else
+          delete_responses_to_replace pairs.to_a
+          responses.concat pairs.to_a
           Responder.new(responses)
         end
       end
 
+      def delete_responses_to_replace(new_responses)
+        new_responses.each{|nr|
+          request_to_remove = nr[0]
+          @@responses = responses.delete_if{|r| r[0] == request_to_remove}
+        }
+      end
+
       # Deletes all logged requests and responses.
       def reset!
         requests.clear
@@ -269,8 +299,10 @@ module ActiveResource
       end
     end
 
+    # Returns true if code is 2xx,
+    # false otherwise.
     def success?
-      (200..299).include?(code)
+      code.in?(200..299)
     end
 
     def [](key)
@@ -281,6 +313,8 @@ module ActiveResource
       headers[key] = value
     end
 
+    # Returns true if the other is a Response with an equal body, equal message
+    # and equal headers. Otherwise it returns false.
     def ==(other)
       if (other.is_a?(Response))
         other.body == body && other.message == message && other.headers == headers

data/lib/active_resource/observing.rb

@@ -5,6 +5,14 @@ module ActiveResource
 
     included do
       %w( create save update destroy ).each do |method|
+        # def create_with_notifications(*args, &block)
+        #   notify_observers(:before_create)
+        #   if result = create_without_notifications(*args, &block)
+        #     notify_observers(:after_create)
+        #   end
+        #   result
+        # end
+        # alias_method_chain(create, :notifications)
         class_eval(<<-EOS, __FILE__, __LINE__ + 1)
           def #{method}_with_notifications(*args, &block)
             notify_observers(:before_#{method})

data/lib/active_resource/schema.rb

@@ -4,7 +4,7 @@ module ActiveResource # :nodoc:
   class Schema # :nodoc:
     # attributes can be known to be one of these types. They are easy to
     # cast to/from.
-    KNOWN_ATTRIBUTE_TYPES = %w( string integer float )
+    KNOWN_ATTRIBUTE_TYPES = %w( string text integer float decimal datetime timestamp time date binary boolean )
 
     # An array of attribute definitions, representing the attributes that
     # have been defined.
@@ -39,8 +39,6 @@ module ActiveResource # :nodoc:
 
     # The following are the attribute types supported by Active Resource
     # migrations.
-    # TODO:  We should eventually support all of these:
-    # %w( string text integer float decimal datetime timestamp time date binary boolean ).each do |attr_type|
     KNOWN_ATTRIBUTE_TYPES.each do |attr_type|
       class_eval <<-EOV, __FILE__, __LINE__ + 1
         def #{attr_type.to_s}(*args)

data/lib/active_resource/validations.rb

@@ -8,12 +8,12 @@ module ActiveResource
   # Active Resource validation is reported to and from this object, which is used by Base#save
   # to determine whether the object in a valid state to be saved. See usage example in Validations.
   class Errors < ActiveModel::Errors
-    # Grabs errors from an array of messages (like ActiveRecord::Validations)
+    # Grabs errors from an array of messages (like ActiveRecord::Validations).
     # The second parameter directs the errors cache to be cleared (default)
-    # or not (by passing true)
+    # or not (by passing true).
     def from_array(messages, save_cache = false)
       clear unless save_cache
-      humanized_attributes = @base.attributes.keys.inject({}) { |h, attr_name| h.update(attr_name.humanize => attr_name) }
+      humanized_attributes = Hash[@base.attributes.keys.map { |attr_name| [attr_name.humanize, attr_name] }]
       messages.each do |message|
         attr_message = humanized_attributes.keys.detect do |attr_name|
           if message[0, attr_name.size + 1] == "#{attr_name} "
@@ -68,20 +68,12 @@ 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=nil)
-      perform_validation = case options
-        when Hash
-          options[:validate] != false
-        when NilClass
-          true
-        else
-          ActiveSupport::Deprecation.warn "save(#{options}) is deprecated, please give save(:validate => #{options}) instead", caller
-          options
-      end
+    def save_with_validation(options={})
+      perform_validation = options[:validate] != false
 
       # clear the remote validations so they don't interfere with the local
       # ones. Otherwise we get an endless loop and can never change the
-      # fields so as to make the resource valid
+      # fields so as to make the resource valid.
       @remote_errors = nil
       if perform_validation && valid? || !perform_validation
         save_without_validation
@@ -92,7 +84,7 @@ module ActiveResource
     rescue ResourceInvalid => error
       # cache the remote errors because every call to <tt>valid?</tt> clears
       # all errors. We must keep a copy to add these back after local
-      # validations
+      # validations.
       @remote_errors = error
       load_remote_errors(@remote_errors, true)
       false
@@ -100,7 +92,7 @@ module ActiveResource
 
 
     # Loads the set of remote errors into the object's Errors based on the
-    # content-type of the error-block received
+    # content-type of the error-block received.
     def load_remote_errors(remote_errors, save_cache = false ) #:nodoc:
       case self.class.format
       when ActiveResource::Formats[:xml]

data/lib/active_resource/version.rb

@@ -1,9 +1,9 @@
 module ActiveResource
   module VERSION #:nodoc:
     MAJOR = 3
-    MINOR = 0
-    TINY  = 20
-    PRE   = nil
+    MINOR = 1
+    TINY  = 0
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,53 +1,52 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: activeresource
-version: !ruby/object:Gem::Version
-  version: 3.0.20
+version: !ruby/object:Gem::Version 
+  prerelease: 6
+  version: 3.1.0.beta1
 platform: ruby
-authors:
+authors: 
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-05-04 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.20
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.20
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.20
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 3.1.0.beta1
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activemodel
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.20
-description: REST on Rails. Wrap your RESTful web app with Ruby classes and work with
-  them like Active Record models.
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 3.1.0.beta1
+  type: :runtime
+  version_requirements: *id002
+description: REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.
 email: david@loudthinking.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
-files:
+files: 
 - CHANGELOG
 - README.rdoc
+- examples/performance.rb
 - examples/simple.rb
 - lib/active_resource/base.rb
 - lib/active_resource/connection.rb
@@ -64,29 +63,34 @@ files:
 - lib/active_resource/validations.rb
 - lib/active_resource/version.rb
 - lib/active_resource.rb
+has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
-metadata: {}
+
 post_install_message: 
-rdoc_options:
-- "--main"
+rdoc_options: 
+- --main
 - README.rdoc
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
+    - !ruby/object:Gem::Version 
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: activeresource
-rubygems_version: 2.0.0.preview3.1
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: REST modeling framework (part of Rails).
 test_files: []
+

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 12c4fd12a01df590f853606ab4b5f6e5661e8d8f
-  data.tar.gz: 5ee8a3bfb4aaf107fe9a7341dce4a39badca74e5
-SHA512:
-  metadata.gz: 7e7719bc289dcce220968d1f44d89c22046df8b1934dbd484c6334b4c21eb336a6eec629b62e5dd8f08d7c7f3d032366a300a854ca3613f95908066b013a9a80
-  data.tar.gz: 1cc60aa0ab2e1629d4853b734c1dd8fabf7ff34b88523f6d7e43756cf8ed054d17144fe37cd8d46f84e7ad1e54909e76ba5db449d85c1e99b5a8d32f374d567f