fb 0.7.3 → 0.7.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 56b9a209c188f5a267c3dda503f72226a467eaa2
+  data.tar.gz: e443a11b2c99d410856eabdc463cf8146e9fb261
+SHA512:
+  metadata.gz: 2b1d66d743e5649eb9fcf65406b8e1d78b747cac4e420867954b02b792875ddb2acf5b8c06a396d7c674869afdb2d0c24b4f903c940f062c8c622f1be24bbe1a
+  data.tar.gz: dda09a0abc589816ce41e88a13d40d335787ee9d9b6c3978f56f96b129fe1ca6b849e5e7d2955737c823cc40dac221b7197a6cd7e733b6e41c5f978f911af3a6

data/fb.c

@@ -2911,7 +2911,7 @@ static VALUE default_int(VALUE hash, const char *key, int def)
 static VALUE database_allocate_instance(VALUE klass)
 {
 	NEWOBJ(obj, struct RObject);
-	OBJSETUP(obj, klass, T_OBJECT);
+	OBJSETUP((VALUE)obj, klass, T_OBJECT);
 	return (VALUE)obj;
 }
 

data/test/ConnectionTestCases.rb

@@ -1,9 +1,6 @@
-require 'test/unit'
 require 'test/FbTestCases'
-# require 'fb'
-# include Fb
 
-class ConnectionTestCases < Test::Unit::TestCase
+class ConnectionTestCases < FbTestCase
   include FbTestCases
   
   def test_execute

data/test/CursorTestCases.rb

@@ -1,9 +1,6 @@
-require 'test/unit'
 require 'test/FbTestCases'
-# require 'fb'
-# include Fb
 
-class CursorTestCases < Test::Unit::TestCase
+class CursorTestCases < FbTestCase
   include FbTestCases
 
   def test_fetch_array
@@ -153,19 +150,19 @@ class CursorTestCases < Test::Unit::TestCase
       connection.execute("create generator test_seq");
       connection.execute("select gen_id(test_seq, 1) from rdb$database") do |cursor|
         r1 = cursor.fetch
-        assert_not_nil r1
+        assert !r1.nil?
         r2 = cursor.fetch
         assert_nil r2
-        assert_raise Error do
+        assert_raises Error do
           r3 = cursor.fetch
         end
       end
       connection.execute("select * from rdb$database") do |cursor|
         r1 = cursor.fetch
-        assert_not_nil r1
+        assert !r1.nil?
         r2 = cursor.fetch
         assert_nil r2
-        assert_raise Error do
+        assert_raises Error do
           r3 = cursor.fetch
         end
       end

data/test/DataTypesTestCases.rb

@@ -1,11 +1,6 @@
-require 'test/unit'
 require 'test/FbTestCases'
-# require 'fb'
-# require 'date'
 
-# include Fb
-
-class DataTypesTestCases < Test::Unit::TestCase
+class DataTypesTestCases < FbTestCase
   include FbTestCases
   
   def gen_i(i)
@@ -277,108 +272,108 @@ class DataTypesTestCases < Test::Unit::TestCase
       cols.size.times do |i|
         sql_insert = "INSERT INTO TEST_#{cols[i]} (VAL) VALUES (?);"
         if cols[i] == 'I'
-          assert_raise TypeError do
+          assert_raises TypeError do
             connection.execute(sql_insert, {:five => "five"})
           end
-          assert_raise TypeError do
+          assert_raises TypeError do
             connection.execute(sql_insert, Time.now)
           end
-          assert_raise RangeError do
+          assert_raises RangeError do
             connection.execute(sql_insert, 5000000000)
           end
         elsif cols[i] == 'SI'
-          assert_raise TypeError do
+          assert_raises TypeError do
             connection.execute(sql_insert, {:five => "five"})
           end
-          assert_raise TypeError do
+          assert_raises TypeError do
             connection.execute(sql_insert, Time.now)
           end
-          assert_raise RangeError do
+          assert_raises RangeError do
             connection.execute(sql_insert, 100000)
           end
         elsif cols[i] == 'BI'
-          assert_raise TypeError do
+          assert_raises TypeError do
             connection.execute(sql_insert, {:five => "five"})
           end
-          assert_raise TypeError do
+          assert_raises TypeError do
             connection.execute(sql_insert, Time.now)
           end
