josevalim-inherited_resources 0.5.1 → 0.5.2

data/CHANGELOG

@@ -1,45 +1,30 @@
-# Version 0.5.0
+# Version 0.5.2
 
+* Decoupled routes name from :instance_name and :collection_name. This way we
+  have more flexibility. Use route_instance_name and route_collection_name to
+  to change routes.
+* Avoid calling human_name on nil when a resource class is not defined.
 * Only call I18n if it's defined.
 
-# Version 0.4.6
+# Version 0.4.6-0
 
-* Dealing with namespaced controllers out of the box;
+* 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.
-
-# Version 0.4.4
-
-* Added better handling for namespaced controllers;
-* Added flash messages scoped by namespaced controllers;
+* Added better handling for namespaced controllers.
+* Added flash messages scoped by namespaced controllers.
 * Deprecated {{resource}} in I18n, use {{resource_name}} instead.
-
-# Version 0.4.3
-
 * rspec bug fix is not automatically required anymore. User has to do it
   explicitly.
-
-# Version 0.4.2
-
 * Added a file which fix a rspec bug when render is called inside a method
   which receives a block.
-
-# Version 0.4.1
-
 * parent? does not take begin_of_association_chain into account anymore
 * Added options to url helpers.
-
-# Version 0.4
-
 * Added :optional to belongs_to associations. It allows you to deal with
   categories/1/products/2 and /products/2 with just one controller.
-
 * Cleaned up tests.
 
-# Version 0.3
+# Version 0.3.0
 
 * Minor bump after three bug fixes.
 * Bug fix when showing warning of constant redefinition.
@@ -48,24 +33,15 @@
   raise "NoMethodError _url", not it will call root_url.
 * More comments on UrlHelpers.
 
-# Version 0.2.1
+# Version 0.2.1-0
 
 * Bug fix when ApplicationController is already loaded when we load respond_to.
-
-# Version 0.2.0
-
 * Added support success/failure blocks.
 * Eager loading of files to work properly in multithreaded environments.
 
-# Version 0.1.2
+# Version 0.1.2-0
 
 * Added more helper_methods.
-
-# Version 0.1.1
-
 * Added Rails 2.3.0 and changed tests to work with ActionController::TestCase.
-
-# Version 0.1.0
-
-* Initial release. Support to I18n, singleton controllers, polymorphic
+* First release. Support to I18n, singleton controllers, polymorphic
 controllers, belongs_to, nested_belongs_to and url helpers.

data/README

@@ -1,6 +1,6 @@
 Inherited Resources
 License: MIT
-Version: 0.5.1
+Version: 0.5.2
 
 You can also read this README in pretty html at the GitHub project Wiki page:
 
@@ -103,14 +103,18 @@ Overwriting defaults
 Now that you learned the default behavior and basic configuration, let's see
 how to extend it.
 
-Assuming that you have a PeopleController, but the resource is actually called
-User, you could overwrite the resource name, collection name and instance name
-just doing:
+Some people usually have an AccountsController to deal with all account
+management while the resource is an User. So you can overwrite the resource class,
+collection name and instance name just doing:
 
-   class PeopleController < InheritedResources::Base
-     defaults :resource_class => User, :collection_name => 'users', :instance_name => 'user'
+   class AccountsController < InheritedResources::Base
+     defaults :resource_class => User, :collection_name, 'users', :instance_name => 'user'
    end
 
+In the case above, in your views you will have @users and @user variables, but
+the routes used will still be accounts_url and account_url. If you plan also to
+change the routes, you can use :route_collection_name and :route_instance_name.
+
 Namespaced controllers work out of the box, but if you need to specify a
 different route prefix, you can do the following:
 

data/lib/inherited_resources/base_helpers.rb

@@ -189,7 +189,7 @@ module InheritedResources #:nodoc:
 
         options = {
           :default  => default_message || '',
-          :resource_name => resource_class.human_name,
+          :resource_name => resource_class ? resource_class.human_name : 'Resource',
         }.merge(interpolation_options)
 
         defaults = []

data/lib/inherited_resources/class_methods.rb

@@ -231,12 +231,18 @@ module InheritedResources #:nodoc:
       # When you inherit from InheritedResources::Base, we make some assumptions on
       # what is your resource_class, instance_name and collection_name.
       #
-      # You can change those values by calling the class method defaults:
+      # You can change those values by calling the class method <tt>defaults</tt>.
+      # This is useful, for example, in an accounts controller, where the object
+      # is an User but controller and routes are accounts.
       #
-      #   class PeopleController < InheritedResources::Base
-      #     defaults :resource_class => User, :instance_name => 'user', :collection_name => 'users'
+      #   class AccountController < InheritedResources::Base
+      #     defaults :resource_class => User, :instance_name => 'user',
+      #              :collection_name => 'users', :singleton => true
       #   end
       #
+      # If you want to change your urls, you can use :route_instance_name and
+      # :route_collection_name helpers.
+      #
       # You can also provide :class_name, which is the same as :resource_class
       # but accepts string (this is given for ActiveRecord compatibility).
       #
@@ -245,7 +251,8 @@ module InheritedResources #:nodoc:
 
         options.symbolize_keys!
         options.assert_valid_keys(:resource_class, :collection_name, :instance_name,
-                                  :class_name, :route_prefix, :singleton)
+                                  :class_name, :route_prefix, :route_collection_name,
+                                  :route_instance_name, :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]
@@ -391,6 +398,9 @@ module InheritedResources #:nodoc:
         config[:collection_name] = base.controller_name.to_sym
         config[:instance_name]   = base.controller_name.singularize.to_sym
 
