ardm-core 1.2.1 → 1.3.0

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/naming_conventions.rb

@@ -20,7 +20,7 @@ module DataMapper
   # DataMapper.setup(name, uri) returns the Adapter for convenience, so you can
   # use code like this:
   #
-  #   adapter = DataMapper.setup(:default, 'mock://localhost/mock')
+  #   adapter = DataMapper.setup(:default, 'mock://127.0.0.1/mock')
   #   adapter.resource_naming_convention = NamingConventions::Resource::Underscored
   module NamingConventions
 
@@ -78,6 +78,25 @@ module DataMapper
         end
       end # module Underscored
 
+      module FQN
+        def self.call(property)
+          model, name = property.model, property.name
+
+          fk_names = model.relationships.inject([]) { |names, rel|
+            if rel.respond_to?(:required?)
+              names + rel.source_key.map(&:name)
+            else
+              names
+            end
+          }
+
+          return name.to_s if fk_names.include?(name)
+
+          storage_name = model.storage_name(property.repository_name)
+          "#{DataMapper::Inflector.singularize(storage_name)}_#{name}"
+        end
+      end # module FQN
+
       module Yaml
         def self.call(property)
           "#{DataMapper::Inflector.pluralize(DataMapper::Inflector.underscore(property.name.to_s))}.yaml"

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.1'
+  VERSION = '1.3.0'
 end

data/script/performance.rb

@@ -38,7 +38,7 @@ log_dir = DataMapper.root / 'log'
 log_dir.mkdir unless log_dir.directory?
 
 DataMapper::Logger.new(log_dir / 'dm.log', :off)
-adapter = DataMapper.setup(:default, "mysql://root@localhost/dm_core_test?socket=#{socket_file}")
+adapter = DataMapper.setup(:default, "mysql://root@127.0.0.1/dm_core_test?socket=#{socket_file}")
 
 if configuration_options[:adapter]
   sqlfile       = File.join(File.dirname(__FILE__), '..', 'tmp', 'performance.sql')

data/script/profile.rb

@@ -28,7 +28,7 @@ SOCKET_FILE = Pathname.glob(%w[
 configuration_options = {
   :adapter  => 'mysql',
   :database => 'dm_core_test',
-  :host     => 'localhost',
+  :host     => '127.0.0.1',
   :username => 'root',
   :password => '',
   :socket   => SOCKET_FILE,

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/finalize_spec.rb

@@ -53,7 +53,7 @@ describe DataMapper do
         include DataMapper::Resource
       end
       begin
-        method(:subject).should raise_error(DataMapper::IncompleteModelError, 'EmptyObject must have at least one property or many to one relationship to be valid')
+        method(:subject).should raise_error(DataMapper::IncompleteModelError, 'EmptyObject must have at least one property or many to one relationship in default to be valid')
       ensure
         DataMapper::Model.descendants.delete(EmptyObject)
         Object.send(:remove_const, :EmptyObject)
@@ -66,7 +66,7 @@ describe DataMapper do
         property :name, String
       end
       begin
-        method(:subject).should raise_error(DataMapper::IncompleteModelError, 'KeylessObject must have a key to be valid')
+        method(:subject).should raise_error(DataMapper::IncompleteModelError, 'KeylessObject must have a key in default to be valid')
       ensure
         DataMapper::Model.descendants.delete(KeylessObject)
         Object.send(:remove_const, :KeylessObject)

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
@@ -592,7 +592,7 @@ describe DataMapper::Associations do
 
           it 'should add the engine object to the car' do
             pending 'Changing a belongs_to parent should add the object to the correct association' do
-              @car.engines.should be_include(@engine)
+              @car.engines.should include(@engine)
             end
           end
         end
@@ -623,7 +623,7 @@ describe DataMapper::Associations do
 
           it 'should add the engine to the car' do
             pending 'Changing a belongs_to parent should add the object to the correct association' do
-              @car2.engines.should be_include(@engine)
+              @car2.engines.should include(@engine)
             end
           end
         end
@@ -642,7 +642,7 @@ describe DataMapper::Associations do
 
           it 'should add the engine to the car' do
             pending 'a change to the foreign key should also change the related object' do
-              @car2.engines.should be_include(@engine)
+              @car2.engines.should include(@engine)
             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'

data/spec/public/resource/state_spec.rb

@@ -0,0 +1,72 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+
+describe 'DataMapper::Resource' do
+  before :all do
+    class ::Author
+      include DataMapper::Resource
+
+      property :id,        Serial
+      property :string_,   String
+      property :bool_,     Boolean
+      property :float_,    Float
+      property :integer_,  Integer
+      property :decimal_,  Decimal
+      property :datetime_, DateTime
+      property :date_,     Date
+      property :time_,     Time
+    end
+
+    DataMapper.finalize
+
+    @model = Author
+  end
+
+  supported_by :all do
+    before do
+      @values = {
+        :string_   => Addressable::URI.parse('http://test.example/'),
+        :bool_     => true,
+        :float_    => 2.5,
+        :integer_  => 10,
+        :decimal_  => BigDecimal.new("999.95"),
+        :datetime_ => DateTime.parse('2010-10-11 12:13:14+0'),
+        :date_     => Date.parse('2010-10-11 12:13:14+0'),
+        :time_     => Time.parse('2010-10-11 12:13:14+0'),
+      }
+      @string_values = {
+        :string_ => 'http://test.example/',
+        :decimal_ => '999.95',
+      }
+
+      @resource = @model.create(@values)
+    end
+
+    describe '.new' do
+      subject { @resource }
+
+      it { should_not be_dirty }
+    end
+
+    [:string_, :bool_, :float_, :integer_, :decimal_, :datetime_, :date_, :time_].each do |property|
+      describe "#{property.to_s[0...-1]} property mutator" do
+        before do
+          @resource.send("#{property}=", @string_values[property] || @values[property].to_s)
+        end
+
+        it 'type casts given equal value so resource remains clean' do
+          @resource.should_not be_dirty
+        end
+      end
+
+      describe "#attribute_set for #{property.to_s[0...-1]} property" do
+        before do
+          @resource.attribute_set(property, @string_values[property] || @values[property].to_s)
+        end
+
+        it 'type casts given equal value so resource remains clean' do
+          @resource.should_not be_dirty
+        end
+      end
+    end
+  end
+end