dm-core 1.2.0 → 1.2.1

data/lib/dm-core/collection.rb

@@ -501,6 +501,7 @@ module DataMapper
     #
     # @api public
     def each
+      return to_enum unless block_given?
       super do |resource|
         begin
           original, resource.collection = resource.collection, self

data/lib/dm-core/model.rb

@@ -314,6 +314,7 @@ module DataMapper
     end
 
     def each(&block)
+      return to_enum unless block_given?
       all.each(&block)
       self
     end

data/lib/dm-core/model/property.rb

@@ -234,6 +234,7 @@ module DataMapper
           #{writer_visibility}
           def #{writer_name}(value)
             property = properties[#{name.inspect}]
+            value    = property.typecast(value)
             self.persistence_state = persistence_state.set(property, value)
             persistence_state.get(property)
           end

data/lib/dm-core/property.rb

@@ -622,7 +622,7 @@ module DataMapper
     #
     # @api private
     def set(resource, value)
-      set!(resource, typecast(value))
+      set!(resource, value)
     end
 
     # Set the ivar value in the resource
@@ -682,8 +682,10 @@ module DataMapper
     def typecast(value)
       if value.nil? || primitive?(value)
         value
-      elsif respond_to?(:typecast_to_primitive)
+      elsif respond_to?(:typecast_to_primitive, true)
         typecast_to_primitive(value)
+      else
+        value
       end
     end
 

data/lib/dm-core/query.rb

@@ -1017,7 +1017,7 @@ module DataMapper
             add_condition(condition)
 
           when Hash
-            condition.each { |kv| append_condition(*kv) }
+            condition.each { |key, value| append_condition(key, value) }
 
           when Array
             statement, *bind_values = *condition
@@ -1053,6 +1053,9 @@ module DataMapper
       @order = Array(@order)
       @order = @order.map do |order|
         case order
+          when Direction
+            order.dup
+
           when Operator
             target   = order.target
             property = target.kind_of?(Property) ? target : @properties[target]
@@ -1065,9 +1068,6 @@ module DataMapper
           when Property
             Direction.new(order)
 
-          when Direction
-            order.dup
-
           when Path
             Direction.new(order.property)
 

data/lib/dm-core/resource.rb

@@ -280,7 +280,10 @@ module DataMapper
     # @api public
     def attribute_set(name, value)
       property = properties[name]
-      self.persistence_state = persistence_state.set(property, value) if property
+      if property
+        value = property.typecast(value)
+        self.persistence_state = persistence_state.set(property, value)
+      end
     end
 
     alias_method :[]=, :attribute_set
@@ -335,6 +338,10 @@ module DataMapper
               raise ArgumentError, "The attribute '#{name}' is not accessible in #{model}"
             end
           when Associations::Relationship, Property
+            # only call a public #typecast (e.g. on Property instances)
+            if name.respond_to?(:typecast)
+              value = name.typecast(value)
+            end
             self.persistence_state = persistence_state.set(name, value)
         end
       end

data/lib/dm-core/resource/persistence_state/transient.rb

@@ -50,7 +50,20 @@ module DataMapper
 
         def set_default_value(subject)
           return if subject.loaded?(resource) || !subject.default?
-          set(subject, subject.default_for(resource))
+          default = typecast_default(subject, subject.default_for(resource))
+          set(subject, default)
+        end
+
+        def typecast_default(subject, default)
+          return default unless subject.respond_to?(:typecast)
+
+          typecasted_default = subject.send(:typecast, default)
+          unless typecasted_default.eql?(default)
+            warn "Automatic typecasting of default property values is deprecated " +
+                 "(#{default.inspect} was casted to #{typecasted_default.inspect}). " +
+                 "Specify the correct type for #{resource.class}."
+          end
+          typecasted_default
         end
 
         def track(subject)

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

@@ -45,12 +45,11 @@ module DataMapper
         next if object.kind_of?(DataMapper::Logger)                    ||
                 object.kind_of?(DataMapper::DescendantSet)             ||
                 object.kind_of?(DataMapper::Adapters::AbstractAdapter) ||
-                object.class.name[0, 13] == 'DataObjects::'
+                object.class.name.to_s[0, 13] == 'DataObjects::'
 
         # skip classes and modules in the DataMapper namespace
         next if object.kind_of?(Module) &&
-                !object.name.nil?       &&
-                object.name[0, 12] == 'DataMapper::'
+                object.name.to_s[0, 12] == 'DataMapper::'
 
         # skip when the ivar is no longer defined in the object
         next unless object.instance_variable_defined?(ivar)

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

@@ -115,7 +115,9 @@ module DataMapper
         end
 
         def connection_uri
-          "#{adapter_name}://#{username}:#{password}@#{host}/#{storage_name}"
+          "#{adapter_name}://#{username}%s@#{host}/#{storage_name}".tap do |s|
+            return s % ((password.empty?) ? "" : ":#{password}")
+          end
         end
 
         def storage_name

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

@@ -233,13 +233,17 @@ share_examples_for 'A public Resource' do
     describe 'when a public mutator is specified' do
       before :all do
         rescue_if @skip do
-          @user.attributes = { :name => 'dkubb' }
+          @user.attributes = { :name => 'dkubb', @user.class.properties[:age] => '42' }
         end
       end
 
       it 'should set the value' do
         @user.name.should eql('dkubb')
       end
+
+      it 'should typecast and set the value' do
+        @user.age.should eql(42)
+      end
     end
 
     describe 'when a non-public mutator is specified' do

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

@@ -139,7 +139,7 @@ module DataMapper
 
     # @return [Hash] The mash as a Hash with string keys.
     def to_hash
-      Hash.new(default).merge(self)
+      Hash.new(default).replace(self)
     end
 
     protected

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

@@ -316,6 +316,7 @@ module DataMapper
     #
     # @api private
     def each
+      return to_enum unless block_given?
       entries.each { |entry| yield(entry) }
       self
     end

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

@@ -207,6 +207,7 @@ module DataMapper
     #
     # @api private
     def each
+      return to_enum unless block_given?
       entries.each { |entry| yield(entry) }
       self
     end

data/lib/dm-core/version.rb

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

data/spec/public/associations/many_to_many_spec.rb

@@ -82,7 +82,7 @@ end
 
         # load the targets without references to a single source
         load_collection = lambda do |query|
-          @author_model.get(*@author.key).articles(query)
+          @author_model.get!(*@author.key).articles(query)
         end
 
         @articles       = load_collection.call(:title => 'Sample Article')
@@ -177,7 +177,7 @@ end
 
         # load the targets without references to a single source
         load_collection = lambda do |query|
-          @author_model.get(*@author.key).articles(query)
+          @author_model.get!(*@author.key).articles(query)
         end
 
         @articles       = load_collection.call(:title => 'Sample Article')

data/spec/public/associations/many_to_one_spec.rb

@@ -73,7 +73,7 @@ describe 'Many to One Associations' do
       user    = @user_model.create(:name => 'dbussink', :age => 25, :description => 'Test')
       comment = @comment_model.create(:body => 'Cool spec', :user => user)
 
-      @comment = @comment_model.get(*comment.key)
+      @comment = @comment_model.get!(*comment.key)
       @user    = @comment.user
     end
 

data/spec/public/associations/one_to_many_spec.rb

@@ -62,7 +62,7 @@ require 'spec_helper'
 
         # load the targets without references to a single source
         load_collection = lambda do |query|
-          @author_model.get(*@author.key).articles(query)
+          @author_model.get!(*@author.key).articles(query)
         end
 
         @articles       = load_collection.call(:title => 'Sample Article')

data/spec/public/associations/one_to_one_spec.rb

@@ -72,7 +72,7 @@ describe 'One to One Associations' do
       comment = @comment_model.create(:body => 'Cool spec')
       user    = @user_model.create(:name => 'dbussink', :age => 25, :description => 'Test', :comment => comment)
 
-      @comment = @comment_model.get(*comment.key)
+      @comment = @comment_model.get!(*comment.key)
       @user    = @comment.user
     end
 
@@ -164,7 +164,7 @@ describe 'One to One Through Associations' do
       comment = @comment_model.create(:body => 'Cool spec')
       user    = @user_model.create(:name => 'dbussink', :age => 25, :description => 'Test', :comment => comment)
 
-      @comment = @comment_model.get(*comment.key)
+      @comment = @comment_model.get!(*comment.key)
       @user    = @comment.user
     end
 

data/spec/public/model/relationship_spec.rb

@@ -72,7 +72,7 @@ share_examples_for 'it creates a one accessor' do
         # set the model scope to not match the expected resource
         @model.default_scope.update(:id.not => @resource.id)
 
-        @return = @car.model.get(*@car.key).__send__(@name)
+        @return = @car.model.get!(*@car.key).__send__(@name)
       end
 
       it 'should return nil' do
@@ -111,13 +111,13 @@ share_examples_for 'it creates a one mutator' do
 
       it 'should persist the Resource' do
         @car.save.should be(true)
-        @car.model.get(*@car.key).__send__(@name).should == @expected
+        @car.model.get!(*@car.key).__send__(@name).should == @expected
       end
 
       it 'should persist the associated Resource' do
         @car.save.should be(true)
         @expected.should be_saved
-        @expected.model.get(*@expected.key).car.should == @car
+        @expected.model.get!(*@expected.key).car.should == @car
       end
     end
 
@@ -151,13 +151,13 @@ share_examples_for 'it creates a one mutator' do
 
       it 'should persist the Resource' do
         @car.save.should be(true)
-        @car.model.get(*@car.key).__send__(@name).should == @return
+        @car.model.get!(*@car.key).__send__(@name).should == @return
       end
 
       it 'should persist the associated Resource' do
         @car.save.should be(true)
         @return.should be_saved
-        @return.model.get(*@return.key).car.should == @car
+        @return.model.get!(*@return.key).car.should == @car
       end
     end
 
@@ -178,7 +178,7 @@ share_examples_for 'it creates a one mutator' do
 
       it 'should persist as nil' do
         @car.save.should be(true)
-        @car.model.get(*@car.key).__send__(@name).should be_nil
+        @car.model.get!(*@car.key).__send__(@name).should be_nil
       end
     end
 
@@ -210,13 +210,13 @@ share_examples_for 'it creates a one mutator' do
 
       it 'should persist the Resource' do
         @car.save.should be(true)
-        @car.model.get(*@car.key).__send__(@name).should == @expected
+        @car.model.get!(*@car.key).__send__(@name).should == @expected
       end
 
       it 'should persist the associated Resource' do
         @car.save.should be(true)
         @expected.should be_saved
-        @expected.model.get(*@expected.key).car.should == @car
+        @expected.model.get!(*@expected.key).car.should == @car
       end
     end
   end
@@ -285,7 +285,7 @@ share_examples_for 'it creates a many accessor' do
           Hash[ @model.key(@repository.name).zip(@expected.key) ]
         )
 
-        @return = @car.model.get(*@car.key).__send__(@name)
+        @return = @car.model.get!(*@car.key).__send__(@name)
       end
 
       it 'should return a Collection' do
@@ -325,13 +325,13 @@ share_examples_for 'it creates a many mutator' do
 
       it 'should persist the Collection' do
         @car.save.should be(true)
-        @car.model.get(*@car.key).__send__(@name).should == @expected
+        @car.model.get!(*@car.key).__send__(@name).should == @expected
       end
 
       it 'should persist the associated Resource' do
         @car.save.should be(true)
         @expected.each { |resource| resource.should be_saved }
-        @expected.each { |resource| resource.model.get(*resource.key).car.should == @car }
+        @expected.each { |resource| resource.model.get!(*resource.key).car.should == @car }
       end
     end
 
@@ -360,13 +360,13 @@ share_examples_for 'it creates a many mutator' do
 
       it 'should persist the Collection' do
         @car.save.should be(true)
-        @car.model.get(*@car.key).__send__(@name).should == @return
+        @car.model.get!(*@car.key).__send__(@name).should == @return
       end
 
       it 'should persist the associated Resource' do
         @car.save.should be(true)
         @return.each { |resource| resource.should be_saved }
-        @return.each { |resource| resource.model.get(*resource.key).car.should == @car }
+        @return.each { |resource| resource.model.get!(*resource.key).car.should == @car }
       end
     end
 
@@ -387,7 +387,7 @@ share_examples_for 'it creates a many mutator' do
 
       it 'should persist as an empty Collection' do
         @car.save.should be(true)
-        @car.model.get(*@car.key).__send__(@name).should be_empty
+        @car.model.get!(*@car.key).__send__(@name).should be_empty
       end
     end
 
@@ -417,13 +417,13 @@ share_examples_for 'it creates a many mutator' do
 
       it 'should persist the Resource' do
         @car.save.should be(true)
-        @car.model.get(*@car.key).__send__(@name).should == @expected
+        @car.model.get!(*@car.key).__send__(@name).should == @expected
       end
 
       it 'should persist the associated Resource' do
         @car.save.should be(true)
         @expected.each { |resource| resource.should be_saved }
-        @expected.each { |resource| resource.model.get(*resource.key).car.should == @car }
+        @expected.each { |resource| resource.model.get!(*resource.key).car.should == @car }
       end
     end
   end

data/spec/public/model_spec.rb

@@ -111,7 +111,7 @@ describe DataMapper::Model do
           end
 
           it 'should add the resources to the alternate repository' do
-            @article.model.get(*@heff1.key).should_not be_nil
+            @article.model.get!(*@heff1.key).should_not be_nil
           end
         end
       end

data/spec/public/property/discriminator_spec.rb

@@ -117,11 +117,11 @@ describe DataMapper::Property::Discriminator do
     end
 
     it 'should persist the type' do
-      @announcement.model.get(*@announcement.key).type.should equal(@announcement_model)
+      @announcement.model.get!(*@announcement.key).type.should equal(@announcement_model)
     end
 
     it 'should be retrieved as an instance of the correct class' do
-      @announcement.model.get(*@announcement.key).should be_instance_of(@announcement_model)
+      @announcement.model.get!(*@announcement.key).should be_instance_of(@announcement_model)
     end
 
     it 'should include descendants in finders' do

data/spec/public/property/object_spec.rb

@@ -30,13 +30,24 @@ describe DataMapper::Property, 'Object type' do
   it { should respond_to(:typecast) }
 
   describe '#typecast' do
+    subject { @property.typecast(@value) }
+
     before do
       @value = { 'lang' => 'en_CA' }
     end
 
-    subject { @property.typecast(@value) }
+    context 'when the value is a primitive' do
+      it { should equal(@value) }
+    end
 
-    it { should equal(@value) }
+    context 'when the value is not a primitive' do
+      before do
+        # simulate the value not being a primitive
+        @property.should_receive(:primitive?).with(@value).and_return(false)
+      end
+
+      it { should equal(@value) }
+    end
   end
 
   it { should respond_to(:dump) }

data/spec/public/property_spec.rb

@@ -263,12 +263,6 @@ describe DataMapper::Property do
 
       it 'triggers lazy loading for given resource'
 
-      it 'type casts given value' do
-        @property.set(@image, Addressable::URI.parse('http://test.example/'))
-        # get a string that has been typecasted using #to_str
-        @image.title.should == 'http://test.example/'
-      end
-
       it 'sets new property value' do
         @property.set(@image, 'Updated value')
         @image.title.should == 'Updated value'