-          assert_raise RangeError do
+          assert_raises RangeError do
             connection.execute(sql_insert, 184467440737095516160) # 2^64 * 10
           end
         elsif cols[i] == 'F'
-          assert_raise TypeError do
+          assert_raises TypeError do
             connection.execute(sql_insert, {:five => "five"})
           end
-          assert_raise RangeError do
+          assert_raises RangeError do
             connection.execute(sql_insert, 10 ** 39)
           end
         elsif cols[i] == 'D'
-          assert_raise TypeError do
+          assert_raises TypeError do
             connection.execute(sql_insert, {:five => "five"})
           end
         elsif cols[i] == 'VC'
-          assert_raise RangeError do
+          assert_raises RangeError do
             connection.execute(sql_insert, "too long")
           end
-          assert_raise RangeError do
+          assert_raises RangeError do
             connection.execute(sql_insert, 1.0/3.0)
           end
         elsif cols[i] ==  'VC10'
-          assert_raise RangeError do
+          assert_raises RangeError do
             connection.execute(sql_insert, 1.0/3.0)
           end
         elsif cols[i].include?('VC10000')
-          assert_raise RangeError do
+          assert_raises RangeError do
             connection.execute(sql_insert, "X" * 10001)
           end
         elsif cols[i] == 'C'
-          assert_raise RangeError do
+          assert_raises RangeError do
             connection.execute(sql_insert, "too long")
           end
         elsif cols[i] == 'C10'
-          assert_raise RangeError do
+          assert_raises RangeError do
             connection.execute(sql_insert, Time.now)
           end
         elsif cols[i] == 'DT'
-          assert_raise ArgumentError do
+          assert_raises ArgumentError do
             connection.execute(sql_insert, Date)
           end
-          assert_raise ArgumentError do
+          assert_raises ArgumentError do
             connection.execute(sql_insert, 2006)
           end
         elsif cols[i] == 'TM'
-          assert_raise TypeError do
+          assert_raises TypeError do
             connection.execute(sql_insert, {:date => "2006/1/1"})
           end
-          assert_raise TypeError do
+          assert_raises TypeError do
             connection.execute(sql_insert, 10000)
           end
         elsif cols[i] ==  'TS'
-          assert_raise TypeError do
+          assert_raises TypeError do
             connection.execute(sql_insert, 5.5)
           end
-          assert_raise TypeError do
+          assert_raises TypeError do
             connection.execute(sql_insert, 10000)
           end
         elsif cols[i] ==  'N92'
-          assert_raise TypeError do
+          assert_raises TypeError do
             connection.execute(sql_insert, {:five => "five"})
           end
-          assert_raise TypeError do
+          assert_raises TypeError do
             connection.execute(sql_insert, Time.now)
           end
-          assert_raise RangeError do
+          assert_raises RangeError do
             connection.execute(sql_insert, 5000000000)
           end
         elsif cols[i] ==  'D92' 
-          assert_raise TypeError do
+          assert_raises TypeError do
             connection.execute(sql_insert, {:five => "five"})
           end
-          assert_raise TypeError do
+          assert_raises TypeError do
             connection.execute(sql_insert, Time.now)
           end
-          assert_raise RangeError do
+          assert_raises RangeError do
             connection.execute(sql_insert, 5000000000)
           end
         end

data/test/DatabaseTestCases.rb

@@ -1,9 +1,6 @@
-require 'test/unit'
 require 'test/FbTestCases'
-# require 'fb'
-# include Fb
 
-class DatabaseTestCases < Test::Unit::TestCase
+class DatabaseTestCases < FbTestCase
   include FbTestCases
   
   def setup
@@ -110,13 +107,13 @@ class DatabaseTestCases < Test::Unit::TestCase
   end
   
   def test_create_bad_param
-    assert_raise TypeError do
+    assert_raises TypeError do
       db = Database.create(1)
     end
   end
 
   def test_create_bad_page_size
-    assert_raise Error do
+    assert_raises Error do
       db = Database.create(@parms.merge(:page_size => 1000))
     end
   end
@@ -161,7 +158,7 @@ class DatabaseTestCases < Test::Unit::TestCase
       connection.execute("insert into test values (1, 'test role')")
     end
     Database.connect(@reader) do |connection|
