datamapper 0.2.5 → 0.3.0

data/spec/{support_spec.rb → support/string_spec.rb}

@@ -1,7 +1,7 @@
-describe DataMapper::Support do
+describe DataMapper::Support::String do
   
-  it "a String should translate" do
+  it "should translate" do
     "%s is great!".t('DataMapper').should eql("DataMapper is great!")
   end
   
-end
+end

data/spec/support/struct_spec.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe Struct do
+  
+  it "should have attributes" do
+    
+    s = Struct.new(:name).new('bob')
+    s.attributes.should == { :name => 'bob' }
+    
+  end
+  
+end

data/spec/support/typed_set_spec.rb

@@ -0,0 +1,66 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe DataMapper::Support::TypedSet do
+  
+  it "should accept objects of a defined type, and raise for others" do
+
+    s = DataMapper::Support::TypedSet.new(Zoo, Animal)
+
+    lambda do
+      s << Zoo.new
+      s.size.should == 1
+    end.should_not raise_error(ArgumentError)
+
+    lambda do
+      s << Animal.new
+      s.size.should == 2
+    end.should_not raise_error(ArgumentError)
+
+    lambda do
+      s << Exhibit.new
+      s.size.should == 2
+    end.should raise_error(ArgumentError)
+
+  end
+
+  it "should be sorted" do
+
+    s = DataMapper::Support::TypedSet.new(Numeric)
+
+    s << 8
+    s << 4
+    s << 9
+    s << 27
+    s << 30
+    s << 1
+    s << 0
+    s << 5
+    s << 3
+
+    s.entries.first.should eql(0)
+    s.entries.last.should eql(30)
+  end
+
+  it "should respond to blank?" do
+    s = DataMapper::Support::TypedSet.new(Numeric)
+    s.should be_blank
+
+    s << 4
+    s.should_not be_blank
+  end
+
+  it "should return the combined entries for two sets" do
+    a = DataMapper::Support::TypedSet.new(Numeric)
+    b = DataMapper::Support::TypedSet.new(Numeric)
+
+    a << 1 << 2 << 3
+    b << 4 << 5 << 6 << 3
+
+    c = (a + b)
+    c.should have(6).entries
+    c.entries.should == [ 1, 2, 3, 4, 5, 6 ]
+
+    lambda { (c + nil) }.should_not raise_error
+  end
+
+end

data/spec/table_spec.rb

@@ -31,7 +31,7 @@ describe DataMapper::Adapters::Sql::Mappings::Table do
   end
   
   it "should create sql for composite unique indexes" do
-    class Cage
+    class Cage #< DataMapper::Base # please do not remove this
       include DataMapper::Persistence
       
       property :name, :string
@@ -45,7 +45,7 @@ describe DataMapper::Adapters::Sql::Mappings::Table do
   end
   
   it "should create sql for composite indexes" do
-    class Lion
+    class Lion #< DataMapper::Base # please do not remove this
       include DataMapper::Persistence
 
       property :name, :string
@@ -59,7 +59,7 @@ describe DataMapper::Adapters::Sql::Mappings::Table do
   end
   
   it "should create sql for multiple composite indexes" do
-    class Course
+    class Course #< DataMapper::Base # please do not remove this
       include DataMapper::Persistence
 
       property :code, :string

data/spec/types/string.rb

@@ -0,0 +1,81 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe DataMapper::Types::String do
+  it "should look like a String" do
+    DataMapper::Types::String.new("duh").should be_a_kind_of(String)
+  end
+
+  it "should answer for :string" do
+    DataMapper::Types::TYPE_MAP[:string].should == DataMapper::Types::String
+  end
+
+  it "should be ready to replace Strings" do
+    DataMapper::Types::TYPE_MAP[String].should == DataMapper::Types::String
+  end
+
+  describe "with validations" do
+
+    it "should catch length errors" do
+      nval = mock("length validator")
+      nval.should_receive(:<)
+
+      DataMapper::Validations::NumberValidator.should_receive(:new).and_return(nval)
+
+      class T < DataMapper::Types::String
+        length < 25
+      end
+
+      inst = T.new("Whatever")
+
+      nval.should_receive(:errors_for).with(inst.length).and_return(["error"])
+
+      inst.should_not be_valid
+      inst.errors.should have_exactly(1).item
+      inst.errors[0].should == "error"
+    end
+
+    it "should catch match errors" do
+      sval = mock("match validator")
+      sval.should_receive(:matches)
+
+      DataMapper::Validations::StringValidator.should_receive(:new).and_return(sval)
+
+      class R < DataMapper::Types::String
+        matches /aabb/
+      end
+
+      inst = R.new("Whatever")
+
+      sval.should_receive(:errors_for).with(inst).and_return(["error"])
+
+      inst.should_not be_valid
+      inst.errors.should have_exactly(1).item
+      inst.errors[0].should == "error"
+    end
+
+    it "should be valid" do
+      nval = mock("length validator")
+      nval.should_receive(:<)
+
+      DataMapper::Validations::NumberValidator.should_receive(:new).and_return(nval)
+
+      sval = mock("match validator")
+      sval.should_receive(:matches)
+
+      DataMapper::Validations::StringValidator.should_receive(:new).and_return(sval)
+
+      class Q < DataMapper::Types::String
+        length < 25
+        matches /aabb/
+      end
+
+      inst = Q.new("Whatever")
+
+      nval.should_receive(:errors_for).with(inst.length).and_return([])
+      sval.should_receive(:errors_for).with(inst).and_return([])
+
+      inst.should be_valid
+      inst.errors.should be_empty
+    end
+  end
+end

