m4dbi 0.6.0 → 0.6.1

data/lib/m4dbi.rb

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

data/lib/m4dbi/hash.rb

@@ -1,7 +1,7 @@
 class Hash
   COMPACT_NILS = true
   DONT_COMPACT_NILS = false
-  
+
   # Takes an optional block to provide a single "field = ?" type subclause
   # for each key-value pair.
   def to_clause( join_string, compact_nils = DONT_COMPACT_NILS )
@@ -21,7 +21,7 @@ class Hash
     end
     [ clause, values_ ]
   end
-  
+
   def to_where_clause
     to_clause( " AND ", COMPACT_NILS ) { |field|
       if self[ field ].nil?
@@ -31,19 +31,21 @@ class Hash
       end
     }
   end
-  
+
   def to_set_clause
     to_clause( ", " )
   end
-  
+
   if method_defined? :slice
     warn "Hash#slice already defined; redefining."
   end
   def slice( *desired_keys )
     Hash[
-      select { |key,value|
-        desired_keys.include? key
-      }
+      *(
+        select { |key,value|
+          desired_keys.include? key
+        }.flatten
+      )
     ]
   end
 end

data/lib/m4dbi/model.rb

@@ -6,11 +6,11 @@ module DBI
     #attr_reader :row
     ancestral_trait_reader :dbh, :table
     ancestral_trait_class_reader :dbh, :table, :pk, :columns
-    
+
     M4DBI_UNASSIGNED = '__m4dbi_unassigned__'
-    
+
     extend Enumerable
-    
+
     def self.[]( first_arg, *args )
       if args.size == 0
         case first_arg
@@ -27,27 +27,27 @@ module DBI
         clause = pk_clause
         values = [ first_arg ] + args
       end
-      
+
       row = dbh.select_one(
         "SELECT * FROM #{table} WHERE #{clause}",
         *values
       )
-          
+
       if row
         self.new( row )
       end
     end
-    
+
     def self.pk_clause
       pk.map { |col|
         "#{col} = ?"
       }.join( ' AND ' )
     end
-    
+
     def self.from_rows( rows )
       rows.map { |r| self.new( r ) }
     end
-    
+
     def self.where( conditions, *args )
       case conditions
         when String
@@ -57,12 +57,12 @@ module DBI
           cond, params = conditions.to_where_clause
           sql = "SELECT * FROM #{table} WHERE #{cond}"
       end
-      
+
       self.from_rows(
         dbh.select_all( sql, *params )
       )
     end
-    
+
     def self.one_where( conditions, *args )
       case conditions
         when String
@@ -72,35 +72,35 @@ module DBI
           cond, params = conditions.to_where_clause
           sql = "SELECT * FROM #{table} WHERE #{cond} LIMIT 1"
       end
-      
+
       row = dbh.select_one( sql, *params )
       if row
         self.new( row )
       end
     end
-    
+
     def self.all
       self.from_rows(
         dbh.select_all( "SELECT * FROM #{table}" )
       )
     end
-    
+
     # TODO: Perhaps we'll use cursors for Model#each.
     def self.each( &block )
       self.all.each( &block )
     end
-    
+
     def self.one
       row = dbh.select_one( "SELECT * FROM #{table} LIMIT 1" )
       if row
         self.new( row )
       end
     end
-    
+
     def self.count
       dbh.select_column( "SELECT COUNT(*) FROM #{table}" ).to_i
     end
