datamapper 0.2.3 → 0.2.4

data/spec/models/person.rb

@@ -6,7 +6,7 @@ class Person < DataMapper::Base
   property :notes, :text
   property :date_of_birth, :date
   
-  embed :address do
+  embed :address, :prefix => true do
     property :street, :string
     property :city, :string
     property :state, :string, :size => 2
@@ -18,15 +18,5 @@ class Person < DataMapper::Base
     
   end
   
-  class Location < DataMapper::EmbeddedValue
-    property :city, :string
-    property :state, :string, :size => 2
-
-    def to_s
-      "#{city}, #{state}"
-    end
-  end
-  
-  embed Location
-  
-end
+  belongs_to :career
+end

data/spec/models/project.rb

@@ -14,6 +14,6 @@ class Project < DataMapper::Base
   private
   
   def create_main_section
-    sections << Section.new(:title => "Main") if sections.empty?
+    sections << Section.find_or_create(:title => "Main") if sections.empty?
   end
 end

data/spec/models/serializer.rb

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

data/spec/models/user.rb

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

data/spec/models/zoo.rb

@@ -4,6 +4,13 @@ class Zoo < DataMapper::Base
   property :updated_at, :datetime
   
   has_many :exhibits
-  
+  begin
   validates_presence_of :name
+  rescue ArgumentError => e
+    throw e unless e.message =~ /specify a unique key/
+  end
+  
+  def name=(val)
+    @name = (val == "Colorado Springs") ? "Cheyenne Mountain" : val
+  end
 end

data/spec/natural_key_spec.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe('A Natural Key') do
+  
+  it "should cause the Table to return a default foreign key composed of it's table and key column name" do
+    database.table(Person).default_foreign_key.should eql('person_id')
+    database.table(Career).default_foreign_key.should eql('career_name')
+  end
+  
+  it "should load the object based on it's natural key" do
+    programmer = Career['Programmer']
+    programmer.should_not be_nil
+    programmer.name.should eql('Programmer')
+    programmer.attributes.should include(:name)
+  end
+  
+  it "should load an association based on the natural key" do
+    database do
+      programmer = Career['Programmer']
+      programmer.followers.should have(2).entries
+      
+      sam = Person.first(:name => 'Sam')
+      scott = Person.first(:name => 'Scott')
+      
+      programmer.followers.should include(sam)
+      programmer.followers.should include(scott)
+      
+      peon = Career['Peon']
+      peon.followers.should have(1).entries
+      
+      bob = Person.first(:name => 'Bob')
+      peon.followers.should include(bob)
+    end
+  end
+  
+end

data/spec/paranoia_spec.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe 'Paranoia' do
+  
+  before(:all) do
+    class Scared < DataMapper::Base
+      property :name, :string
+      property :deleted_at, :datetime
+    end
+    
+    Scared.auto_migrate!
+  end
+  
+  after(:all) do
+    database.table(Scared).drop!
+  end
+  
+  it "should not be found" do
+    cat = Scared.create(:name => 'bob')
+    
+    database.query('SELECT name FROM scareds').should have(1).entries
+    
+    cat2 = Scared.first(:name => 'bob')
+    cat2.should_not be_nil
+    cat2.should be_a_kind_of(Scared)
+    
+    cat.destroy!
+    
+    Scared.first(:name => 'bob').should be_nil
+    
+    Scared.first.should be_nil
+    
+    database.query('SELECT name FROM scareds').should have(1).entries
+  end
+  
+end

data/spec/property_spec.rb

