do_postgres 0.9.2 → 0.9.3

data/History.txt

@@ -0,0 +1 @@
+

data/Manifest.txt

@@ -0,0 +1,19 @@
+History.txt
+LICENSE
+Manifest.txt
+README.txt
+Rakefile
+TODO
+ext/do_postgres_ext.c
+ext/extconf.rb
+ext/type-oids.h
+lib/do_postgres.rb
+lib/do_postgres/transaction.rb
+lib/do_postgres/version.rb
+spec/integration/do_postgres_spec.rb
+spec/integration/logging_spec.rb
+spec/integration/quoting_spec.rb
+spec/integration/timezone_spec.rb
+spec/spec.opts
+spec/spec_helper.rb
+spec/unit/transaction_spec.rb

data/{README → README.txt}

@@ -1,4 +1,3 @@
-do_postgres
-===========
+= do_postgres
 
 A PostgreSQL driver for DataObjects

data/Rakefile

@@ -1,14 +1,10 @@
 require 'rubygems'
-require 'rake/clean'
-require 'rake/gempackagetask'
 require 'spec/rake/spectask'
 require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'tasks/ext_helper'
 
-# House-keeping
-CLEAN.include '**/*.o', '**/*.so', '**/*.bundle', '**/*.a',
-  '**/*.log', '{ext,lib}/*.{bundle,so,obj,pdb,lib,def,exp}',
-  'ext/Makefile'
+ROOT = Pathname(__FILE__).dirname.expand_path
+
+require "lib/do_postgres/version"
 
 JRUBY   = (RUBY_PLATFORM =~ /java/) rescue nil
 WINDOWS = (RUBY_PLATFORM =~ /mswin|mingw|cygwin/) rescue nil
@@ -16,38 +12,31 @@ WINDOWS = (RUBY_PLATFORM =~ /mswin|mingw|cygwin/) rescue nil
           # is not entirely correct.
 SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-spec = Gem::Specification.new do |s|
-  s.name              = 'do_postgres'
-  s.version           = '0.9.2'
-  s.platform          = Gem::Platform::RUBY
-  s.has_rdoc          = true
-  s.extra_rdoc_files  = %w[ README LICENSE TODO ]
-  s.summary           = 'A DataObject.rb driver for PostgreSQL'
-  s.description       = s.summary
-  s.author            = 'Yehuda Katz'
-  s.email             = 'wycats@gmail.com'
-  s.homepage          = 'http://rubyforge.org/projects/dorb'
-  s.rubyforge_project = 'dorb'
-  s.require_path      = 'lib'
-  s.extensions        = %w[ ext/extconf.rb ]
-  s.files             = FileList[ '{ext,lib,spec}/**/*.{c,h,rb}', 'Rakefile', *s.extra_rdoc_files ]
-  s.add_dependency('data_objects', "=#{s.version}")
-end
+AUTHOR = "Bernerd Schaefer"
+EMAIL  = "bj.schaefer@gmail.com"
+GEM_NAME = "do_postgres"
+GEM_VERSION = DataObjects::Postgres::VERSION
+GEM_DEPENDENCIES = [["data_objects", GEM_VERSION]]
+GEM_CLEAN = ['**/*.{o,so,bundle,log,a,gem,dSYM,obj,pdb,lib,def,exp,DS_Store}', 'ext/Makefile']
+GEM_EXTRAS = { :extensions => %w[ ext/extconf.rb ], :has_rdoc => false }
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
+PROJECT_NAME = "dorb"
+PROJECT_URL  = "http://rubyforge.org/projects/dorb"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY = "A DataObject.rb driver for MySQL"
+
+DRIVER = true
+
+require ROOT.parent + 'tasks/hoe'
 
-# Use of ext_helper to properly setup compile tasks and native gem generation
-setup_extension "#{spec.name}_ext", spec
+# Installation
 
 task :install => [ :package ] do