-    
+
     def self.create( hash = {} )
       if block_given?
         row = DBI::Row.new(
@@ -115,13 +115,13 @@ module DBI
           end
         end
       end
-      
+
       keys = hash.keys
       cols = keys.join( ',' )
       values = keys.map { |key| hash[ key ] }
       value_placeholders = values.map { |v| '?' }.join( ',' )
       rec = nil
-      
+
       dbh.one_transaction do |dbh_|
         num_inserted = dbh_.do(
           "INSERT INTO #{table} ( #{cols} ) VALUES ( #{value_placeholders} )",
@@ -148,10 +148,10 @@ module DBI
           end
         end
       end
-      
+
       rec
     end
-    
+
     def self.find_or_create( hash = nil )
       item = nil
       error = nil
@@ -170,37 +170,37 @@ module DBI
         raise error
       end
     end
-    
+
     def self.select_all( *args )
       self.from_rows(
         dbh.select_all( *args )
       )
     end
-    
+
     def self.select_one( *args )
       row = dbh.select_one( *args )
       if row
         self.new( row )
       end
     end
-    
+
     class << self
       alias s select_all
       alias s1 select_one
     end
-    
+
     def self.update( where_hash_or_clause, set_hash )
       where_clause = nil
       set_clause = nil
       where_params = nil
-      
+
       if where_hash_or_clause.respond_to? :keys
         where_clause, where_params = where_hash_or_clause.to_where_clause
       else
         where_clause = where_hash_or_clause
         where_params = []
       end
-      
+
       set_clause, set_params = set_hash.to_set_clause
       params = set_params + where_params
       dbh.do(
@@ -208,7 +208,7 @@ module DBI
         *params
       )
     end
-    
+
     def self.update_one( *args )
       set_clause, set_params = args[ -1 ].to_set_clause
       pk_values = args[ 0..-2 ]
@@ -218,9 +218,9 @@ module DBI
         *params
       )
     end
-    
+
     # Example:
-    #   DBI::Model.one_to_many( Author, :posts, Post, :author, :author_id )
+    #   DBI::Model.one_to_many( Author, Post, :posts, :author, :author_id )
     #   her_posts = some_author.posts
     #   the_author = some_post.author
     def self.one_to_many( the_one, the_many, many_as, one_as, the_one_fk )
@@ -234,7 +234,7 @@ module DBI
         send( "#{the_one_fk}=".to_sym, new_one.pk )
       end
     end
-    
+
     # Example:
     #   DBI::Model.many_to_many(
     #     @m_author, @m_fan, :authors_liked, :fans, :authors_fans, :author_id, :fan_id
@@ -258,7 +258,7 @@ module DBI
           pk
         )
       end
-      
+
       model2.class_def( m1_as.to_sym ) do
         model1.select_all(
           %{
@@ -276,9 +276,9 @@ module DBI
         )
       end
     end
-    
+
     # ------------------- :nodoc:
-    
+
     def initialize( row )
       if not row.respond_to?( "[]".to_sym ) or not row.respond_to?( "[]=".to_sym )
         raise DBI::Error.new( "Attempted to instantiate DBI::Model with an invalid argument (#{row.inspect}).  (Expecting DBI::Row.)" )
@@ -288,7 +288,7 @@ module DBI
       end
       @row = row
     end
-    
+
     def method_missing( method, *args )
       begin
         @row.send( method, *args )
@@ -300,7 +300,7 @@ module DBI
         )
       end
     end
-    
+
     # Returns a single value for single-column primary keys,
     # returns an Array for multi-column primary keys.
     def pk
@@ -310,36 +310,36 @@ module DBI
         pk_values
       end
     end
-    
+
     # Always returns an Array of values, even for single-column primary keys.
     def pk_values
       pk_columns.map { |col|
         @row[ col ]
       }
     end
-    
+
     def pk_columns
       self.class.pk
     end
-    
+
     def pk_clause
       pk_columns.map { |col|
         "#{col} = ?"
       }.join( ' AND ' )
     end
-    
+
     def ==( other )
       other and ( pk == other.pk )
     end
-    
+
     def hash
       "#{self.class.hash}#{pk}".to_i
     end
-    
+
     def eql?( other )
       hash == other.hash
     end
-    
+
     def set( hash )
       set_clause, set_params = hash.to_set_clause
       set_params << pk
@@ -354,7 +354,7 @@ module DBI
       end
       num_updated
     end
-    
+
     # Returns true iff the record and only the record was successfully deleted.
     def delete
       num_deleted = dbh.do(
@@ -363,13 +363,13 @@ module DBI
       )
       num_deleted == 1
     end
-    
+
     # save does nothing.  It exists to provide compatibility with other ORMs.
     def save
       nil
     end
   end
-  
+
   # 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:
@@ -382,7 +382,7 @@ module DBI
     if not pk_.respond_to? :each
       raise DBI::Error.new( "Primary key must be enumerable (was given #{pk_.inspect})" )
     end
-    
+
     model_key =
       # DBD-dependent.  Not all DBDs have dbname implemented by M4DBI.
       if h.respond_to? :dbname
@@ -390,7 +390,7 @@ module DBI
       else
         table
       end
-    
+
     @models ||= Hash.new
     @models[ model_key ] ||= Class.new( DBI::Model ) do |klass|
       klass.trait( {
@@ -399,31 +399,31 @@ module DBI
         :pk => pk_,
         :columns => h.columns( table.to_s ),
       } )
