mongoose 0.1.1 → 0.2.0

data/README

@@ -1,4 +1,4 @@
-= Mongoose 0.1.1
+= Mongoose 0.2.0
 
 A database management system written in Ruby.  It has an ActiveRecord-like
 interface, uses Skiplists for its indexing, and Marshal for its data 
@@ -11,7 +11,9 @@ serialization.  I named it Mongoose, because, like Rudyard Kipling's
 Thanks to Logan Capaldo for letting me steal a lot of the code from KirbyRecord.
 
 Thanks to Ezra Zygmuntowicz and Fabien Franzen, whose ez_where Rails plugin, 
-provided much of the inspiration for the query language.
+provided much of the inspiration for the query language.  Also, Ezra has 
+graciously taken the time to give me pointers on how to make Mongoose's query
+language and api better.
 
 Thanks to everyone who gave me feedback on KirbyBase.  I have tried to put all
 the lessons learned from developing that library to good use here.
@@ -56,7 +58,7 @@ db = Mongoose::Database.new
 
 # Create new table.  Notice how you specify whether a column is indexed or not.
 db.create_table(:plane) do |tbl|
-  tbl.add_indexed_column(:plane_name, :string)
+  tbl.add_indexed_column(:name, :string)
   tbl.add_column(:country, :string)
   tbl.add_indexed_column(:speed, :integer)
   tbl.add_column(:range, :integer)
@@ -64,7 +66,7 @@ end
 
 # Add a record.
 rec = Plane.new
-rec.plane_name = 'P-51'
+rec.name = 'P-51'
 rec.country = 'USA'
 rec.speed = 402
 rec.range = 1205
@@ -73,24 +75,25 @@ rec.save
 # Various ways to find a record; should be familiar to ActiveRecord users.
 Plane.find(1)  # Find record with id equal 1.
 
-Plane.find { |plane| plane.speed > 350 }  # Find all planes with speed > 350.
+Plane.find { speed > 350 }  # Find all planes with speed > 350.
 
 Plane.find  # Find all records.
 
-Plane.find(:first) { |plane| plane.country == 'USA' }
+Plane.find(:first) { country == 'USA' }  # Find first plane from USA.
 
-Plane.find do |plane|                 # Find all planes from either USA or
-  plane.any do                        # Great Britain with speed > 400.
-    plane.country == 'USA'
-    plane.country == 'Great Britain'
+Plane.find do                   # Find all planes from either USA or
+  any do                        # Great Britain with speed > 400.
+    country == 'USA'
+    country == 'Great Britain'
   end
-  plane.speed > 400
+  speed > 400
 end
 
 # Delete a record.
 Plane.find(1).destroy
 
-# Close database.
+# Close database.  This will write the indexes out to disk so they can be
+# initialized quickly next time.
 db.close
 
 == Manifest

data/changes.txt

@@ -11,3 +11,15 @@
   memory usage.
 * Cleaned up the code in SkipList class.
 * Added more unit tests. 
+
+2006-07-21:: Version 0.2.0
+* Added Table.create method.  Thanks to Ezra Zygmuntowicz for this patch.
+* Changed unit tests and examples to use Table.create rather than Table.new.
+* Thanks to Ezra Zygmuntowicz, you no longer have to specify block parameters
+  in your queries, nor prefix all of the column names in queries with those
+  block parameters.  This makes the query language so much cleaner.  Thanks
+  again, Ezra!
+* Logan Capaldo provided a patch for the Table.init_column method that 
+  eliminated the string eval.  Thanks Logan!
+* Included a new example from Daniel Sheppard that shows how to integrate
+  ActiveRecord validations into Mongoose.

data/example/activetable_example.rb

@@ -0,0 +1,56 @@
+# This example comes from Daniel Sheppard.  Thanks very much Daniel!
+# It is an early example of how you can integrate ActiveRecord validations
+# into Mongoose.  Expect more on this in the future.
+
+require 'rubygems'
+require 'mongoose'
+require 'active_support'
+require 'active_record/base'
+require 'active_record/validations'
+
+
+class Mongoose::ActiveTable < Mongoose::Table
+  RecordNotSaved = ActiveRecord::RecordNotSaved
+  def update_attribute(name, value)
+    send(name.to_s + '=', value)
+    save
+  end  
+  def new_record?
+    @id.nil?
+  end
+  def self.human_attribute_name(attribute_key_name) #:nodoc:
+    attribute_key_name.humanize
+  end  
+  def save!
+    save || raise(RecordNotSaved)
+  end
+  
+  def self.init_column(col_name, col_def, col_class)
+    super
+    meth = <<-END_OF_STRING
+    def #{col_name}_before_type_cast
+      #{col_name}
+    end
+    END_OF_STRING
+    self.class_eval(meth)
+  end
+  
+  include ActiveRecord::Validations
+end
+
+
+class Monkey < Mongoose::ActiveTable
+  validates_numericality_of :arms
+end
+
+
+Mongoose::Table.db = Mongoose::Database.new
+unless Mongoose::Table.db.table_exists?('monkey')
+  Mongoose::Table.db.create_table('monkey') do |t|
+    t.add_column 'arms', :integer
+  end
+end
+
+m = Monkey.new()
+m.arms = '2a'
+m.save!

