has_alter_ego 0.0.7 → 0.0.8

data/Changelog.md

@@ -1,3 +1,8 @@
+# 0.0.8 (2010-10-14)
+* Optimizations
+  - fewer queries (2*N => 2)
+  - less YAML parsing
+
 # 0.0.7 (2010-09-28)
 * non-numeric primary keys are no longer supported
 

data/lib/has_alter_ego.rb

@@ -22,44 +22,44 @@ module HasAlterEgo
 
       # Reserve the first n IDs for stubbed objects
       def reserve_space space
-        return if self.last and self.last[self.primary_key] >= space
+        return if self.last and self.last.id >= space
 
         o = self.new
-        o[self.primary_key] = space
+        o.id= space
         o.save_without_alter_ego
         o.delete
         return
       end
 
       def parse_yml
-        yml = get_yml
-        yml.keys.each do |o|
+        @yml = get_yml
+        @db_objects = self.find_all_by_id(@yml.keys, :include => :alter_ego) || []
+        @yml.keys.each do |o|
           parse_yml_for o
         end
-        yml
+        @yml
       end
 
-      def parse_yml_for primary_key
-        yml = get_yml
-        db_object = self.find(primary_key) rescue nil
+      def parse_yml_for id, reload = false
+        db_object = reload ? (self.find(id) rescue nil) : @db_objects.select{|o| o.id == id}.first
         if db_object
           raise "There is already a #{db_object.class} with id #{db_object.id} in the database." unless db_object.has_alter_ego?
           if db_object.alter_ego.state == 'default'
-            assign_attributes db_object, yml[primary_key]
-            db_object.on_seed(yml[primary_key])
+            assign_attributes db_object, @yml[id]
+            db_object.on_seed(@yml[id])
             db_object.save_without_alter_ego
           end
         else
           # Check for destroyed alter_egos
-          alter_ego = AlterEgo.find_by_alter_ego_object_id_and_alter_ego_object_type(primary_key, self.name)
+          alter_ego = AlterEgo.find_by_alter_ego_object_id_and_alter_ego_object_type(id, self.name)
           return if alter_ego.try(:state) == "destroyed"
 
           db_object = self.new
-          db_object[self.primary_key] = primary_key
-          assign_attributes db_object, yml[primary_key]
+          db_object.id = id
+          assign_attributes db_object, @yml[id]
           db_object.build_alter_ego
           db_object.alter_ego.state = 'default'
-          db_object.on_seed(yml[primary_key])
+          db_object.on_seed(@yml[id])
           db_object.save_without_alter_ego
         end
       end
@@ -135,7 +135,7 @@ module HasAlterEgo
         self.alter_ego.state = 'default'
         self.alter_ego.save
 
-        self.class.parse_yml_for self[self.class.primary_key]
+        self.class.parse_yml_for self.id, true
         self.reload
       end
 

data/test/db/fixtures/alter_egos/drinks.yml

@@ -1,5 +1,7 @@
-water:
+1:
+  name: water
   color: none
 
-coffee:
-  color: black
+2:
+  name: coffee
+  color: black

data/test/has_alter_ego_test.rb

@@ -109,32 +109,6 @@ class HasAlterEgoTest < Test::Unit::TestCase
     assert_equal 4, c.tires.size
   end
 
-  def test_different_primary_key
-    assert_equal 2, Drink.all.size
-    assert_equal "none", Drink.find("water").color
-
-    water = Drink.find("water")
-    assert water.has_alter_ego?
-    assert_equal "default", water.alter_ego_state
-
-    water.color = "blue"
-    water.save
-    water.reload
-    assert_equal "blue", water.color
-    assert_equal "modified", water.alter_ego_state
-
-    water.reset
-    water.reload
-    assert_equal "none", water.color
-    assert_equal "default", water.alter_ego_state
-
-    orangejuice = Drink.new
-    orangejuice.name = "orangejuice"
-    orangejuice.color = "yellow"
-    orangejuice.save
-    assert !orangejuice.has_alter_ego?
-  end
-
   def test_destroyed_object_leaves_destroyed_alter_ego
     c = Car.find(6)
     alter_ego = c.alter_ego
@@ -213,12 +187,15 @@ class HasAlterEgoTest < Test::Unit::TestCase
 
   def test_smart_has_one
     Creator.create(:name => "Martin")
-    Creator.create(:name => "Mike")
+    mike = Creator.create(:name => "Mike")
     Drink.destroy_all
+    AlterEgo.destroy_all("alter_ego_object_type = 'Drink'")
     Drink.class_eval do
       def self.get_yml
-        return {1 => {
-                  "creator_by_name" => ["Mike"]}}
+        return {1234 => {
+                  "name" => "water",
+                  "color" => "none",
+                  "creator_by_name" => "Mike"}}
       end
     end
     Drink.parse_yml
@@ -227,11 +204,10 @@ class HasAlterEgoTest < Test::Unit::TestCase
   end
 
   def test_smart_belongs_to
-
     Creator.class_eval do
       def self.get_yml
         return {1 => {
-                  "name" => "Bernd",
+                 "name" => "Bernd",
                   "drink_by_name" => "water"}}
       end
     end

data/test/test_helper.rb

@@ -35,14 +35,14 @@ silence_stream(STDOUT) do
       t.integer :car_id
     end
 
-    create_table :drinks, :id => false do |t|
+    create_table :drinks do |t|
       t.string :name
       t.string :color
     end
 
     create_table :creators do |t|
       t.string :name
-      t.string :drink_id
+      t.integer :drink_id
     end
 
     create_table :sellers do |t|
@@ -87,7 +87,6 @@ class Tire < ActiveRecord::Base
 end
 
 class Drink < ActiveRecord::Base
-  set_primary_key :name
   has_one :creator
   has_alter_ego
 end
@@ -95,4 +94,4 @@ end
 class Creator < ActiveRecord::Base
   belongs_to :drink
   has_alter_ego
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_alter_ego
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Duffeck"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-28 00:00:00 +02:00
+date: 2010-10-15 00:00:00 +02:00
 default_executable: 
 dependencies: []