swift 0.13.0 → 0.14.0

data/test/test_async.rb

@@ -0,0 +1,28 @@
+require_relative 'helper'
+
+describe 'Adapter' do
+  supported_by Swift::DB::Postgres do
+    describe 'async operations' do
+      it 'can runs queries async' do
+        rows = []
+        pool = 3.times.map.with_index {|n| Swift.setup n, Swift::DB::Postgres, db: 'swift' }
+
+        Thread.new do
+          pool[0].async_execute('select pg_sleep(0.3), 1 as query_id') {|row| rows << row[:query_id]}
+        end
+
+        Thread.new do
+          pool[1].async_execute('select pg_sleep(0.2), 2 as query_id') {|row| rows << row[:query_id]}
+        end
+
+        Thread.new do
+          pool[2].async_execute('select pg_sleep(0.1), 3 as query_id') {|row| rows << row[:query_id]}
+        end
+
+        Thread.list.reject {|thread| Thread.current == thread}.each(&:join)
+
+        assert_equal [3, 2, 1], rows
+      end
+    end
+  end
+end

data/test/test_datetime_parser.rb

@@ -0,0 +1,12 @@
+require_relative 'helper'
+
+describe 'DateTimeParser' do
+  it 'should handle ymd style values' do
+    text   = "2011-12-31 09:01:02.80300899 +1100"
+    time   = DateTime.parse(text)
+    result = Swift::DateTime.parse(text)
+
+    assert_equal time.strftime('%F %T %z'), result.strftime('%F %T %z')
+    assert_equal time.second_fraction.to_f.round(8), result.second_fraction.to_f.round(8)
+  end
+end

data/test/test_error.rb

@@ -23,4 +23,27 @@ describe 'Error' do
       end
     end
   end
+
+  supported_by Swift::DB::Postgres do
+    describe 'execute' do
+      before do
+        Swift.db do |db|
+          db.execute %q{drop table if exists users}
+          db.execute %q{create table users(id integer, name text, primary key(id))}
+        end
+      end
+
+      it 'throws connection error on connection failures' do
+        select1 = Swift.db.prepare("select * from users")
+        select2 = Swift.db.prepare("select * from users where id > ?")
+
+        Swift.db.close
+
+        assert_raises(SwiftConnectionError) { select1.execute }
+        assert_raises(SwiftConnectionError) { select2.execute(1) }
+        assert_raises(SwiftConnectionError) { Swift.db.execute("select * from users") }
+        assert_raises(SwiftConnectionError) { Swift.db.execute("select * from users where id > ?", 1) }
+      end
+    end
+  end
 end

data/test/test_scheme.rb

@@ -10,7 +10,7 @@ describe 'scheme' do
       attribute :height,     Swift::Type::Float,    default: 172.25
       attribute :email,      Swift::Type::String
       attribute :verified,   Swift::Type::Boolean,  default: false
