KirbyBase 2.5.1 → 2.5.2

data/README

@@ -1,4 +1,4 @@
-= KirbyBase 2.5.1
+= KirbyBase 2.5.2
 
 A small, plain-text, dbms written in Ruby.  It can be used either embedded 
 or client/server.  
@@ -24,8 +24,8 @@ See the examples directory for examples of how to use KirbyBase.
 * install.rb - install script
 * changes.txt - history of changes.
 * kirbybaserubymanual.html - documentation
-* kirbybase.rb - dbms library
-* kbserver.rb - multi-threaded database server script.
+* lib/kirbybase.rb - dbms library
+* bin/kbserver.rb - multi-threaded database server script.
 * test directory - unit tests
 * examples directory - many example scripts demonstrating features.
 * images directory - images used in manual.

data/changes.txt

@@ -1,3 +1,9 @@
+2005-12-30:: Version 2.5.2
+* Changed the behavior of KBTable#insert method.  If user specifies nil
+  for a field value and there is a default value for that field, the
+  default value will no longer override the user specified nil value.
+  Thanks to Assaph Mehr for suggesting this.
+
 2005-12-28:: Version 2.5.1
 * Fixed a bug that had broken encrypted tables.
 * Changed KBTable#pack method so that it raises an error if trying to

data/examples/aaa_try_this_first/kbtest.rb

@@ -11,7 +11,7 @@ end
 
 #-------------------- Initialize KirbyBase Instance ------------------------
 # To run local, single-user, uncomment next line.
-db = KirbyBase.new
+db = KirbyBase.new 
 
 # To run as a client in a multi-user environment, uncomment next line.
 # Also, make sure kbserver.rb is running.

data/examples/column_required_test/column_required_test.rb

@@ -24,6 +24,17 @@ rescue StandardError => e
     puts;puts
 end
 
+begin
+    # Same thing should happen if I don't even specify a value for
+    # :category.
+    address_book_tbl.insert(:firstname=>'Bruce', :lastname=>'Wayne', 
+     :street_addres=>'1234 Bat Cave', :city=>'Gotham City', 
+     :phone=>'111-111-1111')
+rescue StandardError => e
+    puts e
+    puts;puts
+end
+
 # Now, let's turn off the required flag for :category.
 address_book_tbl.change_column_required(:category, false)
 

data/examples/default_value_test/default_value_test.rb

@@ -13,30 +13,41 @@ address_book_tbl = db.create_table(:address_book,
  :city, :String, :phone, :String, 
  :category, {:DataType=>:String, :Default=>'Super Hero'})
 
-# Insert a record.  Notice that I am passing nil for :category.  KirbyBase
-# will insert the default value, 'Super Hero', in that field.
-address_book_tbl.insert('Bruce', 'Wayne', '1234 Bat Cave', 'Gotham City',
- '111-111-1111', nil)
+# Insert a record.  Notice that I am not passing a value for :category.  
+# KirbyBase will insert the default value, 'Super Hero', in that field.
+address_book_tbl.insert(:firstname=>'Bruce', :lastname=>'Wayne', 
+ :street_address=>'1234 Bat Cave', :city=>'Gotham City',
+ :phone=>'111-111-1111')
 
 # Insert another record.  Here we supply the value for :category, so
 # KirbyBase will use it instead of the default.
-address_book_tbl.insert('Bugs', 'Bunny', '1234 Rabbit Hole', 'The Forest',
- '222-222-2222', 'Cartoon Character')
+address_book_tbl.insert(:firstname=>'Bugs', :lastname=>'Bunny', 
+ :street_address=>'1234 Rabbit Hole', :city=>'The Forest',
+ :phone=>'222-222-2222', :category=>'Cartoon Character')
+ 
+# Insert another record.  Here we explicitly supply nil as the value for
+# category.  KirbyBase will not override this with the default value 
+# because we explicitly specified nil as the value.
+address_book_tbl.insert(:firstname=>'Super', :lastname=>'Man',
+ :street_address=>'1234 Fortress of Solitude', :city=>'Metropolis',
+ :phone=>'333-333-3333', :category=>nil) 
 
 # Now lets change the default value for :category to 'President'.
 address_book_tbl.change_column_default_value(:category, 'President')
 
 # And let's add another record without supplying a value for :category.