-      
+
       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} = currval( '#{table}_#{pk}_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} = 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} = last_insert_rowid();"
         end
       # TODO: more DBDs
       end
-      
+
       klass.trait[ :columns ].each do |col|
         colname = col[ 'name' ]
-        
+
         # Column readers
         class_def( colname.to_sym ) do
           @row[ colname ]
         end
-        
+
         # Column writers
         class_def( "#{colname}=".to_sym ) do |new_value|
           num_changed = dbh.do(
@@ -438,5 +438,5 @@ module DBI
       end
     end
   end
-  
+
 end

data/spec/model.rb

@@ -19,7 +19,7 @@ class ManyCol < DBI::Model( :many_col_table )
   def inc
     self.c1 = c1 + 10
   end
-  
+
   def dec
     self.c1 = c1 - 10
   end
@@ -34,22 +34,23 @@ 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 ] ) )
     class Author < DBI::Model( :authors ); end
   end
-  
+
   it 'can be defined' do
     @m_author.should.not.be.nil
     @m_post.should.not.be.nil
   end
-  
+
   it 'maintains identity across different inheritances' do
     should.not.raise do
       class Author < DBI::Model( :authors ); end
       class Author < DBI::Model( :authors ); end
     end
   end
-  
+
   it 'maintains member methods across redefinitions' do
     class Author < DBI::Model( :authors )
       def method1; 1; end
@@ -61,40 +62,40 @@ describe 'A DBI::Model subclass' do
     a.method1.should.equal 1
     a.method2.should.equal 2
   end
-  
+
   it 'maintains identity across different database handles of the same database' do
     # If you try to subclass a class a second time with a different parent class,
     # Ruby raises an exception.
     should.not.raise do
       original_handle = DBI::DatabaseHandle.last_handle
-      
+
       class Author < DBI::Model( :authors ); end
-        
+
       dbh = connect_to_spec_database
       new_handle = DBI::DatabaseHandle.last_handle
       new_handle.should.equal dbh
       new_handle.should.not.equal original_handle
-      
+
       class Author < DBI::Model( :authors ); end
     end
   end
-  
+
   it 'maintains distinction from models of the same name in different databases' do
     begin
       a1 = @m_author[ 1 ]
       a1.should.not.be.nil
       a1.name.should.equal 'author1'
-      
-      dbh = connect_to_spec_database( 'm4dbi2' )
+
+      dbh = connect_to_spec_database( ENV[ 'M4DBI_DATABASE2' ] || 'm4dbi2' )
       reset_data( dbh, "test-data2.sql" )
-      
+
       @m_author2 = Class.new( DBI::Model( :authors ) )
-      
+
       @m_author2[ 1 ].should.be.nil
       a11 = @m_author2[ 11 ]
       a11.should.not.be.nil
       a11.name.should.equal 'author11'
-      
+
       a2 = @m_author[ 2 ]
       a2.should.not.be.nil
       a2.name.should.equal 'author2'
@@ -104,7 +105,7 @@ describe 'A DBI::Model subclass' do
       connect_to_spec_database
     end
   end
-  
+
   it 'raises an exception when creating with invalid arguments' do
     should.raise( DBI::Error ) do
       @m_author.new nil
@@ -116,82 +117,94 @@ describe 'A DBI::Model subclass' do
       @m_author.new Object.new
     end
   end
-  
+
   it 'provides hash-like single-record access via #[ primary_key_value ]' do
     o = @m_author[ 1 ]
     o.should.not.be.nil
     o.class.should.equal @m_author
     o.name.should.equal 'author1'
-    
+
     o = @m_author[ 2 ]
     o.should.not.be.nil
     o.class.should.equal @m_author
     o.name.should.equal 'author2'
-    
+
+    o = @m_nipk[ 'one' ]
+    o.should.not.be.nil
+    o.class.should.equal @m_nipk
+    o.c1.should.equal 1
+    o.c2.should.equal 2
+
+    o = @m_nipk[ 'two' ]
+    o.should.not.be.nil
+    o.class.should.equal @m_nipk
+    o.c1.should.equal 2
+    o.c2.should.equal 4
+
     o = @m_mcpk[ [ 2, 2 ] ]
     o.should.not.be.nil
     o.class.should.equal @m_mcpk
     o.val.should.equal 'two two'