data/example/relation_examples.rb

@@ -28,11 +28,11 @@ db = Mongoose::Database.new
 
 # Create tables.
 db.create_table(:pilot) do |tbl|
-  tbl.add_indexed_column(:pilot_name, :string)
+  tbl.add_indexed_column(:name, :string)
   tbl.add_column(:years_flying, :integer)
 end
 db.create_table(:plane) do |tbl|
-  tbl.add_indexed_column(:plane_name, :string)
+  tbl.add_indexed_column(:name, :string)
   tbl.add_column(:country, :string)
   tbl.add_indexed_column(:speed, :integer)
   tbl.add_column(:range, :integer)
@@ -45,57 +45,23 @@ db.create_table(:flight) do |tbl|
 end
 
 # Create Pilot records.
-doolittle = Pilot.new
-doolittle.pilot_name = 'Doolitle, James'
-doolittle.years_flying = 15
-doolittle.save
-
-amelia = Pilot.new
-amelia.pilot_name = 'Earhart, Amelia'
-amelia.years_flying = 10
-amelia.save
+doolittle = Pilot.create :name => 'Doolitle, James', :years_flying => 15
+amelia = Pilot.create :name => 'Earhart, Amelia', :years_flying => 10
 
 # Create Plane records.
-rec = Plane.new
-rec.plane_name = 'P-51'
-rec.country = 'USA'
-rec.speed = 402
-rec.range = 1205
-rec.pilot_id = doolittle.id
-rec.save 
-
-rec = Plane.new
-rec.plane_name = 'Spitfire'
-rec.country = 'Great Britain'
-rec.speed = 333
-rec.range = 454
-rec.pilot_id = amelia.id
-rec.save 
+Plane.create :name => 'P-51', :country => 'USA', :speed => 402, 
+ :range => 1205, :pilot_id => doolittle.id
+Plane.create :name => 'Spitfire', :country => 'Great Britain', :speed => 333,
+ :range => 454, :pilot_id => amelia.id
 
 # Create Flight records.
-rec = Flight.new
-rec.pilot_id = doolittle.id
-rec.origin = 'Army'
-rec.destination = 'Nowhere'
-rec.save
-
-rec = Flight.new
-rec.pilot_id = amelia.id
-rec.origin = 'USA'
-rec.destination = 'France'
-
-rec.save
-rec = Flight.new
-rec.pilot_id = amelia.id
-rec.origin = 'USA'
-rec.destination = 'Phillipines'
-rec.save
-
-rec = Flight.new
-rec.pilot_id = amelia.id
-rec.origin = 'China'
-rec.destination = 'Unknown'
-rec.save
+Flight.create :pilot_id => doolittle.id, :origin => 'Army', 
+ :destination => 'Nowhere'
+Flight.create :pilot_id => amelia.id, :origin => 'USA', :destination => 'France'
+Flight.create :pilot_id => amelia.id, :origin => 'USA', 
+ :destination => 'Phillipines'
+Flight.create :pilot_id => amelia.id, :origin => 'China', 
+ :destination => 'Unknown'
 
 puts "\n\nFind Jimmy Doolittle"
 rec = Pilot.find(1)

data/example/simple_examples.rb

@@ -22,48 +22,27 @@ db = Mongoose::Database.new
 # Create new table.  Notice how you specify whether a column is indexed or not.
 unless ARGV[0] == 'keep-data'
   db.create_table(:plane) do |tbl|
-    tbl.add_indexed_column(:plane_name, :string)
+    tbl.add_indexed_column(:name, :string)
     tbl.add_column(:country, :string)
     tbl.add_indexed_column(:speed, :integer)
     tbl.add_column(:range, :integer)
   end
 
   # Add records.
