tenacity 0.1.1 → 0.2.0

data/lib/tenacity/orm_ext/mongo_mapper.rb

@@ -20,10 +20,7 @@
 # == t_has_one
 #
 # The +t_has_one+ association will not define any new keys on the object, since
-# the associated object holds the foreign key.  If the MongoMapper class
-# is the target of a t_has_one association from another class, then a property
-# named after the association will be created on the MongoMapper object to
-# hold the foreign key to the other object.
+# the associated object holds the foreign key.
 #
 #
 # == t_has_many
@@ -49,25 +46,18 @@ module TenacityMongoMapperPlugin
       all(property => id.to_s)
     end
 
-    def _t_initialize_has_many_association(association_id)
-      unless self.respond_to?(has_many_property_name(association_id))
-        key has_many_property_name(association_id), Array
+    def _t_initialize_has_many_association(association)
+      unless self.respond_to?(association.foreign_keys_property)
+        key association.foreign_keys_property, Array
+        after_save { |record| _t_save_associates(record, association) }
       end
-      after_save { |record| _t_save_associates(record, association_id) }
     end
 
-    def _t_initialize_belongs_to_association(association_id)
-      unless self.respond_to?("#{association_id}_id")
-        key "#{association_id}_id", String
+    def _t_initialize_belongs_to_association(association)
+      unless self.respond_to?(association.foreign_key)
+        key association.foreign_key, String
+        before_save { |record| _t_stringify_belongs_to_value(record, association) }
       end
-      before_save { |record| _t_stringify_belongs_to_value(record, association_id) }
-    end
-
-    def _t_initialize_has_one_association(association_id)
-      unless self.respond_to?("#{association_id}_id")
-        key "#{association_id}_id", String
-      end
-      before_save { |record| _t_stringify_has_one_value(record, association_id) }
     end
   end
 
@@ -78,16 +68,16 @@ module TenacityMongoMapperPlugin
       nil
     end
 
-    def _t_associate_many(association_id, associate_ids)
-      self.send(has_many_property_name(association_id) + '=', associate_ids.map { |associate_id| associate_id.to_s })
+    def _t_associate_many(association, associate_ids)
+      self.send(association.foreign_keys_property + '=', associate_ids.map { |associate_id| associate_id.to_s })
     end
 
-    def _t_get_associate_ids(association_id)
-      self.send(has_many_property_name(association_id))
+    def _t_get_associate_ids(association)
+      self.send(association.foreign_keys_property)
     end
 
-    def _t_clear_associates(association_id)
-      self.send(has_many_property_name(association_id) + '=', [])
+    def _t_clear_associates(association)
+      self.send(association.foreign_keys_property + '=', [])
     end
   end
 end

data/lib/tenacity/version.rb

@@ -1,3 +1,3 @@
 module Tenacity
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/tenacity.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.authors     = ["John Wood"]
   s.email       = ["john@johnpwood.net"]
   s.homepage    = "http://github.com/jwood/tenacity"
-  s.summary     = %Q{A ORM independent way of specifying simple relationships between models backed by different databases.}
-  s.description = %Q{Tenacity provides an ORM independent way of specifying simple relationships between models backed by different databases.}
+  s.summary     = %Q{A database client independent way of specifying simple relationships between models backed by different databases.}
+  s.description = %Q{Tenacity provides a database client independent way of specifying simple relationships between models backed by different databases.}
 
   s.rubyforge_project = "tenacity"
 
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "mongo_mapper", "~> 0.8.6"
   s.add_development_dependency "bson_ext", "~> 1.1.3"
   s.add_development_dependency "activerecord", "~> 3.0.0"
-  s.add_development_dependency "mysql", "~> 2.8.1"
+  s.add_development_dependency "sqlite3-ruby", "~> 1.3.1"
   s.add_development_dependency "couchrest", "~> 1.0.0"
   s.add_development_dependency "couchrest_model"
 

data/test/associations/belongs_to_test.rb

@@ -20,6 +20,23 @@ class BelongsToTest < Test::Unit::TestCase
       assert_equal @car, @wheel.active_record_car
       assert_equal other_car, @wheel.active_record_car(true)
     end
