dm-core 0.10.2 → 1.0.0.rc1

data/{spec → lib/dm-core/spec}/lib/counter_adapter.rb

@@ -1,5 +1,9 @@
 class CounterAdapter < DataMapper::Adapters::AbstractAdapter
-  instance_methods.each { |method| undef_method method unless %w[ __id__ __send__ send class dup object_id kind_of? instance_of? respond_to? equal? assert_kind_of should should_not instance_variable_set instance_variable_get extend ].include?(method.to_s) }
+  instance_methods.each do |method|
+    next if method =~ /\A__/ ||
+      %w[ send class dup object_id kind_of? instance_of? respond_to? equal? freeze frozen? should should_not instance_variables instance_variable_set instance_variable_get instance_variable_defined? remove_instance_variable extend hash inspect copy_object ].include?(method.to_s)
+    undef_method method
+  end
 
   attr_reader :counts
 

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

@@ -0,0 +1,50 @@
+module DataMapper
+  module Spec
+    module PendingHelpers
+
+      def pending_if(*args)
+        message, boolean = parse_args(*args)
+
+        if boolean
+          pending(message) { yield }
+        else
+          yield
+        end
+      end
+
+      def rescue_if(*args)
+        message, boolean = parse_args(*args)
+
+        if boolean
+          raised = nil
+          begin
+            yield
+            raised = false
+          rescue Exception
+            raised = true
+          end
+
+          raise "should have raised: #{message || 'TODO'}" if raised == false
+        else
+          yield
+        end
+      end
+
+      private
+
+      def parse_args(*args)
+        case args.map { |arg| arg.class }
+          when [ String, TrueClass ], [ String, FalseClass ] then args
+          when [ String, NilClass ]                          then [ args.first, false      ]
+          when [ String ]                                    then [ args.first, true       ]
+          when [ TrueClass ], [ FalseClass ]                 then [ '',         args.first ]
+          when [ NilClass ]                                  then [ '',         false      ]
+          when []                                            then [ '',         true       ]  # defaults
+          else
+            raise ArgumentError, "Invalid arguments: #{args.inspect}"
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,68 @@
+module DataMapper
+  module Spec
+
+    module Helpers
+      def reset_raise_on_save_failure(object)
+        object.instance_eval do
+          if defined?(@raise_on_save_failure)
+            remove_instance_variable(:@raise_on_save_failure)
+          end
+        end
+      end
+    end
+
+    # global model cleanup
+    def self.cleanup_models
+      descendants = DataMapper::Model.descendants.to_a
+      while model = descendants.shift
+        descendants.concat(model.descendants.to_a - [ model ])
+
+        unless model.name.to_s[0] == ?#
+          parts         = model.name.split('::')
+          constant_name = parts.pop.to_sym
+          base          = parts.empty? ? Object : Object.full_const_get(parts.join('::'))
+
+          base.class_eval { remove_const(constant_name) if const_defined?(constant_name) }
+        end
+
+        remove_ivars(model)
+        model.instance_methods(false).each { |method| model.send(:undef_method, method) }
+
+        DataMapper::Model.descendants.delete(model)
+      end
+    end
+
+    def self.remove_ivars(object, instance_variables = object.instance_variables)
+      seen  = {}
+      stack = instance_variables.map { |var| [ object, var ] }
+
+      while node = stack.pop
+        object, ivar = node
+
+        # skip "global" and non-DM objects
+        next if object.kind_of?(DataMapper::Logger)                    ||
+                object.kind_of?(DataMapper::Model::DescendantSet)      ||
+                object.kind_of?(DataMapper::Adapters::AbstractAdapter) ||
+                object.class.name[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::'
+
+        # skip when the ivar is no longer defined in the object
+        next unless object.instance_variable_defined?(ivar)
+
+        value = object.instance_variable_get(ivar)
+        object.__send__(:remove_instance_variable, ivar) unless object.frozen?
+
+        # skip when the value was seen
+        next if seen.key?(value.object_id)
+        seen[value.object_id] = true
+
+        stack.concat value.instance_variables.map { |ivar| [ value, ivar ] }
+      end
+    end
+
+  end
+end

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

@@ -0,0 +1,165 @@
+require 'dm-core'
+
+module DataMapper
+  module Spec
+
+    class << self
+
+      def root
+        @root ||= default_root
+      end
+
+      def root=(path)
+        @root = Pathname(path)
+      end
+
+      %w[setup setup! adapter adapter_name].each do |action|
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{action}(kind = :default)
+            perform_action(kind, :#{action})
+          end
+        RUBY
+      end
+
+      def configure
+        @configured = begin
+          setup_logger
+          require_plugins
+          require_spec_adapter
+          true
+        end
+      end
+
+      def configured?
+        @configured
+      end
+
+      def setup_logger
+        if log = ENV['LOG']
+          logger = DataMapper::Logger.new(log_stream(log), :debug)
+          logger.auto_flush = true
+        end
+      end
+
+      def require_spec_adapter
+        if ENV['ADAPTER'] == 'in_memory'
+          ENV['ADAPTER_SUPPORTS'] = 'all'
+          Adapters.use(Adapters::InMemoryAdapter)
+        else
+          require "dm-#{ENV['ADAPTER']}-adapter/spec/setup"
+        end
+      end
+
+      def require_plugins
+        plugins = ENV['PLUGINS'] || ENV['PLUGIN']
+        plugins = plugins.to_s.split(/[,\s]+/).push('dm-migrations').uniq
+        plugins.each { |plugin| require plugin }
+      end
+
+      def spec_adapters
+        @spec_adapters ||= {}
+      end
+
+    private
+
+      def perform_action(kind, action)
+        configure unless configured?
+        spec_adapters[kind].send(action)
+      end
+
+      def default_root
+        Pathname(Dir.pwd).join('spec')
+      end
+
+      def log_stream(log)
+        log == 'file' ? root.join('log/dm.log') : $stdout
+      end
+
+    end
+
+    module Adapters
+
+      def self.use(adapter_class)
+        Spec.spec_adapters[:default]   = adapter_class.new(:default)
+        Spec.spec_adapters[:alternate] = adapter_class.new(:alternate)
+      end
+
+      class Adapter
+
+        attr_reader :name
+
+        def initialize(name)
+          @name = name.to_sym
+        end
+
+        def adapter
+          @adapter ||= setup!
+        end
+
+        alias :setup :adapter
+
+        def setup!
+          adapter = DataMapper.setup(name, connection_uri)
+          test_connection(adapter)
+          adapter
+        rescue Exception => e
+          puts "Could not connect to the database using '#{connection_uri}' because of: #{e.inspect}"
+        end
+
+        def adapter_name
+          @adapter_name ||= infer_adapter_name
+        end
+
+        def connection_uri
+          "#{adapter_name}://#{username}:#{password}@localhost/#{storage_name}"
+        end
+
+        def storage_name
+          send("#{name}_storage_name")
+        end
+
+        def default_storage_name
+          "datamapper_default_tests"
+        end
+
+        def alternate_storage_name
+          "datamapper_alternate_tests"
+        end
+
+        def username
+          'datamapper'
+        end
+
+        def password
+          'datamapper'
+        end
+
+        # Test the connection
+        #
+        # Overwrite this method if you need to perform custom connection testing
+        #
+        # @raise [Exception]
+        def test_connection(adapter)
+          if adapter.respond_to?(:select)
+            adapter.select('SELECT 1')
+          end
+        end
+
+      private
+
+        def infer_adapter_name
+          demodulized = ActiveSupport::Inflector.demodulize(self.class.name.chomp('Adapter'))
+          ActiveSupport::Inflector.underscore(demodulized).freeze
+        end
+
+      end
+
+      class InMemoryAdapter < Adapter
+        def connection_uri
+          { :adapter => :in_memory }
+        end
+      end
+
+    end
+  end
+end

data/lib/dm-core/spec/{adapter_shared_spec.rb → shared/adapter_spec.rb}

@@ -1,6 +1,17 @@
 share_examples_for 'An Adapter' do
 
   def self.adapter_supports?(*methods)
+
+    # FIXME obviously this needs a real fix!
+    # --------------------------------------
+    # Probably, delaying adapter_supports?
+    # to be executed after DataMapper.setup
+    # has been called will solve our current
+    # problem with described_type() being nil
+    # for as long as DataMapper.setup wasn't
+    # called
+    return true if ENV['ADAPTER_SUPPORTS'] == 'all'
+
     methods.all? do |method|
       # TODO: figure out a way to see if the instance method is only inherited
       # from the Abstract Adapter, and not defined in it's class.  If that is
@@ -132,8 +143,8 @@ share_examples_for 'An Adapter' do
   if adapter_supports?(:read, :create)
     describe 'query matching' do
       before :all do
-        @red = Heffalump.create(:color => 'red')
-        @two = Heffalump.create(:num_spots => 2)
+        @red  = Heffalump.create(:color => 'red')
+        @two  = Heffalump.create(:num_spots => 2)
         @five = Heffalump.create(:num_spots => 5)
       end
 
@@ -182,10 +193,13 @@ share_examples_for 'An Adapter' do
           end
 
           it 'should be able to search for objects in an empty list and another OR condition (match none on the empty list)' do
-            Heffalump.all(:conditions => DataMapper::Query::Conditions::Operation.new(
-                                           :or,
-                                           DataMapper::Query::Conditions::Comparison.new(:in, Heffalump.properties[:color], []),
-                                           DataMapper::Query::Conditions::Comparison.new(:in, Heffalump.properties[:num_spots], [5]))).should == [ @five ]
+            Heffalump.all(
+              :conditions => DataMapper::Query::Conditions::Operation.new(
+                :or,
+                DataMapper::Query::Conditions::Comparison.new(:in, Heffalump.properties[:color], []),
+                DataMapper::Query::Conditions::Comparison.new(:in, Heffalump.properties[:num_spots], [5])
+              )
+            ).should == [ @five ]
           end
 
           it 'should be able to search for objects not included in an array of values' do
@@ -225,7 +239,7 @@ share_examples_for 'An Adapter' do
 
         describe 'regexp' do
           before do
-            if (defined?(DataMapper::Adapters::Sqlite3Adapter) && @adapter.kind_of?(DataMapper::Adapters::Sqlite3Adapter) ||
+            if (defined?(DataMapper::Adapters::SqliteAdapter) && @adapter.kind_of?(DataMapper::Adapters::SqliteAdapter) ||
                 defined?(DataMapper::Adapters::SqlserverAdapter) && @adapter.kind_of?(DataMapper::Adapters::SqlserverAdapter))
               pending 'delegate regexp matches to same system that the InMemory and YAML adapters use'
             end

data/{spec/public/shared/resource_shared_spec.rb → lib/dm-core/spec/shared/resource_spec.rb}

@@ -32,7 +32,7 @@ share_examples_for 'A public Resource' do
         end
 
         it 'should return true' do
-          @return.should be_true
+          @return.should be(true)
         end
       end
 
@@ -43,7 +43,7 @@ share_examples_for 'A public Resource' do
         end
 
         it 'should return false' do
-          @return.should be_false
+          @return.should be(false)
         end
       end
 
@@ -56,7 +56,7 @@ share_examples_for 'A public Resource' do
         end
 
         it 'should return true' do
-          @return.should be_true
+          @return.should be(true)
         end
       end
 
@@ -69,7 +69,7 @@ share_examples_for 'A public Resource' do
         end
 
         it 'should return true' do
-          @return.should be_true
+          @return.should be(true)
         end
       end
 
@@ -83,7 +83,7 @@ share_examples_for 'A public Resource' do
         end
 
         it 'should return false' do
-          @return.should be_false
+          @return.should be(false)
         end
       end
 
@@ -96,7 +96,7 @@ share_examples_for 'A public Resource' do
         end
 
         it 'should return true' do
-          @return.should be_true
+          @return.should be(true)
         end
       end
 
@@ -104,13 +104,13 @@ share_examples_for 'A public Resource' do
         describe 'when comparing to a resource with a different repository, but the same properties' do
           before :all do
             rescue_if @skip do
-              @other = @alternate_repository.scope { @user_model.create(@user.attributes) }
+              @other = @repository.scope { @user_model.create(@user.attributes) }
               @return = @user.__send__(method, @other)
             end
           end
 
-          it 'should return true' do
-            @return.should be_true
+          it 'should return false' do
+            @return.should be(false)
           end
         end
       end
@@ -122,7 +122,7 @@ share_examples_for 'A public Resource' do
   describe '#<=>' do
     describe 'when the default order properties are equal with another resource' do
       before :all do
-        rescue_if @skip do
+        rescue_if @skip && RUBY_VERSION < '1.9.2' do
           @other = @user_model.new(:name => 'dbussink')
           @return = @user <=> @other
         end
@@ -135,7 +135,7 @@ share_examples_for 'A public Resource' do
 
     describe 'when the default order property values are sorted before another resource' do
       before :all do
-        rescue_if @skip do
+        rescue_if @skip && RUBY_VERSION < '1.9.2' do
           @other = @user_model.new(:name => 'c')
           @return = @user <=> @other
         end
@@ -148,7 +148,7 @@ share_examples_for 'A public Resource' do
 
     describe 'when the default order property values are sorted after another resource' do
       before :all do
-        rescue_if @skip do
+        rescue_if @skip && RUBY_VERSION < '1.9.2' do
           @other = @user_model.new(:name => 'e')
           @return = @user <=> @other
         end
@@ -199,6 +199,19 @@ share_examples_for 'A public Resource' do
       end
     end
 
+    describe 'with a new resource with a property set' do
+      before :all do
+        rescue_if @skip do
+          @user = @user.model.new
+          @user.name = 'dbussink'
+        end
+      end
+
+      it 'should return the expected values' do
+        @user.attributes.should == {:name => 'dbussink'}
+      end
+    end
+
     describe 'with a saved resource' do
       it 'should return the expected values' do
         @user.attributes.only(:name, :description, :age).should == { :name => 'dbussink', :description => 'Test', :age => 25 }
@@ -242,7 +255,7 @@ share_examples_for 'A public Resource' do
         end
 
         it 'should successfully remove a resource' do
-          @return.should be_true
+          @return.should be(true)
         end
 
         it 'should mark the destroyed resource as readonly' do
@@ -250,7 +263,7 @@ share_examples_for 'A public Resource' do
         end
 
         it "should return true when calling #{method} on a destroyed resource" do
-          @resource.__send__(method).should be_true
+          @resource.__send__(method).should be(true)
         end
 
         it 'should remove resource from persistent storage' do
@@ -350,7 +363,7 @@ share_examples_for 'A public Resource' do
 
       it 'should not raise an exception' do
         lambda {
-          @user.dirty?.should be_true
+          @user.dirty?.should be(true)
         }.should_not raise_error(SystemStackError)
       end
     end
@@ -364,7 +377,7 @@ share_examples_for 'A public Resource' do
 
       it 'should not raise an exception' do
         lambda {
-          @user.dirty?.should be_true
+          @user.dirty?.should be(true)
         }.should_not raise_error(SystemStackError)
       end
     end
@@ -373,13 +386,13 @@ share_examples_for 'A public Resource' do
       before :all do
         rescue_if @skip do
           @user.children = [ @user.parent = @user_model.new(:name => 'Parent', :comment => @comment) ]
-          @user.save.should be_true
+          @user.save.should be(true)
         end
       end
 
       it 'should not raise an exception' do
         lambda {
-          @user.dirty?.should be_true
+          @user.dirty?.should be(true)
         }.should_not raise_error(SystemStackError)
       end
     end
@@ -395,7 +408,7 @@ share_examples_for 'A public Resource' do
       end
 
       it 'should return true' do
-        @return.should be_true
+        @return.should be(true)
       end
     end
 
@@ -406,7 +419,7 @@ share_examples_for 'A public Resource' do
       end
 
       it 'should return false' do
-        @return.should be_false
+        @return.should be(false)
       end
     end
 
@@ -419,7 +432,7 @@ share_examples_for 'A public Resource' do
       end
 
       it 'should return false' do
-        @return.should be_false
+        @return.should be(false)
       end
     end
 
@@ -430,7 +443,7 @@ share_examples_for 'A public Resource' do
       end
 
       it 'should return false' do
-        @return.should be_false
+        @return.should be(false)
       end
     end
 
@@ -443,7 +456,7 @@ share_examples_for 'A public Resource' do
       end
 
       it 'should return true' do
-        @return.should be_true
+        @return.should be(true)
       end
     end
 
@@ -457,7 +470,7 @@ share_examples_for 'A public Resource' do
       end
 
       it 'should return false' do
-        @return.should be_false
+        @return.should be(false)
       end
     end
 
@@ -470,7 +483,7 @@ share_examples_for 'A public Resource' do
       end
 
       it 'should return true' do
-        @return.should be_true
+        @return.should be(true)
       end
     end
 
@@ -478,13 +491,13 @@ share_examples_for 'A public Resource' do
       describe 'when comparing to a resource with a different repository, but the same properties' do
         before :all do
           rescue_if @skip do
-            @other = @alternate_repository.scope { @user_model.create(@user.attributes) }
+            @other = @repository.scope { @user_model.create(@user.attributes) }
             @return = @user.eql?(@other)
           end
         end
 
-        it 'should return true' do
-          @return.should be_true
+        it 'should return false' do
+          @return.should be(false)
         end
       end
     end
@@ -617,7 +630,7 @@ share_examples_for 'A public Resource' do
     describe 'on an anonymous resource' do
       before do
         rescue_if @skip do
-          @user = @user.class.first(:fields => [ :description ])
+          @user = @user.model.first(:fields => [ :description ])
           @user.description.should == 'Test'
         end
       end
@@ -645,7 +658,7 @@ share_examples_for 'A public Resource' do
       end
 
       it 'should return false' do
-        @user.readonly?.should be_false
+        @user.readonly?.should be(false)
       end
     end
 
@@ -657,19 +670,19 @@ share_examples_for 'A public Resource' do
       end
 
       it 'should return false' do
-        @user.readonly?.should be_false
+        @user.readonly?.should be(false)
       end
     end
 
     describe 'on a destroyed resource' do
       before :all do
         rescue_if @skip do
-          @user.destroy.should be_true
+          @user.destroy.should be(true)
         end
       end
 
       it 'should return true' do
-        @user.readonly?.should be_true
+        @user.readonly?.should be(true)
       end
     end
 
@@ -682,7 +695,7 @@ share_examples_for 'A public Resource' do
       end
 
       it 'should return true' do
-        @user.readonly?.should be_true
+        @user.readonly?.should be(true)
       end
     end
   end
@@ -691,6 +704,17 @@ share_examples_for 'A public Resource' do
     it { @user.should respond_to(method) }
 
     describe "##{method}" do
+      before :all do
+        @user_model.class_eval do
+          attr_accessor :save_hook_call_count
+
+          before :save do
+            @save_hook_call_count ||= 0
+            @save_hook_call_count += 1
+          end
+        end
+      end
+
       describe 'on a new, not dirty resource' do
         before :all do
           @user = @user_model.new
@@ -698,13 +722,27 @@ share_examples_for 'A public Resource' do
         end
 
         it 'should return false' do
-          @return.should be_false
+          @return.should be(false)
+        end
+
+        it 'should call save hook expected number of times' do
+          @user.save_hook_call_count.should be_nil
         end
       end
 
       describe 'on a not new, not dirty resource' do
+        before :all do
+          rescue_if @skip do
+            @return = @user.__send__(method)
+          end
+        end
+
         it 'should return true even when resource is not dirty' do
-          @user.__send__(method).should be_true
+          @return.should be(true)
+        end
+
+        it 'should call save hook expected number of times' do
+          @user.save_hook_call_count.should be_nil
         end
       end
 
@@ -717,12 +755,16 @@ share_examples_for 'A public Resource' do
         end
 
         it 'should save a resource succesfully when dirty' do
-          @return.should be_true
+          @return.should be(true)
         end
 
         it 'should actually store the changes to persistent storage' do
           @user.attributes.should == @user.reload.attributes
         end
+
+        it 'should call save hook expected number of times' do
+          @user.save_hook_call_count.should == (method == :save ? 1 : nil)
+        end
       end
 
       describe 'on a dirty invalid resource' do
@@ -733,7 +775,11 @@ share_examples_for 'A public Resource' do
         end
 
         it 'should not save an invalid resource' do
-          @user.__send__(method).should be_false
+          @user.__send__(method).should be(false)
+        end
+
+        it 'should call save hook expected number of times' do
+          @user.save_hook_call_count.should == (method == :save ? 1 : nil)
         end
       end
 
@@ -749,13 +795,13 @@ share_examples_for 'A public Resource' do
 
         it 'should save resource' do
           pending_if !@user.respond_to?(:comments) do
-            @return.should be_true
+            @return.should be(true)
           end
         end
 
         it 'should save the first resource created through new' do
           pending_if !@user.respond_to?(:comments) do
-            @first_comment.new?.should be_false
+            @first_comment.new?.should be(false)
           end
         end
 
@@ -767,7 +813,7 @@ share_examples_for 'A public Resource' do
 
         it 'should save the second resource created through the constructor' do
           pending "Changing a belongs_to parent should add the resource to the correct association" do
-            @second_comment.new?.should be_false
+            @second_comment.new?.should be(false)
           end
         end
 
@@ -800,7 +846,7 @@ share_examples_for 'A public Resource' do
 
         it 'should return true' do
           pending_if !@user.respond_to?(:comments) do
-            @return.should be_true
+            @return.should be(true)
           end
         end
 
@@ -829,7 +875,7 @@ share_examples_for 'A public Resource' do
 
         it 'should not raise an exception when saving the resource' do
           pending do
-            lambda { @first_comment.send(method).should be_false }.should_not raise_error
+            lambda { @first_comment.send(method).should be(false) }.should_not raise_error
           end
         end
       end
@@ -847,7 +893,7 @@ share_examples_for 'A public Resource' do
         end
 
         it 'should succesfully save the resource' do
-          @return.should be_true
+          @return.should be(true)
         end
 
         it 'should not have a dirty dependency' do
@@ -904,7 +950,7 @@ share_examples_for 'A public Resource' do
         end
 
         it 'should save a resource succesfully when dirty' do
-          @return.should be_true
+          @return.should be(true)
         end
 
         it 'should actually store the changes to persistent storage' do
@@ -930,7 +976,7 @@ share_examples_for 'A public Resource' do
         end
 
         it 'should return true' do
-          @response.should be_true
+          @response.should be(true)
         end
 
         it 'should save the child' do
@@ -946,21 +992,15 @@ share_examples_for 'A public Resource' do
         end
 
         it 'should relate the child to the parent' do
-          pending_if @one_to_one_through do
-            @child.model.get(*@child.key).referrer.should == @parent
-          end
+          @child.model.get(*@child.key).referrer.should == @parent
         end
 
         it 'should relate the parent to the grandparent' do
-          pending_if @one_to_one_through do
-            @parent.model.get(*@parent.key).referrer.should == @grandparent
-          end
+          @parent.model.get(*@parent.key).referrer.should == @grandparent
         end
 
         it 'should relate the grandparent to nothing' do
-          pending_if @one_to_one_through do
-            @grandparent.model.get(*@grandparent.key).referrer.should be_nil
-          end
+          @grandparent.model.get(*@grandparent.key).referrer.should be_nil
         end
       end
 
@@ -987,7 +1027,7 @@ share_examples_for 'A public Resource' do
 
         it 'should not raise an exception' do
           lambda {
-            @user.__send__(method).should be_true
+            @user.__send__(method).should be(true)
           }.should_not raise_error(SystemStackError)
         end
       end
@@ -1001,7 +1041,7 @@ share_examples_for 'A public Resource' do
 
         it 'should not raise an exception' do
           lambda {
-            @user.__send__(method).should be_true
+            @user.__send__(method).should be(true)
           }.should_not raise_error(SystemStackError)
         end
       end
@@ -1015,7 +1055,7 @@ share_examples_for 'A public Resource' do
 
         it 'should not raise an exception' do
           lambda {
-            @user.__send__(method).should be_true
+            @user.__send__(method).should be(true)
           }.should_not raise_error(SystemStackError)
         end
       end
@@ -1046,18 +1086,6 @@ share_examples_for 'A public Resource' do
     it { @user.should respond_to(method) }
 
     describe "##{method}" do
-      describe 'with no arguments' do
-        before :all do
-          rescue_if @skip do
-            @return = @user.__send__(method)
-          end
-        end
-
-        it 'should return true' do
-          @return.should be_true
-        end
-      end
-
       describe 'with attributes' do
         before :all do
           rescue_if @skip do
@@ -1067,7 +1095,7 @@ share_examples_for 'A public Resource' do
         end
 
         it 'should return true' do
-          @return.should be_true
+          @return.should be(true)
         end
 
         it 'should update attributes of Resource' do
@@ -1082,29 +1110,23 @@ share_examples_for 'A public Resource' do
 
       describe 'with attributes where one is a parent association' do
         before :all do
-          rescue_if 'Use table aliases to avoid ambiguous named in query', @one_to_one_through do
+          rescue_if @skip do
             @attributes = { :referrer => @user_model.create(:name => 'dkubb', :age => 33, :comment => @comment) }
             @return = @user.__send__(method, @attributes)
           end
         end
 
         it 'should return true' do
-          pending_if @one_to_one_through do
-            @return.should be_true
-          end
+          @return.should be(true)
         end
 
         it 'should update attributes of Resource' do
-          pending_if @one_to_one_through do
-            @attributes.each { |key, value| @user.__send__(key).should == value }
-          end
+          @attributes.each { |key, value| @user.__send__(key).should == value }
         end
 
         it 'should persist the changes' do
-          pending_if @one_to_one_through do
-            resource = @user_model.get(*@user.key)
-            @attributes.each { |key, value| resource.__send__(key).should == value }
-          end
+          resource = @user_model.get(*@user.key)
+          @attributes.each { |key, value| resource.__send__(key).should == value }
         end
       end
 
@@ -1116,7 +1138,7 @@ share_examples_for 'A public Resource' do
         end
 
         it 'should return false' do
-          @return.should be_false
+          @return.should be(false)
         end
 
         it 'should not persist the changes' do
@@ -1124,6 +1146,21 @@ share_examples_for 'A public Resource' do
         end
       end
 
+      describe 'on a new resource' do
+        before :all do
+          rescue_if @skip do
+            @user = @user.model.new(@user.attributes)
+            @user.age = 99
+          end
+        end
+
+        it 'should raise an exception' do
+          lambda {
+            @user.__send__(method, :admin => true)
+          }.should raise_error(DataMapper::UpdateConflictError, "#{@user.model}##{method} cannot be called on a new resource")
+        end
+      end
+
       describe 'on a dirty resource' do
         before :all do
           rescue_if @skip do