datamapper 0.2.3 → 0.2.4

data/performance.rb

@@ -1,38 +1,44 @@
 require 'benchmark'
 require 'active_record'
 
-ActiveRecord::Base.establish_connection :adapter => 'mysql',
+socket_file = [
+  "/opt/local/var/run/mysql5/mysqld.sock",
+  "tmp/mysqld.sock",
+  "tmp/mysql.sock"
+].find { |path| File.exists?(path) }
+
+configuration_options = {
+  :adapter => 'mysql',
   :username => 'root',
   :password => '',
-  :database => 'data_mapper_1',
-  :socker => "/tmp/mysql.sock"  
+  :database => 'data_mapper_1'
+}
+
+configuration_options[:socket] = socket_file unless socket_file.nil?
+
+ActiveRecord::Base.establish_connection(configuration_options)
 
 ActiveRecord::Base.find_by_sql('SELECT 1')
 
-class ARAnimal < ActiveRecord::Base
+class ARAnimal < ActiveRecord::Base #:nodoc:
   set_table_name 'animals'
 end
 
-class ARPerson < ActiveRecord::Base
+class ARPerson < ActiveRecord::Base #:nodoc:
   set_table_name 'people'
 end
 
 require 'lib/data_mapper'
 
-DataMapper::Database.setup({
-  :adapter => 'mysql',
-  :database => 'data_mapper_1',
-  :username => 'root',
-  :socket => "/tmp/mysql.sock"
-})
+DataMapper::Database.setup(configuration_options)
 
-class DMAnimal < DataMapper::Base
+class DMAnimal < DataMapper::Base #:nodoc:
   set_table_name 'animals'
   property :name, :string
   property :notes, :string
 end
 
-class DMPerson < DataMapper::Base
+class DMPerson < DataMapper::Base #:nodoc:
   set_table_name 'people'
   property :name, :string
   property :age, :integer
@@ -44,22 +50,22 @@ class DMPerson < DataMapper::Base
   property :zip_code, :string, :size => 10
 end
 
-class Exhibit < DataMapper::Base
+class Exhibit < DataMapper::Base #:nodoc:
   property :name, :string
   belongs_to :zoo
 end
 
-class Zoo < DataMapper::Base
+class Zoo < DataMapper::Base #:nodoc:
   property :name, :string
   has_many :exhibits
 end
 
-class ARZoo < ActiveRecord::Base
+class ARZoo < ActiveRecord::Base #:nodoc:
   set_table_name 'zoos'
   has_many :exhibits, :class_name => 'ARExhibit', :foreign_key => 'zoo_id'
 end
 
-class ARExhibit < ActiveRecord::Base
+class ARExhibit < ActiveRecord::Base #:nodoc:
   set_table_name 'exhibits'
   belongs_to :zoo, :class_name => 'ARZoo', :foreign_key => 'zoo_id'
 end
@@ -260,4 +266,4 @@ Benchmark::send(ENV['BM'] || :bmbm, 40) do |x|
   end
     
     
-end
+end

data/rakefile.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
 require 'rake'
 require 'spec/rake/spectask'
 require 'rake/rdoctask'
@@ -37,7 +38,7 @@ namespace :dm do
 
 end
 
