m4dbi 0.8.1 → 0.8.2

data/lib/m4dbi/model.rb

@@ -2,7 +2,7 @@ module M4DBI
   class Model
     #attr_reader :row
     ancestral_trait_reader :dbh, :table
-    ancestral_trait_class_reader :dbh, :table, :pk, :columns, :st
+    ancestral_trait_class_reader :dbh, :table, :pk, :columns, :st, :callbacks
 
     M4DBI_UNASSIGNED = '__m4dbi_unassigned__'
 
@@ -142,9 +142,15 @@ module M4DBI
           end
           if ! pk_hash.empty?
             rec = self.one_where( pk_hash )
+            callbacks[:after_create].each do |block|
+              block.yield rec
+            end
           else
             begin
               rec = last_record( dbh_ )
+              callbacks[:after_create].each do |block|
+                block.yield rec
+              end
             rescue NoMethodError => e
               # ignore
               #puts "not implemented: #{e.message}"
@@ -221,6 +227,10 @@ module M4DBI
       stm.execute( *params )
     end
 
+    def self.after_create(&block)
+      callbacks[:after_create] << block
+    end
+
     # Example:
     #   M4DBI::Model.one_to_many( Author, Post, :posts, :author, :author_id )
     #   her_posts = some_author.posts
@@ -413,11 +423,14 @@ module M4DBI
     @models ||= Hash.new
     @models[ model_key ] ||= Class.new( M4DBI::Model ) do |klass|
       klass.trait( {
-        :dbh     => h,
-        :table   => table,
-        :pk      => pk_,
-        :columns => h.table_schema( table.to_sym ).columns,
-        :st      => Hash.new,  # prepared statements for all queries
+        :dbh       => h,
+        :table     => table,
+        :pk        => pk_,
+        :columns   => h.table_schema( table.to_sym ).columns,
+        :st        => Hash.new,  # prepared statements for all queries
+        :callbacks => {
+          after_create: []
+        }
       } )
 
       meta_def( 'pk_str'.to_sym ) do

data/lib/m4dbi/version.rb

@@ -1,3 +1,3 @@
 module M4DBI
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

data/spec/collection.rb

@@ -0,0 +1,84 @@
+require File.join(File.dirname(__FILE__), 'helper')
+
+$dbh = connect_to_spec_database
+reset_data
+
+describe 'M4DBI::Collection' do
+  before do
+    @m_author = Class.new( M4DBI::Model( :authors ) )
+    @m_post = Class.new( M4DBI::Model( :posts ) )
+
+    M4DBI::Model.one_to_many(
+      @m_author, @m_post, :posts, :author, :author_id
+    )
+  end
+
+  it 'accepts additions' do
+    num_posts = @m_post.count
+
+    a = @m_author[ 1 ]
+    the_text = 'A new post.'
+
+    num_posts_of_author = a.posts.count
+
+    # Insert without auto-incrementing primary key specified
+    # Try at least as many times as there were records in the DB,
+    # because the sequence used for the IDs is independent of
+    # the actual ID values in the DB for some RDBMSes.
+    num_posts.times do
+      begin
+        a.posts << { :text => the_text }
+        break  # Stop on success
+      rescue Exception => e
+        if e.message !~ /duplicate/
+          raise e
+        end
+      end
+    end
+
+    a.posts.count.should.equal num_posts_of_author + 1
+
+    p = a.posts.find { |p| p.text == the_text }
+    p.should.not.be.nil
+    p.author.should.equal a
+
+    a_ = @m_author[ 1 ]
+    a_.posts.find { |p| p.text == the_text }.should.not.be.nil
+
+    reset_data
+  end
+
+  it 'facilitates single record deletions' do
+    a = @m_author[ 1 ]
+    posts = a.posts
+    n = posts.size
+    p = posts[ 0 ]
+
+    posts.delete( p ).should.be.true
+    a.posts.size.should.equal( n - 1 )
+    posts.find { |p_| p_ == p }.should.be.nil
+
+    reset_data
+  end
+
+  it 'facilitates multi-record deletions' do
+    a = @m_author[ 1 ]
+    posts = a.posts
+    n = posts.size
+    posts.delete( :text => 'Third post.' ).should.equal 1
+    a.posts.size.should.equal( n - 1 )
+    posts.find { |p| p.text == 'Third post.' }.should.be.nil
+    posts.find { |p| p.text == 'First post.' }.should.not.be.nil
+
+    reset_data
+  end
+
+  it 'facilitates table-wide deletion' do
+    a = @m_author[ 1 ]
+    a.posts.should.not.be.empty
+    a.posts.clear.should.be > 0
+    a.posts.should.be.empty
+
+    reset_data
+  end
+end

data/spec/model.rb

@@ -86,16 +86,16 @@ describe 'A M4DBI::Model subclass' do
   end
 
   it 'provides the database handle it is using' do
-    begin
-      @m_author.dbh.should.equal $dbh
+    # begin
+      # @m_author.dbh.should.equal $dbh
 
