activeresource 3.1.0.beta1 → 3.1.0.rc1

data/CHANGELOG

@@ -1,15 +1,47 @@
 *Rails 3.1.0 (unreleased)*
 
-* No changes
+* The default format has been changed to JSON for all requests. If you want to continue to use XML you will need to set `self.format = :xml` in the class. eg.
+
+class User < ActiveResource::Base
+  self.format = :xml
+end
+
+
+*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)*
 
-*Rails 3.0.2 (unreleased)*
+* 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.1 (October 15, 2010)*
 
 * No Changes, just a version bump.
 
+
 *Rails 3.0.0 (August 29, 2010)*
 
 * JSON: set Base.include_root_in_json = true to include a root value in the JSON: {"post": {"title": ...}}. Mirrors the Active Record option.  [Santiago Pastorino]
@@ -67,14 +99,14 @@
 * Ruby 1.9 compatibility.  [Jeremy Kemper]
 
 
-*2.0.2* (December 16th, 2007)
+*2.0.2 (December 16th, 2007)*
 
 * Added more specific exceptions for 400, 401, and 403 (all descending from ClientError so existing rescues will work) #10326 [trek]
 
 * Correct empty response handling.  #10445 [seangeo]
 
 
-*2.0.1* (December 7th, 2007)
+*2.0.1 (December 7th, 2007)*
 
 * Don't cache net/http object so that ActiveResource is more thread-safe.  Closes #10142 [kou]
 

data/lib/active_resource.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006 David Heinemeier Hansson
+# Copyright (c) 2006-2011 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/active_resource/base.rb

@@ -3,7 +3,6 @@ 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/attr_accessor_with_default'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/module/aliasing'
 require 'active_support/core_ext/object/blank'
@@ -81,19 +80,19 @@ module ActiveResource
   # <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.xml.
+  #   # POST to the custom 'register' REST method, i.e. POST /people/new/register.json.
   #   Person.new(:name => 'Ryan').post(:register)
   #   # => { :id => 1, :name => 'Ryan', :position => 'Clerk' }
   #
-  #   # PUT an update by invoking the 'promote' REST method, i.e. PUT /people/1/promote.xml?position=Manager.
+  #   # PUT an update by invoking the 'promote' REST method, i.e. PUT /people/1/promote.json?position=Manager.
   #   Person.find(1).put(:promote, :position => 'Manager')
   #   # => { :id => 1, :name => 'Ryan', :position => 'Manager' }
   #
-  #   # GET all the positions available, i.e. GET /people/positions.xml.
+  #   # GET all the positions available, i.e. GET /people/positions.json.
   #   Person.get(:positions)
   #   # => [{:name => 'Manager'}, {:name => 'Clerk'}]
   #
-  #   # DELETE to 'fire' a person, i.e. DELETE /people/1/fire.xml.
+  #   # DELETE to 'fire' a person, i.e. DELETE /people/1/fire.json.
   #   Person.find(1).delete(:fire)
   #
   # For more information on using custom REST methods, see the
@@ -164,7 +163,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.xml
+  #   # GET http://api.people.com:3000/people/999.json
   #   ryan = Person.find(999) # 404, raises ActiveResource::ResourceNotFound
   #
   #
@@ -218,7 +217,7 @@ module ActiveResource
   #   ryan.save  # => false
   #
   #   # When
-  #   # PUT http://api.people.com:3000/people/1.xml
+  #   # PUT http://api.people.com:3000/people/1.json
   #   # or
   #   # PUT http://api.people.com:3000/people/1.json
   #   # is requested with invalid values, the response is:
@@ -489,7 +488,7 @@ module ActiveResource
       #   Person.format = ActiveResource::Formats::XmlFormat
       #   Person.find(1) # => GET /people/1.xml
       #
-      # Default format is <tt>:xml</tt>.
+      # Default format is <tt>:json</tt>.
       def format=(mime_type_reference_or_format)
         format = mime_type_reference_or_format.is_a?(Symbol) ?
           ActiveResource::Formats[mime_type_reference_or_format] : mime_type_reference_or_format
