datamapper 0.1.1 → 0.2.0

data/spec/{validates_confirmation_of.rb → validates_confirmation_of_spec.rb}

@@ -1,15 +1,16 @@
-context 'A Cow' do
+describe DataMapper::Validations::ConfirmationValidator do
   
-  setup do
+  before(:all) do
     class Cow
 
+      include DataMapper::CallbacksHelper
       include DataMapper::Validations::ValidationHelper
       
       attr_accessor :name, :name_confirmation, :age
     end
   end
   
-  specify('') do
+  it 'should pass validation' do
     class Cow
       validations.clear!
       validates_confirmation_of :name, :context => :save

data/spec/{validates_format_of.rb → validates_format_of_spec.rb}

@@ -1,15 +1,16 @@
-context 'An Employee' do
+context DataMapper::Validations::FormatValidator do
   
-  setup do
+  before(:all) do
     class Employee
 
+      include DataMapper::CallbacksHelper
       include DataMapper::Validations::ValidationHelper
       
       attr_accessor :email
     end
   end
   
-  specify('must have a valid email address') do
+  it 'must have a valid email address' do
     class Employee
       validations.clear!
       validates_format_of :email, :as => :email_address, :on => :save
@@ -31,7 +32,7 @@ context 'An Employee' do
     e.valid?(:save).should == true
   end
   
-  specify('must have a valid organization code') do
+  it 'must have a valid organization code' do
     class Employee
       validations.clear!
       

data/spec/{validates_length_of.rb → validates_length_of_spec.rb}

@@ -1,15 +1,16 @@
-context 'A Cow' do
+describe DataMapper::Validations::LengthValidator do
   
-  setup do
+  before(:all) do
     class Cow
-
+      
+      include DataMapper::CallbacksHelper
       include DataMapper::Validations::ValidationHelper
       
       attr_accessor :name, :age
     end
   end
   
-  specify('should not have a name shorter than 3 characters') do
+  it 'should not have a name shorter than 3 characters' do
     class Cow
       validations.clear!
       validates_length_of :name, :min => 3, :context => :save
@@ -33,7 +34,7 @@ context 'A Cow' do
   end
 
 
-  specify('should not have a name longer than 10 characters') do
+  it 'should not have a name longer than 10 characters' do
     class Cow
       validations.clear!
       validates_length_of :name, :max => 10, :context => :save
@@ -51,7 +52,7 @@ context 'A Cow' do
     betsy.valid?(:save).should == true
   end
 
-  specify('should have a name that is 8 characters long') do
+  it 'should have a name that is 8 characters long' do
     class Cow
       validations.clear!
       validates_length_of :name, :is => 8, :context => :save
@@ -72,7 +73,7 @@ context 'A Cow' do
     betsy.valid?(:save).should == true
   end
 
-  specify('should have a name that is between 10 and 15 characters long') 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

data/spec/{validates_uniqueness_of.rb → validates_uniqueness_of_spec.rb}

@@ -1,6 +1,10 @@
-context 'An Animal' do
+describe DataMapper::Validations::UniqueValidator do
   
-  specify('must have a unique name') do
+  before(:all) do 
+    fixtures('people')
+  end
+  
+  it 'must have a unique name' do
     class Animal
       validations.clear!
       validates_uniqueness_of :name, :context => :save
@@ -17,14 +21,7 @@ context 'An Animal' do
     bugaboo.valid?(:save).should == true
   end
   
-end
-
-context 'A Person' do
-  setup do 
-    fixtures 'people'
-  end
-  
-  specify('must have a unique name for their occupation') do
+  it 'must have a unique name for their occupation' do
     class Person
       validations.clear!
       validates_uniqueness_of :name, :context => :save, :scope => :occupation

data/spec/{validations.rb → validations_spec.rb}

@@ -1,15 +1,16 @@
-context 'Validations' do
+describe DataMapper::Validations do
   
-  setup do
+  before(:all) do
     class Cow
       
+      include DataMapper::CallbacksHelper
       include DataMapper::Validations::ValidationHelper
       
       attr_accessor :name, :age
     end
   end
   
-  specify('should allow you to specify not-null fields in different contexts') do
+  it 'should allow you to specify not-null fields in different contexts' do
     class Cow
       validations.clear!
       validates_presence_of :name, :context => :save