@@ -0,0 +1,70 @@
+describe DataMapper::Property do
+  
+  before(:all) do
+    @property = Zoo.properties.find { |property| property.name == :notes }
+  end
+  
+  it "should map a column" do
+    pending('until Property is implemented')
+    @property.column.should eql(database.table(Zoo)[:notes])
+  end
+  
+  it "should determine lazyness" do
+    pending('until Property is implemented')
+    @property.should be_lazy
+  end
+  
+  it "should determine protection level"
+  
+  it "should return instance variable name"
+  
+  it "should add a validates_presence_of for not-null properties"
+  
+  it "should add a validates_format_of if you pass a format option"
+end
+
+describe DataMapper::Adapters::Sql::Mappings do
+  
+  it "should return the same Table instance for two objects mapped to the same database table" do
+    # Refers to the same Table instance
+    database.table(Person) == database.table(SalesPerson)
+  end
+  
+  it "should have one super-set of total mapped columns" do
+    # Refers to the mapped columns
+    database.table(Person).columns == database.table(SalesPerson).columns
+  end
+  
+  it "should have one set of columns that represents the actual database" do
+    # Refers to the actual columns in the database, which may/are-likely-to-be different
+    # than the mapped columns, sometimes just because your models are dealing with
+    # a legacy database where not every column is mapped to the new model, so this
+    # is expected.
+    database.table(Person).send(:database_columns) == database.table(SalesPerson).send(:database_columns)
+  end
+  
+  it "should have two different sets of mapped properties that point to subsets of the Table columns" do
+    pending('until Property is implemented')
+    
+    table = database.table(Person)
+    
+    # Every property's column should be represented in the Table's column mappings.
+    Person.properties.each do |property|
+      table.columns.should include(property.column)
+    end
+    
+    # For both models in the STI setup...
+    SalesPerson.properties.each do |property|
+      table.columns.should include(property.column)
+    end
+    
+    # Even though Person's properties are fewer than a SalesPerson's
+    Person.properties.size.should_not eql(SalesPerson.properties.size)
+    
+    # And Person's properties should be a subset of a SalesPerson's
+    Person.properties.each do |property|
+      SalesPerson.properties.map(&:column).should include(property.column)
+    end
+  end
+  
+end

data/spec/schema_spec.rb

@@ -1,5 +1,13 @@
 require File.dirname(__FILE__) + "/spec_helper"
 
+describe DataMapper::Adapters::Sql::Mappings::Schema do
+  it "should return all tables from the database schema" do
+    database.adapter.schema.database_tables.size.should == Dir[File.dirname(__FILE__) + '/fixtures/*'].size
+    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
@@ -54,8 +62,8 @@ if ENV['ADAPTER'] == 'postgresql' && false
     end
     
     def table_mapping_for(klass)
