activeresource 3.0.0.beta4 → 3.0.0.rc

data/CHANGELOG

@@ -1,3 +1,8 @@
+*Rails 3.0.0 [release candidate] (July 26th, 2010)*
+
+* No material changes
+
+
 *Rails 3.0.0 [beta 4] (June 8th, 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]

data/lib/active_resource/base.rb

@@ -7,7 +7,6 @@ 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'
-require 'active_support/core_ext/object/misc'
 require 'active_support/core_ext/object/to_query'
 require 'active_support/core_ext/object/duplicable'
 require 'set'
@@ -17,6 +16,7 @@ require 'active_resource/exceptions'
 require 'active_resource/connection'
 require 'active_resource/formats'
 require 'active_resource/schema'
+require 'active_resource/log_subscriber'
 
 module ActiveResource
   # ActiveResource::Base is the main class for mapping RESTful resources as models in a Rails application.
@@ -212,7 +212,7 @@ module ActiveResource
   #   # is requested with invalid values, the response is:
   #   #
   #   # Response (422):
-  #   # <errors type="array"><error>First cannot be empty</error></errors>
+  #   # <errors><error>First cannot be empty</error></errors>
   #   # or
   #   # {"errors":["First cannot be empty"]}
   #   #
@@ -577,7 +577,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| "\#{options[#{key}]}" }
+        prefix_call = value.gsub(/:\w+/) { |key| "\#{URI.escape options[#{key}].to_s}" }
 
         # Clear prefix parameters in case they have been cached
         @prefix_parameters = nil
@@ -622,7 +622,7 @@ module ActiveResource
       #
       def element_path(id, prefix_options = {}, query_options = nil)
         prefix_options, query_options = split_options(prefix_options) if query_options.nil?
-        "#{prefix(prefix_options)}#{collection_name}/#{id}.#{format.extension}#{query_string(query_options)}"
+        "#{prefix(prefix_options)}#{collection_name}/#{URI.escape id.to_s}.#{format.extension}#{query_string(query_options)}"
       end
 
       # Gets the new element path for REST resources.
@@ -763,7 +763,7 @@ module ActiveResource
       #   With any other scope, find returns nil when no data is returned.
       #
       #   Person.find(1)
-      #   # => raises ResourcenotFound
+      #   # => raises ResourceNotFound
       #
       #   Person.find(:all)
       #   Person.find(:first)
@@ -941,7 +941,7 @@ module ActiveResource
     end
 
     # This is a list of known attributes for this resource. Either
-    # gathered fromthe provided <tt>schema</tt>, or from the attributes
+    # 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)

data/lib/active_resource/http_mock.rb

@@ -148,16 +148,28 @@ module ActiveResource
     attr_accessor :path, :method, :body, :headers
 
     def initialize(method, path, body = nil, headers = {})
-      @method, @path, @body, @headers = method, path, body, headers.merge(ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[method] => 'application/xml')
+      @method, @path, @body, @headers = method, path, body, headers
     end
 
     def ==(req)
-      path == req.path && method == req.method && headers == req.headers
+      path == req.path && method == req.method && headers_match?(req)
     end
 
     def to_s
       "<#{method.to_s.upcase}: #{path} [#{headers}] (#{body})>"
     end
+
+    private
+
+    def headers_match?(req)
+      # Ignore format header on equality if it's not defined
+      format_header = ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[method]
+      if headers[format_header].present? || req.headers[format_header].blank?
+        headers == req.headers
+      else
+        headers.dup.merge(format_header => req.headers[format_header]) == req.headers
+      end
+    end
   end
 
   class Response

data/lib/active_resource/log_subscriber.rb

@@ -0,0 +1,15 @@
+module ActiveResource
+  class LogSubscriber < ActiveSupport::LogSubscriber
+    def request(event)
+      result = event.payload[:result]
+      info "#{event.payload[:method].to_s.upcase} #{event.payload[:request_uri]}"
+      info "--> %d %s %d (%.1fms)" % [result.code, result.message, result.body.to_s.length, event.duration]
+    end
+
+    def logger
+      ActiveResource::Base.logger
+    end
+  end
+end
+
+ActiveResource::LogSubscriber.attach_to :active_resource

data/lib/active_resource/railtie.rb

@@ -5,9 +5,6 @@ module ActiveResource
   class Railtie < Rails::Railtie
     config.active_resource = ActiveSupport::OrderedOptions.new
 
-    require "active_resource/railties/log_subscriber"
-    log_subscriber :active_resource, ActiveResource::Railties::LogSubscriber.new
-
     initializer "active_resource.set_configs" do |app|
       app.config.active_resource.each do |k,v|
         ActiveResource::Base.send "#{k}=", v

data/lib/active_resource/validations.rb

@@ -27,7 +27,7 @@ module ActiveResource
 
     # Grabs errors from a json response.
     def from_json(json, save_cache = false)
-      array = ActiveSupport::JSON.decode(json)['errors'] rescue []
+      array = Array.wrap(ActiveSupport::JSON.decode(json)['errors']) rescue []
       from_array array, save_cache
     end
 

data/lib/active_resource/version.rb

@@ -3,7 +3,7 @@ module ActiveResource
     MAJOR = 3
     MINOR = 0
     TINY  = 0
-    BUILD = "beta4"
+    BUILD = "rc"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
   end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: activeresource
 version: !ruby/object:Gem::Version 
+  hash: 7712042
   prerelease: true
   segments: 
   - 3
   - 0
   - 0
-  - beta4
-  version: 3.0.0.beta4
+  - rc
+  version: 3.0.0.rc
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,37 +16,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -04:00
+date: 2010-07-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 7712042
         segments: 
         - 3
         - 0
         - 0
-        - beta4
-        version: 3.0.0.beta4
+        - rc
+        version: 3.0.0.rc
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activemodel
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 7712042
         segments: 
         - 3
         - 0
         - 0
-        - beta4
-        version: 3.0.0.beta4
+        - rc
+        version: 3.0.0.rc
   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.
@@ -55,10 +60,10 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.rdoc
 files: 
 - CHANGELOG
-- README
+- README.rdoc
 - examples/simple.rb
 - lib/active_resource/base.rb
 - lib/active_resource/connection.rb
@@ -68,9 +73,9 @@ files:
 - lib/active_resource/formats/xml_format.rb
 - lib/active_resource/formats.rb
 - lib/active_resource/http_mock.rb
+- lib/active_resource/log_subscriber.rb
 - lib/active_resource/observing.rb
 - lib/active_resource/railtie.rb
-- lib/active_resource/railties/log_subscriber.rb
 - lib/active_resource/schema.rb
 - lib/active_resource/validations.rb
 - lib/active_resource/version.rb
@@ -82,22 +87,26 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --main
-- README
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -106,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: activeresource
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: REST modeling framework (part of Rails).

data/lib/active_resource/railties/log_subscriber.rb

@@ -1,15 +0,0 @@
-module ActiveResource
-  module Railties
-    class LogSubscriber < Rails::LogSubscriber
-      def request(event)
-        result = event.payload[:result]
-        info "#{event.payload[:method].to_s.upcase} #{event.payload[:request_uri]}"
-        info "--> %d %s %d (%.1fms)" % [result.code, result.message, result.body.to_s.length, event.duration]
-      end
-
-      def logger
-        ActiveResource::Base.logger
-      end
-    end
-  end
-end