@@ -498,9 +497,9 @@ module ActiveResource
         connection.format = format if site
       end
 
-      # Returns the current format, default is ActiveResource::Formats::XmlFormat.
+      # Returns the current format, default is ActiveResource::Formats::JsonFormat.
       def format
-        self._format || ActiveResource::Formats::XmlFormat
+        self._format || ActiveResource::Formats::JsonFormat
       end
 
       # Sets the number of seconds after which requests to the REST API should time out.
@@ -565,12 +564,25 @@ module ActiveResource
         @headers ||= {}
       end
 
-      attr_accessor_with_default(:element_name)    { model_name.element } #:nodoc:
-      attr_accessor_with_default(:collection_name) { ActiveSupport::Inflector.pluralize(element_name) } #:nodoc:
+      attr_writer :element_name
+
+      def element_name
+        @element_name ||= model_name.element
+      end
+
+      attr_writer :collection_name
+
+      def collection_name
+        @collection_name ||= ActiveSupport::Inflector.pluralize(element_name)
+      end
+
+      attr_writer :primary_key
 
-      attr_accessor_with_default(:primary_key, 'id') #:nodoc:
+      def primary_key
+        @primary_key ||= 'id'
+      end
 
-      # Gets the \prefix for a resource's nested URL (e.g., <tt>prefix/collectionname/1.xml</tt>)
+      # 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={})
         default = site.path
@@ -587,7 +599,7 @@ module ActiveResource
         prefix_source
       end
 
-      # Sets the \prefix for a resource's nested URL (e.g., <tt>prefix/collectionname/1.xml</tt>).
+      # 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 = '/')
         # Replace :placeholders with '#{embedded options[:lookups]}'
@@ -618,21 +630,21 @@ module ActiveResource
       #
       # ==== 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.xml</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
       #   Post.element_path(1)
-      #   # => /posts/1.xml
+      #   # => /posts/1.json
       #
       #   Comment.element_path(1, :post_id => 5)
-      #   # => /posts/5/comments/1.xml
+      #   # => /posts/5/comments/1.json
       #
       #   Comment.element_path(1, :post_id => 5, :active => 1)
-      #   # => /posts/5/comments/1.xml?active=1
+      #   # => /posts/5/comments/1.json?active=1
       #
       #   Comment.element_path(1, {:post_id => 5}, {:active => 1})
-      #   # => /posts/5/comments/1.xml?active=1
+      #   # => /posts/5/comments/1.json?active=1
       #
       def element_path(id, prefix_options = {}, query_options = nil)
         check_prefix_options(prefix_options)
@@ -645,14 +657,14 @@ module ActiveResource
       #
       # ==== 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.xml</tt>).
+      #   would yield a URL like <tt>/accounts/19/purchases/new.json</tt>).
       #
       # ==== Examples
       #   Post.new_element_path
-      #   # => /posts/new.xml
+      #   # => /posts/new.json
       #
       #   Comment.collection_path(:post_id => 5)
-      #   # => /posts/5/comments/new.xml
+      #   # => /posts/5/comments/new.json
       def new_element_path(prefix_options = {})
         "#{prefix(prefix_options)}#{collection_name}/new.#{format.extension}"
       end
@@ -662,21 +674,21 @@ module ActiveResource
       #
       # ==== 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.xml</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
       #   Post.collection_path
-      #   # => /posts.xml
+      #   # => /posts.json
       #
       #   Comment.collection_path(:post_id => 5)
-      #   # => /posts/5/comments.xml
+      #   # => /posts/5/comments.json
       #
       #   Comment.collection_path(:post_id => 5, :active => 1)
-      #   # => /posts/5/comments.xml?active=1
+      #   # => /posts/5/comments.json?active=1
       #
       #   Comment.collection_path({:post_id => 5}, {:active => 1})
-      #   # => /posts/5/comments.xml?active=1
+      #   # => /posts/5/comments.json?active=1
       #
       def collection_path(prefix_options = {}, query_options = nil)
         check_prefix_options(prefix_options)
@@ -745,34 +757,34 @@ module ActiveResource
       #
       # ==== Examples
       #   Person.find(1)
-      #   # => GET /people/1.xml
+      #   # => GET /people/1.json
       #
       #   Person.find(:all)
-      #   # => GET /people.xml
+      #   # => GET /people.json
       #
       #   Person.find(:all, :params => { :title => "CEO" })
-      #   # => GET /people.xml?title=CEO
+      #   # => GET /people.json?title=CEO
       #
       #   Person.find(:first, :from => :managers)
-      #   # => GET /people/managers.xml
+      #   # => GET /people/managers.json
       #
       #   Person.find(:last, :from => :managers)
-      #   # => GET /people/managers.xml
+      #   # => GET /people/managers.json
       #
-      #   Person.find(:all, :from => "/companies/1/people.xml")
-      #   # => GET /companies/1/people.xml
+      #   Person.find(:all, :from => "/companies/1/people.json")
+      #   # => GET /companies/1/people.json
       #
       #   Person.find(:one, :from => :leader)
-      #   # => GET /people/leader.xml
+      #   # => GET /people/leader.json
       #
       #   Person.find(:all, :from => :developers, :params => { :language => 'ruby' })
-      #   # => GET /people/developers.xml?language=ruby
+      #   # => GET /people/developers.json?language=ruby
       #
-      #   Person.find(:one, :from => "/companies/1/manager.xml")
-      #   # => GET /companies/1/manager.xml
+      #   Person.find(:one, :from => "/companies/1/manager.json")
+      #   # => GET /companies/1/manager.json
       #
       #   StreetAddress.find(1, :params => { :person_id => 1 })
-      #   # => GET /people/1/street_addresses/1.xml
+      #   # => GET /people/1/street_addresses/1.json
       #
       # == Failure or missing data
       #   A failure to find the requested object raises a ResourceNotFound
@@ -833,7 +845,7 @@ module ActiveResource
       #   my_event = Event.find(:first) # let's assume this is event with ID 7
       #   Event.delete(my_event.id) # sends DELETE /events/7
       #
-      #   # Let's assume a request to events/5/cancel.xml
+      #   # 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))
@@ -1121,7 +1133,7 @@ module ActiveResource
 
     # 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 XML for the final object as it looked after the \save (which would include attributes like +created_at+
+    # 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).
     #
     # ==== Examples
@@ -1232,9 +1244,16 @@ module ActiveResource
     #   your_supplier = Supplier.new
     #   your_supplier.load(my_attrs)
     #   your_supplier.save
-    def load(attributes)
+    def load(attributes, remove_root = false)
       raise ArgumentError, "expected an attributes Hash, got #{attributes.inspect}" unless attributes.is_a?(Hash)
       @prefix_options, attributes = split_options(attributes)
+
+      if attributes.keys.size == 1
+        remove_root = self.class.element_name == attributes.keys.first.to_s
+      end
+
+      attributes = Formats.remove_root(attributes) if remove_root
+
       attributes.each do |key, value|
         @attributes[key.to_s] =
           case value
@@ -1285,7 +1304,7 @@ module ActiveResource
     # resource's attributes, the full body of the request will still be sent
     # in the save request to the remote service.
     def update_attributes(attributes)
-      load(attributes) && save
+      load(attributes, false) && save
     end
 
     # For checking <tt>respond_to?</tt> without searching the attributes (which is faster).
@@ -1339,7 +1358,7 @@ module ActiveResource
 
       def load_attributes_from_response(response)
         if !response['Content-Length'].blank? && response['Content-Length'] != "0" && !response.body.nil? && response.body.strip.size > 0
-          load(self.class.format.decode(response.body))
+          load(self.class.format.decode(response.body), true)
           @persisted = true
         end
       end

data/lib/active_resource/connection.rb

@@ -30,7 +30,7 @@ module ActiveResource
 
     # The +site+ parameter is required and will set the +site+
     # attribute to the URI for the remote resource service.
-    def initialize(site, format = ActiveResource::Formats::XmlFormat)
+    def initialize(site, format = ActiveResource::Formats::JsonFormat)
       raise ArgumentError, 'Missing site URI' unless site
       @user = @password = nil
       self.site = site

