inherited_resources 1.2.2 → 1.3.0

data/test/test_helper.rb

@@ -12,7 +12,6 @@ RAILS_ROOT = "anywhere"
 require "active_support"
 require "active_model"
 require "action_controller"
-require "rails/railtie"
 
 I18n.load_path << File.join(File.dirname(__FILE__), 'locales', 'en.yml')
 I18n.reload!
@@ -30,10 +29,15 @@ InheritedResources::Routes.draw do
   match ':controller(/:action(/:id))'
   match ':controller(/:action)'
   resources 'posts'
+  root :to => 'posts#index'
 end
 
 ActionController::Base.send :include, InheritedResources::Routes.url_helpers
 
+# Add app base to load path
+$:.unshift File.expand_path(File.dirname(__FILE__) + '/../app/controllers')
+require 'inherited_resources/base'
+
 class ActiveSupport::TestCase
   setup do
     @routes = InheritedResources::Routes

data/test/url_helpers_test.rb

@@ -125,6 +125,10 @@ end
 
 # Create a TestHelper module with some helpers
 class UrlHelpersTest < ActiveSupport::TestCase
+  def mock_polymorphic(controller, route)
+    controller.expects(:url_for).with(:no=>"no")
+    controller._routes.url_helpers.expects("hash_for_#{route}").returns({:no=>"no"})    
+  end
 
   def test_url_helpers_on_simple_inherited_resource
     controller = HousesController.new
@@ -408,30 +412,30 @@ class UrlHelpersTest < ActiveSupport::TestCase
     controller.instance_variable_set('@bed', bed)
 
     [:url, :path].each do |path_or_url|
-      controller.expects("house_beds_#{path_or_url}").with(house).once
+      mock_polymorphic(controller, "house_beds_#{path_or_url}").with(house).once
       controller.send("collection_#{path_or_url}")
 
-      controller.expects("house_bed_#{path_or_url}").with(house, bed).once
+      mock_polymorphic(controller, "house_bed_#{path_or_url}").with(house, bed).once
       controller.send("resource_#{path_or_url}")
 
-      controller.expects("new_house_bed_#{path_or_url}").with(house).once
+      mock_polymorphic(controller, "new_house_bed_#{path_or_url}").with(house).once
       controller.send("new_resource_#{path_or_url}")
 
-      controller.expects("edit_house_bed_#{path_or_url}").with(house, bed).once
+      mock_polymorphic(controller, "edit_house_bed_#{path_or_url}").with(house, bed).once
       controller.send("edit_resource_#{path_or_url}")
 
-      controller.expects("house_#{path_or_url}").with(house).once
+      mock_polymorphic(controller, "house_#{path_or_url}").with(house).once
       controller.send("parent_#{path_or_url}")
 
-      controller.expects("edit_house_#{path_or_url}").with(house).once
+      mock_polymorphic(controller, "edit_house_#{path_or_url}").with(house).once
       controller.send("edit_parent_#{path_or_url}")
     end
 
     # With options
-    controller.expects("house_bed_url").with(house, bed, :page => 1).once
+    mock_polymorphic(controller, "house_bed_url").with(house, bed, :page => 1).once
     controller.send("resource_url", :page => 1)
 
-    controller.expects("house_url").with(house, :page => 1).once
+    mock_polymorphic(controller, "house_url").with(house, :page => 1).once
     controller.send("parent_url", :page => 1)
 
     # With args
@@ -462,30 +466,30 @@ class UrlHelpersTest < ActiveSupport::TestCase
     controller.instance_variable_set('@sheep', sheep)
 
     [:url, :path].each do |path_or_url|
-      controller.expects("news_sheep_index_#{path_or_url}").with(news).once
+      mock_polymorphic(controller, "news_sheep_index_#{path_or_url}").with(news).once
       controller.send("collection_#{path_or_url}")
 
-      controller.expects("news_sheep_#{path_or_url}").with(news, sheep).once
+      mock_polymorphic(controller, "news_sheep_#{path_or_url}").with(news, sheep).once
       controller.send("resource_#{path_or_url}")
 