+        config[:route_collection_name] = config[:collection_name]
+        config[:route_instance_name]   = config[:instance_name]
+
         # Deal with namespaced controllers
         namespaces = base.controller_path.split('/')[0..-2]
         config[:route_prefix] = namespaces.join('_') unless namespaces.empty?

data/lib/inherited_resources/url_helpers.rb

@@ -77,7 +77,7 @@ module InheritedResources #:nodoc:
       # This is where you are going to be redirected after destroying the manager.
       #
       unless base.singleton
-        resource_segments << resource_config[:collection_name] 
+        resource_segments << resource_config[:route_collection_name]
         generate_url_and_path_helpers(base, nil, :collection, resource_segments, resource_ivars, polymorphic)
         resource_segments.pop
       else
@@ -85,7 +85,7 @@ module InheritedResources #:nodoc:
       end
 
       # Prepare and add new_resource_url
-      resource_segments << resource_config[:instance_name]
+      resource_segments << resource_config[:route_instance_name]
       generate_url_and_path_helpers(base, :new, :resource, resource_segments, resource_ivars, polymorphic)
 
       # We don't add the resource_ivar to edit and show url if singleton.
@@ -95,7 +95,7 @@ module InheritedResources #:nodoc:
       #
       # Instead of:
       #
-      #   edit_project_task_url(@project, @task)
+      #   edit_project_manager_url(@project, @manager)
       #
       resource_ivars << resource_config[:instance_name] unless base.singleton
 
@@ -134,18 +134,16 @@ module InheritedResources #:nodoc:
           #   polymorphic_url(@company)
           #   polymorphic_url(@project)
           #
-          # Obviously, this won't work properly. So in such cases, polymorphic
-          # with singlestons we have to send this:
+          # Obviously, this won't work properly. So in such polymorphic with
+          # singletons cases we have to do this:
           #
           #   polymorphic_url(@company, 'manager')
           #   polymorphic_url(@project, 'manager')
           #
           # This is exactly what we are doing here.
           #
-          # The other case to be handle, is collection and new helpers with
-          # polymorphic urls.
-          #
-          # In such cases, we usually would not send anything:
+          # The other case to handle is collection and new helpers with
+          # polymorphic urls. In such cases, we usually would not send anything:
           #
           #   project_tasks_url(@project)
           #   new_project_task_url(@project)

data/test/class_methods_test.rb

@@ -100,49 +100,49 @@ class BelongsToClassMethodTest < TEST_CLASS
     @controller.response = @response = ActionController::TestResponse.new
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable
+  def test_expose_the_resquested_school_with_chosen_instance_variable_on_index
     GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
     Professor.stubs(:find).returns([mock_professor])
     get :index, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable
+  def test_expose_the_resquested_school_with_chosen_instance_variable_on_show
     GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
     Professor.stubs(:find).returns(mock_professor)
     get :show, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable
+  def test_expose_the_resquested_school_with_chosen_instance_variable_on_new
     GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
     Professor.stubs(:build).returns(mock_professor)
     get :new, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable
+  def test_expose_the_resquested_school_with_chosen_instance_variable_on_edit
     GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
     Professor.stubs(:find).returns(mock_professor)
     get :edit, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable
+  def test_expose_the_resquested_school_with_chosen_instance_variable_on_create
     GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
     Professor.stubs(:build).returns(mock_professor(:save => true))
     post :create, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable
+  def test_expose_the_resquested_school_with_chosen_instance_variable_on_update
     GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
     Professor.stubs(:find).returns(mock_professor(:update_attributes => true))
     put :update, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable
+  def test_expose_the_resquested_school_with_chosen_instance_variable_on_destroy
     GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
     Professor.stubs(:find).returns(mock_professor(:destroy => true))
     delete :destroy, :school_title => 'nice'

data/test/url_helpers_test.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/test_helper'
 
 class Universe; end
 class UniversesController < InheritedResources::Base
-  defaults :singleton => true # Let's not discuss about this :P
+  defaults :singleton => true, :route_instance_name => 'universum'
 end
 
 class House; end
@@ -12,6 +12,7 @@ end
 class Backpack; end
 module Admin; end
 class Admin::BackpacksController < InheritedResources::Base
+  defaults :route_collection_name => 'tour_backpacks'
 end
 
 class Table; end
@@ -94,7 +95,7 @@ class UrlHelpersTest < ActiveSupport::TestCase
     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.expects("admin_tour_backpacks_#{path_or_url}").with({}).once
       controller.send("collection_#{path_or_url}")
 
       controller.expects("admin_backpack_#{path_or_url}").with(:backpack, {}).once
@@ -127,18 +128,18 @@ class UrlHelpersTest < ActiveSupport::TestCase
       controller.expects("root_#{path_or_url}").with({}).once
       controller.send("collection_#{path_or_url}")
 
-      controller.expects("universe_#{path_or_url}").with({}).once
+      controller.expects("universum_#{path_or_url}").with({}).once
       controller.send("resource_#{path_or_url}")
 
-      controller.expects("new_universe_#{path_or_url}").with({}).once
+      controller.expects("new_universum_#{path_or_url}").with({}).once
       controller.send("new_resource_#{path_or_url}")
 
-      controller.expects("edit_universe_#{path_or_url}").with({}).once
+      controller.expects("edit_universum_#{path_or_url}").with({}).once
       controller.send("edit_resource_#{path_or_url}")
 
       # With options
       # Also tests that argument sent are not used
-      controller.expects("universe_#{path_or_url}").with(:page => 1).once
+      controller.expects("universum_#{path_or_url}").with(:page => 1).once
       controller.send("resource_#{path_or_url}", :arg, :page => 1)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-inherited_resources
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-16 00:00:00 -07:00
+date: 2009-03-22 00:00:00 -07:00
 default_executable: 
 dependencies: []