-      session = database
-      DataMapper::Adapters::PostgresqlAdapter::Commands::SaveCommand.new(session.adapter, session, 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

data/spec/serialization_spec.rb

@@ -4,15 +4,16 @@ describe DataMapper::Support::Serialization do
   
   before(:all) do
     fixtures(:animals)
+    fixtures(:zoos)
   end
   
   it "should serialize to YAML" do
-    Animal.first(:name => 'Frog').to_yaml.should == <<-EOS.margin
+    Animal.first(:name => 'Frog').to_yaml.strip.should == <<-EOS.margin
       --- 
       id: 1
       name: Frog
       notes: I am a Frog!
-      
+      nice: false
     EOS
   end
   
@@ -21,6 +22,7 @@ describe DataMapper::Support::Serialization do
       <animal id="1">
         <name>Frog</name>
         <notes>I am a Frog!</notes>
+        <nice>false</nice>
       </animal>
     EOS
     
@@ -40,7 +42,8 @@ describe DataMapper::Support::Serialization do
       {
         "id": 1,
         "name": "Frog",
-        "notes": "I am a Frog!"
+        "notes": "I am a Frog!",
+        "nice": false
       }
     EOS
     

data/spec/serialize_spec.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe('An AR serialize implementation') do
+  
+  it 'should instatiate, save, (clear and load) the original objects' do
+    test_data = { :first => 1, :second => "dos", :third => 3.0 }
+
+    srlzr1 = Serializer.new(:content => test_data)
+    srlzr1.content.should == test_data
+    
+    srlzr1.save
+    srlzr1.content.should == test_data
+    
+    srlzr1 = nil
+    srlzr2 = Serializer.first
+    srlzr2.content.should == test_data
+  end
+
+end

data/spec/single_table_inheritance_spec.rb

@@ -14,8 +14,14 @@ describe 'Single Table Inheritance' do
       clone = Person.first(:name => 'Ted')
       ted.should == clone
       
-      ted.should be_a_kind_of(SalesPerson)
+      clone.class.should eql(SalesPerson)      
     end
+    
+    # Since we're not executing within the same database context
+    # this is not the same object instance as the previous ones.
+    clone2 = Person.first(:name => 'Ted')
+    
+    clone2.class.should eql(SalesPerson)    
   end
   
   it "secondary database should inherit the same attributes" do

data/spec/spec_helper.rb

@@ -1,19 +1,37 @@
+require 'pp'
+
 ENV['LOG_NAME'] = 'spec'
 require File.dirname(__FILE__) + '/../environment'
 
 # Define a fixtures helper method to load up our test data.
 def fixtures(name)
   entry = YAML::load_file(File.dirname(__FILE__) + "/fixtures/#{name}.yaml")
-  klass = Kernel::const_get(Inflector.classify(Inflector.singularize(name)))
+  klass = begin
+    Kernel::const_get(Inflector.classify(Inflector.singularize(name)))
+  rescue
+    nil
+  end
   
-  database.logger.debug { "AUTOMIGRATE: #{klass}" }
-  klass.auto_migrate!
+  unless klass.nil?  
+    database.logger.debug { "AUTOMIGRATE: #{klass}" }
+    klass.auto_migrate!
   
-  (entry.kind_of?(Array) ? entry : [entry]).each do |hash|
-    if hash['type']
-      Object::const_get(hash['type'])::create(hash)
-    else
-      klass::create(hash)
+    (entry.kind_of?(Array) ? entry : [entry]).each do |hash|
+      if hash['type']
+        Object::const_get(hash['type'])::create(hash)
+      else
+        klass::create(hash)
+      end
+    end
+  else
+    # TODO: Get rid of the stupid AnimalsExhibit model...
+    table = database.table(name.to_s)
+    table.create! true
+    
+    pp database.schema
+    
+    (entry.kind_of?(Array) ? entry : [entry]).each do |hash|  
+      table.insert(hash)
     end
   end
 end

data/spec/table_spec.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe DataMapper::Adapters::Sql::Mappings::Table do
+  it "should return all columns from the database" do
+    table = database.adapter.schema.database_tables.detect{|table| table.name == "zoos"}
+    columns = table.database_columns
+    columns.size.should == database.schema[Zoo].columns.size
+    columns.each { |column| column.should be_a_kind_of( DataMapper::Adapters::Sql::Mappings::Column ) }
+  end
+  
+  it "should return the default for a column from the database" do
+    table = database.adapter.schema.database_tables.detect{|table| table.name == "animals"}
+    columns = table.database_columns
+    
+    column1 = columns.detect{|column| column.name == :name }
+    column1.default.should == "No Name"
+    
+    column2 = columns.detect{|column| column.name == :nice }
+    column2.default.should == nil
+  end
+  
+  it "should return the nullability for a column from the database" do
+    table = database.adapter.schema.database_tables.detect{|table| table.name == "animals"}
+    columns = table.database_columns
+    
+    column1 = columns.detect{|column| column.name == :id }
+    column1.nullable?.should be_false
+    
+    column2 = columns.detect{|column| column.name == :nice }
+    column2.nullable?.should be_true
+  end
+  
+end

data/spec/validates_confirmation_of_spec.rb

@@ -1,12 +1,12 @@
 require File.dirname(__FILE__) + "/spec_helper"
 
-describe DataMapper::Validations::ConfirmationValidator do
+describe Validatable::ValidatesConfirmationOf do
   
   before(:all) do
     class Cow
 
       include DataMapper::CallbacksHelper
-      include DataMapper::Validations::ValidationHelper
+      include DataMapper::Validations
       
       attr_accessor :name, :name_confirmation, :age
     end
@@ -14,8 +14,8 @@ describe DataMapper::Validations::ConfirmationValidator do
   
   it 'should pass validation' do
     class Cow
-      validations.clear!
-      validates_confirmation_of :name, :context => :save
+      validations.clear
+      validates_confirmation_of :name, :event => :save
     end
     
     betsy = Cow.new
@@ -36,4 +36,20 @@ describe DataMapper::Validations::ConfirmationValidator do
     betsy.valid?(:save).should == true
   end
   
+  it 'should allow allow a custom error message' do
+    class Cow
+      validations.clear
+      validates_confirmation_of :name, :event => :save, :message => 'You confirm name NOW or else.'
+    end
+    
+    betsy = Cow.new
+    betsy.valid?.should == true
+
+    betsy.name = 'Betsy'
+    betsy.name_confirmation = ''
+    betsy.valid?(:save).should == false
+
+    betsy.errors.full_messages.first.should == 'You confirm name NOW or else.'
+  end
+  
 end

data/spec/validates_format_of_spec.rb

@@ -1,12 +1,12 @@
 require File.dirname(__FILE__) + "/spec_helper"
 
-context DataMapper::Validations::FormatValidator do
+context Validatable::ValidatesFormatOf do
   
   before(:all) do
     class Employee
 
       include DataMapper::CallbacksHelper
-      include DataMapper::Validations::ValidationHelper
+      include DataMapper::Validations
       
       attr_accessor :email
     end
@@ -14,8 +14,8 @@ context DataMapper::Validations::FormatValidator do
   
   it 'must have a valid email address' do
     class Employee
-      validations.clear!
-      validates_format_of :email, :as => :email_address, :on => :save
+      validations.clear
+      validates_format_of :email, :with => :email_address, :on => :save
     end
     
     e = Employee.new
@@ -26,6 +26,7 @@ context DataMapper::Validations::FormatValidator do
       'tester@exampl$.com', '[scizzle]@example.com', '.test@example.com'
     ].all? { |test_email|
       e.email = test_email
+      puts "Email is: #{test_email}"
       e.valid?(:save).should == false
       e.errors.full_messages.first.should == "#{test_email} is not a valid email address"
     }