-      controller.expects("new_news_sheep_#{path_or_url}").with(news).once
+      mock_polymorphic(controller, "new_news_sheep_#{path_or_url}").with(news).once
       controller.send("new_resource_#{path_or_url}")
 
-      controller.expects("edit_news_sheep_#{path_or_url}").with(news, sheep).once
+      mock_polymorphic(controller, "edit_news_sheep_#{path_or_url}").with(news, sheep).once
       controller.send("edit_resource_#{path_or_url}")
 
-      controller.expects("news_#{path_or_url}").with(news).once
+      mock_polymorphic(controller, "news_#{path_or_url}").with(news).once
       controller.send("parent_#{path_or_url}")
 
-      controller.expects("edit_news_#{path_or_url}").with(news).once
+      mock_polymorphic(controller, "edit_news_#{path_or_url}").with(news).once
       controller.send("edit_parent_#{path_or_url}")
     end
 
     # With options
-    controller.expects("news_sheep_url").with(news, sheep, :page => 1).once
+    mock_polymorphic(controller, "news_sheep_url").with(news, sheep, :page => 1).once
     controller.send("resource_url", :page => 1)
 
-    controller.expects("news_url").with(news, :page => 1).once
+    mock_polymorphic(controller, "news_url").with(news, :page => 1).once
     controller.send("parent_url", :page => 1)
 
     # With args
@@ -516,30 +520,30 @@ class UrlHelpersTest < ActiveSupport::TestCase
     controller.instance_variable_set('@desk', desk)
 
     [:url, :path].each do |path_or_url|
-      controller.expects("admin_house_desks_#{path_or_url}").with(house).once
+      mock_polymorphic(controller, "admin_house_desks_#{path_or_url}").with(house).once
       controller.send("collection_#{path_or_url}")
 
-      controller.expects("admin_house_desk_#{path_or_url}").with(house, desk).once
+      mock_polymorphic(controller, "admin_house_desk_#{path_or_url}").with(house, desk).once
       controller.send("resource_#{path_or_url}")
 
-      controller.expects("new_admin_house_desk_#{path_or_url}").with(house).once
+      mock_polymorphic(controller, "new_admin_house_desk_#{path_or_url}").with(house).once
       controller.send("new_resource_#{path_or_url}")
 
-      controller.expects("edit_admin_house_desk_#{path_or_url}").with(house, desk).once
+      mock_polymorphic(controller, "edit_admin_house_desk_#{path_or_url}").with(house, desk).once
       controller.send("edit_resource_#{path_or_url}")
 
-      controller.expects("admin_house_#{path_or_url}").with(house).once
+      mock_polymorphic(controller, "admin_house_#{path_or_url}").with(house).once
       controller.send("parent_#{path_or_url}")
 
-      controller.expects("edit_admin_house_#{path_or_url}").with(house).once
+      mock_polymorphic(controller, "edit_admin_house_#{path_or_url}").with(house).once
       controller.send("edit_parent_#{path_or_url}")
     end
 
     # With options
-    controller.expects("admin_house_desk_url").with(house, desk, :page => 1).once
+    mock_polymorphic(controller, "admin_house_desk_url").with(house, desk, :page => 1).once
     controller.send("resource_url", :page => 1)
 
-    controller.expects("admin_house_url").with(house, :page => 1).once
+    mock_polymorphic(controller, "admin_house_url").with(house, :page => 1).once
     controller.send("parent_url", :page => 1)
 
     # With args
@@ -572,30 +576,30 @@ class UrlHelpersTest < ActiveSupport::TestCase
     controller.instance_variable_set('@dish', dish)
 
     [:url, :path].each do |path_or_url|
-      controller.expects("house_table_dishes_#{path_or_url}").with(house, table).once
+      mock_polymorphic(controller, "house_table_dishes_#{path_or_url}").with(house, table).once
       controller.send("collection_#{path_or_url}")
 