-  rec = Plane.new
-  rec.plane_name = 'P-51'
-  rec.country = 'USA'
-  rec.speed = 402
-  rec.range = 1205
-  rec.save 
-
-  rec2 = Plane.new
-  rec2.plane_name = 'Spitfire'
-  rec2.country = 'Great Britain'
-  rec2.speed = 333
-  rec2.range = 454
-  rec2.save 
-
-  rec3 = Plane.new
-  rec3.plane_name = 'ME-109'
-  rec3.country = 'Germany'
-  rec3.speed = 354
-  rec3.range = 501
-  rec3.save
-
-  rec4 = Plane.new
-  rec4.plane_name = 'P-39'
-  rec4.country = 'USA'
-  rec4.range = 701
+  Plane.create :name => 'P-51', :country => 'USA', :speed => 402, :range => 1205
+  Plane.create :name => 'Spitfire', :country => 'Great Britain', :speed => 333,
+   :range => 454
+  Plane.create :name => 'ME-109', :country => 'Germany', :speed => 354, 
+   :range => 501
 
   # Forgot value for speed, which is a required field.
   begin
-    rec4.save
+  Plane.create :name => 'P-39', :country => 'USA', :range => 701
   rescue RuntimeError => e
     puts e
   end
 
-  rec4.speed = 339
-  rec4.save
+  Plane.create :name => 'P-39', :country => 'USA', :range => 701, :speed => 339
 end
 
 puts "\n\nFind P-51 record by ID"
@@ -77,40 +56,40 @@ if p_51
 end
 
 puts "\n\nFind all records with speed greater than 350 mph"
-result = Plane.find { |plane| plane.speed > 350 }
+result = Plane.find { speed > 350 }
 p result
 
 puts "\n\nFind all US planes with speed greater than 300 mph"
-result = Plane.find { |plane| plane.country == 'USA' and plane.speed > 300 }
+result = Plane.find { country == 'USA' and speed > 300 }
 p result
 
 puts "\n\nFind all British planes with speed greater than 300 mph"
-result = Plane.find do |plane| 
-  plane.country == 'Great Britain' and plane.speed > 300 
+result = Plane.find do  
+  country == 'Great Britain' and speed > 300 
 end
 p result
 
 puts "\n\nFind all Allied planes"
-result = Plane.find do |plane| 
-  plane.any do
-    plane.country == 'USA'
-    plane.country == 'Great Britain'
+result = Plane.find do  
+  any do
+    country == 'USA'
+    country == 'Great Britain'
   end
 end
 p result
 
 puts "\n\nFind all Allied planes with speed greater than 400 mph"
-result = Plane.find do |plane| 
-  plane.any do
-    plane.country == 'USA'
-    plane.country == 'Great Britain'
+result = Plane.find do  
+  any do
+    country == 'USA'
+    country == 'Great Britain'
   end
-  plane.speed > 400
+  speed > 400
 end
 p result
 
 # Delete Spitfire record.
-spitfire = Plane.find(:first) { |plane| plane.plane_name == 'Spitfire' }
+spitfire = Plane.find(:first) { name == 'Spitfire' }
 
 spitfire.destroy if spitfire
 

data/lib/mongoose.rb

@@ -22,7 +22,7 @@ require 'mongoose/util'
 #
 module Mongoose
 
-VERSION = '0.1.1'
+VERSION = '0.2.0'
 DATA_TYPES = [:string, :integer, :float, :time, :date, :datetime, :boolean]
 TBL_EXT = '.mgt'
 TBL_HDR_EXT = '.mgh'

data/lib/mongoose/database.rb

@@ -46,7 +46,7 @@ class Database
     tbl_header[:deleted_recs_counter] = 0
     tbl_header[:columns] = []
     tbl_header[:columns] << { :name => :id, :data_type => :integer, 
-                          :class => IDColumn.to_s }
+                              :class => IDColumn.to_s }
 
     File.open(File.join(@path, table_name.to_s + TBL_HDR_EXT), 'w') do |f|
       YAML.dump(tbl_header, f)

data/lib/mongoose/table.rb

@@ -72,8 +72,8 @@ class Table
 
     define_method(kind.to_sym) do 
       klass = Object.const_get(class_name)
-      Collection.new(self, klass.find { |r|
-       r.send(col) == self.instance_eval { @id } })
+      parent_id = @id
+      Collection.new(self, klass.find { send(col) == parent_id })
     end
   end
 
@@ -87,7 +87,8 @@ class Table
 
     define_method(kind.to_sym) do
       klass = Object.const_get(class_name)
