datamapper 0.2.4 → 0.2.5

data/spec/legacy_spec.rb

@@ -8,8 +8,8 @@ describe 'Legacy mappings' do
   
   it('should allow custom foreign-key mappings') do
     database do
-      Fruit[:name => 'Watermelon'].devourer_of_souls.should == Animal[:name => 'Cup']
-      Animal[:name => 'Cup'].favourite_fruit.should == Fruit[:name => 'Watermelon']
+      Fruit.first(:name => 'Watermelon').devourer_of_souls.should == Animal.first(:name => 'Cup')
+      Animal.first(:name => 'Cup').favourite_fruit.should == Fruit.first(:name => 'Watermelon')
     end
   end
   

data/spec/load_command_spec.rb

@@ -5,6 +5,11 @@ describe DataMapper::Adapters::Sql::Commands::LoadCommand do
   before(:all) do
     fixtures(:zoos)
     fixtures(:animals)
+    fixtures(:people)
+  end
+  
+  after(:all) do
+    fixtures(:people)
   end
   
   def loader_for(klass, options = {})
@@ -109,7 +114,7 @@ describe DataMapper::Adapters::Sql::Commands::LoadCommand do
      zebra = Animal.first(:name => 'Zebra')
      zebra.name.should == 'Zebra'
 
-     elephant = Animal[:name => 'Elephant']
+     elephant = Animal.first(:name => 'Elephant')
      elephant.name.should == 'Elephant'
 
      aged = Person.all(:age => 29)
@@ -122,18 +127,18 @@ describe DataMapper::Adapters::Sql::Commands::LoadCommand do
 
    it 'should not find deleted objects' do
      database do
-       wally = Animal[:name => 'Whale']
+       wally = Animal.first(:name => 'Whale')
        wally.new_record?.should == false
        wally.destroy!.should == true
 
-       wallys_evil_twin = Animal[:name => 'Whale']
+       wallys_evil_twin = Animal.first(:name => 'Whale')
        wallys_evil_twin.should == nil
 
        wally.new_record?.should == true
        wally.save
        wally.new_record?.should == false
 
-       Animal[:name => 'Whale'].should == wally
+       Animal.first(:name => 'Whale').should == wally
      end
    end
 
@@ -160,6 +165,22 @@ describe DataMapper::Adapters::Sql::Commands::LoadCommand do
      Zoo.find(1).should be_a_kind_of(Zoo)
    end
    
+   # TICKET: http://wm.lighthouseapp.com/projects/4819-datamapper/tickets/90
+   it "should return a CLEAN object" do
+     Animal[2].should_not be_dirty
+     Animal.first(:name => 'Cup').should_not be_dirty
+   end
+   
+   it "should retrieve altered integer columns correctly" do
+     pending "see http://wm.lighthouseapp.com/projects/4819-datamapper/tickets/95"
+     sam = Person.first
+     sam.age = 6471561394
+     sam.save
+     sam.reload
+     sam.original_values[:age].should == 6471561394
+     sam.age.should == 6471561394
+   end
+   
    it "should be able to search on UTF-8 strings" do
      Zoo.create(:name => 'Danish Vowels: Smoot!') # øø
      Zoo.first(:name.like => '%Smoot%').should be_a_kind_of(Zoo)
@@ -175,9 +196,11 @@ describe DataMapper::Adapters::Sql::Commands::LoadCommand do
    end
    
    # See the comment in dataobjects_spec for why this is failing
-   it "should return nil when finding by id, and the id is not present and/or invalid" do
-     Zoo.find(nil).should be_nil
-   end
+   unless ENV["ADAPTER"] == "mysql"
+     it "should return nil when finding by id, and the id is not present and/or invalid" do
+       Zoo.find(nil).should be_nil
+     end
+  end
    
    it "should return in order" do
      fixtures(:posts)
@@ -188,6 +211,35 @@ describe DataMapper::Adapters::Sql::Commands::LoadCommand do
      two.title.should eql('Two')
      one.next.next.previous.previous.next.previous.next.next.title.should eql('Three')
    end
+   
+   it "should iterate in batches" do
+     
+     total = Animal.count
+     count = 0
+     
+     Animal.each(:name.not => nil) do |animal|
+       count += 1
+     end
+     
+     count.should == total     
+   end
+   
+   it "should get the right object back" do
+     a = Animal.first(:name => 'Cup')
+     Animal.get(a.id).should == a
+     
+     b = Person.first(:name => 'Amy')
+     Person.get(b.id).should == b
+     
+     c = Person.first(:name => 'Bob')
+     Person.get(c.id).should == c
+     
+     database.execute("UPDATE people SET type = ? WHERE name = ?", nil, "Bob")
+     
+     d = Person.first(:name => 'Bob')
+     Person.get(d.id).should == d
+   end
+   
 end
 
 =begin

data/spec/models/animal.rb

@@ -1,8 +1,12 @@
-class Animal < DataMapper::Base
-  property :name, :string, :default => "No Name"
+class Animal #< DataMapper::Base
+  include DataMapper::Persistence
+
+  property :name, :string, :default => "No Name", :index => :unique
   property :notes, :text
   property :nice, :boolean
   
   has_one :favourite_fruit, :class => 'Fruit', :foreign_key => 'devourer_id'
   has_and_belongs_to_many :exhibits
+  
+  DEFAULT_LIMIT = 5
 end

data/spec/models/animals_exhibit.rb

@@ -1,6 +1,8 @@
 # This is just here to get around the fact I use a Class to load
 # fixtures right now.
-class AnimalsExhibit < DataMapper::Base
+class AnimalsExhibit #< DataMapper::Base
+  include DataMapper::Persistence
+
   property :animal_id, :integer, :key => true
   property :exhibit_id, :integer, :key => true
 end

data/spec/models/career.rb

@@ -1,4 +1,5 @@
-class Career < DataMapper::Base
+class Career #< DataMapper::Base
+  include DataMapper::Persistence
   
   property :name, :string, :key => true
   

data/spec/models/comment.rb

@@ -1,4 +1,6 @@
-class Comment < DataMapper::Base
+class Comment #< DataMapper::Base
+  include DataMapper::Persistence
+  
   property   :comment, :text, :lazy => false
   belongs_to :author, :class => 'User', :foreign_key => 'user_id'
 end

data/spec/models/exhibit.rb

@@ -1,4 +1,6 @@
-class Exhibit < DataMapper::Base
+class Exhibit #< DataMapper::Base
+  include DataMapper::Persistence
+  
   property :name, :string
   
   begin

data/spec/models/fruit.rb

@@ -1,4 +1,6 @@
-class Fruit < DataMapper::Base
+class Fruit #< DataMapper::Base
+  include DataMapper::Persistence
+  
   set_table_name 'fruit'
   property :name, :string, :column => 'fruit_name'
   

data/spec/models/person.rb

@@ -1,4 +1,6 @@
-class Person < DataMapper::Base
+class Person #< DataMapper::Base
+  include DataMapper::Persistence
+  
   property :name, :string
   property :age, :integer
   property :occupation, :string
@@ -19,4 +21,11 @@ class Person < DataMapper::Base
   end
   
   belongs_to :career
+
+  before_save :before_save_callback
+
+  def before_save_callback
+    @notes = "Lorem ipsum dolor sit amet"
+  end
+
 end

data/spec/models/post.rb

@@ -1,4 +1,6 @@
-class Post < DataMapper::Base
+class Post #< DataMapper::Base
+  include DataMapper::Persistence
+  
   property :title, :string
   property :created_at, :datetime
   

data/spec/models/project.rb

@@ -1,4 +1,6 @@
-class Project < DataMapper::Base
+class Project #< DataMapper::Base
+  include DataMapper::Persistence
+  
   property :title, :string
   property :description, :string
 

data/spec/models/section.rb

@@ -1,4 +1,6 @@
-class Section < DataMapper::Base
+class Section #< DataMapper::Base
+  include DataMapper::Persistence
+  
   property :title, :string
   property :created_at, :datetime
   

data/spec/models/serializer.rb

@@ -1,3 +1,5 @@
-class Serializer < DataMapper::Base
+class Serializer #< DataMapper::Base
+  include DataMapper::Persistence
+  
   property :content, :object, :lazy => false
 end

data/spec/models/user.rb

@@ -1,4 +1,6 @@
-class User < DataMapper::Base
+class User #< DataMapper::Base
+  include DataMapper::Persistence
+  
   property :name, :string
   has_many :comments, :class => 'Comment', :foreign_key => 'user_id'
 end

data/spec/models/zoo.rb

@@ -1,4 +1,6 @@
-class Zoo < DataMapper::Base
+class Zoo #< DataMapper::Base
+  include DataMapper::Persistence
+  
   property :name, :string
   property :notes, :text
   property :updated_at, :datetime

data/spec/paranoia_spec.rb

@@ -3,7 +3,9 @@ require File.dirname(__FILE__) + "/spec_helper"
 describe 'Paranoia' do
   
   before(:all) do
-    class Scared < DataMapper::Base
+    class Scared
+      include DataMapper::Persistence
+      
       property :name, :string
       property :deleted_at, :datetime
     end

data/spec/postgres_spec.rb

@@ -0,0 +1,54 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+# Only run these specs when the ADAPTER env-variable is set to 'postgresql'
+# You will probably need to set the DATABASE and USERNAME vars as well.
+if ENV['ADAPTER'] == 'postgresql'
+
+  describe DataMapper::Adapters::PostgresqlAdapter::Mappings::Column do
+    it "should be able to set check-constraints on columns" do
+      mappings = DataMapper::Adapters::PostgresqlAdapter::Mappings
+      table    = mappings::Table.new(database(:mock).adapter, "Zebu")
+      column   = mappings::Column.new(database(:mock).adapter, table, :age,
+                   :integer, 1, { :check => "age > 18"})
+      column.to_long_form.should match(/CHECK \(age > 18\)/)
+    end
+  end
+
+  describe DataMapper::Adapters::PostgresqlAdapter::Mappings::Table do
+    
+    before(:all) do
+      class Cage < DataMapper::Base
+        set_table_name "cages"
+        property :name, :string
+      end
+  
+      class CageInSchema < DataMapper::Base
+        set_table_name "my_schema.cages"
+        property :name, :string
+      end
+    end
+    
+    it "should return a quoted table name for a simple table" do
+      table_sql = database.adapter.table(Cage).to_sql
+      table_sql.should == "\"cages\""
+    end
+  
+    it "should return a quoted schema and table name for a table which specifies a schema" do
+      table_sql = database.adapter.table(CageInSchema).to_sql
+      table_sql.should == "\"my_schema\".\"cages\""
+    end
+
+    it "should search only the specified schema if qualified" do
+      database.save(Cage)
+      database.adapter.table(CageInSchema).exists?.should == false
+      database.save(CageInSchema)
+      database.adapter.table(CageInSchema).exists?.should == true
+    end
+    
+    after do
+      database.adapter.execute("DROP SCHEMA my_schema CASCADE") rescue nil
+    end
+    
+  end
+
+end

data/spec/save_command_spec.rb

@@ -2,16 +2,20 @@ require File.dirname(__FILE__) + "/spec_helper"
 
 describe "Save Commands" do
   
+  before(:all) do
+    fixtures(:zoos)
+  end
+  
   it "should create a new row" do
     total = Zoo.all.length
     Zoo.create({ :name => 'bob' })
-    zoo = Zoo[:name => 'bob']
+    zoo = Zoo.first(:name => 'bob')
     zoo.name.should == 'bob'
     Zoo.all.length.should == total+1
   end
   
   it "should update an existing row" do
-    dallas = Zoo[:name => 'Dallas']
+    dallas = Zoo.first(:name => 'Dallas')
     dallas.name = 'bob'
     dallas.save
     dallas.name = 'Dallas'
@@ -25,15 +29,15 @@ describe "Save Commands" do
   
   it "should stamp association on save" do
     database do