data/lib/active_resource/custom_methods.rb

@@ -11,10 +11,10 @@ module ActiveResource
   #
   #  This route set creates routes for the following HTTP requests:
   #
-  #    POST    /people/new/register.xml # PeopleController.register
-  #    PUT     /people/1/promote.xml    # PeopleController.promote with :id => 1
-  #    DELETE  /people/1/deactivate.xml # PeopleController.deactivate with :id => 1
-  #    GET     /people/active.xml       # PeopleController.active
+  #    POST    /people/new/register.json # PeopleController.register
+  #    PUT     /people/1/promote.json    # PeopleController.promote with :id => 1
+  #    DELETE  /people/1/deactivate.json # PeopleController.deactivate with :id => 1
+  #    GET     /people/active.json       # PeopleController.active
   #
   # Using this module, Active Resource can use these custom REST methods just like the
   # standard methods.
@@ -23,13 +23,13 @@ module ActiveResource
   #     self.site = "http://37s.sunrise.i:3000"
   #   end
   #
-  #   Person.new(:name => 'Ryan).post(:register)  # POST /people/new/register.xml
+  #   Person.new(:name => 'Ryan).post(:register)  # POST /people/new/register.json
   #   # => { :id => 1, :name => 'Ryan' }
   #
-  #   Person.find(1).put(:promote, :position => 'Manager') # PUT /people/1/promote.xml
-  #   Person.find(1).delete(:deactivate) # DELETE /people/1/deactivate.xml
+  #   Person.find(1).put(:promote, :position => 'Manager') # PUT /people/1/promote.json
+  #   Person.find(1).delete(:deactivate) # DELETE /people/1/deactivate.json
   #
-  #   Person.get(:active)  # GET /people/active.xml
+  #   Person.get(:active)  # GET /people/active.json
   #   # => [{:id => 1, :name => 'Ryan'}, {:id => 2, :name => 'Joe'}]
   #
   module CustomMethods
@@ -41,10 +41,10 @@ module ActiveResource
 
         # Invokes a GET to a given custom REST method. For example:
         #
-        #   Person.get(:active)  # GET /people/active.xml
+        #   Person.get(:active)  # GET /people/active.json
         #   # => [{:id => 1, :name => 'Ryan'}, {:id => 2, :name => 'Joe'}]
         #
-        #   Person.get(:active, :awesome => true)  # GET /people/active.xml?awesome=true
+        #   Person.get(:active, :awesome => true)  # GET /people/active.json?awesome=true
         #   # => [{:id => 1, :name => 'Ryan'}]
         #
         # Note: the objects returned from this method are not automatically converted
@@ -54,7 +54,9 @@ module ActiveResource
         #
         #   Person.find(:all, :from => :active)
         def get(custom_method_name, options = {})
-          format.decode(connection.get(custom_method_collection_url(custom_method_name, options), headers).body)
+          hashified = format.decode(connection.get(custom_method_collection_url(custom_method_name, options), headers).body)
+          derooted  = Formats.remove_root(hashified)
+          derooted.is_a?(Array) ? derooted.map { |e| Formats.remove_root(e) } : derooted
         end
 
         def post(custom_method_name, options = {}, body = '')

data/lib/active_resource/formats.rb

@@ -10,5 +10,13 @@ module ActiveResource
     def self.[](mime_type_reference)
       ActiveResource::Formats.const_get(ActiveSupport::Inflector.camelize(mime_type_reference.to_s) + "Format")
     end
+
+    def self.remove_root(data)
+      if data.is_a?(Hash) && data.keys.size == 1
+        data.values.first
+      else
+        data
+      end
+    end
   end
 end

data/lib/active_resource/formats/json_format.rb

@@ -18,7 +18,7 @@ module ActiveResource
       end
 
       def decode(json)
-        ActiveSupport::JSON.decode(json)
+        Formats.remove_root(ActiveSupport::JSON.decode(json))
       end
     end
   end