-      assert_raise Error do
+      assert_raises Error do
         connection.execute("select * from test") do |cursor|
           flunk "Should not reach here."
         end

data/test/EncodingTestCases.rb

@@ -1,8 +1,7 @@
 #coding:utf-8
-require 'test/unit'
 require 'test/FbTestCases'
 
-class EncodingTestCases < Test::Unit::TestCase
+class EncodingTestCases < FbTestCase
   include FbTestCases
 
   def test_encoding

data/test/FbTestCases.rb

@@ -2,6 +2,25 @@ require 'fileutils'
 include FileUtils
 require 'fb'
 
+if RUBY_VERSION =~ /^2/
+  require 'minitest/autorun'
+
+  unless Minitest.const_defined?('Test')
+    Minitest::Test = MiniTest::Unit::TestCase
+  end
+
+  class FbTestCase < Minitest::Test
+  end
+
+else
+  require 'test/unit'
+
+  class FbTestCase < Test::Unit::TestCase
+    def default_test
+    end
+  end
+end
+
 module FbTestCases
   include Fb
 

data/test/FbTestSuite.rb

@@ -1,6 +1,6 @@
 $: << File.dirname(__FILE__)
 $: << File.join(File.dirname(__FILE__),'..')
-require 'test/unit'
+
 require 'DatabaseTestCases'
 require 'ConnectionTestCases'
 require 'CursorTestCases'

data/test/TransactionTestCases.rb

@@ -1,9 +1,6 @@
-require 'test/unit'
 require 'test/FbTestCases'
-# require 'fb'
-# include Fb
 
-class TransactionTestCases < Test::Unit::TestCase
+class TransactionTestCases < FbTestCase
   include FbTestCases
   
   def test_transaction
@@ -30,7 +27,7 @@ class TransactionTestCases < Test::Unit::TestCase
         assert connection.transaction_started
       end
       assert !connection.transaction_started
-      assert_raise RuntimeError do
+      assert_raises RuntimeError do
         connection.transaction do
           assert connection.transaction_started
           raise "generic exception"
@@ -45,7 +42,7 @@ class TransactionTestCases < Test::Unit::TestCase
     sql_select = "SELECT * FROM RDB$DATABASE"
     Database.create(@parms) do |connection|
       assert !connection.transaction_started
-      assert_raise RuntimeError do
+      assert_raises RuntimeError do
         connection.execute(sql_select) do |cursor|
           assert connection.transaction_started
           raise "abort"
@@ -64,7 +61,7 @@ class TransactionTestCases < Test::Unit::TestCase
       assert !connection.transaction_started
       connection.execute(sql_insert, 1, "one")
       assert !connection.transaction_started
-      assert_raise Error do
+      assert_raises Error do
         connection.execute(sql_insert, 1, "two")
       end
       assert !connection.transaction_started, "transaction is active"
@@ -165,7 +162,7 @@ class TransactionTestCases < Test::Unit::TestCase
     Database.create(@parms) do |connection|
       connection.execute(sql_schema)
       assert !connection.transaction_started
-      assert_raise RuntimeError do
+      assert_raises RuntimeError do
         connection.transaction do
           10.times do |i|
             connection.execute(sql_insert, i, i.to_s);

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fb
 version: !ruby/object:Gem::Version
-  version: 0.7.3
-  prerelease: 
+  version: 0.7.4
 platform: ruby
 authors:
 - Brent Rowland
@@ -19,14 +18,14 @@ extensions:
 extra_rdoc_files:
 - README
 files:
+- README
 - extconf.rb
 - fb.c
-- README
 - fb_extensions.rb
 - test/ConnectionTestCases.rb
 - test/CursorTestCases.rb
-- test/DatabaseTestCases.rb
 - test/DataTypesTestCases.rb
+- test/DatabaseTestCases.rb
 - test/EncodingTestCases.rb
 - test/FbTestCases.rb
 - test/FbTestSuite.rb
@@ -34,34 +33,33 @@ files:
 homepage: http://github.com/rowland/fb
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - Fb -- Ruby Firebird Extension
-- --main
+- "--main"
 - README
-- -x
+- "-x"
 - test
 require_paths:
-- .
+- "."
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - Firebird client library fbclient.dll, libfbclient.so or Firebird.framework.
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Firebird database driver
 test_files:
 - test/FbTestSuite.rb