m4dbi 0.6.1 → 0.6.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+## 0.6.1
+
+- Fixed major Hash#slice bug that only surfaced in Ruby 1.8.6 and earier.
+- Minor rdoc and spec additions or adjustments.
+
 ## 0.6.0
 
 - Compatibility with DBI 0.4.0 ensured.

data/lib/m4dbi/collection.rb

@@ -5,23 +5,23 @@ module DBI
       @the_many_model = the_many_model
       @the_one_fk = the_one_fk
     end
-    
+
     def elements
       @the_many_model.where( @the_one_fk => @the_one.pk )
     end
     alias copy elements
-    
+
     def method_missing( method, *args, &blk )
       elements.send( method, *args, &blk )
     end
-    
+
     def push( new_item_hash )
       new_item_hash[ @the_one_fk ] = @the_one.pk
       @the_many_model.create( new_item_hash )
     end
     alias << push
     alias add push
-    
+
     def delete( arg )
       case arg
         when @the_many_model
@@ -30,7 +30,7 @@ module DBI
               DELETE FROM #{@the_many_model.table}
               WHERE
                 #{@the_one_fk} = ?
-                AND #{@the_many_model.pk} = ?
+                AND #{@the_many_model.pk_clause}
             },
             @the_one.pk,
             arg.pk
@@ -54,7 +54,7 @@ module DBI
           )
       end
     end
-    
+
     # Returns the number of records deleted
     def clear
       @the_many_model.dbh.do(

data/lib/m4dbi/model.rb

@@ -103,15 +103,13 @@ module DBI
 
     def self.create( hash = {} )
       if block_given?
-        row = DBI::Row.new(
-          columns.collect { |c| c[ 'name' ] },
-          [ M4DBI_UNASSIGNED ] * columns.size
-        )
+        struct = Struct.new( *( columns.collect { |c| c[ 'name' ].to_sym } ) )
+        row = struct.new( *( [ M4DBI_UNASSIGNED ] * columns.size ) )
         yield row
-        hash = row.to_h
-        hash.to_a.each do |key,value|
-          if value == M4DBI_UNASSIGNED
-            hash.delete( key )
+        hash = {}
+        row.members.each do |k|
+          if row[ k ] != M4DBI_UNASSIGNED
+            hash[ k ] = row[ k ]
           end
         end
       end
@@ -154,13 +152,13 @@ module DBI
 
     def self.find_or_create( hash = nil )
       item = nil
-      error = nil
+      error = DBI::Error.new( "Failed to find_or_create( #{hash.inspect} )" )
       item = self.one_where( hash )
       if item.nil?
         item =
           begin
             self.create( hash )
-          rescue => error
+          rescue Exception => error
             self.one_where( hash )
           end
       end
@@ -293,8 +291,21 @@ module DBI
       begin
         @row.send( method, *args )
       rescue NoMethodError => e
+        if e.backtrace.grep /method_missing/
+          # Prevent infinite recursion
+          self_str = 'model object'
+        elsif self.respond_to? :to_s
+          self_str = self.to_s
+        elsif self.respond_to? :inspect
+          self_str = self.inspect
+        elsif self.respond_to? :class
+          self_str = "#{self.class} object"
+        else
+          self_str = "instance of unknown model"
+        end
+
         raise NoMethodError.new(
-          "undefined method '#{method}' for #{self}",
+          "undefined method '#{method}' for #{self_str}",
           method,
           args
         )
@@ -372,13 +383,14 @@ module DBI
 
   # Define a new DBI::Model like this:
   #   class Post < DBI::Model( :posts ); end
-  # You can specify the primary key column(s) using an array, like so:
-  #   class Author < DBI::Model( :authors, [ 'auth_num' ] ); end
-  def self.Model( table, pk_ = [ 'id' ] )
-    h = DBI::DatabaseHandle.last_handle
+  # You can specify the primary key column(s) using an option, like so:
+  #   class Author < DBI::Model( :authors, pk: [ 'auth_num' ] ); end
+  def self.Model( table, options = Hash.new )
+    h = options[ :dbh ] || DBI::DatabaseHandle.last_handle
     if h.nil? or not h.connected?
       raise DBI::Error.new( "Attempted to create a Model class without first connecting to a database." )
     end
+    pk_ = options[ :pk ] || [ 'id' ]
     if not pk_.respond_to? :each
       raise DBI::Error.new( "Primary key must be enumerable (was given #{pk_.inspect})" )
     end
@@ -400,18 +412,26 @@ module DBI
         :columns => h.columns( table.to_s ),
       } )
 