data/lib/active_resource/formats/xml_format.rb

@@ -18,19 +18,8 @@ module ActiveResource
       end
 
       def decode(xml)
-        from_xml_data(Hash.from_xml(xml))
+        Formats.remove_root(Hash.from_xml(xml))
       end
-
-      private
-        # Manipulate from_xml Hash, because xml_simple is not exactly what we
-        # want for Active Resource.
-        def from_xml_data(data)
-          if data.is_a?(Hash) && data.keys.size == 1
-            data.values.first
-          else
-            data
-          end
-        end
     end
   end
 end

data/lib/active_resource/http_mock.rb

@@ -20,10 +20,10 @@ module ActiveResource
   # * <tt>path</tt> - A string, starting with a "/", defining the URI that is expected to be
   #   called.
   # * <tt>request_headers</tt> - Headers that are expected along with the request.  This argument uses a
-  #   hash format, such as <tt>{ "Content-Type" => "application/xml" }</tt>.  This mock will only trigger
+  #   hash format, such as <tt>{ "Content-Type" => "application/json" }</tt>.  This mock will only trigger
   #   if your tests sends a request with identical headers.
   # * <tt>body</tt> - The data to be returned.  This should be a string of Active Resource parseable content,
-  #   such as XML.
+  #   such as Json.
   # * <tt>status</tt> - The HTTP response code, as an integer, to return with the response.
   # * <tt>response_headers</tt> - Headers to be returned with the response.  Uses the same hash format as
   #   <tt>request_headers</tt> listed above.
@@ -35,12 +35,12 @@ module ActiveResource
   #
   # ==== Example
   #   def setup
-  #     @matz  = { :id => 1, :name => "Matz" }.to_xml(:root => "person")
+  #     @matz  = { :person => { :id => 1, :name => "Matz" } }.to_json
   #     ActiveResource::HttpMock.respond_to do |mock|
-  #       mock.post   "/people.xml",   {}, @matz, 201, "Location" => "/people/1.xml"
-  #       mock.get    "/people/1.xml", {}, @matz
-  #       mock.put    "/people/1.xml", {}, nil, 204
-  #       mock.delete "/people/1.xml", {}, nil, 200
+  #       mock.post   "/people.json",   {}, @matz, 201, "Location" => "/people/1.json"
+  #       mock.get    "/people/1.json", {}, @matz
+  #       mock.put    "/people/1.json", {}, nil, 204
+  #       mock.delete "/people/1.json", {}, nil, 200
   #     end
   #   end
   #
@@ -85,9 +85,9 @@ module ActiveResource
       #
       # ==== Example
       #   def setup
-      #     @matz  = { :id => 1, :name => "Matz" }.to_xml(:root => "person")
+      #     @matz  = { :person => { :id => 1, :name => "Matz" } }.to_json
       #     ActiveResource::HttpMock.respond_to do |mock|
-      #       mock.get "/people/1.xml", {}, @matz
+      #       mock.get "/people/1.json", {}, @matz
       #     end
       #   end
       #
@@ -95,7 +95,7 @@ module ActiveResource
       #     person = Person.find(1)  # Call the remote service
       #
       #     # This request object has the same HTTP method and path as declared by the mock
-      #     expected_request = ActiveResource::Request.new(:get, "/people/1.xml")
+      #     expected_request = ActiveResource::Request.new(:get, "/people/1.json")
       #
       #     # Assert that the mock received, and responded to, the expected request from the model
       #     assert ActiveResource::HttpMock.requests.include?(expected_request)
@@ -117,12 +117,12 @@ module ActiveResource
       #
       # === Example
       #
-      #   @matz  = { :id => 1, :name => "Matz" }.to_xml(:root => "person")
+      #   @matz  = { :person => { :id => 1, :name => "Matz" } }.to_json
       #   ActiveResource::HttpMock.respond_to do |mock|
