inherited_resources 1.2.0 → 1.2.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+# Version 1.2.1
+
+* Fix a bug with namespaces
+* Use Post.scoped instead of Post.all in collection
+
 # Version 1.2
 
 * Improved lookup for namespaces (by github.com/Sirupsen)

data/README.rdoc

@@ -19,7 +19,7 @@ Inherited Resources master branch is now supports Rails 3 and is NOT backward co
 
 You can let bundler to install Inherited Resources by adding this line to your application's Gemfile:
 
-  gem 'inherited_resources', '~> 1.2'
+  gem 'inherited_resources', '~> 1.2.1'
 
 And then execute:
 
@@ -27,7 +27,7 @@ And then execute:
 
 Or install it yourself as:
 
-  gem install inherited_resources --version=1.2
+  gem install inherited_resources --version=1.2.1
 
 === Rails 2.3.x
 

data/lib/inherited_resources/base_helpers.rb

@@ -20,7 +20,7 @@ module InheritedResources
       #   end
       #
       def collection
-        get_collection_ivar || set_collection_ivar(end_of_association_chain.all)
+        get_collection_ivar || set_collection_ivar(end_of_association_chain.scoped)
       end
 
       # This is how the resource is loaded.

data/lib/inherited_resources/class_methods.rb

@@ -328,7 +328,7 @@ module InheritedResources
         # Forum::Thread#create will properly pick up the request parameter
         # which will be forum_thread, and not thread
         # Additionally make this work orthogonally with instance_name
-        config[:request_name] = self.name.sub(/Controller$/, '').underscore.gsub('/', '_').singularize
+        config[:request_name] = self.resource_class.to_s.underscore.gsub('/', '_')
 
         # Initialize polymorphic, singleton, scopes and belongs_to parameters
         polymorphic = self.resources_configuration[:polymorphic] || { :symbols => [], :optional => false }

data/lib/inherited_resources/version.rb

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

data/test/base_test.rb

@@ -30,33 +30,33 @@ module UserTestHelper
 
   protected
 
-    def mock_user(expectations={})
-      @mock_user ||= begin
-        user = mock(expectations.except(:errors))
-        user.stubs(:class).returns(User)
-        user.stubs(:errors).returns(expectations.fetch(:errors, {}))
-        user
-      end
+  def mock_user(expectations={})
+    @mock_user ||= begin
+      user = mock(expectations.except(:errors))
+      user.stubs(:class).returns(User)
+      user.stubs(:errors).returns(expectations.fetch(:errors, {}))
+      user
     end
+  end
 end
 
 class IndexActionBaseTest < ActionController::TestCase
   include UserTestHelper
 
   def test_expose_all_users_as_instance_variable
-    User.expects(:all).returns([mock_user])
+    User.expects(:scoped).returns([mock_user])
     get :index
     assert_equal [mock_user], assigns(:users)
   end
 
   def test_apply_scopes_if_method_is_available
-    User.expects(:all).returns([mock_user])
+    User.expects(:scoped).returns([mock_user])
     get :index
     assert @controller.scopes_applied
   end
 
   def test_controller_should_render_index
-    User.stubs(:all).returns([mock_user])
+    User.stubs(:scoped).returns([mock_user])
     get :index
     assert_response :success
     assert_equal 'Index HTML', @response.body.strip
@@ -64,8 +64,8 @@ class IndexActionBaseTest < ActionController::TestCase
 
   def test_render_all_users_as_xml_when_mime_type_is_xml
     @request.accept = 'application/xml'
-    User.expects(:all).returns(mock_user)
-    mock_user.expects(:to_xml).returns('Generated XML')
+    User.expects(:scoped).returns(collection = [mock_user])
+    collection.expects(:to_xml).returns('Generated XML')
     get :index
     assert_response :success
     assert_equal 'Generated XML', @response.body

data/test/belongs_to_test.rb

@@ -24,7 +24,7 @@ class BelongsToTest < ActionController::TestCase
   end
 
   def test_expose_all_comments_as_instance_variable_on_index
-    Comment.expects(:all).returns([mock_comment])
+    Comment.expects(:scoped).returns([mock_comment])
     get :index, :post_id => '37'
     assert_equal mock_post, assigns(:post)
     assert_equal [mock_comment], assigns(:comments)
@@ -106,7 +106,7 @@ class BelongsToTest < ActionController::TestCase
   def test_helpers
     mock_post.stubs(:class).returns(Post)
 
-    Comment.expects(:all).returns([mock_comment])
+    Comment.expects(:scoped).returns([mock_comment])
     get :index, :post_id => '37'
 
     assert helper_methods.include?('parent?')

data/test/belongs_to_with_shallow_test.rb

@@ -24,7 +24,7 @@ class BelongsToWithShallowTest < ActionController::TestCase
   end
 
   def test_expose_all_tags_as_instance_variable_on_index
-    Tag.expects(:all).returns([mock_tag])
+    Tag.expects(:scoped).returns([mock_tag])
     get :index, :post_id => 'thirty_seven'
     assert_equal mock_post, assigns(:post)
     assert_equal [mock_tag], assigns(:tags)

data/test/customized_belongs_to_test.rb

@@ -22,7 +22,7 @@ class CustomizedBelongsToTest < ActionController::TestCase
   end
 
   def test_expose_the_requested_school_with_chosen_instance_variable_on_index
-    Professor.stubs(:all).returns([mock_professor])
+    Professor.stubs(:scoped).returns([mock_professor])
     get :index, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end

data/test/defaults_test.rb

@@ -23,7 +23,7 @@ class DefaultsTest < ActionController::TestCase
   end
 
   def test_expose_all_painters_as_instance_variable