-address_book_tbl.insert(firstname='George', lastname='Bush',
- street_address='1600 Pennsylvania Ave', 'Washington', '333-333-3333', nil)
+address_book_tbl.insert(:firstname=>'George', :lastname=>'Bush',
+ :street_address=>'1600 Pennsylvania Ave', :city=>'Washington', 
+ :phone=>'333-333-3333')
 
 # Now, let's remove the default value for :category
 address_book_tbl.change_column_default_value(:category, nil)
 
 # And add another record.  We won't specify a value for :category and,
 # KirbyBase will not use a default value, because we removed it.
-address_book_tbl.insert('Silver', 'Surfer', '1234 Galaxy Way',
- 'Any City', '444-444-4444', nil)
+address_book_tbl.insert(:firstname=>'Silver', :lastname=>'Surfer', 
+ :street_address=>'1234 Galaxy Way', :city=>'Any City', 
+ :phone=>'444-444-4444')
 
 # Now lets print the table out and you will see how all of the defaults
 # worked.

data/kirbybaserubymanual.html

@@ -262,7 +262,7 @@ div.exampleblock-content {
 <h1>KirbyBase Manual (Ruby Version)</h1>
 <span id="author">Jamey Cribbs</span><br />
 <span id="email"><tt>&lt;<a href="mailto:jcribbs@twmi.rr.com">jcribbs@twmi.rr.com</a>&gt;</tt></span><br />
-v2.5.1 December 2005
+v2.5.2 December 2005
 </div>
 <div id="preamble">
 <div class="sectionbody">
@@ -753,7 +753,7 @@ memo/blob files, you need to pass the location as an argument, like so:</p>
 <pre><tt>db = KirbyBase.new(:local, nil, './', '.tbl', './memos')</tt></pre>
 </div></div>
 <p>If you don't want KirbyBase to spend time initially creating all of the
-indexes for the tables in the database, you can pass false as the
+indexes for the tables in the database, you can pass true as the
 delay_index_creation argument:</p>
 <div class="listingblock">
 <div class="content">
@@ -2266,7 +2266,7 @@ an Array like all of the regular indexes.  So selects are even faster.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 28-Dec-2005 13:27:25 Eastern Daylight Time
+Last updated 30-Dec-2005 10:16:41 Eastern Daylight Time
 </div>
 </div>
 </body>

data/lib/kirbybase.rb

@@ -146,6 +146,12 @@ require 'yaml'
 # * Moved #build_header_string from KBEngine class to KirbyBase class.
 # * Added KirbyBase::VERSION constant.
 #
+# 2005-12-30:: Version 2.5.2
+# * Changed the behavior of KBTable#insert method.  If user explicitly
+#   specifies nil for a field value and there is a default value for that
+#   field, the default value will no longer override the user specified nil
+#   value.  Thanks to Assaph Mehr for suggesting this.
+#
 #
 #---------------------------------------------------------------------------
 # KBTypeConversionsMixin
@@ -336,7 +342,7 @@ class KirbyBase
     include DRb::DRbUndumped
     include KBTypeConversionsMixin
 
-    VERSION = "2.5.1"
+    VERSION = "2.5.2"
 
     attr_reader :engine
 
@@ -2102,10 +2108,10 @@ class KBTable
 
         input_rec = Struct.new(*field_names).new(*field_names.zip(
          @field_defaults).collect do |fn, fd|
-            if input_rec[fn].nil?
-                fd
-            else
+            if input_rec.has_key?(fn)
                 input_rec[fn]
+            else
+                fd
             end
         end)
 

data/test/tc_local_db.rb

@@ -9,7 +9,7 @@ class TestDatabaseLocal < Test::Unit::TestCase
 	include BaseTest
 
     def test_version
-        assert_equal('2.5.1', KirbyBase::VERSION)
+        assert_equal('2.5.2', KirbyBase::VERSION)
     end
     
 	def test_local?

data/test/tc_local_table.rb

@@ -123,7 +123,7 @@ class TestTableLocal < Test::Unit::TestCase
          t.encrypt = @encrypted }
         tbl.insert('Spitfire', nil)
 
