Changeset 9114

Timestamp:

03/28/08 19:58:46 (1 year ago)

Author:

david

Message:

Fixed that to_param should be used and honored instead of hardcoding the id (closes #11406) [gspiers]

Files:

• trunk/activeresource/CHANGELOG (modified) (1 diff)
• trunk/activeresource/lib/active_resource/base.rb (modified) (4 diffs)
• trunk/activeresource/test/base_test.rb (modified) (6 diffs)

trunk/activeresource/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fixed that to_param should be used and honored instead of hardcoding the id #11406 [gspiers]
-
-* Improve documentation. [Radar, Jan De Poorter, chuyeow, xaviershay, danger, miloops, Xavier Noria,  Sunny Ripert]

trunk/activeresource/lib/active_resource/base.rb

@@ -351 +351 @@
-      def element_path(id, prefix_options = {}, query_options = nil)
-        prefix_options, query_options = split_options(prefix_options) if query_options.nil?
-
+        
-      end
-
@@ -761 +761 @@
-    #   # => false
-    def exists?
-id, :params => prefix_options)
+to_param, :params => prefix_options)      
-    end
-
@@ -808 +808 @@
-    #   # => Wilson Road
-    def reload
-id
+to_param
-    end
-
@@ -904 +904 @@
-
-      def element_path(options = nil)
-id
+to_param
-      end
-

trunk/activeresource/test/base_test.rb

@@ -8 +8 @@
-    @matz  = { :id => 1, :name => 'Matz' }.to_xml(:root => 'person')
-    @david = { :id => 2, :name => 'David' }.to_xml(:root => 'person')
+    @greg  = { :id => 3, :name => 'Greg' }.to_xml(:root => 'person')    
-    @addy  = { :id => 1, :street => '12345 Street' }.to_xml(:root => 'address')
-    @default_request_headers = { 'Content-Type' => 'application/xml' }
@@ -14 +15 @@
-    @people_david = [{ :id => 2, :name => 'David' }].to_xml(:root => 'people')
-    @addresses = [{ :id => 1, :street => '12345 Street' }].to_xml(:root => 'addresses')
-
+
-    ActiveResource::HttpMock.respond_to do |mock|
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    end
-
@@ -303 +308 @@
-    assert_equal '/people/1/addresses/1.xml', StreetAddress.element_path(1, :person_id => 1)
-    assert_equal '/people/1/addresses/1.xml', StreetAddress.element_path(1, 'person_id' => 1)
+    assert_equal '/people/Greg/addresses/1.xml', StreetAddress.element_path(1, 'person_id' => 'Greg')    
+  end
+  
+  def test_custom_element_path_with_redefined_to_param
+    Person.module_eval do
+      alias_method :original_to_param_element_path, :to_param
+       def to_param  
+         name
+       end
+    end
+
+    # Class method.
+    assert_equal '/people/Greg.xml', Person.element_path('Greg')
+    
+    # Protected Instance method.
+    assert_equal '/people/Greg.xml', Person.find('Greg').send(:element_path)
+
+    ensure
+      # revert back to original
+      Person.module_eval do
+        # save the 'new' to_param so we don't get a warning about discarding the method
+        alias_method :element_path_to_param, :to_param
+        alias_method :to_param, :original_to_param_element_path
+      end
-  end
-
@@ -407 +436 @@
-  def test_custom_header
-    Person.headers['key'] = 'value'
-3
+4
-  ensure
-    Person.headers.delete('key')
@@ -487 +516 @@
-    assert_equal address, address.reload
-  end
+  
+  def test_reload_with_redefined_to_param
+    Person.module_eval do
+      alias_method :original_to_param_reload, :to_param
+       def to_param  
+         name
+       end
+    end
+
+    person = Person.find('Greg')
+    assert_equal person, person.reload
+
+    ensure
+      # revert back to original
+      Person.module_eval do
+        # save the 'new' to_param so we don't get a warning about discarding the method
+        alias_method :reload_to_param, :to_param
+        alias_method :to_param, :original_to_param_reload
+      end
+  end  
-  
-  def test_reload_works_without_prefix_options    
@@ -596 +645 @@
-  end
-  
+  def test_exists_with_redefined_to_param
+    Person.module_eval do
+      alias_method :original_to_param_exists, :to_param
+       def to_param  
+         name
+       end
+    end
+
+    # Class method.
+    assert Person.exists?('Greg')    
+
+    # Instance method.
+    assert Person.find('Greg').exists?    
+
+    # Nested class method.
+    assert StreetAddress.exists?(1,  :params => { :person_id => Person.find('Greg').to_param })    
+
+    # Nested instance method.
+    assert StreetAddress.find(1, :params => { :person_id => Person.find('Greg').to_param }).exists?
+
+    ensure
+      # revert back to original
+      Person.module_eval do
+        # save the 'new' to_param so we don't get a warning about discarding the method
+        alias_method :exists_to_param, :to_param
+        alias_method :to_param, :original_to_param_exists
+      end
+  end  
+  
-  def test_to_xml
-    matz = Person.find(1)