-  sh %{#{SUDO} gem install --local pkg/#{spec.name}-#{spec.version} --no-update-sources}, :verbose => false
+  sh %{#{SUDO} gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}, :verbose => false
 end
 
-desc "Uninstall #{spec.name} #{spec.version} (default ruby)"
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION} (default ruby)"
 task :uninstall => [ :clobber ] do
-  sh "#{SUDO} gem uninstall #{spec.name} -v#{spec.version} -I -x", :verbose => false
+  sh "#{SUDO} gem uninstall #{GEM_NAME} -v#{GEM_VERSION} -I -x", :verbose => false
 end
 
 desc 'Run specifications'

data/ext/do_postgres_ext.c

@@ -53,7 +53,7 @@ static VALUE ePostgresError;
 static void data_objects_debug(VALUE string) {
 	VALUE logger = rb_funcall(mPostgres, ID_LOGGER, 0);
 	int log_level = NUM2INT(rb_funcall(logger, ID_LEVEL, 0));
-	
+
 	if (0 == log_level) {
 		rb_funcall(logger, ID_DEBUG, 1, string);
 	}
@@ -87,23 +87,23 @@ static VALUE parse_date(const char *date) {
 	int year, month, day;
 	int jd, ajd;
 	VALUE rational;
-	
+
 	sscanf(date, "%4d-%2d-%2d", &year, &month, &day);
-	
+
 	jd = jd_from_date(year, month, day);
-	
+
 	// Math from Date.jd_to_ajd
 	ajd = jd * 2 - 1;
 	rational = rb_funcall(rb_cRational, rb_intern("new!"), 2, INT2NUM(ajd), INT2NUM(2));
-	
+
 	return rb_funcall(rb_cDate, ID_NEW_DATE, 3, rational, INT2NUM(0), INT2NUM(2299161));
 }
 
 // Creates a Rational for use as a Timezone offset to be passed to DateTime.new!
 static VALUE seconds_to_offset(do_int64 num) {
-	do_int64 den = 86400;	
+	do_int64 den = 86400;
 	reduce(&num, &den);
-	return rb_funcall(rb_cRational, rb_intern("new!"), 2, rb_ll2inum(num), rb_ll2inum(den));	
+	return rb_funcall(rb_cRational, rb_intern("new!"), 2, rb_ll2inum(num), rb_ll2inum(den));
 }
 
 static VALUE timezone_to_offset(int hour_offset, int minute_offset) {
@@ -121,15 +121,15 @@ static VALUE parse_date_time(const char *date) {
 	int year, month, day, hour, min, sec, usec, hour_offset, minute_offset;
 	int jd;
 	do_int64 num, den;
-	
+
 	long int gmt_offset;
 	int is_dst;
-	
+
 	time_t rawtime;
 	struct tm * timeinfo;
 
 	int tokens_read, max_tokens;
-	
+
 	if (0 != strchr(date, '.')) {
 		// This is a datetime with sub-second precision
 		tokens_read = sscanf(date, "%4d-%2d-%2d %2d:%2d:%2d.%d%3d:%2d", &year, &month, &day, &hour, &min, &sec, &usec, &hour_offset, &minute_offset);
@@ -139,7 +139,7 @@ static VALUE parse_date_time(const char *date) {
 		tokens_read = sscanf(date, "%4d-%2d-%2d %2d:%2d:%2d%3d:%2d", &year, &month, &day, &hour, &min, &sec, &hour_offset, &minute_offset);
 		max_tokens = 8;
 	}
-	
+
 	if (max_tokens == tokens_read) {
 		// We read the Date, Time, and Timezone info
 		minute_offset *= hour_offset < 0 ? -1 : 1;
@@ -150,11 +150,11 @@ static VALUE parse_date_time(const char *date) {
 		return parse_date(date);
 	} else if (tokens_read >= (max_tokens - 3)) {
 		// We read the Date and Time, default to the current locale's offset
-		
+
 		// Get localtime
 		time(&rawtime);
 		timeinfo = localtime(&rawtime);
-		
+
 		is_dst = timeinfo->tm_isdst * 3600;
 
 		// Reset to GM Time
@@ -181,7 +181,7 @@ static VALUE parse_date_time(const char *date) {
 
 	// Modify the numerator so when we apply the timezone everything works out
 	num -= (hour_offset * 1440) + (minute_offset * 24);
-	
+
 	den = (24 * 1440);
 	reduce(&num, &den);
 
@@ -199,7 +199,7 @@ static VALUE parse_date_time(const char *date) {
 
 	ajd = rb_funcall(rb_cRational, rb_intern("new!"), 2, rb_ull2inum(num), rb_ull2inum(den));
 	offset = timezone_to_offset(hour_offset, minute_offset);
-	
+
 	return rb_funcall(rb_cDateTime, ID_NEW_DATE, 3, ajd, offset, INT2NUM(2299161));
 }
 
@@ -260,7 +260,7 @@ static VALUE infer_ruby_type(Oid type) {
 }
 
 static VALUE typecast(char *value, char *type) {
-	
+
 	if ( strcmp(type, "Class") == 0) {
 	  return rb_funcall(mDO, rb_intern("find_const"), 1, TAINTED_STRING(value));
 	} else if ( strcmp(type, "Integer") == 0 || strcmp(type, "Fixnum") == 0 || strcmp(type, "Bignum") == 0 ) {
@@ -324,12 +324,12 @@ static VALUE cConnection_initialize(VALUE self, VALUE uri) {
 	}
 
 	db = PQsetdbLogin(
-		host, 
-		port, 
-		NULL, 
-		NULL, 
-		database, 
-		user, 
+		host,
+		port,
+		NULL,
+		NULL,
+		database,
+		user,
 		password
 	);
 
@@ -375,7 +375,7 @@ static VALUE cCommand_quote_string(VALUE self, VALUE string) {
 	char *escaped;
 	int quoted_length = 0;
 	VALUE result;
-	
+
 	length = strlen(source);
 
 	// Allocate space for the escaped version of 'string'
@@ -397,17 +397,17 @@ static VALUE cCommand_execute_non_query(int argc, VALUE *argv[], VALUE self) {
 	PGconn *db = DATA_PTR(rb_iv_get(rb_iv_get(self, "@connection"), "@connection"));
 	PGresult *response;
 	int status;
-	
+
 	int affected_rows;
 	int insert_id;
-	
+
 	VALUE query = build_query_from_args(self, argc, argv);
 	data_objects_debug(query);
-	
+
 	response = PQexec(db, StringValuePtr(query));
-	
+
 	status = PQresultStatus(response);
-	
+
 	if ( status == PGRES_TUPLES_OK ) {
 		insert_id = atoi(PQgetvalue(response, 0, 0));
 		affected_rows = 1;
@@ -421,9 +421,9 @@ static VALUE cCommand_execute_non_query(int argc, VALUE *argv[], VALUE self) {
 		PQclear(response);
 		rb_raise(ePostgresError, message);
 	}
-	
+
 	PQclear(response);
-	
+
 	return rb_funcall(cResult, ID_NEW, 3, self, INT2NUM(affected_rows), INT2NUM(insert_id));
 }
 
@@ -521,14 +521,14 @@ static VALUE cReader_next(VALUE self) {
 
 	for ( i = 0; i < field_count; i++ ) {
 		ruby_type = RARRAY(field_types)->ptr[i];
-		
+
 		if ( TYPE(ruby_type) == T_STRING ) {
 			type = RSTRING(ruby_type)->ptr;
 		}
 		else {
 			type = rb_class2name(ruby_type);
 		}
-		
+
 		// Always return nil if the value returned from Postgres is null
 		if (!PQgetisnull(reader, position, i)) {
 			value = typecast(PQgetvalue(reader, position, i), type);
@@ -546,10 +546,10 @@ static VALUE cReader_next(VALUE self) {
 }
 
 static VALUE cReader_values(VALUE self) {
-	
+
 	int position = rb_iv_get(self, "@position");
 	int row_count = NUM2INT(rb_iv_get(self, "@row_count"));
-	
+
 	if ( position == Qnil || NUM2INT(position) > row_count ) {
 		rb_raise(ePostgresError, "Reader not initialized");
 	}
@@ -565,16 +565,16 @@ static VALUE cReader_fields(VALUE self) {
 void Init_do_postgres_ext() {
 	rb_require("rubygems");
 	rb_require("date");
-	
-	// Get references classes needed for Date/Time parsing 
+
+	// Get references classes needed for Date/Time parsing
 	rb_cDate = CONST_GET(rb_mKernel, "Date");
 	rb_cDateTime = CONST_GET(rb_mKernel, "DateTime");
 	rb_cTime = CONST_GET(rb_mKernel, "Time");
 	rb_cRational = CONST_GET(rb_mKernel, "Rational");
 	rb_cBigDecimal = CONST_GET(rb_mKernel, "BigDecimal");
-	
+
 	rb_funcall(rb_mKernel, rb_intern("require"), 1, rb_str_new2("data_objects"));
-	
+
 	ID_NEW_DATE = RUBY_VERSION_CODE < 186 ? rb_intern("new0") : rb_intern("new!");
 	ID_LOGGER = rb_intern("logger");
 	ID_DEBUG = rb_intern("debug");
@@ -587,28 +587,28 @@ void Init_do_postgres_ext() {
 	cDO_Command = CONST_GET(mDO, "Command");
 	cDO_Result = CONST_GET(mDO, "Result");
 	cDO_Reader = CONST_GET(mDO, "Reader");
-	
+
 	mPostgres = rb_define_module_under(mDO, "Postgres");
 	ePostgresError = rb_define_class("PostgresError", rb_eStandardError);
-	
+
 	cConnection = POSTGRES_CLASS("Connection", cDO_Connection);
 	rb_define_method(cConnection, "initialize", cConnection_initialize, 1);
 	rb_define_method(cConnection, "dispose", cConnection_dispose, 0);
-	
+
 	cCommand = POSTGRES_CLASS("Command", cDO_Command);
 	rb_include_module(cCommand, cDO_Quoting);
 	rb_define_method(cCommand, "set_types", cCommand_set_types, 1);
 	rb_define_method(cCommand, "execute_non_query", cCommand_execute_non_query, -1);
 	rb_define_method(cCommand, "execute_reader", cCommand_execute_reader, -1);
 	rb_define_method(cCommand, "quote_string", cCommand_quote_string, 1);
-	
+
 	cResult = POSTGRES_CLASS("Result", cDO_Result);
-	
+
 	cReader = POSTGRES_CLASS("Reader", cDO_Reader);
 	rb_define_method(cReader, "close", cReader_close, 0);
 	rb_define_method(cReader, "next!", cReader_next, 0);
 	rb_define_method(cReader, "values", cReader_values, 0);
 	rb_define_method(cReader, "fields", cReader_fields, 0);
-	
+
 }
 

data/lib/do_postgres/version.rb

@@ -0,0 +1,5 @@
+module DataObjects
+  module Postgres
+    VERSION = "0.9.3"
+  end
+end

data/spec/integration/do_postgres_spec.rb

@@ -21,6 +21,7 @@ describe "DataObjects::Postgres::Connection" do
 
   it "should connect to the db" do
     connection = DataObjects::Connection.new("postgres://localhost/do_test")
+    connection.close
   end
 end
 
@@ -31,6 +32,10 @@ describe "DataObjects::Postgres::Command" do
     @connection = ensure_users_table_and_return_connection
   end
 
+  after :all do
+    @connection.close
+  end
+
   it "should create a command" do
     @connection.create_command("CREATE TABLE users").should be_a_kind_of(DataObjects::Postgres::Command)
   end
@@ -62,6 +67,10 @@ describe "DataObjects::Postgres::Result" do
     @connection = ensure_users_table_and_return_connection
   end
 
+  after :all do
+    @connection.close
+  end
+
   it "should raise errors on bad queries" do
     command = @connection.create_command("INSER INTO users (name) VALUES ('Test')")
     lambda { command.execute_non_query }.should raise_error

data/spec/integration/logging_spec.rb

@@ -4,7 +4,7 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 describe DataObjects::Postgres::Command do
 
   before(:each) do
-    @connection = DataObjects::Postgres::Connection.new("postgres://localhost/do_test")
+    @connection = DataObjects::Connection.new("postgres://localhost/do_test")
   end
 
   describe "Executing a Reader" do

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--format specdoc
+--colour

metadata

@@ -1,59 +1,77 @@
 --- !ruby/object:Gem::Specification 
 name: do_postgres
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
-- Yehuda Katz
+- Bernerd Schaefer
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-06-25 00:00:00 -05:00
+date: 2008-07-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: data_objects
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.3
     version: 
-description: A DataObject.rb driver for PostgreSQL
-email: wycats@gmail.com
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
+    version: 
+description: A DataObject.rb driver for MySQL
+email: 
+- bj.schaefer@gmail.com
 executables: []
 
 extensions: 
 - ext/extconf.rb
 extra_rdoc_files: 
-- README
+- History.txt
+- Manifest.txt
+- README.txt
+files: 
+- History.txt
 - LICENSE
+- Manifest.txt
+- README.txt
+- Rakefile
 - TODO
-files: 
 - ext/do_postgres_ext.c
-- ext/type-oids.h
 - ext/extconf.rb
-- lib/do_postgres/transaction.rb
+- ext/type-oids.h
 - lib/do_postgres.rb
+- lib/do_postgres/transaction.rb
+- lib/do_postgres/version.rb
 - spec/integration/do_postgres_spec.rb
 - spec/integration/logging_spec.rb
 - spec/integration/quoting_spec.rb
 - spec/integration/timezone_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 - spec/unit/transaction_spec.rb
-- Rakefile
-- README
-- LICENSE
-- TODO
-has_rdoc: true
+has_rdoc: false
 homepage: http://rubyforge.org/projects/dorb
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --main
+- README.txt
 require_paths: 
 - lib
+- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
@@ -69,9 +87,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dorb
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: A DataObject.rb driver for PostgreSQL
+summary: A DataObject.rb driver for MySQL
 test_files: []