-      attribute :created_at, Swift::Type::Time,     default: proc { Time.now }
+      attribute :created_at, Swift::Type::DateTime, default: proc { Time.now }
 
       migrations do |db|
         db.execute %q{

data/test/test_timestamps.rb

@@ -1,13 +1,18 @@
 require_relative 'helper'
-require 'date'
 
 describe 'Adapter' do
   supported_by Swift::DB::Postgres do
     %w(America/Chicago Australia/Melbourne).each do |timezone|
       describe 'time parsing in %s' % timezone do
         before do
-          @db = Swift.db
           ENV['TZ'] = ":#{timezone}"
+          @db = Swift.db
+          @db.execute 'create table datetime_test(id serial, ts timestamp with time zone)'
+          @db.execute "set time zone '#{timezone}'"
+        end
+
+        after do
+          @db.execute 'drop table datetime_test'
         end
 
         it 'should parse timestamps and do conversion accordingly' do
@@ -25,14 +30,19 @@ describe 'Adapter' do
           assert_timestamp_like time, fetch_timestamp_at(time), 'DST off'
         end
 
-        describe 'Adapter timezone' do
-          %w(+05:30 -05:30).each do |offset|
-            it 'should parse timestamps and do conversion accordingly for offset ' + offset do
-              @db = Swift::DB::Postgres.new(@db.options.merge(timezone: offset))
-              server = DateTime.parse('2010-01-01 10:00:00')
-              local  = DateTime.parse('2010-01-01 10:00:00 ' + offset)
-              assert_timestamp_like local, fetch_timestamp_at(server, ''), 'parses correctly'
-            end
+        it 'should store fractional seconds' do
+          time     = Time.now
+          datetime = time.to_datetime
+
+          @db.execute 'insert into datetime_test(ts) values (?), (?)', time, datetime
+          values = @db.execute('select ts from datetime_test').map(&:values).flatten
+
+          assert_equal 2, values.size
+
+          # postgres resolution is microsecond.
+          values.each do |value|
+            assert_equal datetime.strftime('%F %T %z'), value.strftime('%F %T %z')
+            assert_equal datetime.second_fraction.to_f.round(6), value.second_fraction.to_f.round(6)
           end
         end
 
@@ -49,8 +59,8 @@ describe 'Adapter' do
 
         def assert_timestamp_like expect, given, comment
           match = Regexp.new expect.to_time.strftime('%F %T')
-          assert_kind_of Time, given
-          assert_match match, given.strftime('%F %T'), comment
+          assert_kind_of DateTime, given
+          assert_match match, given.to_time.strftime('%F %T'), comment
         end
       end
     end

data/test/test_types.rb

@@ -37,10 +37,10 @@ describe 'Adapter' do
         assert_kind_of TrueClass,  result[:hacker]
         assert_kind_of FalseClass, result[:slacker]
         assert_kind_of Date,       result[:created]
-        assert_kind_of Time,       result[:updated]
+        assert_kind_of DateTime,   result[:updated]
 
         assert_equal   dt,         result[:updated].strftime('%F %T')
-        assert_equal   65000,      result[:updated].usec unless @db.kind_of?(Swift::DB::Mysql)
+        assert_equal   65000,      result[:updated].to_time.usec unless @db.kind_of?(Swift::DB::Mysql)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-16 00:00:00.000000000Z
+date: 2012-03-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &6952860 !ruby/object:Gem::Requirement
+  requirement: &10639060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,18 +22,7 @@ dependencies:
         version: 1.7.0
   type: :development
   prerelease: false
-  version_requirements: *6952860
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: &6951140 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *6951140
+  version_requirements: *10639060
 description: A rational rudimentary database abstraction.
 email:
 - shane.hanna@gmail.com
@@ -43,11 +32,11 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files:
 - LICENSE
-- README.rdoc
+- README.md
 files:
 - API.rdoc
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - ext/adapter.cc
@@ -56,13 +45,11 @@ files:
 - ext/adapter_io.h
 - ext/attribute.cc
 - ext/attribute.h
+- ext/datetime.cc
+- ext/datetime.h
 - ext/extconf.rb
-- ext/pool.cc
-- ext/pool.h
 - ext/query.cc
 - ext/query.h
-- ext/request.cc
-- ext/request.h
 - ext/result.cc
 - ext/result.h
 - ext/statement.cc
@@ -77,7 +64,6 @@ files:
 - lib/swift/header.rb
 - lib/swift/identity_map.rb
 - lib/swift/migrations.rb
-- lib/swift/pool.rb
 - lib/swift/scheme.rb
 - lib/swift/type.rb
 - lib/swift/validations.rb
@@ -86,11 +72,12 @@ files:
 - test/house-explode.jpg
 - test/minitest_teardown_hack.rb
 - test/test_adapter.rb
+- test/test_async.rb
+- test/test_datetime_parser.rb
 - test/test_encoding.rb
 - test/test_error.rb
 - test/test_identity_map.rb
 - test/test_io.rb
-- test/test_pool.rb
 - test/test_scheme.rb
 - test/test_swift.rb
 - test/test_timestamps.rb

data/ext/pool.cc

@@ -1,96 +0,0 @@
-#include "pool.h"
-
-VALUE cSwiftPool;
-
-static void pool_free(dbi::ConnectionPool *self) {
-  if (self) delete self;
-}
-
-VALUE pool_alloc(VALUE klass) {
-  dbi::ConnectionPool *pool = 0;
-  return Data_Wrap_Struct(klass, 0, pool_free, pool);
-}
-
-static dbi::ConnectionPool* pool_handle(VALUE self) {
-  dbi::ConnectionPool *pool;
-  Data_Get_Struct(self, dbi::ConnectionPool, pool);
-  if (!pool) rb_raise(eSwiftRuntimeError, "Invalid object, did you forget to call #super ?");
-  return pool;
-}
-
-VALUE pool_init(VALUE self, VALUE n, VALUE options) {
-  VALUE db       = rb_hash_aref(options, ID2SYM(rb_intern("db")));
-  VALUE user     = rb_hash_aref(options, ID2SYM(rb_intern("user")));
-  VALUE driver   = rb_hash_aref(options, ID2SYM(rb_intern("driver")));
-
-  if (NIL_P(db))     rb_raise(eSwiftArgumentError, "Pool#new called without :db");
-  if (NIL_P(driver)) rb_raise(eSwiftArgumentError, "#new called without :driver");
-
-  user = NIL_P(user) ? current_user() : user;
-  if (NUM2INT(n) < 1) rb_raise(eSwiftArgumentError, "Pool#new called with invalid pool size.");
-
-  try {
-    DATA_PTR(self) = new dbi::ConnectionPool(
-      NUM2INT(n),
-      CSTRING(driver),
-      CSTRING(user),
-      CSTRING(rb_hash_aref(options, ID2SYM(rb_intern("password")))),
-      CSTRING(db),
-      CSTRING(rb_hash_aref(options, ID2SYM(rb_intern("host")))),
-      CSTRING(rb_hash_aref(options, ID2SYM(rb_intern("port"))))
-    );
-
-    rb_iv_set(self, "@timezone", rb_hash_aref(options, ID2SYM(rb_intern("timezone"))));
-  }
-  CATCH_DBI_EXCEPTIONS();
-
-  return Qnil;
-}
-
-void pool_callback(dbi::AbstractResult *result) {
-  VALUE callback = (VALUE)result->context;
-
-  // NOTE: C Result object will be deallocated in dbic++
-  if (!NIL_P(callback)) {
-    VALUE obj = result_wrap_handle(cSwiftResult, 0, result, false);
-    rb_iv_set(obj, "@timezone", rb_iv_get(callback, "@timezone"));
-    rb_proc_call(callback, rb_ary_new3(1, obj));
-  }
-}
-
-VALUE pool_execute(int argc, VALUE *argv, VALUE self) {
-  int n;
-  VALUE sql;
-  VALUE bind_values;
-  VALUE callback;
-  VALUE request = Qnil;
-
-  dbi::ConnectionPool *pool = pool_handle(self);
-  rb_scan_args(argc, argv, "1*&", &sql, &bind_values, &callback);
-
-  // The only way to pass timezone to the C callback routine.
-  if (NIL_P(callback))
-    rb_raise(eSwiftArgumentError, "No block given in Pool#execute");
-  else
-    rb_iv_set(callback, "@timezone", rb_iv_get(self, "@timezone"));
-
-  try {
-    Query query;
-    query_bind_values(&query, bind_values);
-    request = request_alloc(cSwiftRequest);
-    DATA_PTR(request) = pool->execute(CSTRING(sql), query.bind, pool_callback, (void*)callback);
-    return request;
-  }
-  CATCH_DBI_EXCEPTIONS();
-}
-
-void init_swift_pool() {
-  VALUE mSwift = rb_define_module("Swift");
-  VALUE mDB    = rb_define_module_under(mSwift, "DB");
-  cSwiftPool   = rb_define_class_under(mDB, "Pool", rb_cObject);
-
-  rb_define_alloc_func(cSwiftPool, pool_alloc);
-
-  rb_define_method(cSwiftPool, "initialize",  RUBY_METHOD_FUNC(pool_init),     2);
-  rb_define_method(cSwiftPool, "execute",     RUBY_METHOD_FUNC(pool_execute), -1);
-}

data/ext/pool.h

@@ -1,8 +0,0 @@
-#ifndef SWIFT_POOL_H
-#define SWIFT_POOL_H
-
-#include "swift.h"
-
-void init_swift_pool();
-
-#endif

data/ext/request.cc

@@ -1,44 +0,0 @@
-#include "request.h"
-
-VALUE cSwiftRequest;
-
-static void request_free(dbi::Request *request) {
-  if(request) delete request;
-}
-
-VALUE request_alloc(VALUE klass) {
-  dbi::Request *request = 0;
-  return Data_Wrap_Struct(klass, 0, request_free, request);
-}
-
-static dbi::Request* request_handle(VALUE self) {
-  dbi::Request *request;
-  Data_Get_Struct(self, dbi::Request, request);
-  if (!request) rb_raise(eSwiftRuntimeError, "Invalid object, did you forget to call #super ?");
-  return request;
-}
-
-VALUE request_socket(VALUE self) {
-  dbi::Request *request = request_handle(self);
-  try {
-    return INT2NUM(request->socket());
-  }
-  CATCH_DBI_EXCEPTIONS();
-}
-
-VALUE request_process(VALUE self) {
-  dbi::Request *request = request_handle(self);
-  try {
-    return request->process() ? Qtrue : Qfalse;
-  }
-  CATCH_DBI_EXCEPTIONS();
-}
-
-void init_swift_request() {
-  VALUE mSwift  = rb_define_module("Swift");
-  cSwiftRequest = rb_define_class_under(mSwift, "Request", rb_cObject);
-
-  rb_define_alloc_func(cSwiftRequest, request_alloc);
-  rb_define_method(cSwiftRequest, "socket",  RUBY_METHOD_FUNC(request_socket),  0);
-  rb_define_method(cSwiftRequest, "process", RUBY_METHOD_FUNC(request_process), 0);
-}

data/ext/request.h

@@ -1,10 +0,0 @@
-#ifndef SWIFT_REQUEST_H
-#define SWIFT_REQUEST_H
-
-#include "swift.h"
-
-extern VALUE cSwiftRequest;
-VALUE request_alloc(VALUE klass);
-void init_swift_request();
-
-#endif

data/lib/swift/pool.rb

@@ -1,76 +0,0 @@
-require 'eventmachine'
-
-module Swift
-  class Pool
-    module Handler
-      def initialize request, pool
-        @request, @pool = request, pool
-      end
-
-      def socket
-        @request.socket
-      end
-
-      def notify_readable
-        if @request.process
-          detach
-          @pool.detach self
-        end
-      end
-
-      def notify_writable
-        notify_readable
-      end
-    end # Handler
-
-
-    def initialize size, options
-      @pool         = Swift::DB::Pool.new size, options
-
-      # used to be used for db2
-      @writable     = false
-      @pending      = {}
-      @queue        = []
-    end
-
-    def attach c
-      @pending[c] = true
-    end
-
-    def detach c
-      @pending.delete(c)
-      unless @queue.empty?
-        sql, bind, callback = @queue.shift
-        execute(sql, *bind, &callback)
-      end
-    end
-
-    def attached? fd
-      @pending.keys.select{|c| c.socket == fd}.length > 0
-    end
-
-    def execute sql, *bind, &callback
-      request = @pool.execute sql, *bind, &callback
-      # NOTE EM segfaults if we try to attach same fd twice.
-      if request && !attached?(request.socket)
-        EM.watch(request.socket, Handler, request, self) do |c|
-          attach c
-          c.notify_writable = @writable
-          c.notify_readable = true
-        end
-      else
-        @queue << [ sql, bind, callback ]
-      end
-    end
-
-    def run &block
-      EM.run{ yield self }
-    end
-  end # Pool
-
-  def self.pool size, name = :default, &block
-    pool = Pool.new(size, Swift.db(name).options)
-    pool.run(&block) if block_given?
-    pool
-  end
-end # Swift

data/test/test_pool.rb

@@ -1,38 +0,0 @@
-require_relative 'helper'
-require 'swift/pool'
-
-describe 'Adapter' do
-  supported_by Swift::DB::Postgres, Swift::DB::Mysql do
-    describe 'Asynchronous connection pool' do
-      before do
-        Swift.db do |db|
-          db.execute %q{drop table if exists users}
-          db.execute %Q{create table users(name varchar(64))}
-        end
-      end
-
-      it 'creates connection pool and runs queries' do
-        rows = []
-        Swift.pool(5) do |pool|
-          assert pool
-          assert Swift.db.write('users', %w{name}, StringIO.new("user1\nuser2\nuser3\n"))
-          pool.execute('select * from users') do |rs|
-            rows += rs.to_a
-            Thread.new do
-              sleep 0.25
-              pool.execute('select * from users order by name desc') {|rs| rows += rs.to_a; EM.stop }
-            end
-          end
-          pool.execute('select * from users') do |rs|
-            rows += rs.to_a
-          end
-        end
-
-        data = %w(user1 user2 user3)
-
-        assert_equal 9, rows.length
-        assert_equal data*2 + data.reverse, rows.map {|r| r[:name] }
-      end
-    end
-  end
-end