-      klass.find(:first) { |r| r.send(col) == self.instance_eval { @id } }
+      parent_id = @id
+      klass.find(:first) { send(col) == parent_id }
     end
   end
 
@@ -160,12 +161,11 @@ class Table
 
     self.columns << col
 
-    meth = <<-END_OF_STRING
-    def self.#{col_name}
-      self.columns.detect { |c| c.name == "#{col_name}".to_sym } 
+    (class << self; self; end).class_eval do 
+      define_method(col_name) do
+        self.columns.detect { |c| c.name == col_name.to_sym }
+      end
     end
-    END_OF_STRING
-    self.class_eval(meth)
 
     self.class_eval do
       attr_accessor col_name
@@ -219,10 +219,22 @@ class Table
     self.add_column(col_name, col_def, SkipListIndexColumn)
   end
 
+  #-----------------------------------------------------------------------------
+  # Table.create
+  #-----------------------------------------------------------------------------
+  def self.create(options={})
+    rec = new
+    options.each do |k,v|
+      rec.send("#{k}=", v) if self.column_names.include? k
+    end
+    rec.save
+    rec
+  end
+
   #-----------------------------------------------------------------------------
   # Table.find
   #-----------------------------------------------------------------------------
-  def self.find(*args)
+  def self.find(*args, &block)
     # If searching for just one id or a group of ids...
     if args[0].is_a?(Integer)
       if args.size == 1
@@ -233,7 +245,7 @@ class Table
     else
       result = []
       # If passed a query block...
-      if block_given?
+      if block 
         self.query.clear
         query_start = true
         sub_q = false
@@ -241,7 +253,7 @@ class Table
         sub_q_result = []
 
         # Grab the query block
-        yield self 
+        instance_eval(&block) 
 
         # Step through the query block...
         self.query.each_with_index do |q,i|

data/test/tc_relations.rb

@@ -26,12 +26,12 @@ class TestRelations < Test::Unit::TestCase
     @db = Mongoose::Database.new(:path => Dir.tmpdir)
 
     @db.create_table(:pilot) do |tbl|
-      tbl.add_indexed_column(:pilot_name, :string)
+      tbl.add_indexed_column(:name, :string)
       tbl.add_column(:years_flying, :integer)
     end
 
     @db.create_table(:plane) do |tbl|
-      tbl.add_indexed_column(:plane_name, :string)
+      tbl.add_indexed_column(:name, :string)
       tbl.add_column(:country, :string)
       tbl.add_indexed_column(:speed, :integer)
       tbl.add_column(:range, :integer)
@@ -44,55 +44,22 @@ class TestRelations < Test::Unit::TestCase
       tbl.add_column(:pilot_id, :integer)
     end
 
-    @doolittle = Pilot.new
-    @doolittle.pilot_name = 'Doolittle, James'
-    @doolittle.years_flying = 15
-    @doolittle.save
-
-    @amelia = Pilot.new
-    @amelia.pilot_name = 'Earhart, Amelia'
-    @amelia.years_flying = 10
-    @amelia.save
-
-    rec = Plane.new
-    rec.plane_name = 'P-51'
-    rec.country = 'USA'
-    rec.speed = 402
-    rec.range = 1205
-    rec.pilot_id = @doolittle.id
-    rec.save 
-
-    rec = Plane.new
-    rec.plane_name = 'Spitfire'
-    rec.country = 'Great Britain'
-    rec.speed = 333
-    rec.range = 454
-    rec.pilot_id = @amelia.id
-    rec.save 
-
-    rec = Flight.new
-    rec.pilot_id = @doolittle.id
-    rec.origin = 'Army'
-    rec.destination = 'Nowhere'
-    rec.save
-
-    rec = Flight.new
-    rec.pilot_id = @amelia.id
-    rec.origin = 'USA'
-    rec.destination = 'France'
-
-    rec.save
-    rec = Flight.new
-    rec.pilot_id = @amelia.id
-    rec.origin = 'USA'
-    rec.destination = 'Phillipines'
-    rec.save
-
-    rec = Flight.new
-    rec.pilot_id = @amelia.id
-    rec.origin = 'China'
-    rec.destination = 'Unknown'
-    rec.save
+    @doolittle = Pilot.create :name => 'Doolittle, James', :years_flying => 15
+    @amelia = Pilot.create :name => 'Earhart, Amelia', :years_flying => 10
+
+    Plane.create :name => 'P-51', :country => 'USA', :speed => 402, 
+     :range => 1205, :pilot_id => @doolittle.id
+    Plane.create :name => 'Spitfire', :country => 'Great Britain', 
+     :speed => 333, :range => 454, :pilot_id => @amelia.id
+
+    Flight.create :pilot_id => @doolittle.id, :origin => 'Army',
+     :destination => 'Nowhere'
+    Flight.create :pilot_id => @amelia.id, :origin => 'USA',
+     :destination => 'France'
+    Flight.create :pilot_id => @amelia.id, :origin => 'USA',
+     :destination => 'Phillipines'
+    Flight.create :pilot_id => @amelia.id, :origin => 'China',
+     :destination => 'Unknown'
   end
 
   def teardown