data/spec/validates_uniqueness_of_spec.rb

@@ -72,4 +72,21 @@ describe Validatable::ValidatesUniquenessOf do
     bugaboo.valid?(:save).should == false
     bugaboo.errors.full_messages.first.should == 'You try to steal my name? I kill you!'
   end
+  
+  it "should not interfere with the destruction of an object" do
+    pending "see: http://wm.lighthouseapp.com/projects/4819-datamapper/tickets/139"
+    
+    ## creating two dups so that we have invalid records in the db
+    Project.create(:title => 'Dup')
+    Project.create(:title => 'Dup')
+    
+    class Project
+      validations.clear
+      validates_uniqueness_of :title, :message => 'You try to steal my title? I kill you!'
+    end
+    
+    project = Project.first(:title => 'Dup')
+    project.destroy!.should == true
+    
+  end
 end

data/spec/validations/number_validator.rb

@@ -0,0 +1,59 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe DataMapper::Validations::NumberValidator do
+  before(:each) do
+    @v = DataMapper::Validations::NumberValidator.new
+  end
+
+  it "should validate 'less than'" do
+    @v < 10
+
+    @v.errors_for(11).should_not be_empty
+    @v.errors_for(10).should_not be_empty
+    @v.errors_for(9).should be_empty
+  end
+
+  it "should validate 'less than or equals'" do
+    @v <= 10
+
+    @v.errors_for(11).should_not be_empty
+    @v.errors_for(10).should be_empty
+    @v.errors_for(9).should be_empty
+  end
+
+  it "should validate 'greater than'" do
+    @v > 10
+
+    @v.errors_for(11).should be_empty
+    @v.errors_for(10).should_not be_empty
+    @v.errors_for(9).should_not be_empty
+  end
+
+  it "should validate 'greater than or equals'" do
+    @v >= 10
+
+    @v.errors_for(11).should be_empty
+    @v.errors_for(10).should be_empty
+    @v.errors_for(9).should_not be_empty
+  end
+
+  it "should validate 'between' (inclusive)" do
+    @v.between(1 .. 10)
+
+    @v.errors_for(11).should_not be_empty
+    @v.errors_for(0).should_not be_empty
+    @v.errors_for(10).should be_empty
+    @v.errors_for(1).should be_empty
+    @v.errors_for(5).should be_empty
+  end
+
+  it "should validate 'between' (exclusive)" do
+    @v.between(1 ... 10)
+
+    @v.errors_for(11).should_not be_empty
+    @v.errors_for(0).should_not be_empty
+    @v.errors_for(10).should_not be_empty
+    @v.errors_for(1).should be_empty
+    @v.errors_for(5).should be_empty
+  end
+end

data/spec/validations/string_validator.rb

@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe DataMapper::Validations::StringValidator do
+  before(:each) do
+    @v = DataMapper::Validations::StringValidator.new
+  end
+
+  it "should validate 'matches'" do
+    @v.matches /aabb/
+
+    @v.errors_for("cde").should_not be_empty
+    @v.errors_for("aabbb").should be_empty
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: datamapper
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors: 
 - Sam Smoot
@@ -9,7 +9,7 @@ autorequire: data_mapper
 bindir: bin
 cert_chain: []
 
-date: 2007-12-19 00:00:00 -06:00
+date: 2008-03-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,9 +56,10 @@ extensions: []
 
 extra_rdoc_files: 
 - README
+- FAQ
+- QUICKLINKS
 - CHANGELOG
 - MIT-LICENSE
-- do_performance.rb
 - environment.rb
 - example.rb
 - performance.rb
@@ -72,6 +73,7 @@ extra_rdoc_files:
 - lib/data_mapper/adapters/sql/commands/load_command.rb
 - lib/data_mapper/adapters/sql/mappings/associations_set.rb
 - lib/data_mapper/adapters/sql/mappings/column.rb
