ruby-informix 0.7.3 → 0.8.0

data/ext/informixc.ec

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2010, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
+ * Copyright (c) 2006-2012, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -32,7 +32,7 @@
 #include <sqlstype.h>
 #include <sqltypes.h>
 
-static VALUE rb_cDate, rb_cBigDecimal, rb_cRational;
+static VALUE rb_cDate, rb_cBigDecimal;
 
 /* Modules */
 static VALUE rb_mInformix;
@@ -995,7 +995,7 @@ rb_slob_unlock(VALUE self, VALUE offset, VALUE whence, VALUE range)
 typedef enum {
 	slob_estbytes, slob_extsz, slob_flags, slob_maxbytes, slob_sbspace
 } slob_option_t;
-static char *str_slob_options[] = {
+static const char *str_slob_options[] = {
 	"estbytes", "extsz", "flags", "maxbytes", "sbspace"};
 /*
  * Base function for getting storage charasteristics
@@ -1207,7 +1207,7 @@ rb_slob_set_flags(VALUE self, VALUE value)
 }
 
 typedef enum { slob_atime, slob_ctime, slob_mtime, slob_refcnt, slob_size } slob_stat_t;
-static char *str_slob_stats[] = {
+static const char *str_slob_stats[] = {
 	"atime", "ctime", "mtime", "refcnt", "size"
 };
 
@@ -1842,8 +1842,7 @@ make_result(cursor_t *c, VALUE record)
 				value = rb_funcall(value, s_add, 1, LONG2FIX(sign*seconds));
 
 				if (usec != 0) {
-					VALUE argv[2] = { INT2FIX(sign*usec), LONG2FIX(1000000L) };
-					VALUE frac = rb_class_new_instance(2, argv, rb_cRational);
+					VALUE frac = rb_Rational(INT2FIX(sign*usec), LONG2FIX(1000000L));
 					value = rb_funcall(frac, s_add, 1, value);
 				}
 			}
@@ -1909,8 +1908,8 @@ make_result(cursor_t *c, VALUE record)
 		if (BUILTIN_TYPE(record) == T_ARRAY) {
 			rb_ary_store(record, i, item);
 		}
-        else {
-			rb_hash_aset(record, RARRAY(c->field_names)->ptr[i], item);
+		else {
+			rb_hash_aset(record, RARRAY_PTR(c->field_names)[i], item);
 		}
 	}
 	return record;
@@ -2215,8 +2214,8 @@ static VALUE
 rb_database_columns(VALUE self, VALUE tablename)
 {
 	VALUE v, column, result;
-	char *stype;
-	static char *stypes[] = {
+	const char *stype;
+	static const char *stypes[] = {
 		"CHAR", "SMALLINT", "INTEGER", "FLOAT", "SMALLFLOAT", "DECIMAL",
 		"SERIAL", "DATE", "MONEY", "NULL", "DATETIME", "BYTE",
 		"TEXT", "VARCHAR", "INTERVAL", "NCHAR", "NVARCHAR", "INT8",
@@ -2224,7 +2223,7 @@ rb_database_columns(VALUE self, VALUE tablename)
 		"VARIABLE-LENGTH OPAQUE TYPE"
 	};
 
-	static char *qualifiers[] = {
+	static const char *qualifiers[] = {
 		"YEAR", "MONTH", "DAY", "HOUR", "MINUTE", "SECOND"
 	};
 
@@ -2720,7 +2719,7 @@ each_by(VALUE self, VALUE n, VALUE type)
 
 	for(;;) {
 		records = fetch_many(self, n, type);
-		if (RARRAY(records)->len == 0)
+		if (RARRAY_LEN(records) == 0)
 			return self;
 		rb_yield(records);
 	}
@@ -3375,8 +3374,6 @@ void Init_informixc(void)
 	rb_require("bigdecimal");
 	rb_cBigDecimal = rb_const_get(rb_cObject, rb_intern("BigDecimal"));
 
-	rb_cRational = rb_const_get(rb_cObject, rb_intern("Rational"));
-
 	rb_require("informix/exceptions");
 	rb_eError = rb_const_get(rb_mInformix, rb_intern("Error"));
 	rb_eWarning = rb_const_get(rb_mInformix, rb_intern("Warning"));

data/lib/informix.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2010, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
+# Copyright (c) 2008-2012, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
@@ -32,7 +32,7 @@ require 'informix/seqcursor'
 require 'informix/scrollcursor'
 
 module Informix
-  VERSION = "0.7.3"
+  VERSION = "0.8.0"
   VERSION.freeze
 
   # Shortcut to create a +Database+ object connected to +dbname+ as

data/lib/informix/exceptions.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2010, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
+# Copyright (c) 2008-2012, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without

data/lib/informix/interval.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2010, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
+# Copyright (c) 2008-2012, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without

data/lib/informix/scrollcursor.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2010, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
+# Copyright (c) 2008-2012, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without

data/lib/informix/seqcursor.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2010, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
+# Copyright (c) 2008-2012, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without

data/test/{ifx_test_create_table.rb → test_create_table.rb}

@@ -1,9 +1,6 @@
 testdir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift testdir
-$LOAD_PATH.unshift File.join(testdir, "..")
 
-require 'informix'
-require 'test/unit'
 require 'testcase'
 
 class IfxTestCreate < Informix::TestCase

data/test/{ifx_test_errinfo.rb → test_errinfo.rb}

@@ -1,9 +1,6 @@
 testdir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift testdir
-$LOAD_PATH.unshift File.join(testdir, "..")
 
-require 'informix'
-require 'test/unit'
 require 'testcase'
 
 # Informix::ExcInfo is just a struct, not much testing needed

data/test/{ifx_test_exceptions.rb → test_exceptions.rb}

@@ -1,9 +1,6 @@
 testdir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift testdir
-$LOAD_PATH.unshift File.join(testdir, "..")
 
-require 'informix'
-require 'test/unit'
 require 'testcase'
 
 class IfxTestExceptions < Informix::TestCase
@@ -63,7 +60,7 @@ class IfxTestExceptions < Informix::TestCase
   end
   
   def test_sqlcode
-    assert_equal -100, @test_exc.sql_code
+    assert_equal(-100, @test_exc.sql_code)
     assert_equal 0, Informix::Error.new.sql_code
   end
   

data/test/{ifx_test_fetch_n_each.rb → test_fetch_n_each.rb}

@@ -1,12 +1,7 @@
 testdir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift testdir
-$LOAD_PATH.unshift File.join(testdir, "..")
 
-require 'informix'
-require 'test/unit'
 require 'testcase'
-require 'stringio'
-require 'date'
 
 class IfxTestXFetchNEach < Informix::TestCase
   def setup
@@ -22,7 +17,7 @@ class IfxTestXFetchNEach < Informix::TestCase
   end
 
   def teardown
-    @c.drop
+    @c.free
   end
 
   def test_fetch_each_each_by

data/test/{ifx_test_insert.rb → test_insert.rb}

@@ -1,12 +1,7 @@
 testdir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift testdir
-$LOAD_PATH.unshift File.join(testdir, "..")
 
-require 'informix'
-require 'test/unit'
 require 'testcase'
-require 'stringio'
-require 'date'
 
 class IfxTestInsert < Informix::TestCase
   def setup

data/test/{ifx_test_select.rb → test_select.rb}

@@ -1,12 +1,7 @@
 testdir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift testdir
-$LOAD_PATH.unshift File.join(testdir, "..")
 
-require 'informix'
-require 'test/unit'
 require 'testcase'
-require 'stringio'
-require 'date'
 
 class IfxTestSelect < Informix::TestCase
   def setup
@@ -19,9 +14,8 @@ class IfxTestSelect < Informix::TestCase
 
   def test_select
     rows = nil
-
     assert_nothing_raised(Informix::Error, "Selecting records") do
-      rows = db.cursor('select * from test').open.fetch_all
+      rows = db.cursor('select * from test') { |c| c.open; c.fetch_all }
     end
     
     assert_equal(2, rows.size, "# of records retrieved")
@@ -83,5 +77,3 @@ class IfxTestSelect < Informix::TestCase
     end
   end
 end
-
-

data/test/testcase.rb

@@ -1,6 +1,9 @@
 testdir = File.expand_path(File.dirname(__FILE__))
-$LOAD_PATH.unshift File.join(testdir, "..")
+$LOAD_PATH.unshift testdir
+$LOAD_PATH.unshift File.expand_path(File.join(testdir, "..", "lib"))
+$LOAD_PATH.unshift File.expand_path(File.join(testdir, "..", "ext"))
 
+gem 'test-unit'
 require 'test/unit'
 require 'informix'
 require 'date'
@@ -97,15 +100,14 @@ module Informix
     def populate_test_table
       sql = "insert into test values(#{quote_strings(@rows[0]).join(',')})"
 
-      assert_nothing_raised(Informix::Error, "Inserting record with db.do, sql = [#{sql}]") do
+      assert_nothing_raised(Informix::Error, "Inserting record with db.execute, sql = [#{sql}]") do
         db.execute sql
       end
 
       sql = "insert into test values(#{"?," * (@rows[1].size - 1)}#{"?"})"
 
       assert_nothing_raised(Informix::Error, "Inserting record with stmt.execute, sql = [#{sql}]") do
-        stmt = db.prepare sql
-        stmt.execute(*@rows[1])
+        db.prepare(sql) {|stmt| stmt.execute(*@rows[1]) }
       end
       ensure
         rewind_data
@@ -127,8 +129,8 @@ module Informix
       unless args.empty?
         @db ||= Informix.connect(args[0], args[1], args[2])
         @supported = {}
-        @supported["boolean"] = true if supported_data_type?(@db, "boolean")
-        @supported["int8"] = true if supported_data_type?(@db, "int8")
+        @supported["boolean"] = supported_data_type?(@db, "boolean")
+        @supported["int8"] = supported_data_type?(@db, "int8")
 
         @rows = [
           [

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-informix
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
+  prerelease: 
+  version: 0.8.0
 platform: ruby
 authors: 
 - Gerardo Santana Gomez Garrido
@@ -9,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-02 00:00:00 -06:00
-default_executable: 
+date: 2012-04-18 00:00:00 Z
 dependencies: []
 
 description: Ruby library for connecting to IBM Informix 7 and above
@@ -29,19 +29,18 @@ files:
 - lib/informix/interval.rb
 - lib/informix/scrollcursor.rb
 - lib/informix/seqcursor.rb
-- test/ifx_all.rb
-- test/ifx_test_create_table.rb
-- test/ifx_test_errinfo.rb
-- test/ifx_test_exceptions.rb
-- test/ifx_test_fetch_n_each.rb
-- test/ifx_test_insert.rb
-- test/ifx_test_select.rb
+- test/test_create_table.rb
+- test/test_errinfo.rb
+- test/test_exceptions.rb
+- test/test_fetch_n_each.rb
+- test/test_insert.rb
+- test/test_select.rb
 - test/testcase.rb
 - COPYRIGHT
 - Changelog
 - README
 - ext/informixc.c
-has_rdoc: true
+- ext/extconf.rb
 homepage: http://ruby-informix.rubyforge.org/
 licenses: []
 
@@ -60,21 +59,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: ruby-informix
-rubygems_version: 1.3.5
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Ruby library for IBM Informix

data/test/ifx_all.rb

@@ -1,31 +0,0 @@
-testdir = File.expand_path(File.dirname(__FILE__))
-$LOAD_PATH.unshift File.join(testdir, "..")
-
-require 'informix'
-require 'test/unit'
-
-class IfxAll
-  def IfxAll.suite
-    suite = Test::Unit::TestSuite.new "Ruby Informix Test Suite"
-    Object.constants.grep(/^IfxTest/).sort.each do |const_name|
-      if (c = Object.const_get(const_name)).kind_of?(Class) && c.respond_to?(:suite)
-        puts "Adding #{const_name}"
-        suite << c.suite
-      end
-    end
-    suite
-  end
-end
-
-if __FILE__ == $0
-  if ARGV.size == 0
-    STDERR.puts "Usage:
-ruby #{$0} database [username password]"
-    exit 1
-  end
-  require 'test/unit/ui/console/testrunner'
-  Dir.glob(File.join(testdir, "ifx_test*.rb")).each do |testcase|
-    require "#{testcase}"
-  end
-  Test::Unit::UI::Console::TestRunner.run(IfxAll)
-end