-    Malarz.expects(:all).returns([mock_painter])
+    Malarz.expects(:scoped).returns([mock_painter])
     get :index
     assert_equal [mock_painter], assigns(:malarze)
   end
@@ -90,7 +90,7 @@ class DefaultsNamespaceTest < ActionController::TestCase
   end
 
   def test_expose_all_professors_as_instance_variable
-    Professor.expects(:all).returns([mock_professor])
+    Professor.expects(:scoped).returns([mock_professor])
     get :index
     assert_equal [mock_professor], assigns(:professors)
   end
@@ -116,14 +116,14 @@ class DefaultsNamespaceTest < ActionController::TestCase
 
   def test_expose_a_newly_create_professor_when_saved_with_success
     Professor.expects(:new).with({'these' => 'params'}).returns(mock_professor(:save => true))
-    post :create, :university_professor => {:these => 'params'}
+    post :create, :professor => {:these => 'params'}
     assert_equal mock_professor, assigns(:professor)
   end
 
   def test_update_the_professor
     Professor.expects(:find_by_slug).with('forty_two').returns(mock_professor)
     mock_professor.expects(:update_attributes).with({'these' => 'params'}).returns(true)
-    put :update, :id => 'forty_two', :university_professor => {:these => 'params'}
+    put :update, :id => 'forty_two', :professor => {:these => 'params'}
     assert_equal mock_professor, assigns(:professor)
   end
 
@@ -174,3 +174,24 @@ class TwoPartNameModelForNamespacedController < ActionController::TestCase
     assert_equal AdminRole, @controller.resource_class
   end
 end
+
+class User
+end
+class Admin::UsersController < InheritedResources::Base
+end
+class TwoPartNameModelForNamespacedController < ActionController::TestCase
+  tests Admin::UsersController
+
+  def setup
+    # make public so we can test it
+    Admin::UsersController.send(:public, *Admin::UsersController.protected_instance_methods)
+  end
+
+  def test_that_it_picked_the_camelcased_model
+    assert_equal User, @controller.resource_class
+  end
+
+  def test_that_it_got_the_rquest_params_right
+    assert_equal 'user', @controller.resources_configuration[:self][:request_name]
+  end
+end

data/test/nested_belongs_to_with_shallow_test.rb

@@ -30,7 +30,7 @@ class NestedBelongsToWithShallowTest < ActionController::TestCase
 
   def test_assigns_dresser_and_shelf_and_plate_on_index
     Shelf.expects(:find).with('37').twice.returns(mock_shelf)
-    Plate.expects(:all).returns([mock_plate])
+    Plate.expects(:scoped).returns([mock_plate])
     get :index, :shelf_id => '37'
 
     assert_equal mock_dresser, assigns(:dresser)

data/test/optional_belongs_to_test.rb

@@ -22,14 +22,14 @@ class OptionalTest < ActionController::TestCase
   def test_expose_all_products_as_instance_variable_with_category
     Category.expects(:find).with('37').returns(mock_category)
     mock_category.expects(:products).returns(Product)
-    Product.expects(:all).returns([mock_product])
+    Product.expects(:scoped).returns([mock_product])
     get :index, :category_id => '37'
     assert_equal mock_category, assigns(:category)
     assert_equal [mock_product], assigns(:products)
   end
 
   def test_expose_all_products_as_instance_variable_without_category
-    Product.expects(:all).returns([mock_product])
+    Product.expects(:scoped).returns([mock_product])
     get :index
     assert_equal nil, assigns(:category)
     assert_equal [mock_product], assigns(:products)
@@ -142,7 +142,7 @@ class OptionalTest < ActionController::TestCase
   end
 
   def test_polymorphic_helpers
-    Product.expects(:all).returns([mock_product])
+    Product.expects(:scoped).returns([mock_product])
     get :index
 
     assert !@controller.send(:parent?)

data/test/polymorphic_test.rb

@@ -23,7 +23,7 @@ class PolymorphicFactoriesTest < ActionController::TestCase
   end
 
   def test_expose_all_employees_as_instance_variable_on_index
-    Employee.expects(:all).returns([mock_employee])
+    Employee.expects(:scoped).returns([mock_employee])
     get :index, :factory_id => '37'
     assert_equal mock_factory, assigns(:factory)
     assert_equal [mock_employee], assigns(:employees)
@@ -77,7 +77,7 @@ class PolymorphicFactoriesTest < ActionController::TestCase
   def test_polymorphic_helpers
     mock_factory.stubs(:class).returns(Factory)
 
-    Employee.expects(:all).returns([mock_employee])
+    Employee.expects(:scoped).returns([mock_employee])
     get :index, :factory_id => '37'
 
     assert @controller.send(:parent?)
@@ -110,7 +110,7 @@ class PolymorphicCompanyTest < ActionController::TestCase
   end
 
   def test_expose_all_employees_as_instance_variable_on_index
-    Employee.expects(:all).returns([mock_employee])
+    Employee.expects(:scoped).returns([mock_employee])
     get :index, :company_id => '37'
     assert_equal mock_company, assigns(:company)
     assert_equal [mock_employee], assigns(:employees)
@@ -164,7 +164,7 @@ class PolymorphicCompanyTest < ActionController::TestCase
   def test_polymorphic_helpers
     mock_company.stubs(:class).returns(Company)
 
-    Employee.expects(:all).returns([mock_employee])
+    Employee.expects(:scoped).returns([mock_employee])
     get :index, :company_id => '37'
 
     assert @controller.send(:parent?)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inherited_resources
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 +01:00
+date: 2011-01-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency