josevalim-inherited_resources 0.4.5 → 0.4.6

data/CHANGELOG

@@ -1,6 +1,11 @@
+# Version 0.4.6
+
+* Dealing with namespaced controllers out of the box;
+* Added support to namespaced routes through :route_prefix.
+
 # Version 0.4.5
 
-* Added fix when resource_url is not defined;
+* Added fix when resource_url is not defined.
 
 # Version 0.4.4
 

data/README

@@ -1,6 +1,6 @@
 Inherited Resources
 License: MIT
-Version: 0.4.5
+Version: 0.4.6
 
 You can also read this README in pretty html at the GitHub project Wiki page:
 
@@ -111,6 +111,15 @@ just doing:
      defaults :resource_class => User, :collection_name => 'users', :instance_name => 'user'
    end
 
+Namespaced controllers work out of the box, but if you need to specify a
+different route prefix, you can do the following:
+
+   class Administrators::PeopleController < InheritedResources::Base
+     defaults :route_prefix => 'admin'
+   end
+
+Then your named routes will be: 'admin_people_url', 'admin_person_url' and so on.
+
 Further extensions is done by overwriting two methods. Let's suppose you want
 to add pagination to your projects collection:
 

data/lib/inherited_resources/base.rb

@@ -155,6 +155,16 @@
 #     defaults :resource_class => User, :instance_name => 'user', :collection_name => 'users'
 #   end
 #
+# Namespaced controllers work out of the box, but if you need to specify a
+# different route prefix, you can do the following:
+#
+#   class Administrators::PeopleController < InheritedResources::Base
+#     defaults :route_prefix => 'admin'
+#   end
+#
+# Then your named routes will be: 'admin_people_url', 'admin_person_url' and
+# so on.
+#
 # Further customizations can be done replacing some methods. Check
 # base_helpers.rb file for more information.
 

data/lib/inherited_resources/class_methods.rb

@@ -46,9 +46,15 @@
 #
 # * route_name => Allows you to specify what is the route name in your url
 #   helper. By default is 'project'. But if your url helper should be
-#   "admin_project_task_url" instead of "project_task_url", just do:
+#   "myproject_task_url" instead of "project_task_url", just do:
 #
-#     belongs_to :project, :route_name => "admin_project"
+#     belongs_to :project, :route_name => "myproject"
+#
+#   But if you want to use namespaced routes, you can do:
+#
+#     defaults :route_prefix => :admin
+#
+#   That would generate "admin_project_task_url".
 #
 # = nested_belongs_to
 #
@@ -238,7 +244,8 @@ module InheritedResources #:nodoc:
         raise ArgumentError, 'Class method :defaults expects a hash of options.' unless options.is_a? Hash
 
         options.symbolize_keys!
-        options.assert_valid_keys(:resource_class, :collection_name, :instance_name, :class_name, :singleton)
+        options.assert_valid_keys(:resource_class, :collection_name, :instance_name,
+                                  :class_name, :route_prefix, :singleton)
 
         # Checks for special argument :resource_class and :class_name and sets it right away.
         self.resource_class = options.delete(:resource_class)         if options[:resource_class]
@@ -285,7 +292,9 @@ module InheritedResources #:nodoc:
         options = symbols.extract_options!
 
         options.symbolize_keys!
-        options.assert_valid_keys(:class_name, :parent_class, :instance_name, :param, :finder, :route_name, :collection_name, :singleton, :polymorphic, :optional)
+        options.assert_valid_keys(:class_name, :parent_class, :instance_name, :param,
+                                  :finder, :route_name, :collection_name, :singleton,
+                                  :polymorphic, :optional)
 
         optional    = options.delete(:optional)
         singleton   = options.delete(:singleton)
@@ -380,6 +389,10 @@ module InheritedResources #:nodoc:
         config[:collection_name] = base.controller_name.to_sym
         config[:instance_name]   = base.controller_name.singularize.to_sym
 
+        # Deal with namespaced controllers
+        namespaces = base.controller_path.split('/')[0..-2]
+        config[:route_prefix] = namespaces.join('_') unless namespaces.empty?
+
         # Initialize polymorphic, singleton and belongs_to parameters
         base.singleton           = false
         base.parents_symbols     = []

data/lib/inherited_resources/url_helpers.rb

@@ -44,6 +44,9 @@ module InheritedResources #:nodoc:
       resource_config = base.resources_configuration[:self]
       polymorphic = false
 
+      # Add route_prefix if any.
+      resource_segments << resource_config[:route_prefix] if resource_config[:route_prefix]
+
       # Deal with belongs_to associations and polymorphic associations.
       # Remember that we don't have to build the segments in polymorphic cases,
       # because the url will be polymorphic_url.

data/test/defaults_test.rb

@@ -0,0 +1,68 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class Malarz
+  def self.human_name; 'Painter'; end
+end
+
+class PaintersController < InheritedResources::Base
+  defaults :instance_name => 'malarz', :collection_name => 'malarze', :resource_class => Malarz
+end
+
+class DefaultsTest < TEST_CLASS
+  def setup
+    @controller          = PaintersController.new
+    @controller.request  = @request  = ActionController::TestRequest.new
+    @controller.response = @response = ActionController::TestResponse.new
+  end
+
+  def test_expose_all_painters_as_instance_variable
+    Malarz.expects(:find).with(:all).returns([mock_painter])
+    get :index
+    assert_equal [mock_painter], assigns(:malarze)
+  end
+
+  def test_expose_the_resquested_painter_on_show
+    Malarz.expects(:find).with('42').returns(mock_painter)
+    get :show, :id => '42'
+    assert_equal mock_painter, assigns(:malarz)
+  end
+
+  def test_expose_a_new_painter
+    Malarz.expects(:new).returns(mock_painter)
+    get :new
+    assert_equal mock_painter, assigns(:malarz)
+  end
+
+  def test_expose_the_resquested_painter_on_edit
+    Malarz.expects(:find).with('42').returns(mock_painter)
+    get :edit, :id => '42'
+    assert_response :success
+    assert_equal mock_painter, assigns(:malarz)
+  end
+
+  def test_expose_a_newly_create_painter_when_saved_with_success
+    Malarz.expects(:new).with({'these' => 'params'}).returns(mock_painter(:save => true))
+    post :create, :malarz => {:these => 'params'}
+    assert_equal mock_painter, assigns(:malarz)
+  end
+
+  def test_update_the_requested_object
+    Malarz.expects(:find).with('42').returns(mock_painter)
+    mock_painter.expects(:update_attributes).with({'these' => 'params'}).returns(true)
+    put :update, :id => '42', :malarz => {:these => 'params'}
+    assert_equal mock_painter, assigns(:malarz)
+  end
+
+  def test_the_resquested_painter_is_destroyed
+    Malarz.expects(:find).with('42').returns(mock_painter)
+    mock_painter.expects(:destroy)
+    delete :destroy, :id => '42'
+    assert_equal mock_painter, assigns(:malarz)
+  end
+
+  protected
+    def mock_painter(stubs={})
+      @mock_painter ||= mock(stubs)
+    end
+end
+

data/test/url_helpers_test.rb

@@ -9,6 +9,11 @@ class House; end
 class HousesController < InheritedResources::Base
 end
 
+class Backpack; end
+module Admin; end
+class Admin::BackpacksController < InheritedResources::Base
+end
+
 class Table; end
 class TablesController < InheritedResources::Base
   belongs_to :house
@@ -82,6 +87,38 @@ class UrlHelpersTest < ActiveSupport::TestCase
     end
   end
 
+  def test_url_helpers_on_simple_inherited_namespaced_resource
+    controller = Admin::BackpacksController.new
+    controller.instance_variable_set('@backpack', :backpack)
+
+    assert_equal 'admin', controller.class.resources_configuration[:self][:route_prefix]
+
+    [:url, :path].each do |path_or_url|
+      controller.expects("admin_backpacks_#{path_or_url}").with({}).once
+      controller.send("collection_#{path_or_url}")
+
+      controller.expects("admin_backpack_#{path_or_url}").with(:backpack, {}).once
+      controller.send("resource_#{path_or_url}")
+
+      controller.expects("new_admin_backpack_#{path_or_url}").with({}).once
+      controller.send("new_resource_#{path_or_url}")
+
+      controller.expects("edit_admin_backpack_#{path_or_url}").with(:backpack, {}).once
+      controller.send("edit_resource_#{path_or_url}")
+
+      # With arg
+      controller.expects("admin_backpack_#{path_or_url}").with(:arg, {}).once
+      controller.send("resource_#{path_or_url}", :arg)
+
+      controller.expects("admin_backpack_#{path_or_url}").with(:arg, {}).once
+      controller.send("resource_#{path_or_url}", :arg)
+
+      # With options
+      controller.expects("admin_backpack_#{path_or_url}").with(:arg, :page => 1).once
+      controller.send("resource_#{path_or_url}", :arg, :page => 1)
+    end
+  end
+
   def test_url_helpers_on_simple_inherited_singleton_resource
     controller = UniversesController.new
     controller.instance_variable_set('@universe', :universe)

data/test/views/painters/edit.html.erb

@@ -0,0 +1 @@
+Edit HTML

data/test/views/painters/index.html.erb

@@ -0,0 +1 @@
+Index HTML

data/test/views/painters/new.html.erb

@@ -0,0 +1 @@
+New HTML

data/test/views/painters/show.html.erb

@@ -0,0 +1 @@
+Show HTML

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-inherited_resources
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-06 00:00:00 -08:00
+date: 2009-03-11 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -71,6 +71,7 @@ test_files:
 - test/base_test.rb
 - test/belongs_to_test.rb
 - test/class_methods_test.rb
+- test/defaults_test.rb
 - test/nested_belongs_to_test.rb
 - test/optional_belongs_to_test.rb
 - test/polymorphic_test.rb
@@ -94,6 +95,10 @@ test_files:
 - test/views/managers/edit.html.erb
 - test/views/managers/new.html.erb
 - test/views/managers/show.html.erb
+- test/views/painters/edit.html.erb
+- test/views/painters/index.html.erb
+- test/views/painters/new.html.erb
+- test/views/painters/show.html.erb
 - test/views/pets/edit.html.erb
 - test/views/products/edit.html.erb
 - test/views/products/index.html.erb