datamapper 0.2.4 → 0.2.5

data/spec/single_table_inheritance_spec.rb

@@ -32,4 +32,12 @@ describe 'Single Table Inheritance' do
     
   end
   
+  it "should inherit the callbacks of the parent class" do
+    database do      
+      adam = SalesPerson.new(:name => 'adam')
+      adam.save
+      adam.reload.notes.should eql("Lorem ipsum dolor sit amet")
+    end
+  end
+  
 end

data/spec/table_spec.rb

@@ -30,4 +30,50 @@ describe DataMapper::Adapters::Sql::Mappings::Table do
     column2.nullable?.should be_true
   end
   
+  it "should create sql for composite unique indexes" do
+    class Cage
+      include DataMapper::Persistence
+      
+      property :name, :string
+      property :cage_id, :integer
+      
+      index [:name, :cage_id], :unique => true
+    end
+    
+    index_sql = database.adapter.table(Cage).to_create_composite_index_sql
+    index_sql[0].should match(/CREATE UNIQUE INDEX cages_name_cage_id_index/)
+  end
+  
+  it "should create sql for composite indexes" do
+    class Lion
+      include DataMapper::Persistence
+
+      property :name, :string
+      property :tamer_id, :integer
+      
+      index [:name, :tamer_id]
+    end
+    
+    index_sql = database.adapter.table(Lion).to_create_composite_index_sql
+    index_sql[0].should match(/CREATE INDEX lions_name_tamer_id_index/)
+  end
+  
+  it "should create sql for multiple composite indexes" do
+    class Course
+      include DataMapper::Persistence
+
+      property :code, :string
+      property :name, :string
+      property :description, :text
+      property :department_id, :integer
+      property :professor_id, :integer
+      
+      index [:code, :name], :unique => true
+      index [:department_id, :professor_id], :unique => true
+    end
+    
+    index_sql = database.adapter.table(Course).to_create_composite_index_sql
+    index_sql[0].should match(/CREATE UNIQUE INDEX courses_code_name_index/)
+    index_sql[1].should match(/CREATE UNIQUE INDEX courses_department_id_professor_id_index/)    
+  end
 end

data/spec/validates_uniqueness_of_spec.rb

@@ -40,6 +40,24 @@ describe Validatable::ValidatesUniquenessOf do
     new_programmer_scott.valid?(:save).should == false
     new_programmer_scott.errors.full_messages.first.should == "Name has already been taken"
   end
+
+  it 'must have a unique name for their occupation and career_name' do
+    class Person
+      validations.clear
+      validates_uniqueness_of :name, :event => :save, :scope => [:occupation, :career_name]
+    end
+    
+    new_programmer_scott = Person.new(:name => 'Scott', :age => 29, :occupation => 'Programmer', :career_name => 'Programmer')
+    junior_programmer_scott = Person.new(:name => 'Scott', :age => 25, :occupation => 'Programmer', :career_name => 'Junior Programmer')
+    
+    # Should be valid even though there is another 'Scott' already in the database
+    junior_programmer_scott.valid?(:save).should == true
+
+    # Should NOT be valid, there is already a Programmer names Scott, adding one more
+    # would destroy the universe or something
+    new_programmer_scott.valid?(:save).should == false
+    new_programmer_scott.errors.full_messages.first.should == "Name has already been taken"
+  end
   
   it "should allow custom error messages" do
     class Animal
@@ -54,4 +72,4 @@ 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
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: datamapper
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Sam Smoot
@@ -9,7 +9,7 @@ autorequire: data_mapper
 bindir: bin
 cert_chain: []
 
-date: 2007-12-10 00:00:00 -06:00
+date: 2007-12-19 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,7 +80,6 @@ extra_rdoc_files:
 - 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/auto_migrations.rb
@@ -91,6 +90,7 @@ extra_rdoc_files:
 - lib/data_mapper/dependency_queue.rb
 - lib/data_mapper/embedded_value.rb
 - lib/data_mapper/identity_map.rb
+- lib/data_mapper/persistence.rb
 - lib/data_mapper/property.rb
 - lib/data_mapper/support/active_record_impersonation.rb
 - lib/data_mapper/support/blank.rb
@@ -101,6 +101,7 @@ extra_rdoc_files:
 - 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/validatable_extensions/errors.rb
@@ -130,7 +131,6 @@ extra_rdoc_files:
 - plugins/can_has_sphinx/REVISION
 - plugins/can_has_sphinx/scripts/sphinx.sh
 - plugins/can_has_sphinx/tasks/acts_as_sphinx_tasks.rake
-- plugins/dataobjects/do_rb
 files: 
 - README
 - CHANGELOG
@@ -157,7 +157,6 @@ files:
 - 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/auto_migrations.rb
@@ -168,6 +167,7 @@ files:
 - lib/data_mapper/dependency_queue.rb
 - lib/data_mapper/embedded_value.rb
 - lib/data_mapper/identity_map.rb
+- lib/data_mapper/persistence.rb
 - lib/data_mapper/property.rb
 - lib/data_mapper/support/active_record_impersonation.rb
 - lib/data_mapper/support/blank.rb
@@ -178,6 +178,7 @@ files:
 - 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/validatable_extensions/errors.rb
@@ -212,6 +213,7 @@ files:
 - spec/delete_command_spec.rb
 - spec/dependency_spec.rb
 - spec/embedded_value_spec.rb
+- spec/has_many_association_spec.rb
 - spec/legacy_spec.rb
 - spec/load_command_spec.rb
 - spec/magic_columns_spec.rb
@@ -232,6 +234,7 @@ files:
 - spec/models/zoo.rb
 - spec/natural_key_spec.rb
 - spec/paranoia_spec.rb
+- spec/postgres_spec.rb
 - spec/property_spec.rb
 - spec/query_spec.rb
 - spec/save_command_spec.rb
@@ -276,11 +279,6 @@ files:
 - 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/swig_mysql
-- plugins/dataobjects/swig_postgres
-- plugins/dataobjects/swig_sqlite
 has_rdoc: true
 homepage: http://datamapper.org
 post_install_message: 

data/lib/data_mapper/associations/has_one_association.rb

@@ -1,77 +0,0 @@
-require 'data_mapper/associations/has_n_association'
-
-module DataMapper
-  module Associations
-    
-    class HasOneAssociation < HasNAssociation
-      
-      # Define the association instance method (i.e. Project#tasks)
-      def define_accessor(klass)        
-        klass.class_eval <<-EOS
-          def create_#{@association_name}(options)
-            #{@association_name}_association.create(options)
-          end
-          
-          def build_#{@association_name}(options)
-            #{@association_name}_association.build(options)
-          end
-
-          def #{@association_name}
-            #{@association_name}_association.instance
-          end
-          
-          def #{@association_name}=(value)
-            #{@association_name}_association.set(value)
-          end
-          
-          private
-            def #{@association_name}_association
-              @#{@association_name}_association || (@#{@association_name}_association = DataMapper::Associations::HasOneAssociation::Instance.new(self, #{@association_name.inspect}))
-            end
-        EOS
-      end
-      
-      class Instance < Associations::Reference
-      
-        def instance
-          @associated || @associated = begin                    
-            if @instance.loaded_set.nil?
-              nil
-            else
-              # Temp variable for the instance variable name.
-              setter_method = "#{@association_name}=".to_sym
-              instance_variable_name = "@#{association.foreign_key_column}".to_sym
-          
-              set = @instance.loaded_set.group_by { |instance| instance.key }
-          
-              # Fetch the foreign objects for all instances in the current object's loaded-set.
-              @instance.database_context.all(association.associated_constant, association.foreign_key_column => set.keys).each do |assoc|
-                set[assoc.instance_variable_get(instance_variable_name)].first.send(setter_method, assoc)
-              end
-              
-              @associated
-            end
-            
-          end
-        end
-
-        def create(options)
-          @associated = association.constant.new(options)
-          if @associated.save
-            @associated.send("#{@associated_class.foreign_key}=", @instance.key)
-          end
-        end
-      
-        def build(options)
-          @associated = association.constant.new(options)
-        end
-      
-        def set(val)
-          @associated = val
-        end
-            
-      end # class Instance
-      
-    end # class HasOneAssociation
-  end # module Associations
-end # module DataMapper