-PACKAGE_VERSION = '0.2.3'
+PACKAGE_VERSION = '0.2.4'
 
 PACKAGE_FILES = FileList[
   'README',
@@ -86,7 +87,9 @@ gem_spec = Gem::Specification.new do |s|
   s.requirements << 'none'
   s.autorequire = 'data_mapper'
   s.add_dependency('fastthread')
+  s.add_dependency('json')
   s.add_dependency('rspec')
+  s.add_dependency('validatable')
 
   s.has_rdoc = true 
   s.rdoc_options << '--line-numbers' << '--inline-source' << '--main' << 'README'
@@ -106,4 +109,11 @@ end
 
 task :install => :package do
   sh %{sudo gem install pkg/#{PROJECT}-#{PACKAGE_VERSION}}
-end
+end
+
+namespace :dev do
+  desc "Install for development (for windows)"
+  task :winstall => :gem do
+    system %{gem install --no-rdoc --no-ri -l pkg/#{PROJECT}-#{PACKAGE_VERSION}.gem}
+  end
+end

data/spec/active_record_impersonation_spec.rb

@@ -0,0 +1,133 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe DataMapper::Support::ActiveRecordImpersonation do
+  
+  before(:all) do
+    fixtures(:animals)
+    fixtures(:exhibits)
+  end
+  
+  describe 'A record' do
+    it 'should save and return true if validations pass' do
+      count = Exhibit.count
+      bugs_and_more_bugs = Exhibit.new(:name => 'Bugs And More Bugs')
+      bugs_and_more_bugs.save.should be_true
+      Exhibit.count.should == count + 1
+    end
+
+    it 'should return false on save if validations fail' do
+      count = Exhibit.count
+      bugs_and_more_bugs = Exhibit.new
+      bugs_and_more_bugs.save.should be_false
+      Exhibit.count.should == count
+    end
+
+    it 'should reload its attributes' do
+      frog = Animal[:name => 'Frog']
+      frog.name = 'MegaFrog'
+      frog.name.should == 'MegaFrog'
+      frog.reload!
+      frog.name.should == 'Frog'
+    end
+    
+    it "should prepare it's associations for reload" do
+      chippy = Animal.first(:name => 'Cup')
+      amazonia = Exhibit.first(:name => 'Amazonia')
+      amazonia.animals << chippy
+      amazonia.animals.should include(chippy)
+      amazonia.reload!
+      amazonia.animals.should_not include(chippy)
+    end
+
+    it 'should be destroyed!' do
+      capybara = Animal.create(:name => 'Capybara')
+      count = Animal.count
+      capybara.destroy!
+      Animal[:name => 'Capybara'].should be_nil
+      Animal.count.should == count - 1
+    end
+  end
+
+  it 'should return the first match using find_or_create' do
+    count = Animal.count
+    frog = Animal.find_or_create(:name => 'Frog')
+    frog.name.should == 'Frog'
+    Animal.count.should == count
+  end
+
+  it 'should create a record if a match is not found with find_or_create' do
+    count = Animal.count
+    capybara = Animal.find_or_create(:name => 'Capybara')
+    capybara.name.should == 'Capybara'
+    Animal.count.should == count + 1
+  end
+
+  it 'should return all records' do
+    all_animals = Animal.all
+    all_animals.length.should == Animal.count
+    all_animals.each do |animal|
+      animal.class.should == Animal
+    end
+  end
+
+  it 'should return the first record' do
+    Animal.first.should == Animal.find(:first)
+  end
+
+  it 'should return a count of the records' do
+    Animal.count.should == Animal.find_by_sql("SELECT COUNT(*) FROM animals")[0]
+  end
+
+  it 'should delete all records' do
+    Animal.delete_all
+    Animal.count.should == 0
+
+    fixtures(:animals)
+  end
+
+  #it 'should be truncated' do
+  #  Animal.truncate!
+  #  Animal.count.should == 0
+  #
+  #  fixtures(:animals)
+  #end
+
+  it 'should find a matching record given an id' do
+    Animal.find(1).name.should == 'Frog'
+  end
+
+  it 'should find all records' do
+    Animal.find(:all).length.should == Animal.count
+  end
+
+  it 'should find all matching records given some condition' do
+    Animal.find(:all, :conditions => ["name = ?", "Frog"])[0].name.should == 'Frog'
+  end
+
+  it 'should find the first matching record' do
+    Animal.find(:first).name.should == 'Frog'
+  end
+
+  it 'should find the first matching record given some condition' do
+    Animal.find(:first, :conditions => ["name = ?", "Frog"]).name.should == 'Frog'
+  end
+
+  it 'should select records using the supplied sql fragment' do
+    Animal.find_by_sql("SELECT name FROM animals WHERE name='Frog'")[0].should == 'Frog'
+  end
+
+  it 'should retrieve the indexed element' do
+    Animal[1].id.should == 1
+  end
+
+  it 'should retrieve the indexed element using a hash condition' do
+    Animal[:name => 'Frog'].name.should == 'Frog'
+  end
+
+  it 'should create a new record' do
+    count = Animal.count
+    capybara = Animal.create(:name => 'Capybara')
+    capybara.name.should == 'Capybara'
+    Animal.count.should == count + 1
+  end
+end

data/spec/acts_as_tree_spec.rb

@@ -10,9 +10,12 @@ describe('A tree') do
       has_many :children, :class => 'Node', :foreign_key => 'parent_id'
     end
     
-    database.schema[Node].drop!
-    database.save(Node)
-  end    
+    Node.auto_migrate!
+  end
+  
+  after(:all) do
+    database.table(Node).drop!
+  end
 
   it 'should work' do
     root = Node.new(:name => 'root')
@@ -21,7 +24,9 @@ describe('A tree') do
     two = Node.new(:name => 'two')
 
     root.children << one << two
-
+    
+    root.parent_id.should be_nil
+    
     one_one = Node.new(:name => 'one_one')
     one_two = Node.new(:name => 'one_two')
     one.children << one_one << one_two
@@ -30,12 +35,23 @@ describe('A tree') do
     two_two = Node.new(:name => 'two_two')
     two.children << two_one << two_two
 
-    root.save
-
-    grand = Node[:name => 'root']
-    root.should_not == grand # false since +root+ and +grand+ are in different sessions.
+    root.save.should == true
+    root.parent_id.should be_nil
+    
+    root.should have(2).children
+    one.should have(2).children
+    two.should have(2).children
 
+    Node.all(:name => 'root').should have(1).entries
+    
+    grand = Node.first(:name => 'root')
+    
+    grand.should have(2).children
+    
+    root.should == grand # true since +root+ and +grand+ are objects with identical types and attributes.
+    root.should_not eql(grand) # false since +root+ and +grand+ are in different sessions.
+    
     grand.children[0].children[0].name.should == 'one_one'
   end
   
-end
+end

data/spec/associations_spec.rb

@@ -1,6 +1,10 @@
 require File.dirname(__FILE__) + "/spec_helper"
 
 describe DataMapper::Associations::BelongsToAssociation do
+  before(:all) do
+    fixtures(:zoos)
+  end
+  
   before(:each) do
     @aviary = Exhibit[:name => 'Monkey Mayhem']
   end
@@ -11,14 +15,31 @@ describe DataMapper::Associations::BelongsToAssociation do
   end
   
   it 'belongs to a zoo' do
-    @aviary.zoo.should == @aviary.session.first(Zoo, :name => 'San Diego')
+    @aviary.zoo.should == @aviary.database_context.first(Zoo, :name => 'San Diego')
   end
   
   it "is assigned a zoo_id" do
     zoo = Zoo.first
     exhibit = Exhibit.new(:name => 'bob')
     exhibit.zoo = zoo
-    exhibit.instance_variable_get("@zoo_id").should == zoo.id    
+    exhibit.instance_variable_get("@zoo_id").should == zoo.id
+    
+    exhibit.save.should eql(true)
+    
+    zoo2 = Zoo.first
+    zoo2.exhibits.should include(exhibit)
+    
+    exhibit.destroy!
+    
+    zoo = Zoo.new(:name => 'bob')
+    bob = Exhibit.new(:name => 'bob')
+    zoo.exhibits << bob
+    zoo.save.should eql(true)
+    
+    zoo.exhibits.first.should_not be_a_new_record
+    
+    bob.destroy!
+    zoo.destroy!
   end
   
   it 'can build its zoo' do
@@ -118,14 +139,35 @@ describe DataMapper::Associations::HasManyAssociation do
       JOIN `exhibits` ON `exhibits`.`zoo_id` = `zoos`.`id`
     EOS
   end
-  
+
   it "should add an item to an association" do
     bear = Exhibit.new( :name => "Bear")
     @zoo.exhibits << bear
     @zoo.exhibits.should include(bear)
   end
+  
+  it "should build a new item" do
+    bear = @zoo.exhibits.build( :name => "Bear" )
+    bear.should be_kind_of(Exhibit)
+    @zoo.exhibits.should include(bear)
+  end
 
+  it "should not save the item when building" do
+    bear = @zoo.exhibits.build( :name => "Bear" )
+    bear.should be_new_record
+  end
   
+  it "should create a new item" do
+    bear = @zoo.exhibits.create( :name => "Bear" )
+    bear.should be_kind_of(Exhibit)
+    @zoo.exhibits.should include(bear)
+  end
+
+  it "should save the item when creating" do
+    bear = @zoo.exhibits.create( :name => "Bear" )
+    bear.should_not be_new_record
+  end
+
   it "should set the association to a saved target when added with <<" do    
     pirahna = Exhibit.new(:name => "Pirahna")
     pirahna.zoo_id.should be_nil
@@ -228,5 +270,83 @@ describe DataMapper::Associations::HasAndBelongsToManyAssociation do
       end
     end
   end
+  
+  it 'should allow association of additional objects' do
+    @amazonia.animals << Animal.new(:name => "Buffalo")
+    @amazonia.animals.size.should == 2
+    @amazonia.reload
+  end
+  
+  it 'should allow you to fill and clear an association' do
+    marcy = Exhibit.create(:name => 'marcy')
+    
+    Animal.all.each do |animal|
+      marcy.animals << animal
+    end
+    
+    marcy.save.should eql(true)
+    marcy.should have(Animal.count).animals
+    
+    marcy.animals.clear
+    marcy.should have(0).animals
+    
+    marcy.save.should eql(true)
+    
+    marcys_stand_in = Exhibit[marcy.id]
+    marcys_stand_in.should have(0).animals
+    
+    marcy.destroy!    
+  end
+  
+  it 'should allow you to delete a specific association member' do
+    walter = Exhibit.create(:name => 'walter')
+
+    Animal.all.each do |animal|
+      walter.animals << animal
+    end
+    
+    walter.save.should eql(true)
+    walter.should have(Animal.count).animals
+    
+    delete_me = walter.animals.entries.first
+    walter.animals.delete(delete_me).should eql(delete_me)
+    walter.animals.delete(delete_me).should eql(nil)
+    
+    walter.should have(Animal.count - 1).animals
+    walter.save.should eql(true)
+    
+    walters_stand_in = Exhibit[walter.id]
+    walters_stand_in.animals.size.should eql(walter.animals.size)
+
+    walter.destroy!
+  end
+  
+  it "should allow updates to associations using association_ids[]" do
+    pending "Awaiting implementation of association_ids[]"
+    meerkat = Animal.new(:name => "Meerkat")
+    @amazonia.animals.size.should == 1
+    
+    @amazonia.animal_ids << meerkat.id
+    @amazonia.save
+    
+    @amazonia.animals.size.should == 2
+    @amazonia.animals.should include?(meerkat)
+  end
+  
+  it "Should handle setting complementary associations" do
+    u1 = User.create(:name => "u1")
+    u1.comments.should be_empty
+    
+    c1 = Comment.create(:comment => "c", :author => u1)
+    p u1
+    p c1
+    
+    u1.comments.should_not be_empty
+    u1.comments.should include(c1)
+    
+    u1.reload!
+    u1.comments.should_not be_empty
+    u1.comments.should include(c1)
+  end
 
-end
+end

data/spec/attributes_spec.rb

@@ -14,4 +14,17 @@ describe DataMapper::Base do
     zoo.notes.should eql('This is another test.')
   end
   
+  it "should allow custom setters" do
+    zoo = Zoo.new
+    
+    zoo.name = 'Colorado Springs'
+    zoo.name.should eql("Cheyenne Mountain")
+  end
+  
+  it "should call custom setters on mass-assignment" do
+    zoo = Zoo.new(:name => 'Colorado Springs')
+    
+    zoo.name.should eql("Cheyenne Mountain")
+  end
+  
 end

data/spec/auto_migrations_spec.rb

@@ -0,0 +1,44 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe Zoo, "with auto-migrations" do
+  it "should allow auto migration" do
+    Zoo.should respond_to("auto_migrate!")
+  end
+end
+
+describe DataMapper::AutoMigrations do
+  it "should find all new models" do
+    database.schema[Zoo].drop!
+    Zoo.auto_migrate!
+    database.table_exists?(Zoo).should be_true
+    database.column_exists_for_table?(Zoo, :id).should be_true
+    database.column_exists_for_table?(Zoo, :name).should be_true
+    database.column_exists_for_table?(Zoo, :notes).should be_true
+    database.column_exists_for_table?(Zoo, :updated_at).should be_true    
+  end
+  
+  it "should find all changed models"
+  it "should find all unmapped tables"
+end
+
+describe DataMapper::AutoMigrations, "when migrating a new model" do
+  it "should allow creation of new tables for new models"
+  it "should allow renaming of unmapped tables for new models"
+  it "should create columns for the model's properties"
+end
+
+describe DataMapper::AutoMigrations, "when migrating a changed model" do
+  it "should find all new properties"
+  it "should allow creation of new columns for new properties"
+  it "should allow an unmapped column to be renamed for a new property"
+  it "should find all unmapped columns"
+  it "should allow removal of any or all unmapped columns"
+end
+
+describe DataMapper::AutoMigrations, "when migrating an unmapped table" do
+  it "should allow the table to be dropped"
+end
+
+describe DataMapper::AutoMigrations, "after migrating" do
+  it "should store migration decisions to allow the migration to be replicated"
+end