tractor 0.4.0 → 0.4.1

data/.gitignore

@@ -19,3 +19,5 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+tractor.iml
+.idea

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/tractor/model/base.rb

@@ -107,23 +107,18 @@ module Tractor
         save
       end
       
-      def remove_from_associations
-        self.class.associations.each do |key, value|
-          foreign_key_value = self.send(value[:foreign_key])
-          return unless foreign_key_value
-          value[:foreign_klass].find_by_id(foreign_key_value).send(key).delete(self.id)
+      def add_to_associations
+        for_each_associated_foreign_instance do |foreign_instance|
+          foreign_instance.push(self)
         end
       end
-      
-      def add_to_associations
-        self.class.associations.each do |key, value|
-          foreign_key_value = self.send(value[:foreign_key])
-          
-          return unless foreign_key_value
-          value[:foreign_klass].find_by_id(foreign_key_value).send(key).push(self)
+
+      def remove_from_associations
+        for_each_associated_foreign_instance do |foreign_instance|
+          foreign_instance.delete(self.id)
         end
       end
-      
+
       def add_to_indices
         self.class.indices.each do |name|
           index = Index.new(self.class, name, send(name))
@@ -201,9 +196,8 @@ module Tractor
         
         # make an assumption about the foreign_key... probably bad :)
         def association(name, klass)
-          foreign_key = "#{self.to_s.gsub(/^.*::/, '').downcase}_id"
-          klass.associations[name] = {:foreign_key => foreign_key, :klass => klass, :foreign_klass => self}
-          
+          foreign_key_name = "#{self.to_s.gsub(/^.*::/, '').downcase}_id"
+          klass.associations[self.name] = {:foreign_key_name => foreign_key_name, :set_name => name}
           define_method(name) do
             @association_store[name] = Association.new("#{self.class}:#{self.id}:#{name}", klass)
           end
@@ -263,6 +257,16 @@ module Tractor
       private 
       
         attr_reader :attribute_store, :association_store
+
+        def for_each_associated_foreign_instance
+          self.class.associations.each do |association_owner_class_name, association_attributes|
+            foreign_klass = Object.module_eval(association_owner_class_name)
+            foreign_key = self.send(association_attributes[:foreign_key_name])
+            foreign_instance = foreign_klass.find_by_id(foreign_key)
+            yield(foreign_instance.send(association_attributes[:set_name]))
+          end
+        end
+
     end
   end
-end
+end

data/spec/model/base_spec.rb

@@ -81,8 +81,9 @@ describe Tractor::Model::Base do
     
     before do
       @game     = Tractor::Model::Game.new({ :id => 'g1' })
-      @player1  = Tractor::Model::Player.new({ :id => 'p1', :name => "delicious" })
-      @player2  = Tractor::Model::Player.new({ :id => 'p2', :name => "gross" })
+      Tractor::Model::Game.create({ :id => 'g2' })
+      @player1  = Tractor::Model::Player.new({ :id => 'p1', :name => "delicious", :game_id => "g1" })
+      @player2  = Tractor::Model::Player.new({ :id => 'p2', :name => "gross", :game_id => "g2" })
       
       game.save
       player1.save
@@ -94,13 +95,11 @@ describe Tractor::Model::Base do
     end
     
     it "adds a push method for the set on an instance of the class" do
-      game.players.push player1
-      redis.smembers('Tractor::Model::Game:g1:players').should == ['p1']
+      game.players.push player2
+      redis.smembers('Tractor::Model::Game:g1:players').should == ['p1', 'p2']
     end
     
     it "adds an ids method for the set that returns all ids in it" do
-      game.players.ids.should be_empty
-      game.players.push player1
       game.players.ids.should == [player1.id]
     end
     
@@ -111,17 +110,9 @@ describe Tractor::Model::Base do
     end
     
     it "adds an all method for the association to return the items in it" do
-      game.players.all.should == []
-      game.players.push player1
-      game.players.push player2
-      
       player1_from_game = game.players.all[0]
-      player2_from_game = game.players.all[1]
-      
       player1_from_game.name.should == player1.name
       player1_from_game.id.should == player1.id
-      player2_from_game.name.should == player2.name
-      player2_from_game.id.should == player2.id
     end
     
     it "requires the object being added to have been saved to the database before adding it to the association"
@@ -216,12 +207,10 @@ describe Tractor::Model::Base do
     before do
       Sammich.create({ :id => 's1', :weight => "medium", :product => "Turkey Avocado" })
       Sammich.create({ :id => 's2', :weight => "medium", :product => "Reuben Sammich" })
-      Tractor::Model::Player.create({ :id => 'p1', :name => "delicious" })
     end
     
     it "returns all the ids for a given class" do
       Sammich.ids.should == ['s1', 's2']
-      Tractor::Model::Player.ids.should == ['p1']
     end
   end
   
@@ -229,12 +218,10 @@ describe Tractor::Model::Base do
     before do
       Sammich.create({ :id => 's1', :weight => "medium", :product => "Turkey Avocado" })
       Sammich.create({ :id => 's2', :weight => "medium", :product => "Reuben Sammich" })
-      Tractor::Model::Player.create({ :id => 'p1', :name => "delicious" })
     end
     
     it "returns the count of all items of a given class" do
       Sammich.count.should == 2
-      Tractor::Model::Player.count.should == 1
     end
   end
   

data/tractor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tractor}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shane Wolf"]
-  s.date = %q{2010-05-25}
+  s.date = %q{2010-05-26}
   s.description = %q{Very simple object mappings for ruby objects}
   s.email = %q{shanewolf@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tractor
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Shane Wolf
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-25 00:00:00 -07:00
+date: 2010-05-26 00:00:00 -07:00
 default_executable: 
 dependencies: []