@@ -25,7 +26,7 @@ context 'Validations' do
     betsy.valid?(:save).should == true
   end
   
-  specify('should be able to use ":on" for a context alias') do
+  it 'should be able to use ":on" for a context alias' do
     class Cow
       validations.clear!
       validates_presence_of :name, :age, :on => :create
@@ -43,7 +44,7 @@ context 'Validations' do
     maggie.valid?(:create).should == true
   end
   
-  specify('should default to a general context if unspecified') do
+  it 'should default to a general context if unspecified' do
     class Cow
       validations.clear!
       validates_presence_of :name, :age
@@ -51,6 +52,7 @@ context 'Validations' do
     
     rhonda = Cow.new
     rhonda.valid?.should == false
+    rhonda.errors.should have(2).full_messages
     
     rhonda.errors.full_messages.should include('Age must not be blank')
     rhonda.errors.full_messages.should include('Name must not be blank')
@@ -58,6 +60,22 @@ context 'Validations' do
     rhonda.name = 'Rhonda'
     rhonda.age = 44
     rhonda.valid?.should == true
-  end  
+  end
+  
+  it 'should have 1 validation error' do    
+    class VPOTest
+      
+      include DataMapper::CallbacksHelper
+      include DataMapper::Validations::ValidationHelper
+      
+      attr_accessor :name, :whatever
+      
+      validates_presence_of :name
+    end
+
+    o = VPOTest.new
+    o.should_not be_valid
+    o.errors.should have(1).full_messages
+  end
   
 end

data/tasks/drivers.rb