+
+    should "be able to specify the class name of the associated class" do
+      dashboard = MongoMapperDashboard.create
+      ash_tray = MongoMapperAshTray.create(:dashboard => dashboard)
+      assert_equal dashboard, ash_tray.dashboard
+    end
+
+    should "be able to specify the foreign key to use for the associated class" do
+      car = ActiveRecordCar.create
+      windshield = CouchRestWindshield.create(:active_record_car => car)
+      assert_equal car.id.to_s, windshield.car_id
+      assert !windshield.respond_to?(:active_record_car_id)
+
+      engine = ActiveRecordEngine.create(:active_record_car => car)
+      assert_equal car.id, engine.car_id
+      assert !engine.respond_to?(:active_record_car_id)
+    end
   end
 
   context "A MongoMapper class with belongs_to association to an ActiveRecord class" do
@@ -113,7 +130,6 @@ class BelongsToTest < Test::Unit::TestCase
     should "return nil if no association is set" do
       assert_nil CouchRestRadio.find(@radio.id).mongo_mapper_dashboard
     end
-
   end
 
 end

data/test/associations/has_many_test.rb

@@ -23,6 +23,28 @@ class HasManyTest < Test::Unit::TestCase
       assert_equal @wheels, @car.mongo_mapper_wheels
       assert_equal other_wheels, @car.mongo_mapper_wheels(true)
     end
+
+    should "be able to specify the class name of the associated class" do
+      vent_1 = MongoMapperVent.create
+      vent_2 = MongoMapperVent.create
+      vent_3 = MongoMapperVent.create
+      dashboard = MongoMapperDashboard.create
+      dashboard.vents = [vent_1, vent_2, vent_3]
+      dashboard.save
+      assert_set_equal [vent_1, vent_2, vent_3], MongoMapperDashboard.find(dashboard.id).vents
+    end
+
+    should "be able to specify the foreign key to use for the class" do
+      car = ActiveRecordCar.create
+      door_1 = CouchRestDoor.create({})
+      door_2 = CouchRestDoor.create({})
+      door_3 = CouchRestDoor.create({})
+      car.couch_rest_doors = [door_1, door_2, door_3]
+      car.save
+
+      assert_set_equal [door_1, door_2, door_3], ActiveRecordCar.find(car.id).couch_rest_doors
+      assert_set_equal [door_1.id.to_s, door_2.id.to_s, door_3.id.to_s], ActiveRecordCar.find(car.id).couch_rest_door_ids
+    end
   end
 
   context "An ActiveRecord class with a has_many association to a MongoMapper class" do

data/test/associations/has_one_test.rb

@@ -21,6 +21,21 @@ class HasOneTest < Test::Unit::TestCase
       assert_equal @climate_control_unit, @dashboard.active_record_climate_control_unit
       assert_equal other_climate_control_unit, @dashboard.active_record_climate_control_unit(true)
     end
+
+    should "be able to specify the class name of the associated class" do
+      ash_tray = MongoMapperAshTray.create
+      dashboard = MongoMapperDashboard.create(:ash_tray => ash_tray)
+      assert_equal ash_tray, dashboard.ash_tray
+    end
+
+    should "be able to specify the foreign key to use for the class" do
+      car = ActiveRecordCar.create
+      windshield = CouchRestWindshield.create(:active_record_car => car)
+      assert_equal windshield, car.couch_rest_windshield
+
+      engine = ActiveRecordEngine.create(:active_record_car => car)
+      assert_equal engine, car.active_record_engine
+    end
   end
 
   context "A MongoMapper class with a has_one association to an ActiveRecord class" do

data/test/fixtures/active_record_car.rb

@@ -3,4 +3,8 @@ class ActiveRecordCar < ActiveRecord::Base
 
   t_has_many :mongo_mapper_wheels
   t_has_one :mongo_mapper_dashboard
+
+  t_has_one :couch_rest_windshield, :foreign_key => :car_id
+  t_has_one :active_record_engine, :foreign_key => 'car_id'
+  t_has_many :couch_rest_doors, :foreign_key => 'automobile_id'
 end

data/test/fixtures/active_record_engine.rb

@@ -0,0 +1,5 @@
+class ActiveRecordEngine < ActiveRecord::Base
+  include Tenacity
+
+  t_belongs_to :active_record_car, :foreign_key => 'car_id'
+end

data/test/fixtures/couch_rest_door.rb