-    
+
     o = @m_mcpk[ 1, 1 ]
     o.should.not.be.nil
     o.class.should.equal @m_mcpk
     o.val.should.equal 'one one'
-    
+
     o = @m_mcpk[ { :kc1 => 5, :kc2 => 6 } ]
     o.should.not.be.nil
     o.class.should.equal @m_mcpk
     o.val.should.equal 'five six'
-    
+
     should.not.raise( DBI::Error ) do
       o = @m_author[ nil ]
       o.should.be.nil
     end
   end
-  
+
   it 'provides hash-like single-record access via #[ field_hash ]' do
     o = @m_author[ :name => 'author1' ]
     o.should.not.be.nil
     o.class.should.equal @m_author
     o.id.should.equal 1
-    
+
     o = @m_post[ :author_id => 1 ]
     o.should.not.be.nil
     o.class.should.equal @m_post
     o.text.should.equal 'First post.'
-    
+
     o = @m_mc[ :c1 => 100, :c2 => 50 ]
     o.should.not.be.nil
     o.class.should.equal @m_mc
     o.c3.should.equal 20
-    
+
     o = @m_mc[ :c1 => 100, :c2 => nil ]
     o.should.not.be.nil
     o.class.should.equal @m_mc
     o.c3.should.equal 40
   end
-  
+
   it 'returns nil from #[] when no record is found' do
     o = @m_author[ 999 ]
     o.should.be.nil
-    
+
     o = @m_author[ :name => 'foobar' ]
     o.should.be.nil
   end
-  
+
   it 'provides multi-record access via #where( Hash )' do
     posts = @m_post.where( :author_id => 1 )
     posts.should.not.be.nil
     posts.should.not.be.empty
     posts.size.should.equal 2
     posts[ 0 ].class.should.equal @m_post
-      
+
     sorted_posts = posts.sort { |p1,p2|
       p1._id <=> p2._id
     }
     p = sorted_posts.first
     p.text.should.equal 'First post.'
-    
+
     rows = @m_mc.where( :c1 => 100, :c2 => 50 )
     rows.should.not.be.nil
     rows.should.not.be.empty
@@ -200,7 +213,7 @@ describe 'A DBI::Model subclass' do
     row.class.should.equal @m_mc
     row.c1.should.equal 100
     row.c3.should.equal 20
-    
+
     rows = @m_mc.where( :c1 => 100, :c2 => nil )
     rows.should.not.be.nil
     rows.should.not.be.empty
@@ -209,85 +222,85 @@ describe 'A DBI::Model subclass' do
     row.class.should.equal @m_mc
     row.c1.should.equal 100
     row.c3.should.equal 40
-  end    
-    
+  end
+
   it 'provides multi-record access via #where( String )' do
     posts = @m_post.where( "id < 3" )
     posts.should.not.be.nil
     posts.should.not.be.empty
     posts.size.should.equal 2
     posts[ 0 ].class.should.equal @m_post
-      
+
     sorted_posts = posts.sort { |p1,p2|
       p2._id <=> p1._id
     }
     p = sorted_posts.first
     p.text.should.equal 'Second post.'
   end
-  
+
   it 'provides multi-record access via #where( String, param, param... )' do
     posts = @m_post.where( "id < ?", 3 )
     posts.should.not.be.nil
     posts.should.not.be.empty
     posts.size.should.equal 2
     posts[ 0 ].class.should.equal @m_post
-      
+
     sorted_posts = posts.sort { |p1,p2|
       p2._id <=> p1._id
     }
     p = sorted_posts.first
     p.text.should.equal 'Second post.'
   end
-  
+
   it 'returns an empty array from #where when no records are found' do
     a = @m_author.where( :id => 999 )
     a.should.be.empty
-    
+
     p = @m_post.where( "text = 'aoeu'" )
     p.should.be.empty
   end
-  
+
   it 'provides single-record access via #one_where( Hash )' do
     post = @m_post.one_where( :author_id => 2 )
     post.should.not.be.nil
     post.class.should.equal @m_post
     post.text.should.equal 'Second post.'
-    
+
     row = @m_mc.one_where( :c1 => 100, :c2 => nil )
     row.should.not.be.nil
     row.class.should.equal @m_mc
     row.c1.should.equal 100
     row.c3.should.equal 40
   end
-  
+
   it 'provides single-record access via #one_where( String )' do
     post = @m_post.one_where( "text LIKE '%Third%'" )
     post.should.not.be.nil
     post.class.should.equal @m_post
     post.id.should.equal 3
   end