-      #     mock.post   "/people.xml",   {}, @matz, 201, "Location" => "/people/1.xml"
-      #     mock.get    "/people/1.xml", {}, @matz
-      #     mock.put    "/people/1.xml", {}, nil, 204
-      #     mock.delete "/people/1.xml", {}, nil, 200
+      #     mock.post   "/people.json",   {}, @matz, 201, "Location" => "/people/1.json"
+      #     mock.get    "/people/1.json", {}, @matz
+      #     mock.put    "/people/1.json", {}, nil, 204
+      #     mock.delete "/people/1.json", {}, nil, 200
       #   end
       #
       # Alternatively, accepts a hash of <tt>{Request => Response}</tt> pairs allowing you to generate
@@ -135,11 +135,11 @@ module ActiveResource
       #
       # Request.new(:#{method}, path, nil, request_headers)
       #
-      #   @matz  = { :id => 1, :name => "Matz" }.to_xml(:root => "person")
+      #   @matz  = { :person => { :id => 1, :name => "Matz" } }.to_json
       #
-      #   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)
+      #   create_matz      = ActiveResource::Request.new(:post, '/people.json', @matz, {})
+      #   created_response = ActiveResource::Response.new("", 201, {"Location" => "/people/1.json"})
+      #   get_matz         = ActiveResource::Request.new(:get, '/people/1.json', nil)
       #   ok_response      = ActiveResource::Response.new("", 200, {})
       #
       #   pairs = {create_matz => created_response, get_matz => ok_response}
@@ -154,12 +154,12 @@ module ActiveResource
       # === Example
       #
       #   ActiveResource::HttpMock.respond_to do |mock|
-      #     mock.send(:get, "/people/1", {}, "XML1")
+      #     mock.send(:get, "/people/1", {}, "JSON1")
       #   end
       #   ActiveResource::HttpMock.responses.length #=> 1
       #
       #   ActiveResource::HttpMock.respond_to(false) do |mock|
-      #     mock.send(:get, "/people/2", {}, "XML2")
+      #     mock.send(:get, "/people/2", {}, "JSON2")
       #   end
       #   ActiveResource::HttpMock.responses.length #=> 2
       #
@@ -169,11 +169,11 @@ module ActiveResource
       # === Example
       #
       #   ActiveResource::HttpMock.respond_to do |mock|
-      #     mock.send(:get, "/people/1", {}, "XML1")
+      #     mock.send(:get, "/people/1", {}, "JSON1")
       #   end
       #   ActiveResource::HttpMock.responses.length #=> 1
       #
-      #   get_matz         = ActiveResource::Request.new(:get, '/people/1.xml', nil)
+      #   get_matz         = ActiveResource::Request.new(:get, '/people/1.json', nil)
       #   ok_response      = ActiveResource::Response.new("", 200, {})
       #
       #   pairs = {get_matz => ok_response}

data/lib/active_resource/version.rb

@@ -3,7 +3,7 @@ module ActiveResource
     MAJOR = 3
     MINOR = 1
     TINY  = 0
-    PRE   = "beta1"
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -2,7 +2,7 @@
 name: activeresource
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 3.1.0.beta1
+  version: 3.1.0.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 -05:00
+date: 2011-05-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.1.0.beta1
+        version: 3.1.0.rc1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.1.0.beta1
+        version: 3.1.0.rc1
   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.
@@ -47,7 +47,6 @@ files:
 - CHANGELOG
 - README.rdoc
 - examples/performance.rb
-- examples/simple.rb
 - lib/active_resource/base.rb
 - lib/active_resource/connection.rb
 - lib/active_resource/custom_methods.rb
@@ -87,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 
-rubyforge_project: activeresource
+rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3

data/examples/simple.rb

@@ -1,15 +0,0 @@
-$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
-require 'active_resource'
-require 'active_support/core_ext/hash/conversions'
-
-ActiveSupport::XmlMini.backend = ENV['XMLMINI'] || 'REXML'
-ActiveResource::HttpMock.respond_to do |mock|
-  mock.get '/people/1.xml', {}, { :id => 1, :name => 'bob' }.to_xml(:root => 'person')
-end
-
-class Person < ActiveResource::Base
-  self.site = 'http://localhost/'
-end
-
-bob = Person.find(1)
-puts bob.inspect