+      meta_def( 'pk_str'.to_sym ) do
+        if pk.size == 1
+          pk[ 0 ].to_s
+        else
+          pk.to_s
+        end
+      end
+
       if defined?( DBI::DBD::Pg::Database ) and DBI::DBD::Pg::Database === h.handle
         # TODO: This is broken for non-SERIAL or multi-column primary keys
         meta_def( "last_record".to_sym ) do |dbh_|
-          self.s1 "SELECT * FROM #{table} WHERE #{pk} = currval( '#{table}_#{pk}_seq' );"
+          self.s1 "SELECT * FROM #{table} WHERE #{pk_str} = currval( '#{table}_#{pk_str}_seq' );"
         end
       elsif defined?( DBI::DBD::Mysql::Database ) and DBI::DBD::Mysql::Database === h.handle
         meta_def( "last_record".to_sym ) do |dbh_|
-          self.s1 "SELECT * FROM #{table} WHERE #{pk} = LAST_INSERT_ID();"
+          self.s1 "SELECT * FROM #{table} WHERE #{pk_str} = LAST_INSERT_ID();"
         end
       elsif defined?( DBI::DBD::SQLite3::Database ) and DBI::DBD::SQLite3::Database === h.handle
         meta_def( "last_record".to_sym ) do |dbh_|
-          self.s1 "SELECT * FROM #{table} WHERE #{pk} = last_insert_rowid();"
+          self.s1 "SELECT * FROM #{table} WHERE #{pk_str} = last_insert_rowid();"
         end
       # TODO: more DBDs
       end

data/lib/m4dbi/row.rb

@@ -9,7 +9,7 @@ module DBI
           field = convert_alternate_fieldname( field )
         end
         if @column_names.include?( field )
-          self[ field ] = *args
+          self[ field ] = args[ 0 ]
         else
           super
         end
@@ -27,7 +27,7 @@ module DBI
         end
       end
     end
-    
+
     def convert_alternate_fieldname( field )
       field.gsub( /(^_)|(_$)/ , '' )
     end

data/lib/m4dbi.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 
-M4DBI_VERSION = '0.6.1'
+M4DBI_VERSION = '0.6.2'
 
 __DIR__ = File.expand_path( File.dirname( __FILE__ ) )
 

data/spec/dbi.rb

@@ -4,31 +4,31 @@ $dbh = connect_to_spec_database
 reset_data
 
 describe 'DBI::DatabaseHandle#select_column' do
-  
+
   it 'selects one column' do
     name = $dbh.select_column(
       "SELECT name FROM authors LIMIT 1"
     )
     name.class.should.not.equal Array
     name.should.equal 'author1'
-    
+
     null = $dbh.select_column(
       "SELECT c4 FROM many_col_table WHERE c3 = 40"
     )
     null.should.be.nil
-    
+
     should.raise( DBI::DataError ) do
       $dbh.select_column( "SELECT name FROM authors WHERE 1+1 = 3" )
     end
   end
-  
+
   it 'selects one column of first row' do
     name = $dbh.select_column(
       "SELECT name FROM authors ORDER BY name DESC"
     )
     name.should.equal 'author3'
   end