@@ -0,0 +1,10 @@
+require 'couchrest_model'
+
+class CouchRestDoor < CouchRest::Model::Base
+  include Tenacity
+  use_database COUCH_DB
+
+  property 'automobile_id'
+  t_belongs_to :active_record_car, :foreign_key => 'automobile_id'
+end
+

data/test/fixtures/couch_rest_windshield.rb

@@ -0,0 +1,10 @@
+require 'couchrest_model'
+
+class CouchRestWindshield < CouchRest::Model::Base
+  include Tenacity
+  use_database COUCH_DB
+
+  property :car_id
+  t_belongs_to :active_record_car, :foreign_key => 'car_id'
+end
+

data/test/fixtures/mongo_mapper_ash_tray.rb

@@ -0,0 +1,8 @@
+require 'mongo_mapper'
+
+class MongoMapperAshTray
+  include MongoMapper::Document
+  include Tenacity
+
+  t_belongs_to :dashboard, :class_name => 'MongoMapperDashboard'
+end

data/test/fixtures/mongo_mapper_dashboard.rb

@@ -7,4 +7,7 @@ class MongoMapperDashboard
   t_belongs_to :active_record_car
   t_has_one :active_record_climate_control_unit
   t_has_one :couch_rest_radio
+
+  t_has_many :vents, :class_name => 'MongoMapperVent', :foreign_keys_property => 'dashboard_vent_ids'
+  t_has_one :ash_tray, :class_name => 'MongoMapperAshTray'
 end

data/test/fixtures/mongo_mapper_vent.rb

@@ -0,0 +1,8 @@
+require 'mongo_mapper'
+
+class MongoMapperVent
+  include MongoMapper::Document
+  include Tenacity
+
+  t_belongs_to :dashboard, :class_name => 'MongoMapperDashboard'
+end

data/test/fixtures/mongo_mapper_wheel.rb

@@ -5,5 +5,5 @@ class MongoMapperWheel
   include Tenacity
 
   t_belongs_to :active_record_car
-  t_has_many :active_record_nuts
+  t_has_many :active_record_nuts, :join_table => 'nuts_and_wheels', :association_foreign_key => 'nut_id'
 end

data/test/helpers/active_record_test_helper.rb

@@ -1,7 +1,37 @@
 require 'active_record'
 
 ActiveRecord::Base.establish_connection(
-  :adapter => "mysql",
-  :host => "localhost",
-  :username => "root",
-  :database => "tenacity_test")
+  :adapter => 'sqlite3',
+  :database => ':memory:')
+
+ActiveRecord::Schema.define :version => 0 do
+  create_table :active_record_cars, :force => true do |t|
+  end
+
+  create_table :active_record_engines, :force => true do |t|
+    t.integer :car_id
+  end
+
+  create_table :active_record_climate_control_units, :force => true do |t|
+    t.string :mongo_mapper_dashboard_id
+  end
+
+  create_table :active_record_cars_mongo_mapper_wheels, :force => true do |t|
+    t.integer :active_record_car_id
+    t.string :mongo_mapper_wheel_id
+  end
+
+  create_table :active_record_cars_couch_rest_doors, :force => true do |t|
+    t.integer :active_record_car_id
+    t.string :couch_rest_door_id
+  end
+
+  create_table :active_record_nuts, :force => true do |t|
+    t.string :mongo_mapper_wheel_id
+  end
+
+  create_table :nuts_and_wheels, :force => true do |t|
+    t.integer :nut_id
+    t.string :mongo_mapper_wheel_id
+  end
+end

data/test/orm_ext/activerecord_test.rb

@@ -56,30 +56,37 @@ class ActiveRecordTest < Test::Unit::TestCase
 
     should "be able to clear the associates of a given object" do
       nut = ActiveRecordNut.create
-      nut._t_associate_many(:mongo_mapper_wheels, ['abc123', 'def456', 'ghi789'])
+      nut._t_associate_many(association, ['abc123', 'def456', 'ghi789'])
       nut.save
-      nut._t_clear_associates(:mongo_mapper_wheels)
-      assert_set_equal [], nut._t_get_associate_ids(:mongo_mapper_wheels)
+      nut._t_clear_associates(association)
+      assert_set_equal [], nut._t_get_associate_ids(association)
     end
 
     should "be able to associate many objects with the given object" do
       nut = ActiveRecordNut.create
-      nut._t_associate_many(:mongo_mapper_wheels, ['abc123', 'def456', 'ghi789'])
-      rows = ActiveRecordNut.connection.execute("select mongo_mapper_wheel_id from active_record_nuts_mongo_mapper_wheels where active_record_nut_id = #{nut.id}")
+      nut._t_associate_many(association, ['abc123', 'def456', 'ghi789'])
+      rows = ActiveRecordNut.connection.execute("select mongo_mapper_wheel_id from nuts_and_wheels where nut_id = #{nut.id}")
       ids = []; rows.each { |r| ids << r[0] }; ids
       assert_set_equal ['abc123', 'def456', 'ghi789'], ids
     end
 
     should "be able to get the ids of the objects associated with the given object" do
       nut = ActiveRecordNut.create
-      nut._t_associate_many(:mongo_mapper_wheels, ['abc123', 'def456', 'ghi789'])
-      assert_set_equal ['abc123', 'def456', 'ghi789'], nut._t_get_associate_ids(:mongo_mapper_wheels)
+      nut._t_associate_many(association, ['abc123', 'def456', 'ghi789'])
+      assert_set_equal ['abc123', 'def456', 'ghi789'], nut._t_get_associate_ids(association)
     end
 
     should "return an empty array if there are no objects associated with the given object ids" do
       nut = ActiveRecordNut.create
-      assert_set_equal [], nut._t_get_associate_ids(:mongo_mapper_wheels)
+      assert_set_equal [], nut._t_get_associate_ids(association)
     end
   end
 
+  private
+
+  def association
+    Tenacity::Association.new(:t_has_many, :mongo_mapper_wheels, ActiveRecordNut, :join_table => :nuts_and_wheels,
+                              :association_key => :nut_id)
+  end
+
 end

data/test/orm_ext/couchrest_test.rb

@@ -62,7 +62,7 @@ class CouchRestTest < Test::Unit::TestCase
       button_2 = MongoMapperButton.create
       button_3 = MongoMapperButton.create
       radio = CouchRestRadio.create({})
-      radio._t_associate_many(:mongo_mapper_buttons, [button_1.id, button_2.id, button_3.id])
+      radio._t_associate_many(association, [button_1.id, button_2.id, button_3.id])
       assert_set_equal [button_1.id.to_s, button_2.id.to_s, button_3.id.to_s], radio.t_mongo_mapper_button_ids
     end
 
@@ -71,13 +71,14 @@ class CouchRestTest < Test::Unit::TestCase
       button_2 = MongoMapperButton.create
       button_3 = MongoMapperButton.create
       radio = CouchRestRadio.create({})
-      radio._t_associate_many(:mongo_mapper_buttons, [button_1.id, button_2.id, button_3.id])
-      assert_set_equal [button_1.id.to_s, button_2.id.to_s, button_3.id.to_s], radio._t_get_associate_ids(:mongo_mapper_buttons)
+
+      radio._t_associate_many(association, [button_1.id, button_2.id, button_3.id])
+      assert_set_equal [button_1.id.to_s, button_2.id.to_s, button_3.id.to_s], radio._t_get_associate_ids(association)
     end
 
     should "return an empty array when trying to fetch associate ids for an object with no associates" do
       radio = CouchRestRadio.create({})
-      assert_equal [], radio._t_get_associate_ids(:mongo_mapper_buttons)
+      assert_equal [], radio._t_get_associate_ids(association)
     end
 
     should "be able to clear the associates of an object" do
@@ -85,11 +86,17 @@ class CouchRestTest < Test::Unit::TestCase
       button_2 = MongoMapperButton.create
       button_3 = MongoMapperButton.create
       radio = CouchRestRadio.create({})
-      radio._t_associate_many(:mongo_mapper_buttons, [button_1.id, button_2.id, button_3.id])
-      assert_set_equal [button_1.id.to_s, button_2.id.to_s, button_3.id.to_s], radio._t_get_associate_ids(:mongo_mapper_buttons)
-      radio._t_clear_associates(:mongo_mapper_buttons)
-      assert_equal [], radio._t_get_associate_ids(:mongo_mapper_buttons)
+
+      radio._t_associate_many(association, [button_1.id, button_2.id, button_3.id])
+      assert_set_equal [button_1.id.to_s, button_2.id.to_s, button_3.id.to_s], radio._t_get_associate_ids(association)
+      radio._t_clear_associates(association)
+      assert_equal [], radio._t_get_associate_ids(association)
     end