@@ -36,15 +37,13 @@ context DataMapper::Validations::FormatValidator do
   
   it 'must have a valid organization code' do
     class Employee
-      validations.clear!
+      validations.clear
       
       attr_accessor :organization_code
       
       # WARNING: contrived example
       # The organization code must be A#### or B######X12
-      validates_format_of :organization_code, :on => :save, :with => lambda { |code|
-        (code =~ /A\d{4}/) || (code =~ /[B-Z]\d{6}X12/)
-      }
+      validates_format_of :organization_code, :on => :save, :with => /(A\d{4}|[B-Z]\d{6}X12)/
     end
     
     e = Employee.new
@@ -61,4 +60,19 @@ context DataMapper::Validations::FormatValidator do
     e.valid?(:save).should == true
   end
   
+  
+  it 'should allow custom error messages' do
+    class Employee
+      validations.clear
+      validates_format_of :email, :with => :email_address, :on => :save, :message => "Me needs good email, m'kay?"
+    end
+    
+    e = Employee.new
+    e.valid?.should == true
+    
+    e.valid?(:save).should == false
+    e.errors.full_messages.first.should == "Me needs good email, m'kay?"
+    
+  end
+  
 end

data/spec/validates_length_of_spec.rb

@@ -1,12 +1,12 @@
 require File.dirname(__FILE__) + "/spec_helper"
 
-describe DataMapper::Validations::LengthValidator do
+describe Validatable::ValidatesLengthOf do
   
   before(:all) do
     class Cow
       
       include DataMapper::CallbacksHelper
-      include DataMapper::Validations::ValidationHelper
+      include DataMapper::Validations
       
       attr_accessor :name, :age
     end
@@ -14,19 +14,19 @@ describe DataMapper::Validations::LengthValidator do
   
   it 'should not have a name shorter than 3 characters' do
     class Cow
-      validations.clear!
-      validates_length_of :name, :min => 3, :context => :save
+      validations.clear
+      validates_length_of :name, :minimum => 3, :event => :save
     end
     
     betsy = Cow.new
     betsy.valid?.should == true
 
     betsy.valid?(:save).should == false
-    betsy.errors.full_messages.first.should == 'Name must be more than 3 characters long'
+    betsy.errors.full_messages.first.should == 'Name must be more than 2 characters long'
 
     betsy.name = 'Be'
     betsy.valid?(:save).should == false
