inherited_resources 1.2.1 → 1.2.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+# Version 1.2.2
+
+* Fix a bug in params parsing
+* Call .scoped only if it is available
+
 # Version 1.2.1
 
 * Fix a bug with namespaces

data/README.rdoc

@@ -15,11 +15,9 @@ http://akitaonrails.com/2009/09/01/screencast-real-thin-restful-controllers-with
 
 === Rails 3
 
-Inherited Resources master branch is now supports Rails 3 and is NOT backward compatible.
+You can let bundler install Inherited Resources by adding this line to your application's Gemfile:
 
-You can let bundler to install Inherited Resources by adding this line to your application's Gemfile:
-
-  gem 'inherited_resources', '~> 1.2.1'
+  gem 'inherited_resources'
 
 And then execute:
 
@@ -27,13 +25,13 @@ And then execute:
 
 Or install it yourself as:
 
-  gem install inherited_resources --version=1.2.1
+  gem install inherited_resources
 
 === Rails 2.3.x
 
 If you want to use the Rails 2.3.x version, you should install:
 
-  sudo gem install inherited_resources --version=1.0.6
+  gem install inherited_resources --version=1.0.6
 
 Or checkout from the v1.0 branch:
 
@@ -71,6 +69,8 @@ that through the following configuration value:
 
   InheritedResources.flash_keys = [ :success, :failure ]
 
+Notice the CollectionResponder won't work with InheritedResources, as InheritedResources hardcodes the redirect path based on the current scope (like belongs to, polymorphic associations, etc).
+
 == Basic Usage
 
 To use Inherited Resources you just have to inherit (duh) it:
@@ -294,7 +294,7 @@ in destroy action calculate in following order collection_url, parent_url, root_
 Example:
 
     class ButtonsConntroller < InheritedResources::Base
-      belong_to :window
+      belongs_to :window
       actions :all, :except => [:show, :index]
     end
 

data/lib/inherited_resources/actions.rb

@@ -42,7 +42,7 @@ module InheritedResources
     def update(options={}, &block)
       object = resource
 
-      if update_resource(object, params[resource_request_name])
+      if update_resource(object, resource_params)
         options[:location] ||= smart_resource_url
       end
 

data/lib/inherited_resources/base_helpers.rb

@@ -20,7 +20,10 @@ module InheritedResources
       #   end
       #
       def collection
-        get_collection_ivar || set_collection_ivar(end_of_association_chain.scoped)
+        get_collection_ivar || begin
+          c = end_of_association_chain
+          set_collection_ivar(c.respond_to?(:scoped) ? c.scoped : c.all)
+        end
       end
 
       # This is how the resource is loaded.
@@ -46,7 +49,7 @@ module InheritedResources
       # instance variable.
       #
       def build_resource
-        get_resource_ivar || set_resource_ivar(end_of_association_chain.send(method_for_build, params[resource_request_name] || {}))
+        get_resource_ivar || set_resource_ivar(end_of_association_chain.send(method_for_build, resource_params))
       end
 
       # Responsible for saving the resource on :create method. Overwriting this
@@ -294,6 +297,11 @@ module InheritedResources
         end
         url ||= root_url rescue nil
       end
+
+      # extract attributes from params
+      def resource_params
+        params[resource_request_name] || params[resource_instance_name] || {}
+      end
   end
 end
 

data/lib/inherited_resources/version.rb

@@ -1,3 +1,3 @@
 module InheritedResources
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.2.2'.freeze
 end

data/test/base_test.rb

@@ -35,6 +35,12 @@ module UserTestHelper
       user = mock(expectations.except(:errors))
       user.stubs(:class).returns(User)
       user.stubs(:errors).returns(expectations.fetch(:errors, {}))
+      user.singleton_class.class_eval do
+        def method_missing(symbol, *arguments, &block)
+          raise NoMethodError.new('this is expected by Array#flatten') if symbol == :to_ary
+          super
+        end
+      end
       user
     end
   end
@@ -70,6 +76,12 @@ class IndexActionBaseTest < ActionController::TestCase
     assert_response :success
     assert_equal 'Generated XML', @response.body
   end
+
+  def test_scoped_is_called_only_when_available
+    User.stubs(:all).returns([mock_user])
+    get :index
+    assert_equal Array, assigns(:users).class
+  end
 end
 
 class ShowActionBaseTest < ActionController::TestCase

data/test/class_methods_test.rb

@@ -64,23 +64,23 @@ class DefaultsClassMethodTest < ActiveSupport::TestCase
   end
 
   def test_defaults_are_set
-    assert Folder, FoldersController.send(:resource_class)
-    assert :folder, FoldersController.send(:resources_configuration)[:self][:instance_name]
-    assert :folders, FoldersController.send(:resources_configuration)[:self][:collection_name]
+    assert_equal Folder, FoldersController.send(:resource_class)
+    assert_equal :folder, FoldersController.send(:resources_configuration)[:self][:instance_name]
+    assert_equal :folders, FoldersController.send(:resources_configuration)[:self][:collection_name]
   end
 
   def test_defaults_can_be_overwriten
     BooksController.send(:defaults, :resource_class => String, :instance_name => 'string', :collection_name => 'strings')
 
-    assert String, BooksController.send(:resource_class)
-    assert :string, BooksController.send(:resources_configuration)[:self][:instance_name]
-    assert :strings, BooksController.send(:resources_configuration)[:self][:collection_name]
+    assert_equal String, BooksController.send(:resource_class)
+    assert_equal :string, BooksController.send(:resources_configuration)[:self][:instance_name]
+    assert_equal :strings, BooksController.send(:resources_configuration)[:self][:collection_name]
 
     BooksController.send(:defaults, :class_name => 'Fixnum', :instance_name => :fixnum, :collection_name => :fixnums)
 
-    assert String, BooksController.send(:resource_class)
-    assert :string, BooksController.send(:resources_configuration)[:self][:instance_name]
-    assert :strings, BooksController.send(:resources_configuration)[:self][:collection_name]
+    assert_equal Fixnum, BooksController.send(:resource_class)
+    assert_equal :fixnum, BooksController.send(:resources_configuration)[:self][:instance_name]
+    assert_equal :fixnums, BooksController.send(:resources_configuration)[:self][:collection_name]
   end
 
   def test_defaults_raises_invalid_key

data/test/nested_model_with_shallow_test.rb

@@ -57,6 +57,20 @@ class NestedModelWithShallowTest < ActionController::TestCase
     assert_equal mock_group, assigns(:group)
   end
 
+  def test_expose_a_newly_create_group_with_speciality
+    Speciality.expects(:find).with('37').twice.returns(mock_speciality)
+    Plan::Group.expects(:build).with({'these' => :params}).returns(mock_group(:save => true))
+    post :create, :speciality_id => '37', :group => {:these => :params}
+    assert_equal mock_group, assigns(:group)
+  end
+
+  def test_expose_a_update_group_with_speciality
+    should_find_parents
+    mock_group.expects(:update_attributes).with('these' => :params).returns(true)
+    post :update, :id => 'forty_two', :group => {:these => :params}
+    assert_equal mock_group, assigns(:group)
+  end
+
   protected
     def should_find_parents
       Plan::Group.expects(:find_by_slug).with('forty_two').returns(mock_group)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inherited_resources
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 +01:00
+date: 2011-04-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: inherited_resources
-rubygems_version: 1.3.7
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Inherited Resources speeds up development by making your controllers inherit all restful actions so you just have to focus on what is important.