-  
+
   it 'provides single-record access via #one_where( String, param, param... )' do
     post = @m_post.one_where( "text LIKE ?", '%Third%' )
     post.should.not.be.nil
     post.class.should.equal @m_post
     post.id.should.equal 3
   end
-  
+
   it 'returns nil from #one_where when no record is found' do
     a = @m_author.one_where( :id => 999 )
     a.should.be.nil
-    
+
     p = @m_post.one_where( "text = 'aoeu'" )
     p.should.be.nil
   end
-  
+
   it 'returns all table records via #all' do
     rows = @m_author.all
     rows.should.not.be.nil
     rows.should.not.be.empty
     rows.size.should.equal 3
-    
+
     rows[ 0 ].id.should.equal 1
     rows[ 0 ].class.should.equal @m_author
     rows[ 0 ].name.should.equal 'author1'
@@ -295,29 +308,29 @@ describe 'A DBI::Model subclass' do
     rows[ 1 ].class.should.equal @m_author
     rows[ 1 ].name.should.equal 'author2'
   end
-  
+
   it 'returns an empty array when #all is called on an empty table' do
     rows = @m_empty.all
     rows.should.not.be.nil
     rows.should.be.empty
   end
-  
+
   it 'returns a random single record from #one' do
     one = @m_author.one
     one.should.not.be.nil
     one.class.should.equal @m_author
   end
-  
+
   it 'returns nil from #one on an empty table' do
     one = @m_empty.one
     one.should.be.nil
   end
-  
+
   it 'returns the record count via #count' do
     n = @m_author.count
     n.should.equal 3
   end