+  end
+
+  private
 
+  def association
+    Tenacity::Association.new(:t_has_many, :mongo_mapper_buttons, CouchRestRadio)
   end
 end

data/test/orm_ext/mongo_mapper_test.rb

@@ -60,7 +60,7 @@ class MongoMapperTest < Test::Unit::TestCase
       nut_2 = ActiveRecordNut.create
       nut_3 = ActiveRecordNut.create
       wheel = MongoMapperWheel.create
-      wheel._t_associate_many(:active_record_nuts, [nut_1.id, nut_2.id, nut_3.id])
+      wheel._t_associate_many(association, [nut_1.id, nut_2.id, nut_3.id])
       assert_set_equal [nut_1.id.to_s, nut_2.id.to_s, nut_3.id.to_s], wheel.t_active_record_nut_ids
     end
 
@@ -69,13 +69,14 @@ class MongoMapperTest < Test::Unit::TestCase
       nut_2 = ActiveRecordNut.create
       nut_3 = ActiveRecordNut.create
       wheel = MongoMapperWheel.create
-      wheel._t_associate_many(:active_record_nuts, [nut_1.id, nut_2.id, nut_3.id])
-      assert_set_equal [nut_1.id.to_s, nut_2.id.to_s, nut_3.id.to_s], wheel._t_get_associate_ids(:active_record_nuts)
+
+      wheel._t_associate_many(association, [nut_1.id, nut_2.id, nut_3.id])
+      assert_set_equal [nut_1.id.to_s, nut_2.id.to_s, nut_3.id.to_s], wheel._t_get_associate_ids(association)
     end
 
     should "return an empty array when trying to fetch associate ids for an object with no associates" do
       wheel = MongoMapperWheel.create
-      assert_equal [], wheel._t_get_associate_ids(:active_record_nuts)
+      assert_equal [], wheel._t_get_associate_ids(association)
     end
 
     should "be able to clear the associates of an object" do
@@ -83,11 +84,16 @@ class MongoMapperTest < Test::Unit::TestCase
       nut_2 = ActiveRecordNut.create
       nut_3 = ActiveRecordNut.create
       wheel = MongoMapperWheel.create
-      wheel._t_associate_many(:active_record_nuts, [nut_1.id, nut_2.id, nut_3.id])
-      assert_set_equal [nut_1.id.to_s, nut_2.id.to_s, nut_3.id.to_s], wheel._t_get_associate_ids(:active_record_nuts)
-      wheel._t_clear_associates(:active_record_nuts)
-      assert_equal [], wheel._t_get_associate_ids(:active_record_nuts)
+
+      wheel._t_associate_many(association, [nut_1.id, nut_2.id, nut_3.id])
+      assert_set_equal [nut_1.id.to_s, nut_2.id.to_s, nut_3.id.to_s], wheel._t_get_associate_ids(association)
+      wheel._t_clear_associates(association)
+      assert_equal [], wheel._t_get_associate_ids(association)
     end
   end
 
+  def association
+    Tenacity::Association.new(:t_has_many, :active_record_nuts, MongoMapperWheel)
+  end
+
 end

data/test/test_helper.rb

@@ -19,17 +19,20 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'tenacity'
 
-Dir[File.join(File.dirname(__FILE__), 'fixtures/*.rb')].each { |file| require file }
+Dir[File.join(File.dirname(__FILE__), 'fixtures', '*.rb')].each { |file| require file }
 
 def setup_fixtures
   ActiveRecordCar.delete_all
   ActiveRecordClimateControlUnit.delete_all
+  ActiveRecordEngine.delete_all
+  ActiveRecordClimateControlUnit.delete_all
   ActiveRecordNut.delete_all
   MongoMapperDashboard.delete_all
   MongoMapperWheel.delete_all
 
   ActiveRecordCar.connection.execute("delete from active_record_cars_mongo_mapper_wheels")
-  ActiveRecordCar.connection.execute("delete from active_record_nuts_mongo_mapper_wheels")
+  ActiveRecordCar.connection.execute("delete from active_record_cars_couch_rest_doors")
+  ActiveRecordCar.connection.execute("delete from nuts_and_wheels")
 end
 
 def setup_couchdb_fixtures