+- lib/data_mapper/adapters/sql/mappings/conditions.rb
 - lib/data_mapper/adapters/sql/mappings/schema.rb
 - lib/data_mapper/adapters/sql/mappings/table.rb
 - lib/data_mapper/adapters/sql/quoting.rb
@@ -82,6 +84,7 @@ extra_rdoc_files:
 - lib/data_mapper/associations/has_n_association.rb
 - lib/data_mapper/associations/reference.rb
 - lib/data_mapper/associations.rb
+- lib/data_mapper/attributes.rb
 - lib/data_mapper/auto_migrations.rb
 - lib/data_mapper/base.rb
 - lib/data_mapper/callbacks.rb
@@ -90,20 +93,25 @@ extra_rdoc_files:
 - lib/data_mapper/dependency_queue.rb
 - lib/data_mapper/embedded_value.rb
 - lib/data_mapper/identity_map.rb
+- lib/data_mapper/is/tree.rb
+- lib/data_mapper/migration.rb
 - lib/data_mapper/persistence.rb
 - lib/data_mapper/property.rb
-- lib/data_mapper/support/active_record_impersonation.rb
+- lib/data_mapper/query.rb
 - lib/data_mapper/support/blank.rb
 - lib/data_mapper/support/connection_pool.rb
 - lib/data_mapper/support/enumerable.rb
 - lib/data_mapper/support/errors.rb
 - lib/data_mapper/support/inflector.rb
+- lib/data_mapper/support/object.rb
 - lib/data_mapper/support/serialization.rb
 - lib/data_mapper/support/silence.rb
 - lib/data_mapper/support/string.rb
 - lib/data_mapper/support/struct.rb
 - lib/data_mapper/support/symbol.rb
-- lib/data_mapper/support/weak_hash.rb
+- lib/data_mapper/support/typed_set.rb
+- lib/data_mapper/types/base.rb
+- lib/data_mapper/types/string.rb
 - lib/data_mapper/validatable_extensions/errors.rb
 - lib/data_mapper/validatable_extensions/macros.rb
 - lib/data_mapper/validatable_extensions/validatable_instance_methods.rb
@@ -118,6 +126,9 @@ extra_rdoc_files:
 - lib/data_mapper/validatable_extensions/validations/validates_presence_of.rb
 - lib/data_mapper/validatable_extensions/validations/validates_true_for.rb
 - lib/data_mapper/validatable_extensions/validations/validates_uniqueness_of.rb
+- lib/data_mapper/validations/number_validator.rb
+- lib/data_mapper/validations/string_validator.rb
+- lib/data_mapper/validations/validator.rb
 - lib/data_mapper/validations.rb
 - lib/data_mapper.rb
 - tasks/fixtures.rb
@@ -133,9 +144,10 @@ extra_rdoc_files:
 - plugins/can_has_sphinx/tasks/acts_as_sphinx_tasks.rake
 files: 
 - README
+- FAQ
+- QUICKLINKS
 - CHANGELOG
 - MIT-LICENSE
-- do_performance.rb
 - environment.rb
 - example.rb
 - performance.rb
@@ -149,6 +161,7 @@ files:
 - lib/data_mapper/adapters/sql/commands/load_command.rb
 - lib/data_mapper/adapters/sql/mappings/associations_set.rb
 - lib/data_mapper/adapters/sql/mappings/column.rb
+- lib/data_mapper/adapters/sql/mappings/conditions.rb
 - lib/data_mapper/adapters/sql/mappings/schema.rb
 - lib/data_mapper/adapters/sql/mappings/table.rb
 - lib/data_mapper/adapters/sql/quoting.rb
@@ -159,6 +172,7 @@ files:
 - lib/data_mapper/associations/has_n_association.rb
 - lib/data_mapper/associations/reference.rb
 - lib/data_mapper/associations.rb
+- lib/data_mapper/attributes.rb
 - lib/data_mapper/auto_migrations.rb
 - lib/data_mapper/base.rb
 - lib/data_mapper/callbacks.rb
@@ -167,20 +181,25 @@ files:
 - lib/data_mapper/dependency_queue.rb
 - lib/data_mapper/embedded_value.rb
 - lib/data_mapper/identity_map.rb
+- lib/data_mapper/is/tree.rb
+- lib/data_mapper/migration.rb
 - lib/data_mapper/persistence.rb
 - lib/data_mapper/property.rb
-- lib/data_mapper/support/active_record_impersonation.rb
+- lib/data_mapper/query.rb
 - lib/data_mapper/support/blank.rb
 - lib/data_mapper/support/connection_pool.rb
 - lib/data_mapper/support/enumerable.rb
 - lib/data_mapper/support/errors.rb
 - lib/data_mapper/support/inflector.rb
+- lib/data_mapper/support/object.rb
 - lib/data_mapper/support/serialization.rb
 - lib/data_mapper/support/silence.rb
 - lib/data_mapper/support/string.rb
 - lib/data_mapper/support/struct.rb
 - lib/data_mapper/support/symbol.rb