-        assert_equal([1, 'Spitfire', 300], tbl[1].to_a) 
+        assert_equal([1, 'Spitfire', nil], tbl[1].to_a) 
     end
 
     def test_insert_007
@@ -219,7 +219,7 @@ class TestTableLocal < Test::Unit::TestCase
         tbl = @db.create_table(:plane, :name, :String,
          :speed, {:DataType=>:Integer, :Default=>300, :Required=>true}
          ) { |t| t.encrypt = @encrypted }
-        tbl.insert(:name => 'Spitfire', :speed => nil)
+        tbl.insert(:name => 'Spitfire')
 
         assert_raise(ArgumentError) { tbl.update(:speed => nil) { |r|
          r.recno == 1 } }
@@ -459,6 +459,34 @@ class TestTableLocal < Test::Unit::TestCase
         assert_equal([1, 'one', 'bob'], tbl[1].to_a) 
     end
 
+    def test_column_required_005
+        tbl = @db.create_table(:empty, :one, :String, :two, 
+         {:DataType => :String, :Required => true}) { |t|
+         t.encrypt = @encrypted }
+        tbl.insert('one', 'two') 
+        
+        assert_raise(ArgumentError) {
+         tbl.update('one', nil) { |r| r.recno == 1 } } 
+    end
+
+    def test_column_required_006
+        tbl = @db.create_table(:empty, :one, :String, :two, 
+         {:DataType => :String, :Required => true}) { |t|
+         t.encrypt = @encrypted }
+        tbl.insert('one', 'two') 
+        
+        assert_raise(ArgumentError) {
+         tbl.update(:two => nil) { |r| r.recno == 1 } } 
+    end
+
+    def test_column_required_007
+        tbl = @db.create_table(:empty, :one, :String, :two, 
+         {:DataType => :String, :Required => true, :Default => 'three'}
+         ) { |t| t.encrypt = @encrypted }
+         
+        assert_raise(ArgumentError) { tbl.insert('one', nil) } 
+    end
+
     def test_change_column_required_001
         tbl = @db.create_table(:empty, :one, :String, :two, :String
          ) { |t| t.encrypt = @encrypted }
@@ -481,7 +509,7 @@ class TestTableLocal < Test::Unit::TestCase
          {:DataType => :String, :Default => 'two'}) { |t|
          t.encrypt = @encrypted }
         tbl.insert('one', nil)
-        assert_equal([1, 'one', 'two'], tbl[1].to_a) 
+        assert_equal([1, 'one', nil], tbl[1].to_a) 
     end
 
     def test_column_default_002
@@ -493,6 +521,32 @@ class TestTableLocal < Test::Unit::TestCase
         assert_equal([1, 'one', 'not two'], tbl[1].to_a) 
     end
 
+    def test_column_default_003
+        tbl = @db.create_table(:empty, :one, :String, :two, 
+         {:DataType => :String, :Default => 'two'}) { |t|
+         t.encrypt = @encrypted }
+        tbl.insert(:one => 'one')
+
+        assert_equal([1, 'one', 'two'], tbl[1].to_a) 
+    end
+
+    def test_column_default_004
+        tbl = @db.create_table(:empty, :one, :String, :two, 
+         {:DataType => :String, :Default => 'two'}) { |t|
+         t.encrypt = @encrypted }
+        tbl.insert(Struct.new(:one, :two).new('one'))
+
+        assert_equal([1, 'one', nil], tbl[1].to_a) 
+    end
+
+    def test_column_default_005
+        tbl = @db.create_table(:empty, :one, :String, :two, 
+         {:DataType => :String, :Default => 'two', :Required => true}) { |t|
+         t.encrypt = @encrypted }
+
+        assert_raise(ArgumentError) { tbl.insert('one', nil) } 
+    end
+
     def test_change_column_default_value_001
         tbl = @db.create_table(:empty, :one, :String, :two, :String
          ) { |t| t.encrypt = @encrypted }

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: KirbyBase
 version: !ruby/object:Gem::Version 
-  version: 2.5.1
-date: 2005-12-28
+  version: 2.5.2
+date: 2006-01-03
 summary: "KirbyBase is a simple, pure-Ruby, plain-text, flat-file database management
   system."
 require_paths: