karsthammer-inherited_resources 1.2.1 → 1.2.1.1

data/Gemfile.lock

@@ -30,12 +30,10 @@ GEM
     activesupport (3.0.3)
     arel (2.0.6)
     builder (2.1.2)
-    columnize (0.3.1)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     has_scope (0.5.0)
     i18n (0.5.0)
-    linecache (0.43)
     mail (2.2.14)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -65,11 +63,7 @@ GEM
       thor (~> 0.14.4)
     rake (0.8.7)
     responders (0.6.2)
-    ruby-debug (0.10.3)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
-      linecache (>= 0.3)
+    test-unit (2.2.0)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
@@ -83,4 +77,4 @@ DEPENDENCIES
   mocha
   rails (= 3.0.3)
   responders (~> 0.6.0)
-  ruby-debug
+  test-unit

data/lib/inherited_resources/version.rb

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

data/test/multiple_nested_optional_belongs_to_test.rb

@@ -0,0 +1,369 @@
+require File.expand_path('test_helper', File.dirname(__FILE__))
+
+class Student; end
+class Manager; end
+class Employee; end
+
+class Project
+	def self.human_name; "Project"; end
+end
+
+class ProjectsController < InheritedResources::Base
+	belongs_to :student, :manager, :employee, :optional => true
+end
+
+class MultipleNestedOptionalTest < ActionController::TestCase
+	tests ProjectsController
+
+	def setup
+		@controller.stubs(:resource_url).returns('/')
+		@controller.stubs(:collection_url).returns('/')
+	end
+
+	# INDEX
+	def test_expose_all_projects_as_instance_variable_with_student
+		Student.expects(:find).with('37').returns(mock_student)
+		mock_student.expects(:projects).returns(Project)
+		Project.expects(:scoped).returns([mock_project])
+		get :index, :student_id => '37'
+		assert_equal mock_student, assigns(:student)
+		assert_equal [mock_project], assigns(:projects)
+	end
+
+	def test_expose_all_projects_as_instance_variable_with_manager
+		Manager.expects(:find).with('38').returns(mock_manager)
+		mock_manager.expects(:projects).returns(Project)
+		Project.expects(:scoped).returns([mock_project])
+		get :index, :manager_id => '38'
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal [mock_project], assigns(:projects)
+	end
+
+	def test_expose_all_projects_as_instance_variable_with_employee
+		Employee.expects(:find).with('666').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:scoped).returns([mock_project])
+		get :index, :employee_id => '666'
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal [mock_project], assigns(:projects)
+	end
+
+	def test_expose_all_projects_as_instance_variable_with_manager_and_employee
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:employees).returns(Employee)
+		Employee.expects(:find).with('42').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:scoped).returns([mock_project])
+		get :index, :manager_id => '37', :employee_id => '42'
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal [mock_project], assigns(:projects)
+	end
+
+	def test_expose_all_projects_as_instance_variable_without_parents
+		Project.expects(:scoped).returns([mock_project])
+		get :index
+		assert_equal [mock_project], assigns(:projects)
+	end
+
+	# SHOW
+	def test_expose_the_requested_project_with_student
+		Student.expects(:find).with('37').returns(mock_student)
+		mock_student.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		get :show, :id => '42', :student_id => '37'
+		assert_equal mock_student, assigns(:student)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_the_requested_project_with_manager
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		get :show, :id => '42', :manager_id => '37'
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_the_requested_project_with_employee
+		Employee.expects(:find).with('37').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		get :show, :id => '42', :employee_id => '37'
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_the_requested_project_with_manager_and_employee
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:employees).returns(Employee)
+		Employee.expects(:find).with('42').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:find).with('13').returns(mock_project)
+		get :show, :id => '13', :manager_id => '37', :employee_id => '42'
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_the_requested_project_without_parents
+		Project.expects(:find).with('13').returns(mock_project)
+		get :show, :id => '13'
+		assert_equal mock_project, assigns(:project)
+	end
+
+	# NEW
+	def test_expose_a_new_project_with_student
+		Student.expects(:find).with('37').returns(mock_student)
+		mock_student.expects(:projects).returns(Project)
+		Project.expects(:build).returns(mock_project)
+		get :new, :student_id => '37'
+		assert_equal mock_student, assigns(:student)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_a_new_project_with_manager
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:projects).returns(Project)
+		Project.expects(:build).returns(mock_project)
+		get :new, :manager_id => '37'
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_a_new_project_with_employee
+		Employee.expects(:find).with('37').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:build).returns(mock_project)
+		get :new, :employee_id => '37'
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_a_new_project_with_manager_and_employee
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:employees).returns(Employee)
+		Employee.expects(:find).with('42').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:build).returns(mock_project)
+		get :new, :manager_id => '37', :employee_id => '42'
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_a_new_project_without_parents
+		Project.expects(:new).returns(mock_project)
+		get :new
+		assert_equal mock_project, assigns(:project)
+	end
+
+	# EDIT
+	def test_expose_the_requested_project_for_edition_with_student
+		Student.expects(:find).with('37').returns(mock_student)
+		mock_student.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		get :edit, :id => '42', :student_id => '37'
+		assert_equal mock_student, assigns(:student)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_the_requested_project_for_edition_with_manager
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		get :edit, :id => '42', :manager_id => '37'
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_the_requested_project_for_edition_with_employee
+		Employee.expects(:find).with('37').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		get :edit, :id => '42', :employee_id => '37'
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_the_requested_project_for_edition_with_manager_and_employee
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:employees).returns(Employee)
+		Employee.expects(:find).with('42').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:find).with('13').returns(mock_project)
+		get :edit, :id => '13', :manager_id => '37', :employee_id => '42'
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_the_requested_project_for_edition_without_parents
+		Project.expects(:find).with('13').returns(mock_project)
+		get :edit, :id => '13'
+		assert_equal mock_project, assigns(:project)
+	end
+
+	# CREATE
+	def test_expose_a_newly_created_project_with_student
+		Student.expects(:find).with('37').returns(mock_student)
+		mock_student.expects(:projects).returns(Project)
+		Project.expects(:build).with({ 'these' => 'params' }).returns(mock_project(:save => true))
+		post :create, :student_id => '37', :project => { :these => 'params' }
+		assert_equal mock_student, assigns(:student)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_a_newly_created_project_with_manager
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:projects).returns(Project)
+		Project.expects(:build).with({ 'these' => 'params' }).returns(mock_project(:save => true))
+		post :create, :manager_id => '37', :project => { :these => 'params' }
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_project, assigns(:project)
+	end
+	
+	def test_expose_a_newly_created_project_with_employee
+		Employee.expects(:find).with('37').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:build).with({ 'these' => 'params' }).returns(mock_project(:save => true))
+		post :create, :employee_id => '37', :project => { :these => 'params' }
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_a_newly_created_project_with_manager_and_employee
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:employees).returns(Employee)
+		Employee.expects(:find).with('42').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:build).with({ 'these' => 'params' }).returns(mock_project(:save => true))
+		post :create, :manager_id => '37', :employee_id => '42', :project => { :these => 'params' }
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_a_newly_created_project_without_parents
+		Project.expects(:new).with({ 'these' => 'params' }).returns(mock_project(:save => true))
+		post :create, :project => { :these => 'params' }
+		assert_equal mock_project, assigns(:project)
+	end
+
+	# UPDATE
+	def test_update_the_requested_project_with_student
+		Student.expects(:find).with('37').returns(mock_student)
+		mock_student.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		mock_project.expects(:update_attributes).with({ 'these' => 'params' }).returns(true)
+		put :update, :id => '42', :student_id => '37', :project => { :these => 'params' }
+		assert_equal mock_student, assigns(:student)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_update_the_requested_project_with_manager
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		mock_project.expects(:update_attributes).with({ 'these' => 'params' }).returns(true)
+		put :update, :id => '42', :manager_id => '37', :project => { :these => 'params' }
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_update_the_requested_project_with_employee
+		Employee.expects(:find).with('37').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		mock_project.expects(:update_attributes).with({ 'these' => 'params' }).returns(true)
+		put :update, :id => '42', :employee_id => '37', :project => { :these => 'params' }
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_update_the_requested_project_with_manager_and_employee
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:employees).returns(Employee)
+		Employee.expects(:find).with('13').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		mock_project.expects(:update_attributes).with({ 'these' => 'params' }).returns(true)
+		put :update, :id => '42', :manager_id => '37', :employee_id => '13', :project => { :these => 'params' }
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	# DESTROY
+	def test_the_requested_project_is_destroyed_with_student
+		Student.expects(:find).with('37').returns(mock_student)
+		mock_student.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		mock_project.expects(:destroy).returns(true)
+
+		delete :destroy, :id => '42', :student_id => '37'
+		assert_equal mock_student, assigns(:student)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_the_requested_project_is_destroyed_with_manager
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		mock_project.expects(:destroy).returns(true)
+
+		delete :destroy, :id => '42', :manager_id => '37'
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_the_requested_project_is_destroyed_with_employee
+		Employee.expects(:find).with('37').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		mock_project.expects(:destroy).returns(true)
+
+		delete :destroy, :id => '42', :employee_id => '37'
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_the_requested_project_is_destroyed_with_manager_and_employee
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:employees).returns(Employee)
+		Employee.expects(:find).with('13').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		mock_project.expects(:destroy).returns(true)
+
+		delete :destroy, :id => '42', :manager_id => '37', :employee_id => '13'
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_the_requested_project_is_destroyed_without_parents
+		Project.expects(:find).with('42').returns(mock_project)
+		mock_project.expects(:destroy).returns(true)
+
+		delete :destroy, :id => '42'
+		assert_equal mock_project, assigns(:project)
+	end
+
+	protected
+	def mock_manager(stubs={})
+		@mock_manager ||= mock(stubs)
+	end
+
+	def mock_employee(stubs={})
+		@mock_employee ||= mock(stubs)
+	end
+
+	def mock_student(stubs={})
+		@mock_student ||= mock(stubs)
+	end
+
+	def mock_project(stubs={})
+		@mock_project ||= mock(stubs)
+	end
+end

data/test/test_helper.rb

@@ -21,7 +21,7 @@ class ApplicationController < ActionController::Base; end
 
 # Add IR to load path and load the main file
 $:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-require 'inherited_resources'
+require 'karsthammer-inherited_resources'
 
 ActionController::Base.view_paths = File.join(File.dirname(__FILE__), 'views')
 

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

@@ -2,7 +2,7 @@
 name: karsthammer-inherited_resources
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.1
+  version: 1.2.1.1
 platform: ruby
 authors: 
 - Karst Hammer
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 +01:00
+date: 2011-03-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,6 +81,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
@@ -131,10 +132,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
@@ -196,6 +200,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
@@ -246,10 +251,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