@@ -103,7 +70,7 @@ class TestRelations < Test::Unit::TestCase
   end
 
   def test_has_one
-    assert_equal('P-51', @doolittle.plane.plane_name)
+    assert_equal('P-51', @doolittle.plane.name)
   end
 
   def test_has_many_001
@@ -112,28 +79,24 @@ class TestRelations < Test::Unit::TestCase
   end
 
   def test_has_many_002
-    rec = Flight.new
-    rec.pilot_id = @amelia.id
-    rec.origin = 'Tuscon'
-    rec.destination = 'Phoenix'
+    rec = Flight.create :pilot_id => @amelia.id, :origin => 'Tuscon',
+     :destination => 'Phoenix'
     @amelia.flights << rec
 
     assert(@amelia.flights.any? {|f| f.origin == 'Tuscon'})
   end
 
   def test_belongs_to_001
-    assert_equal('Earhart, Amelia', Plane.find(2).pilot.pilot_name)
-    assert_equal('Doolittle, James', Flight.find(1).pilot.pilot_name)
+    assert_equal('Earhart, Amelia', Plane.find(2).pilot.name)
+    assert_equal('Doolittle, James', Flight.find(1).pilot.name)
   end
 
   def test_belongs_to_002
-    red_baron = Pilot.new
-    red_baron.pilot_name = 'Baron, The Red'
-    red_baron.years_flying = 50
-    spitfire = Plane.find(:first) {|plane| plane.plane_name == 'Spitfire'}
+    red_baron = Pilot.create :name => 'Baron, The Red', :years_flying => 50
+    spitfire = Plane.find(:first) { name == 'Spitfire'}
     spitfire.pilot = red_baron
 
-    assert('Baron, The Red', spitfire.pilot.pilot_name)
-    assert_equal('Spitfire', red_baron.plane.plane_name)
+    assert('Baron, The Red', spitfire.pilot.name)
+    assert_equal('Spitfire', red_baron.plane.name)
   end
 end

data/test/tc_table.rb

@@ -22,33 +22,14 @@ class TestTable < Test::Unit::TestCase
       tbl.add_column(:range, :integer)
     end
 
-    rec = Plane.new
-    rec.name = 'P-51'
-    rec.country = 'USA'
-    rec.speed = 402
-    rec.range = 1205
-    rec.save 
-
-    rec = Plane.new
-    rec.name = 'Spitfire'
-    rec.country = 'Great Britain'
-    rec.speed = 333
-    rec.range = 454
-    rec.save 
-
-    rec = Plane.new
-    rec.name = 'ME-109'
-    rec.country = 'Germany'
-    rec.speed = 351
-    rec.range = 501
-    rec.save 
-
-    rec = Plane.new
-    rec.name = 'P-38'
-    rec.country = 'USA'
-    rec.speed = 401
-    rec.range = 999
-    rec.save 
+    Plane.create :name => 'P-51', :country => 'USA', :speed => 402, 
+     :range => 1205
+    Plane.create :name => 'Spitfire', :country => 'Great Britain', 
+     :speed => 333, :range => 454
+    Plane.create :name => 'ME-109', :country => 'Germany', :speed => 351, 
+     :range => 501
+    Plane.create :name => 'P-38', :country => 'USA', :speed => 401, 
+     :range => 999
   end
 
   def teardown
@@ -64,14 +45,21 @@ class TestTable < Test::Unit::TestCase
   end
 
   def test_add_record
-    rec = Plane.find(1)
+    rec = Plane.new
+    rec.name = 'Zero'
+    rec.country = 'Japan'
+    rec.speed = 377
+    rec.range = 888
+    rec.save
 
