dm-core 1.0.0.rc3 → 1.0.0

data/Gemfile

@@ -71,7 +71,7 @@
 source 'http://rubygems.org'
 
 DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.0.rc3'
+DM_VERSION = '~> 1.0.0'
 
 group :runtime do # Runtime dependencies (as in the gemspec)
 

data/VERSION

@@ -1 +1 @@
-1.0.0.rc3
+1.0.0

data/dm-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-core}
-  s.version = "1.0.0.rc3"
+  s.version = "1.0.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2010-05-27}
+  s.date = %q{2010-06-08}
   s.description = %q{Faster, Better, Simpler.}
   s.email = %q{dan.kubb@gmail.com}
   s.extra_rdoc_files = [

data/lib/dm-core.rb

@@ -206,7 +206,14 @@ module DataMapper
 
   class UpdateConflictError < PersistenceError; end
 
-  class SaveFailureError < PersistenceError; end
+  class SaveFailureError < PersistenceError
+    attr_reader :resource
+
+    def initialize(message, resource)
+      super(message)
+      @resource = resource
+    end
+  end
 
   class ImmutableError < RuntimeError; end
 
@@ -311,6 +318,10 @@ module DataMapper
     repository_name = model.repository_name
     relationships   = model.relationships(repository_name).values
 
+    if name.to_s.strip.empty?
+      raise IncompleteModelError, "#{model.inspect} must have a name"
+    end
+
     if model.properties(repository_name).empty? &&
       !relationships.any? { |relationship| relationship.kind_of?(Associations::ManyToOne::Relationship) }
       raise IncompleteModelError, "#{name} must have at least one property or many to one relationship to be valid"
@@ -320,13 +331,11 @@ module DataMapper
       raise IncompleteModelError, "#{name} must have a key to be valid"
     end
 
-
     # initialize join models and target keys
     relationships.each do |relationship|
       relationship.child_key
       relationship.through if relationship.respond_to?(:through)
       relationship.via     if relationship.respond_to?(:via)
     end
-
   end
 end

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

@@ -39,7 +39,8 @@ module DataMapper
       private
 
         def setup_hook(type, name, method, proc)
-          if types = hooks[name]
+          types = hooks[name]
+          if types && types[type]
             types[type] << if proc
               ProcCommand.new(proc)
             else
@@ -54,8 +55,10 @@ module DataMapper
         def copy_hooks(model)
           hooks = Hash.new do |hooks, name|
             hooks[name] = Hash.new do |types, type|
-              types[type] = self.hooks[name][type].map do |command|
-                command.copy(model)
+              if self.hooks[name]
+                types[type] = self.hooks[name][type].map do |command|
+                  command.copy(model)
+                end
               end
             end
           end

data/lib/dm-core/resource.rb

@@ -442,10 +442,10 @@ module DataMapper
       return true if destroyed?
       catch :halt do
         before_destroy_hook
-        retval = _destroy
+        _destroy
         after_destroy_hook
-        retval
       end
+      destroyed?
     end
 
     # Destroy the instance, remove it from the repository, bypassing hooks
@@ -457,6 +457,7 @@ module DataMapper
     def destroy!
       return true if destroyed?
       _destroy(false)
+      destroyed?
     end
 
     # Compares another Resource for equality
@@ -958,26 +959,13 @@ module DataMapper
       child_relationships.map { |relationship| relationship.get_collection(self) }
     end
 
-    # Creates the resource with default values
+    # Commit the persisted state
     #
-    # If resource is not dirty or a new (not yet saved),
-    # this method returns false
-    #
-    # On successful save identity map of the repository is
-    # updated
-    #
-    # Needs to be a protected method so that it is hookable
-    #
-    # The primary purpose of this method is to allow before :create
-    # hooks to fire at a point just before/after resource creation
-    #
-    # @return [Boolean]
-    #   true if the receiver was successfully created
+    # @return [undefined]
     #
     # @api private
-    def _create
+    def _persist
       self.persisted_state = persisted_state.commit
-      true
     end
 
     # This method executes the hooks before and after resource creation
@@ -991,28 +979,12 @@ module DataMapper
       catch :halt do
         before_save_hook
         before_create_hook
-        retval = _create
+        _persist
         after_create_hook
         after_save_hook
-        retval
       end
     end
 
-    # Updates resource state
-    #
-    # The primary purpose of this method is to allow before :update
-    # hooks to fire at a point just before/after resource update whether
-    # it is the result of Resource#save, or using Resource#update
-    #
-    # @return [Boolean]
-    #   true if the receiver was successfully created
-    #
-    # @api private
-    def _update
-      self.persisted_state = persisted_state.commit
-      clean?
-    end
-
     # This method executes the hooks before and after resource updating
     #
     # @return [Boolean]
@@ -1024,18 +996,20 @@ module DataMapper
       catch :halt do
         before_save_hook
         before_update_hook
-        retval = _update
+        _persist
         after_update_hook
         after_save_hook
-        retval
       end
     end
 
+    # Destroy the resource
+    #
+    # @return [undefined]
+    #
     # @api private
     def _destroy(execute_hooks = true)
-      deleted              = persisted_state.delete
-      self.persisted_state = deleted.commit
-      true
+      self.persisted_state = persisted_state.delete
+      _persist
     end
 
     # @api private
@@ -1055,12 +1029,12 @@ module DataMapper
       # short-circuit if the resource is not dirty
       return saved? unless dirty_self?
 
-      new_resource = new?
       if execute_hooks
-        new_resource ? create_with_hooks : update_with_hooks
+        new? ? create_with_hooks : update_with_hooks
       else
-        new_resource ? _create : _update
+        _persist
       end
+      clean?
     end
 
     # Saves the parent resources
@@ -1231,7 +1205,7 @@ module DataMapper
     # @api private
     def assert_save_successful(method, save_retval)
       if save_retval != true && raise_on_save_failure
-        raise SaveFailureError, "#{model}##{method} returned #{save_retval.inspect}, #{model} was not saved"
+        raise SaveFailureError.new("#{model}##{method} returned #{save_retval.inspect}, #{model} was not saved", self)
       end
     end
 

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

@@ -17,8 +17,9 @@ module DataMapper
       while model = descendants.shift
         descendants.concat(model.descendants.to_a - [ model ])
 
-        unless model.name.to_s[0] == ?#
-          parts         = model.name.split('::')
+        model_name = model.name.to_s.strip
+        unless model_name.empty? || model_name[0] == ?#
+          parts         = model_name.split('::')
           constant_name = parts.pop.to_sym
           base          = parts.empty? ? Object : Object.full_const_get(parts.join('::'))
 

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

@@ -767,6 +767,21 @@ share_examples_for 'A public Resource' do
         end
       end
 
+      describe 'on a new, invalid resource' do
+        before :all do
+          @user = @user_model.new(:name => nil)
+          @return = @user.__send__(method)
+        end
+
+        it 'should return false' do
+          @return.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
+
       describe 'on a dirty invalid resource' do
         before :all do
           rescue_if @skip do

data/lib/dm-core/version.rb

@@ -1,3 +1,3 @@
 module DataMapper
-  VERSION = '1.0.0.rc3'
+  VERSION = '1.0.0'
 end

data/spec/public/finalize_spec.rb

@@ -1,32 +1,43 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 describe DataMapper do
-  describe '.setup' do
-    it "should not raise with valid models" do
+  describe '.finalize' do
+    subject { DataMapper.finalize }
+
+    it 'should not raise with valid models' do
       class ::ValidObject
         include DataMapper::Resource
         property :id, Integer, :key => true
       end
-      lambda { DataMapper.finalize }.should_not raise_error
+      method(:subject).should_not raise_error
       DataMapper::Model.descendants.delete(ValidObject)
       Object.send(:remove_const, :ValidObject)
     end
 
-    it "should raise on an empty model" do
+    it 'should raise on an anonymous model' do
+      model = Class.new do
+        include DataMapper::Resource
+        property :id, Integer, :key => true
+      end
+      method(:subject).should raise_error(DataMapper::IncompleteModelError, "#{model.inspect} must have a name")
+      DataMapper::Model.descendants.delete(model)
+    end
+
+    it 'should raise on an empty model' do
       class ::EmptyObject
         include DataMapper::Resource
       end
-      lambda { DataMapper.finalize }.should raise_error
+      method(:subject).should raise_error(DataMapper::IncompleteModelError, 'EmptyObject must have at least one property or many to one relationship to be valid')
       DataMapper::Model.descendants.delete(EmptyObject)
       Object.send(:remove_const, :EmptyObject)
     end
 
-    it "should raise on a keyless model" do
+    it 'should raise on a keyless model' do
       class ::KeylessObject
         include DataMapper::Resource
         property :name, String
       end
-      lambda { DataMapper.finalize }.should raise_error
+      method(:subject).should raise_error(DataMapper::IncompleteModelError, 'KeylessObject must have a key to be valid')
       DataMapper::Model.descendants.delete(KeylessObject)
       Object.send(:remove_const, :KeylessObject)
     end

data/spec/public/model/hook_spec.rb

@@ -12,6 +12,7 @@ describe DataMapper::Model::Hook do
     end
 
     class ::ModelHookSpecsSubclass < ModelHookSpecs; end
+
     DataMapper.finalize
   end
 
@@ -99,11 +100,11 @@ describe DataMapper::Model::Hook do
       supported_by :all do
         before do
           @hooks = hooks = []
-          ModelHookSpecs.before(:create) { hooks << :inherited_hook }
+          ModelHookSpecs.before(:an_instance_method) { hooks << :inherited_hook }
         end
 
         it 'should execute inherited hook' do
-          ModelHookSpecsSubclass.create
+          ModelHookSpecsSubclass.new.an_instance_method
           @hooks.should == [ :inherited_hook ]
         end
       end
@@ -113,22 +114,21 @@ describe DataMapper::Model::Hook do
       supported_by :all do
         before do
           @hooks = hooks = []
-          ModelHookSpecsSubclass.before(:create) { hooks << :hook }
+          ModelHookSpecsSubclass.before(:an_instance_method) { hooks << :hook }
         end
 
         it 'should execute hook' do
-          ModelHookSpecsSubclass.create
+          ModelHookSpecsSubclass.new.an_instance_method
           @hooks.should == [ :hook ]
         end
 
         it 'should not alter hooks in the parent class' do
           @hooks.should be_empty
-          ModelHookSpecs.create
+          ModelHookSpecs.new.an_instance_method
           @hooks.should == []
         end
       end
     end
-
   end
 
   describe '#after' do
@@ -206,5 +206,40 @@ describe DataMapper::Model::Hook do
         end
       end
     end
+
+    describe 'with an inherited hook' do
+      supported_by :all do
+        before do
+          @hooks = hooks = []
+          ModelHookSpecs.after(:an_instance_method) { hooks << :inherited_hook }
+        end
+
+        it 'should execute inherited hook' do
+          ModelHookSpecsSubclass.new.an_instance_method
+          @hooks.should == [ :inherited_hook ]
+        end
+      end
+    end
+
+    describe 'with a hook declared in the subclasss' do
+      supported_by :all do
+        before do
+          @hooks = hooks = []
+          ModelHookSpecsSubclass.after(:an_instance_method) { hooks << :hook }
+        end
+
+        it 'should execute hook' do
+          ModelHookSpecsSubclass.new.an_instance_method
+          @hooks.should == [ :hook ]
+        end
+
+        it 'should not alter hooks in the parent class' do
+          @hooks.should be_empty
+          ModelHookSpecs.new.an_instance_method
+          @hooks.should == []
+        end
+      end
+    end
+
   end
 end

data/spec/public/resource_spec.rb

@@ -172,7 +172,9 @@ describe DataMapper::Resource do
             end
 
             it 'should raise an exception' do
-              method(:subject).should raise_error(DataMapper::SaveFailureError, "Blog::User##{method} returned false, Blog::User was not saved")
+              method(:subject).should raise_error(DataMapper::SaveFailureError, "Blog::User##{method} returned false, Blog::User was not saved") { |error|
+                error.resource.should equal(@user)
+              }
             end
           end
         end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-core
 version: !ruby/object:Gem::Version 
-  hash: 977940572
-  prerelease: true
+  hash: 23
+  prerelease: false
   segments: 
   - 1
   - 0
   - 0
-  - rc3
-  version: 1.0.0.rc3
+  version: 1.0.0
 platform: ruby
 authors: 
 - Dan Kubb
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 -07:00
+date: 2010-06-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -305,14 +304,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: datamapper