-  
+
   it 'provides a means to create new records via #create( Hash )' do
     a = @m_author.create(
       :id => 9,
@@ -329,22 +342,22 @@ describe 'A DBI::Model subclass' do
     a.should.respond_to :name
     a.should.not.respond_to :no_column_by_this_name
     a.name.should.equal 'author9'
-    
+
     a_ = @m_author[ 9 ]
     a_.should.not.be.nil
     a_.should.equal a
     a_.name.should.equal 'author9'
-    
+
     reset_data
   end
-  
+
   it 'provides a means to create new records via #create { |r| }' do
     should.raise( NoMethodError ) do
       @m_author.create { |rec|
         rec.no_such_column = 'foobar'
       }
     end
-    
+
     a = @m_author.create { |rec|
       rec.id = 9
       rec.name = 'author9'
@@ -353,11 +366,11 @@ describe 'A DBI::Model subclass' do
     a.class.should.equal @m_author
     a.id.should.equal 9
     a.name.should.equal 'author9'
-    
+
     a_ = @m_author[ 9 ]
     a_.should.equal a
     a_.name.should.equal 'author9'
-    
+
     m = nil
     should.not.raise do
       m = @m_mc.create { |rec|
@@ -373,10 +386,10 @@ describe 'A DBI::Model subclass' do
     m_.c3.should.equal 8
     m_.c4.should.be.nil
     m_.c5.should.be.nil
-    
+
     reset_data
   end
-  
+
   it 'returns a record via #find_or_create( Hash )' do
     n = @m_author.count
     a = @m_author.find_or_create(
@@ -390,7 +403,7 @@ describe 'A DBI::Model subclass' do
     a.should.not.respond_to :no_column_by_this_name
     a.name.should.equal 'author1'
     @m_author.count.should.equal n
-    
+
     n = @m_mc.count
     row = @m_mc.find_or_create( :c1 => 100, :c2 => nil )
     row.should.not.be.nil
@@ -399,7 +412,7 @@ describe 'A DBI::Model subclass' do
     row.c3.should.equal 40
     @m_mc.count.should.equal n
   end
-  
+
   it 'creates a record via #find_or_create( Hash )' do
     n = @m_author.count
     a = @m_author.find_or_create(
@@ -413,15 +426,15 @@ describe 'A DBI::Model subclass' do
     a.should.not.respond_to :no_column_by_this_name
     a.name.should.equal 'author9'
     @m_author.count.should.equal n+1
-    
+
     a_ = @m_author[ 9 ]
     a_.should.not.be.nil
     a_.should.equal a
     a_.name.should.equal 'author9'
-    
+
     reset_data
   end
-  
+
   it 'provides a means to use generic raw SQL to select model instances' do
     posts = @m_post.s(
       %{
@@ -439,19 +452,19 @@ describe 'A DBI::Model subclass' do
     posts.should.not.be.nil
     posts.should.not.be.empty
     posts.size.should.equal 2
-    
+
     posts[ 0 ].id.should.equal 1
     posts[ 0 ].text.should.equal 'First post.'
     posts[ 0 ].class.should.equal @m_post
     posts[ 1 ].id.should.equal 3
     posts[ 1 ].text.should.equal 'Third post.'
     posts[ 1 ].class.should.equal @m_post
-    
+
     no_posts = @m_post.s( "SELECT * FROM posts WHERE 1+1 = 3" )
     no_posts.should.not.be.nil
     no_posts.should.be.empty
   end
-  
+
   it 'provides a means to use generic raw SQL to select one model instance' do
     post = @m_post.s1(
       %{
@@ -468,18 +481,18 @@ describe 'A DBI::Model subclass' do
       },
       'author1'
     )
-    
+
     post.should.not.be.nil
     post.class.should.equal @m_post
-    
+
     post.id.should.equal 3
     post.author_id.should.equal 1
     post.text.should.equal 'Third post.'
-    
+
     no_post = @m_post.s1( "SELECT * FROM posts WHERE 1+1 = 3" )
     no_post.should.be.nil
   end
-  
+
   it 'is Enumerable' do
     should.not.raise do
       @m_author.each { |a| }
@@ -498,66 +511,66 @@ describe 'A DBI::Model subclass' do
     authors.find { |a| a.name == 'author3' }.should.not.be.nil
     authors.find { |a| a.name == 'author99' }.should.be.nil
   end
-  
+
   it 'provides a means to update records referred to by primary key value' do
     new_text = 'Some new text.'
-    
+
     p2 = @m_post[ 2 ]
     p2.text.should.not.equal new_text
     @m_post.update_one( 2, { :text => new_text } )
     p2_ = @m_post[ 2 ]
     p2_.text.should.equal new_text
-    
+
     row = @m_mcpk[ 1, 1 ]
     row.val.should.not.equal new_text
     @m_mcpk.update_one( 1, 1, { :val => new_text } )
     row = @m_mcpk[ 1, 1 ]
     row.val.should.equal new_text
-    
+
     row = @m_mcpk[ 3, 4 ]
     row.val.should.not.equal new_text
     @m_mcpk.update_one( 3, 4, { :val => new_text } )
     row = @m_mcpk[ 3, 4 ]
     row.val.should.equal new_text
-    
+
     reset_data
   end
-  
+
   it 'provides a means to update records referred to by a value hash' do
     new_text = 'This is some new text.'
-    
+
     posts = @m_post.where( :author_id => 1 )
     posts.size.should.equal 2
     posts.find_all { |p| p.text == new_text }.should.be.empty
-    
+
     @m_post.update(
       { :author_id => 1 },
       { :text => new_text }
     )
-    
+
     posts_ = @m_post.where( :author_id => 1 )
     posts_.size.should.equal 2
     posts_.find_all { |p| p.text == new_text }.should.equal posts_
-    
+
     reset_data
   end
-  
+
   it 'provides a means to update records specified by a raw WHERE clause' do
     new_text = 'This is some new text.'
-    
+
     posts = @m_post.where( :author_id => 1 )
     posts.size.should.equal 2
     posts.find_all { |p| p.text == new_text }.should.be.empty
-    
+
     @m_post.update(
       "author_id < 2",
       { :text => new_text }
     )
-    
+
     posts_ = @m_post.where( :author_id => 1 )
     posts_.size.should.equal 2
     posts_.find_all { |p| p.text == new_text }.should.equal posts_
-    
+
     reset_data
   end
 end
@@ -568,7 +581,7 @@ describe 'A created DBI::Model subclass instance' do
     @m_author = Class.new( DBI::Model( :authors ) )
     @m_post = Class.new( DBI::Model( :posts ) )
   end
-  
+
   it 'provides read access to fields via identically-named readers' do
     mc = @m_mc.create(
       :c3 => 3,
@@ -585,7 +598,7 @@ describe 'A created DBI::Model subclass instance' do
     mc.c3.should.equal 3
     mc.c4.should.equal 4
   end
-    
+
   it 'provides write access to fields via identically-named writers' do
     mc = @m_mc.create(
       :c3 => 30,
@@ -600,7 +613,7 @@ describe 'A created DBI::Model subclass instance' do
     mc.c4.should.equal 40
     id_ = mc.id
     id_.should.not.be.nil
-    
+
     mc_ = @m_mc[ id_ ]
     mc_.id.should.equal id_
     mc_.c1.should.equal 10
@@ -608,25 +621,25 @@ describe 'A created DBI::Model subclass instance' do
     mc_.c3.should.equal 30
     mc_.c4.should.equal 40
   end
-  
+
   it 'maintains Hash key equality across different fetches' do
     h = Hash.new
     a = @m_author[ 1 ]
     h[ a ] = 123
     a_ = @m_author[ 1 ]
     h[ a_].should.equal 123
-    
+
     a2 = @m_author[ 2 ]
     h[ a2 ].should.be.nil
-    
+
     h[ a2 ] = 456
     h[ a ].should.equal 123
     h[ a_ ].should.equal 123
-    
+
     a2_ = @m_author[ 2 ]
     h[ a2_ ].should.equal 456
   end
-  
+
   it 'maintains Hash key distinction for different Model subclasses' do
     h = Hash.new
     a = @m_author[ 1 ]
@@ -634,7 +647,7 @@ describe 'A created DBI::Model subclass instance' do
     p = @m_post[ 1 ]
     h[ p ] = 456
     h[ p ].should.equal 456
-    
+
     a_ = @m_author[ 1 ]
     h[ a_ ].should.equal 123
   end
@@ -645,57 +658,58 @@ 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 ] ) )
   end
-  
+
   it 'provides access to primary key value' do
     a = @m_author[ 1 ]
     a.pk.should.equal 1
-    
+
     p = @m_post[ 3 ]
     p.pk.should.equal 3
-    
+
     r = @m_mcpk[ 1, 1 ]
     r.pk.should.equal [ 1, 1 ]
-    
+
     r = @m_mcpk[ { :kc1 => 3, :kc2 => 4 } ]
     r.pk.should.equal [ 3, 4 ]
   end
-  
+
   it 'provides read access to fields via identically-named readers' do
     p = @m_post[ 2 ]
-    
+
     should.not.raise( NoMethodError ) do
       p.id
       p.author_id
       p.text
     end
-    
+
     should.raise( NoMethodError ) do
       p.foobar
     end
-    
+
     p.id.should.equal 2
     p.author_id.should.equal 2
     p.text.should.equal 'Second post.'
   end
-  
+
   it 'provides write access to fields via identically-named writers' do
     the_new_text = 'Here is some new text.'
-    
+
     p2 = @m_post[ 2 ]
-    
+
     p3 = @m_post[ 3 ]
     p3.text = the_new_text
     p3.text.should.equal the_new_text
-    
+
     p3_ = @m_post[ 3 ]
     p3_.text.should.equal the_new_text
-    
+
     # Shouldn't change other rows
     p2_ = @m_post[ 2 ]
     p2_.text.should.equal p2.text
-    
+
     mc1 = @m_mc.create(
       :id => 1,
       :c1 => 2
@@ -705,17 +719,17 @@ describe 'A found DBI::Model subclass instance' do
     mc1.c1.should.be.nil
     mc1_ = @m_mc[ 1 ]
     mc1_.c1.should.be.nil
-    
+
     reset_data
   end
-  
+
   it 'maintains identity across multiple DB hits' do
     px = @m_post[ 1 ]
     py = @m_post[ 1 ]
-    
+
     px.should.equal py
   end
-  
+
   it 'provides multi-column writability via Model#set' do
     p = @m_post[ 1 ]
     the_new_text = 'The 3rd post.'
@@ -725,11 +739,11 @@ describe 'A found DBI::Model subclass instance' do
     )
     p.author_id.should.equal 2
     p.text.should.equal the_new_text
-    
+
     p_ = @m_post[ 1 ]
     p_.author_id.should.equal 2
     p_.text.should.equal the_new_text
-    
+
     mc1 = @m_mc.create(
       :id => 1,
       :c1 => 2,
@@ -744,17 +758,23 @@ describe 'A found DBI::Model subclass instance' do
     mc1_ = @m_mc[ 1 ]
     mc1_.c1.should.be.nil
     mc1_.c2.should.equal 4
-    
+
     reset_data
   end
-  
+
   it 'is deleted by #delete' do
     p = @m_post[ 3 ]
     p.should.not.be.nil
     successfully_deleted = p.delete
     successfully_deleted.should.be.true
     @m_post[ 3 ].should.be.nil
-    
+
+    o = @m_nipk[ 'one' ]
+    o.should.not.be.nil
+    successfully_deleted = o.delete
+    successfully_deleted.should.be.true
+    @m_nipk[ 'one' ].should.be.nil
+
     reset_data
   end
 
@@ -764,7 +784,7 @@ describe 'A found DBI::Model subclass instance' do
       p.save
     end
   end
-  
+
 end
 
 describe 'DBI::Model (relationships)' do
@@ -773,7 +793,7 @@ describe 'DBI::Model (relationships)' do
     @m_post = Class.new( DBI::Model( :posts ) )
     @m_fan = Class.new( DBI::Model( :fans ) )
   end
-  
+
   it 'facilitates relating one to many, providing read access' do
     DBI::Model.one_to_many( @m_author, @m_post, :posts, :author, :author_id )
     a = @m_author[ 1 ]
@@ -782,7 +802,7 @@ describe 'DBI::Model (relationships)' do
     p.author.should.not.be.nil
     p.author.id.should.equal 1
   end
-  
+
   it 'facilitates relating one to many, allowing one of the many to set its one' do
     DBI::Model.one_to_many(
       @m_author, @m_post, :posts, :author, :author_id
@@ -793,10 +813,10 @@ describe 'DBI::Model (relationships)' do
     p.author = @m_author.create( :id => 4, :name => 'author4' )
     p_ = @m_post[ 3 ]
     p_.author.id.should.equal 4
-    
+
     reset_data
   end
-  
+
   it 'facilitates relating many to many, providing read access' do
     DBI::Model.many_to_many(
       @m_author, @m_fan, :authors_liked, :fans, :authors_fans, :author_id, :fan_id
@@ -805,7 +825,7 @@ describe 'DBI::Model (relationships)' do
     a2 = @m_author[ 2 ]
     f2 = @m_fan[ 2 ]
     f3 = @m_fan[ 3 ]
-    
+
     a1f = a1.fans
     a1f.should.not.be.nil
     a1f.should.not.be.empty
@@ -814,7 +834,7 @@ describe 'DBI::Model (relationships)' do
     a1f.find { |f| f.name == 'fan1' }.should.be.nil
     a1f.find { |f| f.name == 'fan2' }.should.not.be.nil
     a1f.find { |f| f.name == 'fan3' }.should.not.be.nil
-    
+
     a2f = a2.fans
     a2f.should.not.be.nil
     a2f.should.not.be.empty
@@ -823,14 +843,14 @@ describe 'DBI::Model (relationships)' do
     a2f.find { |f| f.name == 'fan1' }.should.be.nil
     a2f.find { |f| f.name == 'fan3' }.should.not.be.nil
     a2f.find { |f| f.name == 'fan4' }.should.not.be.nil
-    
+
     f2a = f2.authors_liked
     f2a.should.not.be.nil
     f2a.should.not.be.empty
     f2a.size.should.equal 1
     f2a[ 0 ].class.should.equal @m_author
     f2a[ 0 ].name.should.equal 'author1'
-    
+
     f3a = f3.authors_liked
     f3a.should.not.be.nil
     f3a.should.not.be.empty
@@ -838,7 +858,7 @@ describe 'DBI::Model (relationships)' do
     f3a.find { |a| a.name == 'author1' }.should.not.be.nil
     f3a.find { |a| a.name == 'author2' }.should.not.be.nil
     f3a.find { |a| a.name == 'author3' }.should.be.nil
-    
+
     @m_author[ 3 ].fans.should.be.empty
     @m_fan[ 5 ].authors_liked.should.be.empty
   end
@@ -848,12 +868,12 @@ describe 'DBI::Collection' do
   before do
     @m_author = Class.new( DBI::Model( :authors ) )
     @m_post = Class.new( DBI::Model( :posts ) )
-    
+
     DBI::Model.one_to_many(
       @m_author, @m_post, :posts, :author, :author_id
     )
   end
-  
+
   it 'accepts additions' do
     a = @m_author[ 1 ]
     the_text = 'A new post.'
@@ -861,26 +881,26 @@ describe 'DBI::Collection' do
     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
@@ -889,16 +909,16 @@ describe 'DBI::Collection' do
     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,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: m4dbi
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Pistos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-10 00:00:00 -05:00
+date: 2009-02-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - bacon (optional)
 rubyforge_project: m4dbi
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Models (and More) for DBI