-    assert(rec.is_a?(Plane))
-    assert_equal(1, rec.id)
-    assert_equal('P-51', rec.name)
-    assert_equal('USA', rec.country)
-    assert_equal(402, rec.speed)
-    assert_equal(1205, rec.range)
+    rec2 = Plane.find(rec.id)
+
+    assert(rec2.is_a?(Plane))
+    assert_equal(rec.id, rec2.id)
+    assert_equal('Zero', rec2.name)
+    assert_equal('Japan', rec2.country)
+    assert_equal(377, rec2.speed)
+    assert_equal(888, rec2.range)
   end
 
   def test_update_record_001
@@ -95,7 +83,7 @@ class TestTable < Test::Unit::TestCase
   end 
 
   def find_001
-    rec = Plane.find(:first) { |plane| plane.name == 'P-51' }
+    rec = Plane.find(:first) { name == 'P-51' }
 
     assert(rec.is_a?(Plane))
     assert_equal(rec.name, 'P-51')
@@ -111,7 +99,7 @@ class TestTable < Test::Unit::TestCase
   end 
 
   def find_002
-    recs = Plane.find { |plane| plane.name == 'P-51' }
+    recs = Plane.find { name == 'P-51' }
 
     assert_equal(recs.size, 1)
     assert(recs.first.is_a?(Plane))
@@ -134,30 +122,30 @@ class TestTable < Test::Unit::TestCase
   end 
 
   def find_003
-    recs = Plane.find do |plane| 
-      plane.any do
-        plane.country == 'USA'
-        plane.country == 'Great Britain'
+    recs = Plane.find do 
+      any do
+        country == 'USA'
+        country == 'Great Britain'
       end
     end
     assert_equal(recs.size, 3)
 
-    recs = Plane.find do |plane| 
-      plane.any do
-        plane.country == 'USA'
-        plane.country == 'Great Britain'
+    recs = Plane.find do 
+      any do
+        country == 'USA'
+        country == 'Great Britain'
       end
-      plane.speed > 400
+      speed > 400
     end
     assert_equal(recs.size, 2)
 
-    recs = Plane.find do |plane| 
-      plane.any do
-        plane.country == 'USA'
-        plane.country == 'Great Britain'
+    recs = Plane.find do 
+      any do
+        country == 'USA'
+        country == 'Great Britain'
       end
-      plane.speed > 400
-      plane.range > 1000
+      speed > 400
+      range > 1000
     end
     assert_equal(recs.size, 1)
     assert_equal(recs.first.name, 'P-51')
@@ -173,23 +161,23 @@ class TestTable < Test::Unit::TestCase
   end 
 
   def find_004
-    recs = Plane.find { |plane| plane.name.one_of('P-51', 'ME-109') } 
+    recs = Plane.find { name.one_of('P-51', 'ME-109') } 
     assert_equal(recs.size, 2)
 
-    recs = Plane.find { |plane| plane.country.one_of('USA', 'Germany') } 
+    recs = Plane.find { country.one_of('USA', 'Germany') } 
     assert_equal(recs.size, 3)
 
-    recs = Plane.find { |plane| plane.speed.between(351, 400) }
+    recs = Plane.find { speed.between(351, 400) }
     assert_equal(0, recs.size)
 
-    recs = Plane.find { |plane| plane.speed.between(351, 400, true) }
+    recs = Plane.find { speed.between(351, 400, true) }
     assert_equal(1, recs.size)
     assert_equal('ME-109', recs.first.name)
 
-    recs = Plane.find { |plane| plane.range.between(450, 501) }
+    recs = Plane.find { range.between(450, 501) }
     assert_equal(1, recs.size)
 
-    recs = Plane.find { |plane| plane.range.between(450, 501, false, true) }
+    recs = Plane.find { range.between(450, 501, false, true) }
     assert_equal(2, recs.size)
   end 
 
@@ -203,7 +191,7 @@ class TestTable < Test::Unit::TestCase
   end 
 
   def test_destroy
-    rec = Plane.find(:first) { |plane| plane.name == 'P-51' }
+    rec = Plane.find(:first) { name == 'P-51' }
     rec.destroy
 
     recs = Plane.find 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: mongoose
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2006-07-20 00:00:00 -04:00
+  version: 0.2.0
+date: 2006-07-21 00:00:00 -04:00
 summary: Mongoose is a pure_ruby database management system.
 require_paths: 
 - lib
@@ -44,6 +44,7 @@ files:
 - test/tc_relations.rb
 - example/relation_examples.rb
 - example/simple_examples.rb
+- example/activetable_example.rb
 test_files: 
 - test/ts_mongoose.rb
 rdoc_options: []