m4dbi 0.8.6 → 0.8.7

data/lib/m4dbi/model.rb

@@ -416,6 +416,7 @@ module M4DBI
     def set( hash )
       set_clause, set_params = hash.to_set_clause
       set_params << pk
+      state_before = self.to_h
       st = prepare("UPDATE #{table} SET #{set_clause} WHERE #{pk_clause}")
       num_updated = st.execute( *set_params ).affected_count
       if num_updated > 0
@@ -425,7 +426,7 @@ module M4DBI
         if self.class.hooks[:active]
           self.class.hooks[:after_update].each do |block|
             self.class.hooks[:active] = false
-            block.yield self
+            block.yield state_before, self
             self.class.hooks[:active] = true
           end
         end
@@ -466,6 +467,15 @@ module M4DBI
     def save!
       nil
     end
+
+    def to_h
+      h = Hash.new
+      self.class.columns.each do |col|
+        col_name = col['name'].to_s
+        h[col_name] = @row[col_name]
+      end
+      h
+    end
   end
 
   # Define a new M4DBI::Model like this:
@@ -546,6 +556,7 @@ module M4DBI
         # Column writers
 
         class_def( "#{method}=".to_sym ) do |new_value|
+          state_before = self.to_h
           stm = prepare("UPDATE #{table} SET #{colname} = ? WHERE #{pk_clause}")
           num_changed = stm.execute(
             new_value,
@@ -557,7 +568,7 @@ module M4DBI
           if self.class.hooks[:active]
             self.class.hooks[:after_update].each do |block|
               self.class.hooks[:active] = false
-              block.yield self
+              block.yield state_before, self
               self.class.hooks[:active] = true
             end
           end

data/lib/m4dbi/statement.rb

@@ -21,7 +21,7 @@ module M4DBI
       if rows.any?
         rows[0][0]
       else
-        raise RDBI::Error.new( "Query returned no rows.  SQL: #{@dbh.last_query}" )
+        raise RDBI::Error.new( "Query returned no rows." )
       end
     end
 

data/lib/m4dbi/version.rb

@@ -1,3 +1,3 @@
 module M4DBI
-  VERSION = '0.8.6'
+  VERSION = '0.8.7'
 end

data/spec/model.rb

@@ -854,7 +854,7 @@ describe 'A created M4DBI::Model subclass instance' do
 
   it 'after setting data, executes code provided in an after_update hook' do
     class Author < M4DBI::Model( :authors )
-      after_update do |author|
+      after_update do |author_before, author|
         $test = 3
         author.name = 'different name'
       end
@@ -875,9 +875,25 @@ describe 'A created M4DBI::Model subclass instance' do
     a.name.should.equal 'different name'
   end
 
+  it 'after setting data, passes a Hash representing the previous state to after_update blocks' do
+    class Author < M4DBI::Model( :authors )
+      after_update do |author_before, author|
+        $test = author_before['name']
+        author.name = 'different name'
+      end
+    end
+
+    $test.should.not.equal 'theauthor'
+    a = Author.create(name: 'theauthor')
+    $test.should.not.equal 'theauthor'
+    a.name = 'foobar'
+    $test.should.equal 'theauthor'
+    a.name.should.equal 'different name'
+  end
+
   it 'provides a means to remove all after_update hooks' do
     class Author < M4DBI::Model( :authors )
-      after_update do |author|
+      after_update do |_, _|
         $test = 'remove after_update'
       end
     end
@@ -908,7 +924,7 @@ describe 'A created M4DBI::Model subclass instance' do
   it 'provides a means to remove all after_delete hooks' do
     class Author < M4DBI::Model( :authors )
       after_delete do |author|
-        $test = 'remove after_update'
+        $test = 'remove after_delete'
       end
     end
     class Author < M4DBI::Model( :authors )
@@ -1047,12 +1063,13 @@ describe 'A found M4DBI::Model subclass instance' do
   end
 
   it 'before deletion, executes code provided in an before_delete hook' do
+    $test = 'something'
     class Author < M4DBI::Model( :authors )
       before_delete do |author|
         $test = author.name
       end
     end
-    $test.should.not.equal 'theauthor'
+    $test.should.equal 'something'
     a = Author.create(name: 'theauthor')
     $test.should.not.equal 'theauthor'
     a.delete
@@ -1085,6 +1102,19 @@ describe 'A found M4DBI::Model subclass instance' do
       p.save!
     end
   end
+
+  it 'provides a Hash representation' do
+    record = @m_mc.create( id: 12, c1: 50, c2: 44  )
+    record.to_h.should.equal( {
+      'id' => 12,
+      'c1' => 50,
+      'c2' => 44,
+      'c3' => nil,
+      'c4' => nil,
+      'c5' => nil,
+      'ts' => nil,
+    } )
+  end
 end
 
 describe 'M4DBI::Model (relationships)' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: m4dbi
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2013-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metaid
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - bacon (optional)
 rubyforge_project: 
-rubygems_version: 1.8.18
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Models (and More) for RDBI