-      controller.expects("house_table_dish_#{path_or_url}").with(house, table, dish).once
+      mock_polymorphic(controller, "house_table_dish_#{path_or_url}").with(house, table, dish).once
       controller.send("resource_#{path_or_url}")
 
-      controller.expects("new_house_table_dish_#{path_or_url}").with(house, table).once
+      mock_polymorphic(controller, "new_house_table_dish_#{path_or_url}").with(house, table).once
       controller.send("new_resource_#{path_or_url}")
 
-      controller.expects("edit_house_table_dish_#{path_or_url}").with(house, table, dish).once
+      mock_polymorphic(controller, "edit_house_table_dish_#{path_or_url}").with(house, table, dish).once
       controller.send("edit_resource_#{path_or_url}")
 
-      controller.expects("house_table_#{path_or_url}").with(house, table).once
+      mock_polymorphic(controller, "house_table_#{path_or_url}").with(house, table).once
       controller.send("parent_#{path_or_url}")
 
-      controller.expects("edit_house_table_#{path_or_url}").with(house, table).once
+      mock_polymorphic(controller, "edit_house_table_#{path_or_url}").with(house, table).once
       controller.send("edit_parent_#{path_or_url}")
     end
 
     # With options
-    controller.expects("house_table_dish_url").with(house, table, dish, :page => 1).once
+    mock_polymorphic(controller, "house_table_dish_url").with(house, table, dish, :page => 1).once
     controller.send("resource_url", :page => 1)
 
-    controller.expects("house_table_url").with(house, table, :page => 1).once
+    mock_polymorphic(controller, "house_table_url").with(house, table, :page => 1).once
     controller.send("parent_url", :page => 1)
 
     # With args
@@ -624,30 +628,30 @@ class UrlHelpersTest < ActiveSupport::TestCase
     # controller.instance_variable_set('@center', :center)
 
     [:url, :path].each do |path_or_url|
-      controller.expects("house_table_#{path_or_url}").with(house, table).once
+      mock_polymorphic(controller, "house_table_#{path_or_url}").with(house, table).once
       controller.send("collection_#{path_or_url}")
 
-      controller.expects("house_table_center_#{path_or_url}").with(house, table).once
+      mock_polymorphic(controller, "house_table_center_#{path_or_url}").with(house, table).once
       controller.send("resource_#{path_or_url}")
 
-      controller.expects("new_house_table_center_#{path_or_url}").with(house, table).once
+      mock_polymorphic(controller, "new_house_table_center_#{path_or_url}").with(house, table).once
       controller.send("new_resource_#{path_or_url}")
 
-      controller.expects("edit_house_table_center_#{path_or_url}").with(house, table).once
+      mock_polymorphic(controller, "edit_house_table_center_#{path_or_url}").with(house, table).once
       controller.send("edit_resource_#{path_or_url}")
 
-      controller.expects("house_table_#{path_or_url}").with(house, table).once
+      mock_polymorphic(controller, "house_table_#{path_or_url}").with(house, table).once
       controller.send("parent_#{path_or_url}")
 
-      controller.expects("edit_house_table_#{path_or_url}").with(house, table).once
+      mock_polymorphic(controller, "edit_house_table_#{path_or_url}").with(house, table).once
       controller.send("edit_parent_#{path_or_url}")
     end
 
     # With options
-    controller.expects("house_table_center_url").with(house, table, :page => 1)
+    mock_polymorphic(controller, "house_table_center_url").with(house, table, :page => 1)
     controller.send("resource_url", :page => 1)
 
-    controller.expects("house_table_url").with(house, table, :page => 1)
+    mock_polymorphic(controller, "house_table_url").with(house, table, :page => 1)
     controller.send("parent_url", :page => 1)
 
     # With args
@@ -669,21 +673,21 @@ class UrlHelpersTest < ActiveSupport::TestCase
     controller.instance_variable_set('@bed', bed)
 
     [:url, :path].each do |path_or_url|
-      controller.expects("beds_#{path_or_url}").with().once
+      mock_polymorphic(controller, "beds_#{path_or_url}").with().once
       controller.send("collection_#{path_or_url}")
 