-    betsy.errors.full_messages.first.should == 'Name must be more than 3 characters long'
+    betsy.errors.full_messages.first.should == 'Name must be more than 2 characters long'
 
     betsy.name = 'Bet'
     betsy.valid?(:save).should == true
@@ -38,8 +38,8 @@ describe DataMapper::Validations::LengthValidator do
 
   it 'should not have a name longer than 10 characters' do
     class Cow
-      validations.clear!
-      validates_length_of :name, :max => 10, :context => :save
+      validations.clear
+      validates_length_of :name, :maximum => 10, :event => :save
     end
     
     betsy = Cow.new
@@ -48,7 +48,7 @@ describe DataMapper::Validations::LengthValidator do
 
     betsy.name = 'Testicular Fortitude'
     betsy.valid?(:save).should == false
-    betsy.errors.full_messages.first.should == 'Name must be less than 10 characters long'
+    betsy.errors.full_messages.first.should == 'Name must be less than 11 characters long'
 
     betsy.name = 'Betsy'
     betsy.valid?(:save).should == true
@@ -56,8 +56,8 @@ describe DataMapper::Validations::LengthValidator do
 
   it 'should have a name that is 8 characters long' do
     class Cow
-      validations.clear!
-      validates_length_of :name, :is => 8, :context => :save
+      validations.clear
+      validates_length_of :name, :is => 8, :event => :save
     end
     
     # Context is not save
@@ -77,8 +77,8 @@ describe DataMapper::Validations::LengthValidator do
 
   it 'should have a name that is between 10 and 15 characters long' do
     class Cow
-      validations.clear!
-      validates_length_of :name, :in => (10..15), :context => :save
+      validations.clear
+      validates_length_of :name, :within => (10..15), :event => :save
     end
     
     # Context is not save
@@ -101,4 +101,17 @@ describe DataMapper::Validations::LengthValidator do
     betsy.name = 'Smootenstein'
     betsy.valid?(:save).should == true
   end
+  
+  it 'should allow custom error messages' do
+    class Cow
+      validations.clear
+      validates_length_of :name, :is => 8, :event => :save, :message => '8 letters, no more, no less.'
+    end
+    
+    betsy = Cow.new
+    betsy.valid?.should == true
+    
+    betsy.valid?(:save).should == false
+    betsy.errors.full_messages.first.should == '8 letters, no more, no less.'
+  end
 end

data/spec/validates_uniqueness_of_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + "/spec_helper"
 
-describe DataMapper::Validations::UniqueValidator do
+describe Validatable::ValidatesUniquenessOf do
   
   before(:all) do 
     fixtures('people')
@@ -8,8 +8,8 @@ describe DataMapper::Validations::UniqueValidator do
   
   it 'must have a unique name' do
     class Animal
-      validations.clear!
-      validates_uniqueness_of :name, :context => :save
+      validations.clear
+      validates_uniqueness_of :name, :event => :save
     end
     
     bugaboo = Animal.new
@@ -25,8 +25,8 @@ describe DataMapper::Validations::UniqueValidator do
   
   it 'must have a unique name for their occupation' do
     class Person
-      validations.clear!
-      validates_uniqueness_of :name, :context => :save, :scope => :occupation
+      validations.clear
+      validates_uniqueness_of :name, :event => :save, :scope => :occupation
     end
     
     new_programmer_scott = Person.new(:name => 'Scott', :age => 29, :occupation => 'Programmer')
@@ -41,4 +41,17 @@ describe DataMapper::Validations::UniqueValidator do
     new_programmer_scott.errors.full_messages.first.should == "Name has already been taken"
   end
   
+  it "should allow custom error messages" do
+    class Animal
+      validations.clear
+      validates_uniqueness_of :name, :event => :save, :message => 'You try to steal my name? I kill you!'
+    end
+    
+    bugaboo = Animal.new
+    bugaboo.valid?.should == true
+
+    bugaboo.name = 'Bear'
+    bugaboo.valid?(:save).should == false
+    bugaboo.errors.full_messages.first.should == 'You try to steal my name? I kill you!'
+  end
 end