-      dallas = Zoo[:name => 'Dallas']
+      dallas = Zoo.first(:name => 'Dallas')
       dallas.exhibits << Exhibit.new(:name => 'Flying Monkeys')
       dallas.save
-      Exhibit[:name => 'Flying Monkeys'].zoo.should == dallas
+      Exhibit.first(:name => 'Flying Monkeys').zoo.should == dallas
     end
   end
   
   it "should be invalid if invalid associations are loaded" do
-    miami = Zoo[:name => 'Miami']
+    miami = Zoo.first(:name => 'Miami')
     fish_fancy = Exhibit.new
     miami.exhibits << fish_fancy
     miami.should_not be_valid

data/spec/schema_spec.rb

@@ -6,94 +6,3 @@ describe DataMapper::Adapters::Sql::Mappings::Schema do
     database.adapter.schema.database_tables.each { |table| table.should be_a_kind_of( DataMapper::Adapters::Sql::Mappings::Table ) }
   end
 end
-
-
-if ENV['ADAPTER'] == 'postgresql' && false
-  
-  describe DataMapper::Adapters::PostgresqlAdapter::Mappings::Table do
-    
-    before(:all) do
-      class Cage < DataMapper::Base
-        set_table_name "cages"
-        property :name, :string
-      end
-  
-      class CageInSchema < DataMapper::Base
-        set_table_name "my_schema.cages"
-        property :name, :string
-      end
-    end
-    
-    it "should return a quoted table name for a simple table" do
-      table_sql = database.adapter.table(Cage).to_sql
-      table_sql.should == "\"cages\""
-    end
-  
-    it "should return a quoted schema and table name for a table which specifies a schema" do
-      table_sql = database.adapter.table(CageInSchema).to_sql
-      table_sql.should == "\"my_schema\".\"cages\""
-    end
-
-    it "should search only the specified schema if qualified" do
-      database.save(Cage)
-      database.adapter.table(CageInSchema).exists?.should == false
-      database.save(CageInSchema)
-      database.adapter.table(CageInSchema).exists?.should == true
-    end
-    
-    after do
-      database.adapter.execute("DROP SCHEMA my_schema CASCADE") rescue nil
-    end
-    
-  end
-  
-  describe DataMapper::Adapters::PostgresqlAdapter::Commands::SaveCommand do
-    
-    before(:all) do
-      class Cage < DataMapper::Base
-        set_table_name "cages"
-        property :name, :string
-      end
-  
-      class CageInSchema < DataMapper::Base
-        set_table_name "my_schema.cages"
-        property :name, :string
-      end
-    end
-    
-    def table_mapping_for(klass)
-      database_context = database
-      DataMapper::Adapters::PostgresqlAdapter::Commands::SaveCommand.new(database_context.adapter, database_context, klass)
-    end
-  
-    it "should create a schema if it doesn't already exist" do
-      create_sql  = table_mapping_for(CageInSchema).to_create_table_sql
-      create_sql.should == <<-EOS.compress_lines
-      CREATE SCHEMA "my_schema"; CREATE TABLE "my_schema"."cages" ("id" serial primary key, "name" varchar)
-      EOS
-    end
-
-    it "shouldn't create a schema if it exists" do
-      database.save(CageInSchema)
-      create_sql  = table_mapping_for(CageInSchema).to_create_table_sql
-      create_sql.should == <<-EOS.compress_lines
-      CREATE TABLE "my_schema"."cages" ("id" serial primary key, "name" varchar)
-      EOS
-    end
-    
-    it "basic crud should work in schemas" do
-      database.save(CageInSchema)
-      CageInSchema.find(:all).size.should == 0
-      CageInSchema.create({ :name => 'bob' })
-      CageInSchema.find(:all).size.should == 1
-      cage = CageInSchema.first(:name => 'bob')
-      cage.name.should == 'bob'
-      cage.destroy!.should == true
-    end
-    
-    after do
-      database.adapter.execute("DROP SCHEMA my_schema CASCADE") rescue nil
-    end
-    
-  end
-end