-      dbh = connect_to_spec_database( ENV[ 'M4DBI_DATABASE2' ] || 'm4dbi2' )
-      @m_author2 = Class.new( M4DBI::Model( :authors ) )
-      @m_author2.dbh.should.equal dbh
-    ensure
-      # Clean up handles for later specs
-      connect_to_spec_database
-    end
+      # dbh = connect_to_spec_database( ENV[ 'M4DBI_DATABASE2' ] || 'm4dbi2' )
+      # @m_author2 = Class.new( M4DBI::Model( :authors ) )
+      # @m_author2.dbh.should.equal dbh
+    # ensure
+      # # Clean up handles for later specs
+      # connect_to_spec_database
+    # end
   end
 
   it 'maintains distinction from models of the same name in different databases' do
@@ -670,6 +670,19 @@ describe 'A M4DBI::Model subclass' do
 
     reset_data
   end
+
+  it 'after creation, executes code provided in an after_create hook' do
+    class Author < M4DBI::Model( :authors )
+      after_create do |author|
+        $test = 2
+        author.name = 'different name'
+      end
+    end
+    $test.should.not.equal 2
+    a = Author.create(name: 'theauthor')
+    $test.should.equal 2
+    a.name.should.equal 'different name'
+  end
 end
 
 describe 'A created M4DBI::Model subclass instance' do
@@ -950,7 +963,6 @@ describe 'A found M4DBI::Model subclass instance' do
       p.save!
     end
   end
-
 end
 
 describe 'M4DBI::Model (relationships)' do
@@ -1029,83 +1041,3 @@ describe 'M4DBI::Model (relationships)' do
     @m_fan[ 5 ].authors_liked.should.be.empty
   end
 end
-
-describe 'M4DBI::Collection' do
-  before do
-    @m_author = Class.new( M4DBI::Model( :authors ) )
-    @m_post = Class.new( M4DBI::Model( :posts ) )
-
-    M4DBI::Model.one_to_many(
-      @m_author, @m_post, :posts, :author, :author_id
-    )
-  end
-
-  it 'accepts additions' do
-    num_posts = @m_post.count
-
-    a = @m_author[ 1 ]
-    the_text = 'A new post.'
-
-    num_posts_of_author = a.posts.count
-
-    # Insert without auto-incrementing primary key specified
-    # Try at least as many times as there were records in the DB,
-    # because the sequence used for the IDs is independent of
-    # the actual ID values in the DB for some RDBMSes.
-    num_posts.times do
-      begin
-        a.posts << { :text => the_text }
-        break  # Stop on success
-      rescue Exception => e
-        if e.message !~ /duplicate/
-          raise e
-        end
-      end
-    end
-
-    a.posts.count.should.equal num_posts_of_author + 1
-
-    p = a.posts.find { |p| p.text == the_text }
-    p.should.not.be.nil
-    p.author.should.equal a
-
-    a_ = @m_author[ 1 ]
-    a_.posts.find { |p| p.text == the_text }.should.not.be.nil
-
-    reset_data
-  end
-
-  it 'facilitates single record deletions' do
-    a = @m_author[ 1 ]
-    posts = a.posts
-    n = posts.size
-    p = posts[ 0 ]
-
-    posts.delete( p ).should.be.true
-    a.posts.size.should.equal( n - 1 )
-    posts.find { |p_| p_ == p }.should.be.nil
-
-    reset_data
-  end
-
-  it 'facilitates multi-record deletions' do
-    a = @m_author[ 1 ]
-    posts = a.posts
-    n = posts.size
-    posts.delete( :text => 'Third post.' ).should.equal 1
-    a.posts.size.should.equal( n - 1 )
-    posts.find { |p| p.text == 'Third post.' }.should.be.nil
-    posts.find { |p| p.text == 'First post.' }.should.not.be.nil
-
-    reset_data
-  end
-
-  it 'facilitates table-wide deletion' do
-    a = @m_author[ 1 ]
-    a.posts.should.not.be.empty
-    a.posts.clear.should.be > 0
-    a.posts.should.be.empty
-
-    reset_data
-  end
-end

metadata

@@ -1,58 +1,61 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: m4dbi
-version: !ruby/object:Gem::Version
-  version: 0.8.1
+version: !ruby/object:Gem::Version 
+  hash: 59
   prerelease: 
+  segments: 
+  - 0
+  - 8
+  - 2
+  version: 0.8.2
 platform: ruby
-authors:
+authors: 
 - Pistos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-06-25 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: metaid
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdbi
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rdbi
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: M4DBI provides models, associations and some convenient extensions to
-  RDBI.
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+description: M4DBI provides models, associations and some convenient extensions to RDBI.
 email: m4dbi dot pistos at purepistos dot net
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
 - CHANGELOG
 - LICENCE
-files:
+files: 
 - README.rdoc
 - CHANGELOG
 - LICENCE
@@ -69,34 +72,44 @@ files:
 - spec/database.rb
 - spec/model.rb
 - spec/helper.rb
+- spec/collection.rb
 - spec/hash.rb
 homepage: https://github.com/Pistos/m4dbi
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-requirements:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+requirements: 
 - bacon (optional)
 rubyforge_project: 
-rubygems_version: 1.8.18
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Models (and More) for RDBI
-test_files:
+test_files: 
 - spec/database.rb
 - spec/model.rb
 - spec/helper.rb
+- spec/collection.rb
 - spec/hash.rb