passiverecord 0.0.2 → 0.1

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.1. Different subclasses of PassiveRecord can now use the same keys safely.
+
 v0.0.2. Switching to Echoe for gem packaging and removing the end-user dependency for Hoe
 
 v0.0.1. Initial release

data/Manifest

@@ -8,3 +8,7 @@ lib/passive_record/schema.rb
 test/test_associations.rb
 test/test_base.rb
 test/test_helper.rb
+test/fixtures/continents.rb
+test/fixtures/doors.yml
+test/fixtures/furniture.rb
+test/fixtures/furniture.yml

data/README

@@ -5,7 +5,7 @@ by Jason L Perry (http://paint.itred.org)
   
 A replacement for ActiveRecord when you just need to model
 a few unchanging objects, and don't necessarily need a full blown
-ActiveRecord class and table in the database.
+ActiveRecord class and table in the database. Use with reservation.
 
 == FEATURES:
   

data/lib/passive_record/base.rb

@@ -34,10 +34,10 @@ module PassiveRecord
 
       def create(*args)
         attributes = extract_options!(args)
-        key = args.first || @@instances.size+1
+        key = args.first || find_every.size+1
         instance = self.new(attributes)
         instance.key = key
-        @@instances[key] = instance
+        @@instances[base_key(key)] = instance
         return key
       end
 
@@ -51,6 +51,10 @@ module PassiveRecord
       def count
         find_every.size
       end
+      
+      def base_class
+        class_of_passive_record_descendant(self)
+      end
 
     protected
 
@@ -79,7 +83,7 @@ module PassiveRecord
       end
 
       def find_one(_key)
-        values = @@instances.select { |key, value| _key == key && value.is_a?(self) }.map {|its| its.last}
+        values = @@instances.select { |key, value| base_key(_key) == key && value.is_a?(self) }.map {|its| its.last}
         unless values.empty?
           return values.first
         else
@@ -88,7 +92,8 @@ module PassiveRecord
       end
 
       def find_some(keys)
-        values = @@instances.select { |key, value| (keys).include?(key) && value.is_a?(self) }.map {|its| its.last}
+        base_keys = keys.map { |key| base_key(key)  }
+        values = @@instances.select { |key, value| (base_keys).include?(key) && value.is_a?(self) }.map {|its| its.last }
       end
 
       def extract_options!(args) #:nodoc:
@@ -103,7 +108,7 @@ module PassiveRecord
           # super unless all_attributes_exists?(attribute_names)
           attributes = {}
           attribute_names.each_with_index { |name, idx| attributes[name] = arguments[idx] }
-          expressions = []
+          expressions = ["value.is_a?(self)"]
           attributes.each_pair { |key, value| expressions << attribute_expression("value.#{key}", value)  }          
           results = @@instances.select { |key, value| eval expressions.join(" && ")  }.map {|its| its.last}
           return expects_array ? results : results.pop
@@ -121,6 +126,28 @@ module PassiveRecord
         end
       end
       
+      # Returns the class descending directly from PassiveRecord in the inheritance hierarchy.
+      def base_class(klass = self)
+        if klass.superclass == Base
+          klass
+        elsif klass.superclass.nil?
+          raise PassiveRecordError, "#{name} doesn't belong in a hierarchy descending from PassiveRecord"
+        else
+          base_class(klass.superclass)
+        end
+      end
+            
+      # Returns the real hash key used to store instances.
+      # Keys are name spaced with their class name, ie "Continent:1"
+      def base_key(key)
+        "#{base_class.name}:#{key}"
+      end
+      
+      # Returns the key portion of a +base_key+
+      def key_base(base_key)
+        base_key.split(":").last
+      end
+      
     end
   end
 end

data/passiverecord.gemspec

@@ -1,11 +1,11 @@
 
-# Gem::Specification for Passiverecord-0.0.2
+# Gem::Specification for Passiverecord-0.1
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{passiverecord}
-  s.version = "0.0.2"
-  s.date = %q{2007-09-28}
+  s.version = "0.1"
+  s.date = %q{2007-10-03}
   s.summary = %q{Pacifying overactive records}
   s.email = %q{jasper@ambethia.com}
   s.homepage = %q{http://code.itred.org/projects/passive-record}
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.description = %q{Pacifying overactive records}
   s.has_rdoc = true
   s.authors = ["Jason L Perry"]
-  s.files = ["CHANGELOG", "Manifest", "README", "lib/passive_record.rb", "lib/passive_record/associations.rb", "lib/passive_record/base.rb", "lib/passive_record/schema.rb", "test/test_associations.rb", "test/test_base.rb", "test/test_helper.rb", "passiverecord.gemspec"]
+  s.files = ["CHANGELOG", "Manifest", "README", "lib/passive_record.rb", "lib/passive_record/associations.rb", "lib/passive_record/base.rb", "lib/passive_record/schema.rb", "test/test_associations.rb", "test/test_base.rb", "test/test_helper.rb", "test/fixtures/continents.rb", "test/fixtures/doors.yml", "test/fixtures/furniture.rb", "test/fixtures/furniture.yml", "passiverecord.gemspec"]
   s.test_files = ["test/test_associations.rb", "test/test_base.rb", "test/test_helper.rb"]
   s.add_dependency(%q<activerecord>, [">= 0", "= 1.15.3"])
 end

data/test/fixtures/continents.rb

@@ -0,0 +1,10 @@
+class Continent < PassiveRecord::Base
+  schema :name => String, :size => Integer, :population => Integer  
+  
+  create :name => "Africa",        :size => 30370000, :population => 890000000
+  create :name => "Antarctica",    :size => 13720000, :population => 1000
+  create :name => "Australia",     :size => 7600000,  :population => 20000000
+  create :name => "Eurasia",       :size => 53990000, :population => 4510000000
+  create :name => "North America", :size => 24490000, :population => 515000000
+  create :name => "South America", :size => 17840000, :population => 371000000
+end

data/test/fixtures/doors.yml

@@ -0,0 +1,9 @@
+---
+office:
+  id: 1
+  inside_id: 5
+  outside_id: 1
+restroom:
+  id: 2
+  inside_id: 4
+  outside_id: 1

data/test/fixtures/furniture.rb

@@ -0,0 +1,41 @@
+ActiveRecord::Base.establish_connection(:adapter  => "sqlite3", :database => ":memory:")
+
+ActiveRecord::Base.connection.create_table "furniture", :force => true do |t|
+  t.column :name,    :string
+  t.column :room_id, :integer
+end 
+
+ActiveRecord::Base.connection.create_table "doors", :force => true do |t|
+  t.column :inside_id,  :integer
+  t.column :outside_id, :integer
+end 
+
+Inflector.inflections { |inflect| inflect.uncountable %w( furniture )}
+
+class Furniture < ActiveRecord::Base
+  belongs_to :room
+end
+
+class Door < ActiveRecord::Base
+  belongs_to :inside,   :class_name => "Room", :foreign_key => "inside_id"
+  belongs_to :outside,  :class_name => "Room", :foreign_key => "outside_id"
+end
+
+class Room < PassiveRecord::Base
+  has_many :furniture,      :order      => :name
+  has_one  :light_fixture,  :class_name => "Furniture"
+  
+  has_many :ins,   :class_name => "Door", :foreign_key => "outside_id"
+  has_many :outs,  :class_name => "Door", :foreign_key => "inside_id"
+  
+  has_many :exits,      :through => :outs
+  has_many :entrances,  :through => :ins
+  
+  schema :name => String
+  
+  create 1, :name => "Family Room"
+  create 2, :name => "Kitchen"
+  create 3, :name => "Bedroom"
+  create 4, :name => "Restroom"
+  create 5, :name => "Office"
+end

data/test/fixtures/furniture.yml

@@ -0,0 +1,13 @@
+---
+couch:
+  id: 1
+  name: Couch
+  room_id: 1
+ottoman:
+  id: 2
+  name: Ottoman
+  room_id: 1
+ottlite:
+  id: 3
+  name: Ott-lite
+  room_id: 5

data/test/test_associations.rb

@@ -1,59 +1,9 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-class Room < PassiveRecord::Base
-  has_many :furniture, :order => :name
-  has_one  :light_fixture, :class_name => "Furniture"
-  
-  has_many :ins,   :class_name => "Door", :foreign_key => "outside_id"
-  has_many :outs,  :class_name => "Door", :foreign_key => "inside_id"
-  
-  has_many :exits, :through => :outs
-  has_many :entrances, :through => :ins
-  
-  schema :name => String
-  
-  create :name => "Family Room"
-  create :name => "Kitchen"
-  create :name => "Bedroom"
-  create :name => "Restroom"
-  create :name => "Office"
-end
-
-ActiveRecord::Base.establish_connection(:adapter  => "sqlite3", :database => ":memory:")
-ActiveRecord::Base.connection.create_table "furniture", :force => true do |t|
-  t.column :name,    :string
-  t.column :room_id, :integer
-end 
-
-ActiveRecord::Base.connection.create_table "doors", :force => true do |t|
-  t.column :inside_id,  :integer
-  t.column :outside_id, :integer
-end 
-
-Inflector.inflections { |inflect| inflect.uncountable %w( furniture )}
-
-class Furniture < ActiveRecord::Base
-  belongs_to :room
-end
-
-class Door < ActiveRecord::Base
-  belongs_to :inside,   :class_name => "Room", :foreign_key => "inside_id"
-  belongs_to :outside,  :class_name => "Room", :foreign_key => "outside_id"
-end
-
 class PassiveRecord::AssociationsTest < Test::Unit::TestCase
-
-  # some "fixtures"
+  
   def setup
-    Furniture.create :name => "Couch",    :room_id => Room.find_by_name("Family Room").id
-    Furniture.create :name => "Ottoman",  :room_id => Room.find_by_name("Family Room").id
-    Furniture.create :name => "Ott-lite", :room_id => Room.find_by_name("Office").id
-    
-    Door.create :inside_id  => Room.find_by_name("Office").id,
-                :outside_id => Room.find_by_name("Family Room").id
-                
-    Door.create :inside_id  => Room.find_by_name("Restroom").id,
-                :outside_id => Room.find_by_name("Family Room").id
+    create_fixtures :doors, :furniture
   end
   
   def test_should_have_many
@@ -87,10 +37,5 @@ class PassiveRecord::AssociationsTest < Test::Unit::TestCase
     room = Room.find_by_name("Office")
 
     assert_equal room, lamp.room    
-  end
-  
-  def teardown
-    Furniture.delete_all
-  end
-   
+  end  
 end

data/test/test_base.rb

@@ -1,28 +1,16 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-class Continent < PassiveRecord::Base
-  schema :name => String, :size => Integer, :population => Integer  
-end
-
 class PassiveRecord::BaseTest < Test::Unit::TestCase
   
-  def setup
-    # Add the geographic 6 continents
-    Continent.send :create, :name => "Africa",        :size => 30370000, :population => 890000000 
-    Continent.send :create, :name => "Antarctica",    :size => 13720000, :population => 1000
-    Continent.send :create, :name => "Australia",     :size => 7600000,  :population => 20000000
-    Continent.send :create, :name => "Eurasia",       :size => 53990000, :population => 4510000000
-    Continent.send :create, :name => "North America", :size => 24490000, :population => 515000000
-    Continent.send :create, :name => "South America", :size => 17840000, :population => 371000000
-  end
-    
   def test_should_create_instance
     assert_equal 7, Continent.send(:create, :name => "Atlantis", :size => 0, :population => 0)
+    PassiveRecord::Base.send(:class_variable_get, "@@instances").delete("Continent:7")
   end
   
   def test_should_create_instance_with_manual_key
     assert_equal "ATL", Continent.send(:create, "ATL", :name => "Atlantis", :size => 0, :population => 0)
     assert Continent.find("ATL")
+    PassiveRecord::Base.send(:class_variable_get, "@@instances").delete("Continent:ATL")
   end
   
   def test_should_count_instances
@@ -77,11 +65,4 @@ class PassiveRecord::BaseTest < Test::Unit::TestCase
     assert_equal Continent.find(6), Continent.find_by_name_and_size(/America/, 17840000)
   end
 
-  def test_should_puts_some_stuff
-  end
-  
-  def teardown
-    Continent.send :class_variable_set, "@@instances", {}
-  end
-   
 end

data/test/test_helper.rb

@@ -1,2 +1,31 @@
 require 'test/unit'
+require 'rubygems'
+require 'active_record'
+require 'active_record/fixtures'
+require 'active_support'
+require 'active_support/breakpoint'
+
 require File.dirname(__FILE__) + '/../lib/passive_record'
+
+ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
+
+Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"
+
+$LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path)
+
+require 'continents'
+require 'furniture'
+
+class Test::Unit::TestCase #:nodoc:
+
+  def create_fixtures(*table_names)
+    if block_given?
+      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) { yield }
+    else
+      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
+    end
+  end
+  
+  self.use_transactional_fixtures = true
+  self.use_instantiated_fixtures  = false
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: passiverecord
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2007-09-28 00:00:00 -04:00
+  version: "0.1"
+date: 2007-10-03 00:00:00 -04:00
 summary: Pacifying overactive records
 require_paths: 
 - lib
@@ -39,6 +39,10 @@ files:
 - test/test_associations.rb
 - test/test_base.rb
 - test/test_helper.rb
+- test/fixtures/continents.rb
+- test/fixtures/doors.yml
+- test/fixtures/furniture.rb
+- test/fixtures/furniture.yml
 - passiverecord.gemspec
 test_files: 
 - test/test_associations.rb