-- lib/data_mapper/support/weak_hash.rb
+- lib/data_mapper/support/typed_set.rb
+- lib/data_mapper/types/base.rb
+- lib/data_mapper/types/string.rb
 - lib/data_mapper/validatable_extensions/errors.rb
 - lib/data_mapper/validatable_extensions/macros.rb
 - lib/data_mapper/validatable_extensions/validatable_instance_methods.rb
@@ -195,61 +214,81 @@ files:
 - lib/data_mapper/validatable_extensions/validations/validates_presence_of.rb
 - lib/data_mapper/validatable_extensions/validations/validates_true_for.rb
 - lib/data_mapper/validatable_extensions/validations/validates_uniqueness_of.rb
+- lib/data_mapper/validations/number_validator.rb
+- lib/data_mapper/validations/string_validator.rb
+- lib/data_mapper/validations/validator.rb
 - lib/data_mapper/validations.rb
 - lib/data_mapper.rb
-- spec/active_record_impersonation_spec.rb
 - spec/acts_as_tree_spec.rb
-- spec/associations_spec.rb
+- spec/adapters/data_object_adapter_spec.rb
+- spec/associations/belongs_to_association_spec.rb
+- spec/associations/has_and_belongs_to_many_association_spec.rb
+- spec/associations/has_many_association_spec.rb
 - spec/attributes_spec.rb
 - spec/auto_migrations_spec.rb
-- spec/base_spec.rb
 - spec/callbacks_spec.rb
 - spec/can_has_sphinx.rb
 - spec/coersion_spec.rb
 - spec/column_spec.rb
-- spec/conditions_spec.rb
 - spec/count_command_spec.rb
+- spec/database_spec.rb
 - spec/dataobjects_spec.rb
 - spec/delete_command_spec.rb
 - spec/dependency_spec.rb
 - spec/embedded_value_spec.rb
-- spec/has_many_association_spec.rb
+- spec/is_a_tree_spec.rb
 - spec/legacy_spec.rb
 - spec/load_command_spec.rb
 - spec/magic_columns_spec.rb
+- spec/migration_spec.rb
 - spec/mock_adapter.rb
 - spec/models/animal.rb
-- spec/models/animals_exhibit.rb
+- spec/models/candidate.rb
 - spec/models/career.rb
+- spec/models/chain.rb
 - spec/models/comment.rb
 - spec/models/exhibit.rb
+- spec/models/fence.rb
 - spec/models/fruit.rb
+- spec/models/job.rb
 - spec/models/person.rb
 - spec/models/post.rb
 - spec/models/project.rb
 - spec/models/sales_person.rb
 - spec/models/section.rb
 - spec/models/serializer.rb
+- spec/models/task.rb
+- spec/models/tomato.rb
 - spec/models/user.rb
 - spec/models/zoo.rb
 - spec/natural_key_spec.rb
 - spec/paranoia_spec.rb
+- spec/persistence_spec.rb
 - spec/postgres_spec.rb
 - spec/property_spec.rb
 - spec/query_spec.rb
 - spec/save_command_spec.rb
 - spec/schema_spec.rb
-- spec/serialization_spec.rb
 - spec/serialize_spec.rb
 - spec/single_table_inheritance_spec.rb
 - spec/spec_helper.rb
-- spec/support_spec.rb
+- spec/support/blank_spec.rb
+- spec/support/inflector_spec.rb
+- spec/support/object_spec.rb
+- spec/support/serialization_spec.rb
+- spec/support/silence_spec.rb
+- spec/support/string_spec.rb
+- spec/support/struct_spec.rb
+- spec/support/typed_set_spec.rb
 - spec/symbolic_operators_spec.rb
 - spec/table_spec.rb
+- spec/types/string.rb
 - spec/validates_confirmation_of_spec.rb
 - spec/validates_format_of_spec.rb
 - spec/validates_length_of_spec.rb
 - spec/validates_uniqueness_of_spec.rb
+- spec/validations/number_validator.rb
+- spec/validations/string_validator.rb
 - spec/validations_spec.rb
 - spec/fixtures/animals.yaml
 - spec/fixtures/animals_exhibits.yaml
@@ -262,6 +301,9 @@ files:
 - spec/fixtures/projects.yaml
 - spec/fixtures/sections.yaml
 - spec/fixtures/serializers.yaml
+- spec/fixtures/tasks.yaml
+- spec/fixtures/tasks_tasks.yaml
+- spec/fixtures/tomatoes.yaml
 - spec/fixtures/users.yaml
 - spec/fixtures/zoos.yaml
 - tasks/fixtures.rb
@@ -304,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: datamapper
-rubygems_version: 0.9.5
+rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
 summary: An Object/Relational Mapper for Ruby