@@ -0,0 +1,20 @@
+namespace :dm do
+  namespace :install do
+    
+    desc 'Install DataObjects.rb Mysql Driver'
+    task :mysql do
+      %x(cd #{File.dirname(__FILE__) + '/../plugins/dataobjects/swig_mysql/'} && ruby extconf.rb && make && sudo make install)
+    end
+    
+    desc 'Install DataObjects.rb SQLite3 Driver'
+    task :sqlite3 do
+      %x(cd #{File.dirname(__FILE__) + '/../plugins/dataobjects/swig_sqlite/'} && ruby extconf.rb && make && sudo make install)
+    end
+    
+    desc 'Install DataObjects.rb PostgreSQL Driver'
+    task :postgresql do
+      %x(cd #{File.dirname(__FILE__) + '/../plugins/dataobjects/swig_postgres/'} && ruby extconf.rb && make && sudo make install)
+    end
+    
+  end
+end

data/tasks/fixtures.rb

@@ -0,0 +1,42 @@
+namespace :dm do
+  namespace :fixtures do
+    require 'yaml'
+    
+    def fixtures_path
+      return ENV['FIXTURE_PATH'] if ENV['FIXTURE_PATH']
+      
+      %w(db dev schema spec).find do |parent|
+        test_for_dir = "#{DM_APP_ROOT}/#{parent}/fixtures"
+        File.exists?(test_for_dir) ? test_for_dir : nil
+      end
+    end
+    
+    desc 'Dump database fixtures'
+    task :dump do
+      directory fixtures_path
+      puts DataMapper::Base.subclasses.join("\n")
+      DataMapper::Base.subclasses.each do |table|
+        puts "Dumping #{table}"
+        File.open( "#{fixtures_path}/#{table.to_s.underscore}.yml", "w") do |f|
+          f.write YAML::dump(table.all.map{|r| r.attributes})
+        end
+      end
+    end
+    
+    desc 'Load database fixtures'
+    task :load do
+      directory fixtures_path
+      DataMapper::Base.subclasses.each do |table|
+        file_name = "#{fixtures_path}/#{table.to_s.underscore}.yml"
+        next unless File.exists?( file_name )
+        puts "Loading #{table}"
+        table.delete_all
+        File.open( file_name, "r") do |f|
+          YAML::load(f).each do |attrs|
+            table.create attrs
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: datamapper
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2007-08-12 00:00:00 -05:00
+  version: 0.2.0
+date: 2007-10-25 00:00:00 -05:00
 summary: An Object/Relational Mapper for Ruby
 require_paths: 
 - lib
 email: ssmoot@gmail.com
 homepage: http://datamapper.org
 rubyforge_project: datamapper
-description: It's ActiveRecord, but Faster, Better, Simpler.
+description: Faster, Better, Simpler.
 autorequire: data_mapper
 default_executable: 
 bindir: bin
@@ -32,90 +32,145 @@ files:
 - README
 - CHANGELOG
 - MIT-LICENSE
+- do_performance.rb
+- environment.rb
 - example.rb
 - performance.rb
 - profile_data_mapper.rb
 - rakefile.rb
-- lib/data_mapper.rb
-- lib/data_mapper/associations.rb
-- lib/data_mapper/base.rb
-- lib/data_mapper/callbacks.rb
-- lib/data_mapper/database.rb
-- lib/data_mapper/identity_map.rb
-- lib/data_mapper/session.rb
-- lib/data_mapper/unit_of_work.rb
 - lib/data_mapper/adapters/abstract_adapter.rb
+- lib/data_mapper/adapters/data_object_adapter.rb
 - lib/data_mapper/adapters/mysql_adapter.rb
 - lib/data_mapper/adapters/postgresql_adapter.rb
-- lib/data_mapper/adapters/sql_adapter.rb
-- lib/data_mapper/adapters/sqlite3_adapter.rb
 - lib/data_mapper/adapters/sql/coersion.rb
-- lib/data_mapper/adapters/sql/quoting.rb
-- lib/data_mapper/adapters/sql/commands/advanced_load_command.rb
 - lib/data_mapper/adapters/sql/commands/conditions.rb
-- lib/data_mapper/adapters/sql/commands/delete_command.rb
 - lib/data_mapper/adapters/sql/commands/load_command.rb
-- lib/data_mapper/adapters/sql/commands/save_command.rb
-- lib/data_mapper/adapters/sql/commands/table_exists_command.rb
+- lib/data_mapper/adapters/sql/commands/loader.rb
+- lib/data_mapper/adapters/sql/mappings/associations_set.rb
 - lib/data_mapper/adapters/sql/mappings/column.rb
 - lib/data_mapper/adapters/sql/mappings/schema.rb
 - lib/data_mapper/adapters/sql/mappings/table.rb
-- lib/data_mapper/associations/advanced_has_many_association.rb
+- lib/data_mapper/adapters/sql/quoting.rb
+- lib/data_mapper/adapters/sqlite3_adapter.rb
 - lib/data_mapper/associations/belongs_to_association.rb
 - lib/data_mapper/associations/has_and_belongs_to_many_association.rb
 - lib/data_mapper/associations/has_many_association.rb
+- lib/data_mapper/associations/has_n_association.rb
 - lib/data_mapper/associations/has_one_association.rb
+- lib/data_mapper/associations/reference.rb
+- lib/data_mapper/associations.rb
+- lib/data_mapper/base.rb
+- lib/data_mapper/callbacks.rb
+- lib/data_mapper/context.rb
+- lib/data_mapper/database.rb
+- lib/data_mapper/embedded_value.rb
+- lib/data_mapper/identity_map.rb
 - lib/data_mapper/support/active_record_impersonation.rb
 - lib/data_mapper/support/blank.rb
-- lib/data_mapper/support/blank_slate.rb
 - lib/data_mapper/support/connection_pool.rb
 - lib/data_mapper/support/enumerable.rb
 - lib/data_mapper/support/inflector.rb
-- lib/data_mapper/support/proc.rb
+- lib/data_mapper/support/serialization.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/validations/confirmation_validator.rb
 - lib/data_mapper/validations/contextual_validations.rb
 - lib/data_mapper/validations/format_validator.rb
+- lib/data_mapper/validations/formats/email.rb
 - lib/data_mapper/validations/generic_validator.rb
 - lib/data_mapper/validations/length_validator.rb
 - lib/data_mapper/validations/required_field_validator.rb
 - lib/data_mapper/validations/unique_validator.rb
 - lib/data_mapper/validations/validation_errors.rb
 - lib/data_mapper/validations/validation_helper.rb
-- lib/data_mapper/validations/formats/email.rb
-- spec/basic_finder.rb
-- spec/belongs_to.rb
+- lib/data_mapper.rb
+- spec/acts_as_tree_spec.rb
+- spec/associations_spec.rb
+- spec/attributes_spec.rb
+- spec/base_spec.rb
+- spec/callbacks_spec.rb
+- spec/can_has_sphinx.rb
+- spec/coersion_spec.rb
+- spec/conditions_spec.rb
+- spec/conversions_to_yaml_spec.rb
+- spec/count_command_spec.rb
 - spec/delete_command_spec.rb
-- spec/has_and_belongs_to_many.rb
-- spec/has_many.rb
-- spec/legacy.rb
+- spec/embedded_value_spec.rb
+- spec/legacy_spec.rb
 - spec/load_command_spec.rb
-- spec/new_record.rb
-- spec/save_command_spec.rb
-- spec/spec_helper.rb
-- spec/sub_select.rb
-- spec/symbolic_operators.rb
-- spec/validates_confirmation_of.rb
-- spec/validates_format_of.rb
-- spec/validates_length_of.rb
-- spec/validates_uniqueness_of.rb
-- spec/validations.rb
+- spec/magic_columns_spec.rb
+- spec/mock_adapter.rb
 - spec/models/animal.rb
+- spec/models/animals_exhibit.rb
 - spec/models/exhibit.rb
 - spec/models/fruit.rb
 - spec/models/person.rb
 - spec/models/post.rb
+- spec/models/project.rb
 - spec/models/sales_person.rb
+- spec/models/section.rb
 - spec/models/zoo.rb
-- spec/support/string_spec.rb
+- spec/query_spec.rb
+- spec/save_command_spec.rb
+- spec/schema_spec.rb
+- spec/single_table_inheritance_spec.rb
+- spec/spec_helper.rb
+- spec/symbolic_operators_spec.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_spec.rb
 - spec/fixtures/animals.yaml
+- spec/fixtures/animals_exhibits.yaml
 - spec/fixtures/exhibits.yaml
 - spec/fixtures/fruit.yaml
 - spec/fixtures/people.yaml
 - spec/fixtures/zoos.yaml
+- tasks/drivers.rb
+- tasks/fixtures.rb
+- plugins/can_has_sphinx
+- plugins/can_has_sphinx/init.rb
+- plugins/can_has_sphinx/install.rb
+- plugins/can_has_sphinx/lib
+- plugins/can_has_sphinx/lib/acts_as_sphinx.rb
+- plugins/can_has_sphinx/lib/sphinx.rb
+- plugins/can_has_sphinx/LICENSE
+- plugins/can_has_sphinx/Rakefile
+- plugins/can_has_sphinx/README
+- plugins/can_has_sphinx/REVISION
+- plugins/can_has_sphinx/scripts
+- plugins/can_has_sphinx/scripts/sphinx.sh
+- plugins/can_has_sphinx/tasks
+- plugins/can_has_sphinx/tasks/acts_as_sphinx_tasks.rake
+- plugins/dataobjects
+- plugins/dataobjects/do.rb
+- plugins/dataobjects/do_mysql.rb
+- plugins/dataobjects/do_postgres.rb
+- plugins/dataobjects/do_sqlite3.rb
+- plugins/dataobjects/Rakefile
+- plugins/dataobjects/REVISION
+- plugins/dataobjects/spec
+- plugins/dataobjects/spec/do_spec.rb
+- plugins/dataobjects/spec/spec_helper.rb
+- plugins/dataobjects/swig_mysql
+- plugins/dataobjects/swig_mysql/do_mysql.bundle
+- plugins/dataobjects/swig_mysql/extconf.rb
+- plugins/dataobjects/swig_mysql/mysql_c.c
+- plugins/dataobjects/swig_mysql/mysql_c.i
+- plugins/dataobjects/swig_mysql/mysql_supp.i
+- plugins/dataobjects/swig_postgres
+- plugins/dataobjects/swig_postgres/extconf.rb
+- plugins/dataobjects/swig_postgres/Makefile
+- plugins/dataobjects/swig_postgres/postgres_c.bundle
+- plugins/dataobjects/swig_postgres/postgres_c.c
+- plugins/dataobjects/swig_postgres/postgres_c.i
+- plugins/dataobjects/swig_sqlite
+- plugins/dataobjects/swig_sqlite/db
+- plugins/dataobjects/swig_sqlite/extconf.rb
+- plugins/dataobjects/swig_sqlite/sqlite3_c.c
+- plugins/dataobjects/swig_sqlite/sqlite_c.i
 test_files: []
 
 rdoc_options: 
@@ -127,11 +182,95 @@ extra_rdoc_files:
 - README
 - CHANGELOG
 - MIT-LICENSE
+- do_performance.rb
+- environment.rb
+- example.rb
+- performance.rb
+- profile_data_mapper.rb
+- rakefile.rb
+- lib/data_mapper/adapters/abstract_adapter.rb
+- lib/data_mapper/adapters/data_object_adapter.rb
+- lib/data_mapper/adapters/mysql_adapter.rb
+- lib/data_mapper/adapters/postgresql_adapter.rb
+- lib/data_mapper/adapters/sql/coersion.rb
+- lib/data_mapper/adapters/sql/commands/conditions.rb
+- lib/data_mapper/adapters/sql/commands/load_command.rb
+- lib/data_mapper/adapters/sql/commands/loader.rb
+- lib/data_mapper/adapters/sql/mappings/associations_set.rb
+- lib/data_mapper/adapters/sql/mappings/column.rb
+- lib/data_mapper/adapters/sql/mappings/schema.rb
+- lib/data_mapper/adapters/sql/mappings/table.rb
+- lib/data_mapper/adapters/sql/quoting.rb
+- lib/data_mapper/adapters/sqlite3_adapter.rb
+- lib/data_mapper/associations/belongs_to_association.rb
+- lib/data_mapper/associations/has_and_belongs_to_many_association.rb
+- lib/data_mapper/associations/has_many_association.rb
+- lib/data_mapper/associations/has_n_association.rb
+- lib/data_mapper/associations/has_one_association.rb
+- lib/data_mapper/associations/reference.rb
+- lib/data_mapper/associations.rb
+- lib/data_mapper/base.rb
+- lib/data_mapper/callbacks.rb
+- lib/data_mapper/context.rb
+- lib/data_mapper/database.rb
+- lib/data_mapper/embedded_value.rb
+- lib/data_mapper/identity_map.rb
+- lib/data_mapper/support/active_record_impersonation.rb
+- lib/data_mapper/support/blank.rb
+- lib/data_mapper/support/connection_pool.rb
+- lib/data_mapper/support/enumerable.rb
+- lib/data_mapper/support/inflector.rb
+- lib/data_mapper/support/serialization.rb
+- lib/data_mapper/support/string.rb
+- lib/data_mapper/support/symbol.rb
+- lib/data_mapper/support/weak_hash.rb
+- lib/data_mapper/validations/confirmation_validator.rb
+- lib/data_mapper/validations/contextual_validations.rb
+- lib/data_mapper/validations/format_validator.rb
+- lib/data_mapper/validations/formats/email.rb
+- lib/data_mapper/validations/generic_validator.rb
+- lib/data_mapper/validations/length_validator.rb
+- lib/data_mapper/validations/required_field_validator.rb
+- lib/data_mapper/validations/unique_validator.rb
+- lib/data_mapper/validations/validation_errors.rb
+- lib/data_mapper/validations/validation_helper.rb
+- lib/data_mapper.rb
+- tasks/drivers.rb
+- tasks/fixtures.rb
+- plugins/can_has_sphinx
+- plugins/can_has_sphinx/init.rb
+- plugins/can_has_sphinx/install.rb
+- plugins/can_has_sphinx/lib
+- plugins/can_has_sphinx/lib/acts_as_sphinx.rb
+- plugins/can_has_sphinx/lib/sphinx.rb
+- plugins/can_has_sphinx/LICENSE
+- plugins/can_has_sphinx/Rakefile
+- plugins/can_has_sphinx/README
+- plugins/can_has_sphinx/REVISION
+- plugins/can_has_sphinx/scripts
+- plugins/can_has_sphinx/scripts/sphinx.sh
+- plugins/can_has_sphinx/tasks
+- plugins/can_has_sphinx/tasks/acts_as_sphinx_tasks.rake
+- plugins/dataobjects
+- plugins/dataobjects/do.rb
+- plugins/dataobjects/do_mysql.rb
+- plugins/dataobjects/do_postgres.rb
+- plugins/dataobjects/do_sqlite3.rb
+- plugins/dataobjects/Rakefile
+- plugins/dataobjects/REVISION
 executables: []
 
 extensions: []
 
 requirements: 
 - none
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: fastthread
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: