dm-core 1.1.0 → 1.2.0.rc1

data/lib/dm-core/spec/lib/adapter_helpers.rb

@@ -24,13 +24,10 @@ module DataMapper
               @adapter    = DataMapper::Spec.adapter(kind)
               @repository = DataMapper.repository(@adapter.name)
 
+              @repository.scope { DataMapper.finalize }
+
               # create all tables and constraints before each spec
               if @repository.respond_to?(:auto_migrate!)
-                # If we are going to auto-migrate, we must also finalize
-                @repository.scope do
-                  DataMapper.finalize
-                end
-
                 @repository.auto_migrate!
               end
             end

data/lib/dm-core/spec/setup.rb

@@ -42,11 +42,12 @@ module DataMapper
       end
 
       def require_spec_adapter
-        if ENV['ADAPTER'] == 'in_memory'
+        desired_adapter = ENV['ADAPTER']
+        if desired_adapter.nil? || desired_adapter == 'in_memory'
           ENV['ADAPTER_SUPPORTS'] = 'all'
           Adapters.use(Adapters::InMemoryAdapter)
         else
-          require "dm-#{ENV['ADAPTER']}-adapter/spec/setup"
+          require "dm-#{desired_adapter}-adapter/spec/setup"
         end
       end
 

data/lib/dm-core/spec/shared/public/property_spec.rb

@@ -22,6 +22,14 @@ share_examples_for 'A public Property' do
       @type.accept_options :foo, :bar
     end
 
+    before :all do
+      @original = @type.accepted_options.dup
+    end
+
+    after :all do
+      @type.accepted_options.replace(@original - [ :foo, :bar ])
+    end
+
     describe "predefined options" do
       before :all do
         class ::ChildSubType < @subtype

data/lib/dm-core/spec/shared/resource_spec.rb

@@ -101,6 +101,13 @@ share_examples_for 'A public Resource' do
       end
 
       with_alternate_adapter do
+        before :all do
+          if @user_model.respond_to?(:auto_migrate!)
+            # force the user model to be available in the alternate repository
+            @user_model.auto_migrate!(@adapter.name)
+          end
+        end
+
         describe 'when comparing to a resource with a different repository, but the same properties' do
           before :all do
             rescue_if @skip do
@@ -489,6 +496,13 @@ share_examples_for 'A public Resource' do
     end
 
     with_alternate_adapter do
+      before :all do
+        if @user_model.respond_to?(:auto_migrate!)
+          # force the user model to be available in the alternate repository
+          @user_model.auto_migrate!(@adapter.name)
+        end
+      end
+
       describe 'when comparing to a resource with a different repository, but the same properties' do
         before :all do
           rescue_if @skip do

data/lib/dm-core/spec/shared/semipublic/property_spec.rb

@@ -31,7 +31,7 @@ share_examples_for 'A semipublic Property' do
       end
 
       it 'should set the options to the default' do
-        @property.options.should == @options.merge(@type.options)
+        @property.options.should == @type.options.merge(@options)
       end
     end
 

data/lib/dm-core/support/descendant_set.rb

@@ -1,5 +1,3 @@
-require 'dm-core/support/subject_set'
-
 module DataMapper
   class DescendantSet
     include Enumerable

data/lib/dm-core/support/ext/array.rb

@@ -1,24 +1,5 @@
 module DataMapper; module Ext
   module Array
-    # Transforms an Array of key/value pairs into a Hash.
-    #
-    # This is a better idiom than using Hash[*array.flatten] in Ruby 1.8.6
-    # because it is not possible to limit the flattening to a single
-    # level.
-    #
-    # @param [Array] array
-    #   The array of key/value pairs to transform.
-    #
-    # @return [Hash]
-    #   A Hash where each entry in the Array is turned into a key/value.
-    #
-    # @api semipublic
-    def self.to_hash(array)
-      h = {}
-      array.each { |k,v| h[k] = v }
-      h
-    end
-
     # Transforms an Array of key/value pairs into a {Mash}.
     #
     # This is a better idiom than using Mash[*array.flatten] in Ruby 1.8.6

data/lib/dm-core/support/ext/blank.rb

@@ -7,6 +7,7 @@ module DataMapper
     #
     # @api semipublic
     def self.blank?(value)
+      return value.blank? if value.respond_to?(:blank?)
       case value
       when ::NilClass, ::FalseClass
         true

data/lib/dm-core/support/hook.rb

@@ -1,6 +1,3 @@
-require 'dm-core/support/assertions'
-require 'dm-core/support/local_object_space'
-
 module DataMapper
   #
   # TODO: Write more documentation!

data/lib/dm-core/support/naming_conventions.rb

@@ -38,6 +38,12 @@ module DataMapper
         end
       end # module UnderscoredAndPluralizedWithoutModule
 
+      module UnderscoredAndPluralizedWithoutLeadingModule
+        def self.call(name)
+          UnderscoredAndPluralized.call(name.to_s.gsub(/^[^:]*::/,''))
+        end
+      end
+
       module Underscored
         def self.call(name)
           DataMapper::Inflector.underscore(name)

data/lib/dm-core/support/ordered_set.rb

@@ -1,5 +1,3 @@
-require 'dm-core/support/equalizer'
-
 module DataMapper
 
   # An ordered set of things

data/lib/dm-core/support/subject_set.rb

@@ -1,5 +1,3 @@
-require 'dm-core/support/ordered_set'
-
 module DataMapper
 
   # An insertion ordered set of named objects

data/lib/dm-core/version.rb

@@ -1,3 +1,3 @@
 module DataMapper
-  VERSION = '1.1.0'
+  VERSION = '1.2.0.rc1'
 end

data/spec/public/associations/many_to_many_spec.rb

@@ -159,7 +159,6 @@ end
       @author_model      = Blog::Author
       @article_model     = Blog::Article
       @publication_model = Blog::Publication
-      DataMapper.finalize
 
       @join_model = Blog::Site
     end

data/spec/public/model/property_spec.rb

@@ -1,5 +1,19 @@
 require 'spec_helper'
 
+shared_examples_for "a correct property declaration" do
+  it 'should define a name accessor' do
+    @model.should_not be_method_defined(@property_name)
+    subject
+    @model.should be_method_defined(@property_name)
+  end
+
+  it 'should define a name= mutator' do
+    @model.should_not be_method_defined(:"#{@property_name}=")
+    subject
+    @model.should be_method_defined(:"#{@property_name}=")
+  end
+end
+
 describe DataMapper::Model::Property do
   before do
     Object.send(:remove_const, :ModelPropertySpecs) if defined?(ModelPropertySpecs)
@@ -12,19 +26,45 @@ describe DataMapper::Model::Property do
   end
 
   describe '#property' do
+    context "using default repository" do
+      before do
+        Object.send(:remove_const, :UserDefault) if defined?(::UserDefault)
+
+        class ::UserDefault
+          include DataMapper::Resource
+          property :id, Serial
+        end
+
+        @model         = ::UserDefault
+        @property_name = :name
+      end
 
-    subject { ModelPropertySpecs.property(:name, String) }
+      subject do
+        ::UserDefault.property(:name, String)
+      end
 
-    it 'should define a name accessor' do
-      ModelPropertySpecs.should_not be_method_defined(:name)
-      subject
-      ModelPropertySpecs.should be_method_defined(:name)
+      it_should_behave_like "a correct property declaration"
     end
 
-    it 'should define a name= mutator' do
-      ModelPropertySpecs.should_not be_method_defined(:name=)
-      subject
-      ModelPropertySpecs.should be_method_defined(:name=)
+    context "using alternate repository" do
+      before do
+        Object.send(:remove_const, :UserAlternate) if defined?(::UserAlternate)
+
+        class ::UserAlternate
+          include DataMapper::Resource
+          property :id, Serial
+          repository(:alternate) { property :age, Integer }
+        end
+
+        @model         = UserAlternate
+        @property_name = :alt_name
+      end
+
+      subject do
+        ::UserAlternate.property(:alt_name, String)
+      end
+
+      it_should_behave_like "a correct property declaration"
     end
 
     it 'should raise an exception if the method exists' do
@@ -33,6 +73,12 @@ describe DataMapper::Model::Property do
       }.should raise_error(ArgumentError, '+name+ was :key, which cannot be used as a property name since it collides with an existing method or a query option')
     end
 
+    it 'should raise an exception if the property is boolean and method with question mark already exists' do
+      lambda {
+        ModelPropertySpecs.property(:destroyed, DataMapper::Property::Boolean)
+      }.should raise_error(ArgumentError, '+name+ was :destroyed, which cannot be used as a property name since it collides with an existing method or a query option')
+    end
+
     it 'should raise an exception if the name is the same as one of the query options' do
       lambda {
         ModelPropertySpecs.property(:order, String)

data/spec/public/model/relationship_spec.rb

@@ -282,7 +282,8 @@ share_examples_for 'it creates a many accessor' do
 
         # set the model scope to only return the first record
         @model.default_scope.update(
-          DataMapper::Ext::Array.to_hash(@model.key(@repository.name).zip(@expected.key)))
+          Hash[ @model.key(@repository.name).zip(@expected.key) ]
+        )
 
         @return = @car.model.get(*@car.key).__send__(@name)
       end
@@ -433,7 +434,7 @@ describe DataMapper::Associations do
     class ::Car
       include DataMapper::Resource
 
-      property :id, Serial
+      property :id,   Serial
       property :name, String
     end
 
@@ -497,6 +498,27 @@ describe DataMapper::Associations do
           end
         end
       end
+
+      describe 'with a :unique option' do
+        let(:unique) { [ :one, :two, :three ] }
+
+        before :all do
+          @relationship = Car.belongs_to("#{@name}_with_unique".to_sym, @model, :unique => unique)
+          DataMapper.finalize
+        end
+
+        it 'should create a foreign key that is unique' do
+          @relationship.child_key.each do |property|
+            property.should be_unique
+          end
+        end
+
+        it 'should create a foreign key that has a unique index' do
+          @relationship.child_key.each do |property|
+            property.unique_index.should equal(unique)
+          end
+        end
+      end
     end
 
     # TODO: refactor these specs into above structure once they pass

data/spec/public/model_spec.rb

@@ -36,6 +36,13 @@ describe DataMapper::Model do
 
     describe '#copy' do
       with_alternate_adapter do
+        before :all do
+          if @article_model.respond_to?(:auto_migrate!)
+            # force the article model to be available in the alternate repository
+            @article_model.auto_migrate!(@adapter.name)
+          end
+        end
+
         describe 'between identical models' do
           before :all do
             @return = @resources = @article_model.copy(@repository.name, @adapter.name)
@@ -422,5 +429,30 @@ describe DataMapper::Model do
         end
       end
     end
+
+    it 'A model should respond to allowed_writer_methods' do
+      @article_model.should respond_to(:allowed_writer_methods)
+    end
+
+    describe '#allowed_writer_methods' do
+      subject { @article_model.allowed_writer_methods }
+
+      let(:expected_writer_methods) do
+        %w[ original= revisions= previous= publications= article_publications=
+            id= title= content= subtitle= original_id= persisted_state= ].to_set
+      end
+
+      it { should be_kind_of(Set) }
+
+      it { should be_all { |method| method.kind_of?(String) } }
+
+      it { should be_frozen }
+
+      it 'is idempotent' do
+        should equal(instance_eval(&self.class.subject))
+      end
+
+      it { should eql(expected_writer_methods) }
+    end
   end
 end

data/spec/public/property/binary_spec.rb

@@ -2,13 +2,21 @@ require 'spec_helper'
 
 describe DataMapper::Property::Binary do
   before :all do
-    @name  = :title
-    @type  = DataMapper::Property::Binary
-    @primitive = String
-    @value = 'value'
-    @other_value = 'return value'
+    @name          = :title
+    @type          = described_class
+    @primitive     = String
+    @value         = 'value'
+    @other_value   = 'return value'
     @invalid_value = 1
   end
 
-  it_should_behave_like "A public Property"
+  it_should_behave_like 'A public Property'
+
+  describe '.options' do
+    subject { described_class.options }
+
+    it { should be_kind_of(Hash) }
+
+    it { should eql(:primitive => @primitive, :length => 50) }
+  end
 end

data/spec/public/property/boolean_spec.rb

@@ -2,13 +2,21 @@ require 'spec_helper'
 
 describe DataMapper::Property::Boolean do
   before :all do
-    @name  = :active
-    @type  = DataMapper::Property::Boolean
-    @primitive = TrueClass
-    @value = true
-    @other_value = false
+    @name          = :active
+    @type          = described_class
+    @primitive     = TrueClass
+    @value         = true
+    @other_value   = false
     @invalid_value = 1
   end
 
-  it_should_behave_like "A public Property"
+  it_should_behave_like 'A public Property'
+
+  describe '.options' do
+    subject { described_class.options }
+
+    it { should be_kind_of(Hash) }
+
+    it { should eql(:primitive => @primitive) }
+  end
 end

data/spec/public/property/class_spec.rb

@@ -8,13 +8,21 @@ describe DataMapper::Property::Class do
     class ::Foo; end
     class ::Bar; end
 
-    @name  = :type
-    @type  = DataMapper::Property::Class
-    @primitive = Class
-    @value = Foo
-    @other_value = Bar
+    @name          = :type
+    @type          = described_class
+    @primitive     = Class
+    @value         = Foo
+    @other_value   = Bar
     @invalid_value = 1
   end
 
-  it_should_behave_like "A public Property"
+  it_should_behave_like 'A public Property'
+
+  describe '.options' do
+    subject { described_class.options }
+
+    it { should be_kind_of(Hash) }
+
+    it { should eql(:primitive => @primitive) }
+  end
 end

data/spec/public/property/date_spec.rb

@@ -2,13 +2,21 @@ require 'spec_helper'
 
 describe DataMapper::Property::Date do
   before :all do
-    @name  = :created_on
-    @type  = DataMapper::Property::Date
-    @primitive = Date
-    @value = Date.today
-    @other_value = Date.today+1
+    @name          = :created_on
+    @type          = described_class
+    @primitive     = Date
+    @value         = Date.today
+    @other_value   = Date.today + 1
     @invalid_value = 1
   end
 
-  it_should_behave_like "A public Property"
+  it_should_behave_like 'A public Property'
+
+  describe '.options' do
+    subject { described_class.options }
+
+    it { should be_kind_of(Hash) }
+
+    it { should eql(:primitive => @primitive) }
+  end
 end