-  
+
   it 'selects first column of first row' do
     name = $dbh.select_column(
       "SELECT name, id FROM authors ORDER BY name DESC"
@@ -38,50 +38,54 @@ describe 'DBI::DatabaseHandle#select_column' do
 end
 
 describe 'DBI::DatabaseHandle#one_transaction' do
-  
+
   it 'turns off autocommit for the duration of a single transaction' do
     $dbh.d( "DELETE FROM many_col_table;" )
     $dbh.i( "INSERT INTO many_col_table ( id, c1 ) VALUES ( 1, 10 );" )
-    
+
     # Here we will attempt to increment a value two times in parallel.
     # If each multi-operation transaction is truly atomic, we expect that
     # the final value will reflect two increments.
     # If atomicity is not respected, the value should only reflect one
     # increment.
-    
+
     # First, we test the non-transactional case, to show failure.
-    
+
     thread1 = Thread.new do
       value = $dbh.sc "SELECT c1 FROM many_col_table WHERE id = 1;"
       value.should.equal 10
-      sleep 2 # seconds
+      sleep 1 # seconds
       $dbh.u "UPDATE many_col_table SET c1 = ?", ( value + 1 )
     end
-    
+
+    sleep 0.5
+
     thread2 = Thread.new do
       value = $dbh.sc "SELECT c1 FROM many_col_table WHERE id = 1;"
       value.should.equal 10
       # Update right away
       $dbh.u "UPDATE many_col_table SET c1 = ?", ( value + 1 )
     end
-    
+
     thread2.join
     thread1.join
-    
+
     value = $dbh.sc "SELECT c1 FROM many_col_table WHERE id = 1;"
     # Failure; two increments should give a final value of 12.
     value.should.equal( 10 + 1 )
-    
+
     # Now, we show that transactions keep things sane.
-    
+
     thread1 = Thread.new do
       $dbh.one_transaction do |dbh|
         value = dbh.sc "SELECT c1 FROM many_col_table WHERE id = 1;"
-        sleep 2 # seconds
+        sleep 1 # seconds
         dbh.u "UPDATE many_col_table SET c1 = ?", ( value + 1 )
       end
     end
-    
+
+    sleep 0.5
+
     thread2 = Thread.new do
       $dbh.one_transaction do |dbh|
         value = dbh.sc "SELECT c1 FROM many_col_table WHERE id = 1;"
@@ -89,50 +93,50 @@ describe 'DBI::DatabaseHandle#one_transaction' do
         dbh.u "UPDATE many_col_table SET c1 = ?", ( value + 1 )
       end
     end
-    
+
     thread2.join
     thread1.join
-    
+
     value = $dbh.sc "SELECT c1 FROM many_col_table WHERE id = 1;"
     value.should.equal( 11 + 1 + 1 )
-    
+
     reset_data
   end
-  
+
 end
 
 describe 'DBI::Row accessors' do
-  
+
   it 'provide read access via #fieldname' do
     row = $dbh.select_one(
       "SELECT * FROM posts ORDER BY author_id DESC LIMIT 1"
     )
     row.should.not.equal nil
-    
+
     row._id.should.be.same_as row[ 'id' ]
     row.id_.should.be.same_as row[ 'id' ]
     row.author_id.should.be.same_as row[ 'author_id' ]
     row.text.should.be.same_as row[ 'text' ]
-    
+
     row.text.should.equal 'Second post.'
   end
-  
+
   it 'provide in-memory (non-syncing) write access via #fieldname=' do
     row = $dbh.select_one(
       "SELECT * FROM posts ORDER BY author_id DESC LIMIT 1"
     )
     row.should.not.equal nil
-    
+
     old_id = row._id
     row.id = old_id + 1
     row._id.should.not.equal old_id
     row._id.should.equal( old_id + 1 )
-    
+
     old_text = row.text
     new_text = 'This is the new post text.'
     row.text = new_text
     row.text.should.not.equal old_text
     row.text.should.equal new_text
   end
-  
+
 end

data/spec/model.rb

@@ -34,8 +34,8 @@ describe 'A DBI::Model subclass' do
     @m_post = Class.new( DBI::Model( :posts ) )
     @m_empty = Class.new( DBI::Model( :empty_table ) )
     @m_mc = Class.new( DBI::Model( :many_col_table ) )
-    @m_nipk = Class.new( DBI::Model( :non_id_pk, [ :str ] ) )
-    @m_mcpk = Class.new( DBI::Model( :mcpk, [ :kc1, :kc2 ] ) )
+    @m_nipk = Class.new( DBI::Model( :non_id_pk, :pk => [ :str ] ) )
+    @m_mcpk = Class.new( DBI::Model( :mcpk, :pk => [ :kc1, :kc2 ] ) )
     class Author < DBI::Model( :authors ); end
   end
 
@@ -90,6 +90,7 @@ describe 'A DBI::Model subclass' do
       reset_data( dbh, "test-data2.sql" )
 
       @m_author2 = Class.new( DBI::Model( :authors ) )
+      @m_author2.dbh.should.equal dbh
 
       @m_author2[ 1 ].should.be.nil
       a11 = @m_author2[ 11 ]
@@ -101,7 +102,34 @@ describe 'A DBI::Model subclass' do
       a2.name.should.equal 'author2'
     ensure
       # Clean up handles for later specs
-      dbh.disconnect if dbh and dbh.connected?
+      # puts dbh.object_id
+      # dbh.disconnect if dbh and dbh.connected?
+      connect_to_spec_database
+    end
+  end
+
+  it 'can use a specific database handle' do
+    begin
+      dbh1 = connect_to_spec_database
+      dbh1.should.equal DBI::DatabaseHandle.last_handle
+      dbh2 = connect_to_spec_database( ENV[ 'M4DBI_DATABASE2' ] || 'm4dbi2' )
+      dbh2.should.equal DBI::DatabaseHandle.last_handle
+      reset_data( dbh2, "test-data2.sql" )
+
+      dbh1.should.not.equal dbh2
+
+      class Author1 < DBI::Model( :authors, :dbh => dbh1 ); end
+      class Author2 < DBI::Model( :authors, :dbh => dbh2 ); end
+
+      a1 = Author1[ 1 ]
+      a1.should.not.be.nil
+      a1.name.should.equal 'author1'
+
+      a11 = Author2[ 11 ]
+      a11.should.not.be.nil
+      a11.name.should.equal 'author11'
+    ensure
+      # Clean up handles for later specs
       connect_to_spec_database
     end
   end
@@ -348,6 +376,22 @@ describe 'A DBI::Model subclass' do
     a_.should.equal a
     a_.name.should.equal 'author9'
 
+    # No value given for auto-incrementing primary key
+    a = @m_author.create(
+      :name => 'author10'
+    )
+    a.should.not.be.nil
+    a.class.should.equal @m_author
+    a.id.should.not.equal 9
+    a.should.respond_to :name
+    a.should.not.respond_to :no_column_by_this_name
+    a.name.should.equal 'author10'
+
+    a_ = @m_author[ a.id ]
+    a_.should.not.be.nil
+    a_.should.equal a
+    a_.name.should.equal 'author10'
+
     reset_data
   end
 
@@ -658,8 +702,8 @@ describe 'A found DBI::Model subclass instance' do
     @m_author = Class.new( DBI::Model( :authors ) )
     @m_post = Class.new( DBI::Model( :posts ) )
     @m_mc = Class.new( DBI::Model( :many_col_table ) )
-    @m_nipk = Class.new( DBI::Model( :non_id_pk, [ :str ] ) )
-    @m_mcpk = Class.new( DBI::Model( :mcpk, [ :kc1, :kc2 ] ) )
+    @m_nipk = Class.new( DBI::Model( :non_id_pk, :pk => [ :str ] ) )
+    @m_mcpk = Class.new( DBI::Model( :mcpk, :pk => [ :kc1, :kc2 ] ) )
   end
 
   it 'provides access to primary key value' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: m4dbi
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Pistos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-08 00:00:00 -05:00
+date: 2009-07-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,21 +48,23 @@ files:
 - READHIM
 - CHANGELOG
 - LICENCE
-- lib/m4dbi/array.rb
-- lib/m4dbi/collection.rb
+- lib/m4dbi.rb
 - lib/m4dbi/row.rb
-- lib/m4dbi/timestamp.rb
+- lib/m4dbi/array.rb
 - lib/m4dbi/traits.rb
-- lib/m4dbi/database-handle.rb
+- lib/m4dbi/collection.rb
 - lib/m4dbi/hash.rb
+- lib/m4dbi/database-handle.rb
 - lib/m4dbi/model.rb
-- lib/m4dbi.rb
-- spec/model.rb
+- lib/m4dbi/timestamp.rb
 - spec/dbi.rb
 - spec/hash.rb
+- spec/model.rb
 - spec/helper.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://purepistos.net/m4dbi
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -83,12 +85,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - bacon (optional)
 rubyforge_project: m4dbi
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Models (and More) for DBI
 test_files: 
-- spec/model.rb
 - spec/dbi.rb
 - spec/hash.rb
+- spec/model.rb
 - spec/helper.rb