-      controller.expects("bed_#{path_or_url}").with(bed).once
+      mock_polymorphic(controller, "bed_#{path_or_url}").with(bed).once
       controller.send("resource_#{path_or_url}")
 
-      controller.expects("new_bed_#{path_or_url}").with().once
+      mock_polymorphic(controller, "new_bed_#{path_or_url}").with().once
       controller.send("new_resource_#{path_or_url}")
 
-      controller.expects("edit_bed_#{path_or_url}").with(bed).once
+      mock_polymorphic(controller, "edit_bed_#{path_or_url}").with(bed).once
       controller.send("edit_resource_#{path_or_url}")
     end
 
     # With options
-    controller.expects("bed_url").with(bed, :page => 1).once
+    mock_polymorphic(controller, "bed_url").with(bed, :page => 1).once
     controller.send("resource_url", :page => 1)
 
     # With args
@@ -701,7 +705,6 @@ class UrlHelpersTest < ActiveSupport::TestCase
     controller.instance_variable_set('@mirror', :mirror)
 
     [:url, :path].each do |path_or_url|
-
       controller.expects("house_mirrors_#{path_or_url}").with(:house, {}).once
       controller.send("collection_#{path_or_url}")
 

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

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

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

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

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

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

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 2
-  version: 1.2.2
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-17 00:00:00 +02:00
+date: 2011-09-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,13 +66,13 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- app/controllers/inherited_resources/base.rb
 - inherited_resources.gemspec
 - lib/generators/rails/USAGE
 - lib/generators/rails/inherited_resources_controller_generator.rb
 - lib/generators/rails/templates/controller.rb
 - lib/inherited_resources.rb
 - lib/inherited_resources/actions.rb
-- lib/inherited_resources/base.rb
 - lib/inherited_resources/base_helpers.rb
 - lib/inherited_resources/belongs_to_helpers.rb
 - lib/inherited_resources/blank_slate.rb
@@ -95,6 +95,7 @@ files:
 - test/customized_redirect_to_test.rb
 - test/defaults_test.rb
 - test/locales/en.yml
+- test/multiple_nested_optional_belongs_to_test.rb
 - test/nested_belongs_to_test.rb
 - test/nested_belongs_to_with_shallow_test.rb
 - test/nested_model_with_shallow_test.rb
@@ -145,10 +146,13 @@ files:
 - test/views/professors/index.html.erb
 - test/views/professors/new.html.erb
 - test/views/professors/show.html.erb
+- test/views/projects/edit.html.erb
 - test/views/projects/index.html.erb
 - test/views/projects/index.json.erb
+- test/views/projects/new.html.erb
 - test/views/projects/respond_to_skip_default_template.html.erb
 - test/views/projects/respond_with_resource.html.erb
+- test/views/projects/show.html.erb
 - test/views/students/edit.html.erb
 - test/views/students/new.html.erb
 - test/views/tags/edit.html.erb
@@ -200,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: inherited_resources
-rubygems_version: 1.5.3
+rubygems_version: 1.6.2
 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.
@@ -216,6 +220,7 @@ test_files:
 - test/customized_redirect_to_test.rb
 - test/defaults_test.rb
 - test/locales/en.yml
+- test/multiple_nested_optional_belongs_to_test.rb
 - test/nested_belongs_to_test.rb
 - test/nested_belongs_to_with_shallow_test.rb
 - test/nested_model_with_shallow_test.rb
@@ -266,10 +271,13 @@ test_files:
 - test/views/professors/index.html.erb
 - test/views/professors/new.html.erb
 - test/views/professors/show.html.erb
+- test/views/projects/edit.html.erb
 - test/views/projects/index.html.erb
 - test/views/projects/index.json.erb
+- test/views/projects/new.html.erb
 - test/views/projects/respond_to_skip_default_template.html.erb
 - test/views/projects/respond_with_resource.html.erb
+- test/views/projects/show.html.erb
 - test/views/students/edit.html.erb
 - test/views/students/new.html.erb
 - test/views/tags/edit.html.erb