activeresource 2.1.1 → 2.1.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+*2.1.2 (October 23rd, 2008)*
+
+* Included in Rails 2.1.2
+
+
 *2.1.1 (September 4th, 2008)*
 
 * Fixed Base#exists? to check status code as integer [#299 state:resolved] (Wes Oldenbeuving)

data/Rakefile

@@ -66,7 +66,7 @@ spec = Gem::Specification.new do |s|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
   
-  s.add_dependency('activesupport', '= 2.1.1' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 2.1.2' + PKG_BUILD)
 
   s.require_path = 'lib'
   s.autorequire = 'active_resource'

data/lib/active_resource/base.rb

@@ -843,13 +843,8 @@ module ActiveResource
     #
     #   my_group.to_xml(:skip_instruct => true)
     #   # => <subsidiary_group> [...] </subsidiary_group>
-    def encode(options={})
-      case self.class.format
-        when ActiveResource::Formats[:xml]
-          self.class.format.encode(attributes, {:root => self.class.element_name}.merge(options))
-        else
-          self.class.format.encode(attributes, options)
-      end
+    def to_xml(options={})
+      attributes.to_xml({:root => self.class.element_name}.merge(options))
     end
 
     # A method to reload the attributes of this object from the remote web service.
@@ -934,14 +929,14 @@ module ActiveResource
 
       # Update the resource on the remote service.
       def update
-        returning connection.put(element_path(prefix_options), encode, self.class.headers) do |response|
+        returning connection.put(element_path(prefix_options), to_xml, self.class.headers) do |response|
           load_attributes_from_response(response)
         end
       end
 
       # Create (i.e., save to the remote service) the new resource.
       def create
-        returning connection.post(collection_path, encode, self.class.headers) do |response|
+        returning connection.post(collection_path, to_xml, self.class.headers) do |response|
           self.id = id_from_response(response)
           load_attributes_from_response(response)
         end

data/lib/active_resource/connection.rb

@@ -63,13 +63,6 @@ module ActiveResource
   # This class is used by ActiveResource::Base to interface with REST
   # services.
   class Connection
-
-    HTTP_FORMAT_HEADER_NAMES = {  :get => 'Accept',
-      :put => 'Content-Type',
-      :post => 'Content-Type',
-      :delete => 'Accept'
-    }
-
     attr_reader :site, :user, :password, :timeout
     attr_accessor :format
 
@@ -113,25 +106,25 @@ module ActiveResource
     # Execute a GET request.
     # Used to get (find) resources.
     def get(path, headers = {})
-      format.decode(request(:get, path, build_request_headers(headers, :get)).body)
+      format.decode(request(:get, path, build_request_headers(headers)).body)
     end
 
     # Execute a DELETE request (see HTTP protocol documentation if unfamiliar).
     # Used to delete resources.
     def delete(path, headers = {})
-      request(:delete, path, build_request_headers(headers, :delete))
+      request(:delete, path, build_request_headers(headers))
     end
 
     # Execute a PUT request (see HTTP protocol documentation if unfamiliar).
     # Used to update resources.
     def put(path, body = '', headers = {})
-      request(:put, path, body.to_s, build_request_headers(headers, :put))
+      request(:put, path, body.to_s, build_request_headers(headers))
     end
 
     # Execute a POST request.
     # Used to create new resources.
     def post(path, body = '', headers = {})
-      request(:post, path, body.to_s, build_request_headers(headers, :post))
+      request(:post, path, body.to_s, build_request_headers(headers))
     end
 
     # Execute a HEAD request.
@@ -194,12 +187,12 @@ module ActiveResource
       end
 
       def default_header
-        @default_header ||= {}
+        @default_header ||= { 'Content-Type' => format.mime_type }
       end
 
       # Builds headers for request to remote service.
-      def build_request_headers(headers, http_method=nil)
-        authorization_header.update(default_header).update(headers).update(http_format_header(http_method))
+      def build_request_headers(headers)
+        authorization_header.update(default_header).update(headers)
       end
 
       # Sets authorization header
@@ -207,10 +200,6 @@ module ActiveResource
         (@user || @password ? { 'Authorization' => 'Basic ' + ["#{@user}:#{ @password}"].pack('m').delete("\r\n") } : {})
       end
 
-      def http_format_header(http_method)
-        {HTTP_FORMAT_HEADER_NAMES[http_method] => format.mime_type}
-      end
-
       def logger #:nodoc:
         ActiveResource::Base.logger
       end

data/lib/active_resource/custom_methods.rb

@@ -30,7 +30,7 @@ module ActiveResource
   #   Person.get(:active)  # GET /people/active.xml
   #   # => [{:id => 1, :name => 'Ryan'}, {:id => 2, :name => 'Joe'}]
   #
-  module CustomMethods
+  module CustomMethods 
     def self.included(base)
       base.class_eval do
         extend ActiveResource::CustomMethods::ClassMethods
@@ -83,25 +83,24 @@ module ActiveResource
         "#{prefix(prefix_options)}#{collection_name}/#{method_name}.#{format.extension}#{query_string(query_options)}"
       end
     end
-
+    
     module InstanceMethods
       def get(method_name, options = {})
         connection.get(custom_method_element_url(method_name, options), self.class.headers)
       end
-
-      def post(method_name, options = {}, body = nil)
-        request_body = body.nil? ? encode : body
+      
+      def post(method_name, options = {}, body = '')
         if new?
-          connection.post(custom_method_new_element_url(method_name, options), request_body, self.class.headers)
+          connection.post(custom_method_new_element_url(method_name, options), (body.nil? ? to_xml : body), self.class.headers)
         else
-          connection.post(custom_method_element_url(method_name, options), request_body, self.class.headers)
+          connection.post(custom_method_element_url(method_name, options), body, self.class.headers)
         end
       end
-
+      
       def put(method_name, options = {}, body = '')
         connection.put(custom_method_element_url(method_name, options), body, self.class.headers)
       end
-
+      
       def delete(method_name, options = {})
         connection.delete(custom_method_element_url(method_name, options), self.class.headers)
       end
@@ -111,7 +110,7 @@ module ActiveResource
         def custom_method_element_url(method_name, options = {})
           "#{self.class.prefix(prefix_options)}#{self.class.collection_name}/#{id}/#{method_name}.#{self.class.format.extension}#{self.class.send!(:query_string, options)}"
         end
-
+      
         def custom_method_new_element_url(method_name, options = {})
           "#{self.class.prefix(prefix_options)}#{self.class.collection_name}/new/#{method_name}.#{self.class.format.extension}#{self.class.send!(:query_string, options)}"
         end

data/lib/active_resource/formats/json_format.rb

@@ -2,22 +2,22 @@ module ActiveResource
   module Formats
     module JsonFormat
       extend self
-
+      
       def extension
         "json"
       end
-
+      
       def mime_type
         "application/json"
       end
-
-      def encode(hash, options={})
+      
+      def encode(hash)
         hash.to_json
       end
-
+      
       def decode(json)
         ActiveSupport::JSON.decode(json)
       end
     end
   end
-end
+end

data/lib/active_resource/formats/xml_format.rb

@@ -2,23 +2,23 @@ module ActiveResource
   module Formats
     module XmlFormat
       extend self
-
+      
       def extension
         "xml"
       end
-
+      
       def mime_type
         "application/xml"
       end
-
-      def encode(hash, options={})
-        hash.to_xml(options)
+      
+      def encode(hash)
+        hash.to_xml
       end
-
+      
       def decode(xml)
         from_xml_data(Hash.from_xml(xml))
       end
-
+      
       private
         # Manipulate from_xml Hash, because xml_simple is not exactly what we
         # want for Active Resource.
@@ -28,7 +28,7 @@ module ActiveResource
           else
             data
           end
-        end
+        end      
     end
   end
-end
+end

data/lib/active_resource/http_mock.rb

@@ -146,7 +146,7 @@ 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.reverse_merge('Content-Type' => 'application/xml')
     end
 
     def ==(other_request)

data/lib/active_resource/version.rb

@@ -2,7 +2,7 @@ module ActiveResource
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/base/custom_methods_test.rb

@@ -10,7 +10,8 @@ class CustomMethodsTest < Test::Unit::TestCase
     @ryan  = { :name => 'Ryan' }.to_xml(:root => 'person')
     @addy  = { :id => 1, :street => '12345 Street' }.to_xml(:root => 'address')
     @addy_deep  = { :id => 1, :street => '12345 Street', :zip => "27519" }.to_xml(:root => 'address')
-
+    @default_request_headers = { 'Content-Type' => 'application/xml' }
+    
     ActiveResource::HttpMock.respond_to do |mock|
       mock.get    "/people/1.xml",             {}, @matz
       mock.get    "/people/1/shallow.xml", {}, @matz

data/test/base_test.rb

@@ -819,7 +819,7 @@ class BaseTest < Test::Unit::TestCase
   
   def test_to_xml
     matz = Person.find(1)
-    xml = matz.encode
+    xml = matz.to_xml
     assert xml.starts_with?('<?xml version="1.0" encoding="UTF-8"?>')
     assert xml.include?('<name>Matz</name>')
     assert xml.include?('<id type="integer">1</id>')

data/test/format_test.rb

@@ -5,22 +5,14 @@ class FormatTest < Test::Unit::TestCase
   def setup
     @matz  = { :id => 1, :name => 'Matz' }
     @david = { :id => 2, :name => 'David' }
-
+    
     @programmers = [ @matz, @david ]
   end
-
-  def test_http_format_header_name
-    header_name = ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[:get]
-    assert_equal 'Accept', header_name
-
-    headers_names = [ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[:put], ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[:post]]
-    headers_names.each{|header_name| assert_equal 'Content-Type', header_name}
-  end
-
+  
   def test_formats_on_single_element
     for format in [ :json, :xml ]
       using_format(Person, format) do
-        ActiveResource::HttpMock.respond_to.get "/people/1.#{format}", {'Accept' => ActiveResource::Formats[format].mime_type}, ActiveResource::Formats[format].encode(@david)
+        ActiveResource::HttpMock.respond_to.get "/people/1.#{format}", {}, ActiveResource::Formats[format].encode(@david)
         assert_equal @david[:name], Person.find(1).name
       end
     end
@@ -29,7 +21,7 @@ class FormatTest < Test::Unit::TestCase
   def test_formats_on_collection
     for format in [ :json, :xml ]
       using_format(Person, format) do
-        ActiveResource::HttpMock.respond_to.get "/people.#{format}", {'Accept' => ActiveResource::Formats[format].mime_type}, ActiveResource::Formats[format].encode(@programmers)
+        ActiveResource::HttpMock.respond_to.get "/people.#{format}", {}, ActiveResource::Formats[format].encode(@programmers)
         remote_programmers = Person.find(:all)
         assert_equal 2, remote_programmers.size
         assert remote_programmers.select { |p| p.name == 'David' }
@@ -40,7 +32,7 @@ class FormatTest < Test::Unit::TestCase
   def test_formats_on_custom_collection_method
     for format in [ :json, :xml ]
       using_format(Person, format) do
-        ActiveResource::HttpMock.respond_to.get "/people/retrieve.#{format}?name=David", {'Accept' => ActiveResource::Formats[format].mime_type}, ActiveResource::Formats[format].encode([@david])
+        ActiveResource::HttpMock.respond_to.get "/people/retrieve.#{format}?name=David", {}, ActiveResource::Formats[format].encode([@david])
         remote_programmers = Person.get(:retrieve, :name => 'David')
         assert_equal 1, remote_programmers.size
         assert_equal @david[:id], remote_programmers[0]['id']
@@ -48,13 +40,13 @@ class FormatTest < Test::Unit::TestCase
       end
     end
   end
-
+  
   def test_formats_on_custom_element_method
     for format in [ :json, :xml ]
       using_format(Person, format) do
         ActiveResource::HttpMock.respond_to do |mock|
-          mock.get "/people/2.#{format}", {'Accept' => ActiveResource::Formats[format].mime_type}, ActiveResource::Formats[format].encode(@david)
-          mock.get "/people/2/shallow.#{format}", {'Accept' => ActiveResource::Formats[format].mime_type}, ActiveResource::Formats[format].encode(@david)
+          mock.get "/people/2.#{format}", {}, ActiveResource::Formats[format].encode(@david)
+          mock.get "/people/2/shallow.#{format}", {}, ActiveResource::Formats[format].encode(@david)
         end
         remote_programmer = Person.find(2).get(:shallow)
         assert_equal @david[:id], remote_programmer['id']
@@ -65,24 +57,20 @@ class FormatTest < Test::Unit::TestCase
     for format in [ :json, :xml ]
       ryan = ActiveResource::Formats[format].encode({ :name => 'Ryan' })
       using_format(Person, format) do
+        ActiveResource::HttpMock.respond_to.post "/people/new/register.#{format}", {}, ryan, 201, 'Location' => "/people/5.#{format}"
         remote_ryan = Person.new(:name => 'Ryan')
-        ActiveResource::HttpMock.respond_to.post "/people.#{format}", {'Content-Type' => ActiveResource::Formats[format].mime_type}, ryan, 201, {'Location' => "/people/5.#{format}"}
-        remote_ryan.save
-
-        remote_ryan = Person.new(:name => 'Ryan')
-        ActiveResource::HttpMock.respond_to.post "/people/new/register.#{format}", {'Content-Type' => ActiveResource::Formats[format].mime_type}, ryan, 201, {'Location' => "/people/5.#{format}"}
         assert_equal ActiveResource::Response.new(ryan, 201, {'Location' => "/people/5.#{format}"}), remote_ryan.post(:register)
       end
     end
   end
-
+  
   def test_setting_format_before_site
     resource = Class.new(ActiveResource::Base)
     resource.format = :json
     resource.site   = 'http://37s.sunrise.i:3000'
     assert_equal ActiveResource::Formats[:json], resource.connection.format
   end
-
+  
   private
     def using_format(klass, mime_type_reference)
       previous_format = klass.format

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activeresource
 version: !ruby/object:Gem::Version 
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ autorequire: active_resource
 bindir: bin
 cert_chain: []
 
-date: 2008-09-04 00:00:00 +02:00
+date: 2008-10-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.1.1
+        version: 2.1.2
     version: 
 description: Wraps web resources in model classes that can be manipulated through XML over REST.
 email: david@loudthinking.com