swift 0.14.0 → 1.0.0

data/lib/swift/validations.rb

@@ -7,7 +7,7 @@ module Swift
     end
   end # Errors
 
-  class Scheme
+  class Record
     def self.validations &validations
       define_method :validate do
         errors = Errors.new(self)
@@ -23,5 +23,5 @@ module Swift
     def valid?
       validate.empty?
     end
-  end # Scheme
+  end # Record
 end # Swift

data/lib/swift.rb

@@ -8,13 +8,11 @@ unless %r{^1\.9\.[3-9]|^2\.}.match(RUBY_VERSION)
 end
 
 # Extension.
-require_relative '../ext/swift'
 require_relative 'swift/adapter'
 require_relative 'swift/adapter/sql'
 require_relative 'swift/attribute'
-require_relative 'swift/db'
 require_relative 'swift/header'
-require_relative 'swift/scheme'
+require_relative 'swift/record'
 require_relative 'swift/type'
 
 # A rational rudimentary object relational mapper.
@@ -26,7 +24,7 @@ require_relative 'swift/type'
 #   Swift.trace true # Debugging.
 #   Swift.setup :default, Swift::DB::Postgres, db: 'swift'
 #
-#   class User < Swift::Scheme
+#   class User < Swift::Record
 #     store     :users
 #     attribute :id,    Swift::Type::Integer, serial: true, key: true
 #     attribute :name,  Swift::Type::String
@@ -99,8 +97,8 @@ module Swift
     #     other_users.execute(32)
     #   end
     #
-    # @param  [Symbol] name   Adapter name.
-    # @param  [Proc]   &block Scope this block to the named adapter instead of <tt>:default</tt>.
+    # @param  [Symbol] name     Adapter name.
+    # @param  [Proc]   block    Scope this block to the named adapter instead of <tt>:default</tt>.
     # @return [Swift::Adapter]
     #--
     # I pilfered the logic from DM but I don't really understand what is/isn't thread safe.
@@ -131,5 +129,9 @@ module Swift
     def schema
       @schema ||= []
     end
+
+    def trace io = $stdout, &block
+      Swift.db.trace(io, &block)
+    end
   end
 end # Swift

data/swift.gemspec

@@ -4,15 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{swift}
-  s.version = "0.14.0"
+  s.name = "swift"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Shane Hanna}, %q{Bharanee 'Barney' Rathna}]
-  s.date = %q{2012-03-21}
-  s.description = %q{A rational rudimentary database abstraction.}
-  s.email = [%q{shane.hanna@gmail.com}, %q{deepfryed@gmail.com}]
-  s.extensions = [%q{ext/extconf.rb}]
+  s.authors = ["Shane Hanna", "Bharanee 'Barney' Rathna"]
+  s.date = "2012-08-01"
+  s.description = "A rational rudimentary database abstraction."
+  s.email = ["shane.hanna@gmail.com", "deepfryed@gmail.com"]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
@@ -23,32 +22,21 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
-    "ext/adapter.cc",
-    "ext/adapter.h",
-    "ext/adapter_io.cc",
-    "ext/adapter_io.h",
-    "ext/attribute.cc",
-    "ext/attribute.h",
-    "ext/datetime.cc",
-    "ext/datetime.h",
-    "ext/extconf.rb",
-    "ext/query.cc",
-    "ext/query.h",
-    "ext/result.cc",
-    "ext/result.h",
-    "ext/statement.cc",
-    "ext/statement.h",
-    "ext/swift.cc",
-    "ext/swift.h",
     "lib/swift.rb",
     "lib/swift/adapter.rb",
+    "lib/swift/adapter/mysql.rb",
+    "lib/swift/adapter/postgres.rb",
     "lib/swift/adapter/sql.rb",
+    "lib/swift/adapter/sqlite3.rb",
     "lib/swift/attribute.rb",
-    "lib/swift/db.rb",
+    "lib/swift/eventmachine.rb",
     "lib/swift/header.rb",
     "lib/swift/identity_map.rb",
     "lib/swift/migrations.rb",
-    "lib/swift/scheme.rb",
+    "lib/swift/record.rb",
+    "lib/swift/result.rb",
+    "lib/swift/statement.rb",
+    "lib/swift/synchrony.rb",
     "lib/swift/type.rb",
     "lib/swift/validations.rb",
     "swift.gemspec",
@@ -62,17 +50,17 @@ Gem::Specification.new do |s|
     "test/test_error.rb",
     "test/test_identity_map.rb",
     "test/test_io.rb",
-    "test/test_scheme.rb",
+    "test/test_record.rb",
     "test/test_swift.rb",
     "test/test_timestamps.rb",
     "test/test_transactions.rb",
     "test/test_types.rb",
     "test/test_validations.rb"
   ]
-  s.homepage = %q{http://github.com/shanna/swift}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.2}
-  s.summary = %q{A rational rudimentary database abstraction.}
+  s.homepage = "http://github.com/shanna/swift"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.23"
+  s.summary = "A rational rudimentary database abstraction."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/helper.rb

@@ -1,19 +1,26 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'test'))
 
-require 'minitest/spec'
-require 'minitest/unit'
+require 'bundler/setup'
+
+require 'etc'
+require 'minitest/autorun'
 require 'minitest_teardown_hack'
 require 'swift'
+require 'swift/adapter/mysql'
+require 'swift/adapter/postgres'
+require 'swift/adapter/sqlite3'
 require 'swift/migrations'
-require 'etc'
 
 class MiniTest::Spec
   def self.supported_by *adapters, &block
-    adapter_defaults    = { Swift::DB::Sqlite3 => { db: ':memory:' } }
+    adapter_defaults    = { Swift::Adapter::Sqlite3 => { db: ':memory:' } }
     connection_defaults = { db: 'swift_test', user: Etc.getlogin, host: '127.0.0.1' }
     adapters.each do |adapter|
       begin
+        #next if Swift::Adapter::Sqlite3 == adapter
+        #next if Swift::Adapter::Mysql == adapter
+        #next if Swift::Adapter::Postgres == adapter
         Swift.setup :default, adapter, connection_defaults.merge(adapter_defaults.fetch(adapter, {}))
       rescue => error
         warn "Unable to setup 'swift_test' db for #{adapter}, #{error.message}. Skipping..."
@@ -32,5 +39,3 @@ class MiniTest::Spec
     end
   end
 end
-
-MiniTest::Unit.autorun

data/test/test_adapter.rb

@@ -2,13 +2,13 @@ require_relative 'helper'
 require 'stringio'
 
 describe 'Adapter' do
-  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::Sqlite3 do
+  supported_by Swift::Adapter::Postgres, Swift::Adapter::Mysql, Swift::Adapter::Sqlite3 do
     describe 'db' do
       before do
         @db = Swift.db
         @db.execute('drop table if exists users')
         serial = case @db
-          when Swift::DB::Sqlite3 then 'integer primary key'
+          when Swift::Adapter::Sqlite3 then 'integer primary key'
           else 'serial'
         end
         @db.execute %Q{create table users(id #{serial}, name text, email text, created_at timestamp)}
@@ -20,12 +20,6 @@ describe 'Adapter' do
         end
       end
 
-      it 'reconnects to db' do
-        Swift.trace true, open('/dev/null', 'w')
-        assert_block { @db.reconnect }
-        Swift.trace false
-      end
-
       it 'records closed state' do
         assert !Swift.db.closed?
         Swift.db.close
@@ -43,9 +37,9 @@ describe 'Adapter' do
       end
 
       describe 'prepared statements' do
-        it 'executes via Statement#new' do
+        it 'executes via Adapter#prepare' do
           result = []
-          Swift::Statement.new(@db, 'select count(*) as n from users').execute {|r| result << r[:n] }
+          @db.prepare('select count(*) as n from users').execute.each {|r| result << r[:n] }
           assert_kind_of Fixnum, result[0]
         end
 
@@ -53,12 +47,6 @@ describe 'Adapter' do
           assert @db.prepare(%q{insert into users (name) values ('Apple Arthurton')}).execute
         end
 
-        it 'returns the command' do
-          sql = 'select * from users where id = ?'
-          assert_equal sql, @db.prepare(sql).command
-          assert_equal sql, @db.prepare(sql).to_s
-        end
-
         it 'executes with bind values' do
           assert @db.prepare(%q{insert into users (name) values (?)}).execute('Apple Arthurton')
         end
@@ -71,12 +59,11 @@ describe 'Adapter' do
 
         it 'has insert_id' do
           sql = case @db
-            when Swift::DB::Postgres then %q{insert into users (name) values (?) returning id}
+            when Swift::Adapter::Postgres then %q{insert into users (name) values (?) returning id}
             else %q{insert into users (name) values (?)}
           end
           statement = @db.prepare(sql)
           assert 1, statement.execute('Connie Arthurton').insert_id
-          assert 1, statement.insert_id # caches insert_id, just interface compatibility with dbic++
         end
       end
 
@@ -111,8 +98,8 @@ describe 'Adapter' do
           @db.execute('select * from users') {|r| assert_kind_of Hash, r }
         end
 
-        it 'returns a result set on Adapter#results' do
-          assert_kind_of Swift::Result, @db.execute('select * from users')
+        it 'returns a result set on Adapter#execute' do
+          assert_respond_to @db.execute('select * from users'), :each
         end
 
         it 'returns fields' do
@@ -131,16 +118,15 @@ describe 'Adapter' do
         end
       end
 
-
-      describe 'bulk writes!' do
+      describe 'bulk writes' do
         it 'writes from an IO object' do
           data = StringIO.new "Sally Arthurton\tsally@local\nJonas Arthurton\tjonas@local\n"
-          assert_equal 2, @db.write('users', %w{name email}, data)
+          assert_equal 2, @db.write('users', %w{name email}, data).affected_rows
         end
 
         it 'writes from a string' do
           data = "Sally Arthurton\tsally@local\nJonas Arthurton\tjonas@local\n"
-          assert_equal 2, @db.write('users', %w{name email}, data)
+          assert_equal 2, @db.write('users', %w{name email}, data).affected_rows
         end
 
         it 'writes with no columns specified' do
@@ -148,7 +134,7 @@ describe 'Adapter' do
           data = "1\tSally Arthurton\tsally@local\t#{ts}\n"
           row  = {id: 1, name: 'Sally Arthurton', email: 'sally@local', created_at: ts}
 
-          assert_equal 1,   @db.write('users', [], data)
+          assert_equal 1,   @db.write('users', data).affected_rows
           assert_equal row, @db.execute('select * from users limit 1').first
         end
       end

data/test/test_async.rb

@@ -1,26 +1,23 @@
 require_relative 'helper'
 
 describe 'Adapter' do
-  supported_by Swift::DB::Postgres do
+  supported_by Swift::Adapter::Postgres, Swift::Adapter::Mysql 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]}
+        pool = 3.times.map.with_index {|n| Swift.setup n, Swift.db.class, db: 'swift_test' }
+        func = case Swift.db
+          when Swift::Adapter::Mysql    then 'sleep'
+          when Swift::Adapter::Postgres then 'pg_sleep'
         end
 
-        Thread.new do
-          pool[2].async_execute('select pg_sleep(0.1), 3 as query_id') {|row| rows << row[:query_id]}
+        3.times do |n|
+          Thread.new do
+            pool[n].query("select #{func}(#{(3 - n) / 10.0}), #{n + 1} as query_id") {|row| rows << row[:query_id]}
+          end
         end
 
         Thread.list.reject {|thread| Thread.current == thread}.each(&:join)
-
         assert_equal [3, 2, 1], rows
       end
     end

data/test/test_encoding.rb

@@ -1,7 +1,7 @@
 require_relative 'helper'
 
 describe 'Adapter' do
-  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::Sqlite3 do
+  supported_by Swift::Adapter::Postgres, Swift::Adapter::Mysql, Swift::Adapter::Sqlite3 do
     describe 'character encoding' do
       before do
         Swift.db do |db|
@@ -9,7 +9,7 @@ describe 'Adapter' do
           db.execute %q{create table users(name text)}
 
           # Mysql on debian at least doesn't default to utf8.
-          if db.kind_of? Swift::DB::Mysql
+          if db.kind_of? Swift::Adapter::Mysql
             db.execute %q{alter table users default character set utf8}
             db.execute %q{alter table users change name name text charset utf8}
           end

data/test/test_error.rb

@@ -1,7 +1,7 @@
 require_relative 'helper'
 
 describe 'Error' do
-  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::Sqlite3 do
+  supported_by Swift::Adapter::Postgres, Swift::Adapter::Mysql, Swift::Adapter::Sqlite3 do
     describe 'prepare' do
       before do
         Swift.db do |db|
@@ -11,20 +11,20 @@ describe 'Error' do
       end
 
       it 'throws a runtime error on invalid sql' do
-        assert_raises(SwiftRuntimeError) do
+        assert_raises(Swift::RuntimeError) do
           Swift.db.prepare('garble garble garble')
         end
       end
 
       it 'throws a runtime error on invalid bind parameters' do
-        assert_raises(SwiftRuntimeError) do
+        assert_raises(Swift::ArgumentError) do
           Swift.db.prepare('select * from users where id > ?').execute
         end
       end
     end
   end
 
-  supported_by Swift::DB::Postgres do
+  supported_by Swift::Adapter::Postgres do
     describe 'execute' do
       before do
         Swift.db do |db|
@@ -39,10 +39,10 @@ describe 'Error' do
 
         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) }
+        assert_raises(Swift::ConnectionError) { select1.execute }
+        assert_raises(Swift::ConnectionError) { select2.execute(1) }
+        assert_raises(Swift::ConnectionError) { Swift.db.execute("select * from users") }
+        assert_raises(Swift::ConnectionError) { Swift.db.execute("select * from users where id > ?", 1) }
       end
     end
   end

data/test/test_io.rb

@@ -1,10 +1,10 @@
 require_relative 'helper'
 
 describe 'Adapter' do
-  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::Sqlite3 do
+  supported_by Swift::Adapter::Postgres, Swift::Adapter::Mysql, Swift::Adapter::Sqlite3 do
     describe 'Storing binary objects' do
       before do
-        user = Class.new(Swift::Scheme) do
+        user = Class.new(Swift::Record) do
           store :users
           attribute :id,    Swift::Type::Integer, serial: true, key: true
           attribute :name,  Swift::Type::String

data/test/{test_scheme.rb → test_record.rb}

@@ -1,8 +1,8 @@
 require_relative 'helper'
 
-describe 'scheme' do
+describe 'record' do
   before do
-    @user = Class.new(Swift::Scheme) do
+    @user = Class.new(Swift::Record) do
       store     :users
       attribute :id,         Swift::Type::Integer,  serial: true, key: true
       attribute :name,       Swift::Type::String,   default: "dave"
@@ -57,13 +57,13 @@ describe 'scheme' do
     end
   end
 
-  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::Sqlite3 do
+  supported_by Swift::Adapter::Postgres, Swift::Adapter::Mysql, Swift::Adapter::Sqlite3 do
     describe 'adapter operations' do
       before do
         Swift.db.migrate! @user
       end
 
-      it 'should return scheme instance when given scheme in #execute' do
+      it 'should return record instance when given record in #execute' do
         user = @user.create
         assert_equal 1, Swift.db.execute(@user, 'select * from users').first.id
       end
@@ -77,12 +77,12 @@ describe 'scheme' do
       end
 
       it 'adapter should barf when trying to delete an invalid instance' do
-        assert_raises(ArgumentError) { Swift.db.delete @user, {id: nil, name: 'foo'} }
+        assert_raises(Swift::ArgumentError) { Swift.db.delete @user, {id: nil, name: 'foo'} }
       end
 
       it 'should not update without valid keys' do
         user = @user.new
-        assert_raises(ArgumentError) { user.update(name: 'dave') }
+        assert_raises(Swift::ArgumentError) { user.update(name: 'dave') }
       end
 
       it 'should update with valid keys' do

data/test/test_swift.rb

@@ -1,70 +1,28 @@
-require 'tempfile'
 require_relative 'helper'
 
 describe 'Swift' do
-  supported_by Swift::DB::Sqlite3 do
+  supported_by Swift::Adapter::Sqlite3 do
     describe 'Trace' do
-      before do
-        Swift.trace(false)
-        @file = Tempfile.new('swift-test')
-      end
-
-      after do
-        @file.unlink
-      end
-
       it 'should trace commands' do
         sql = 'create table users (id integer, name text)'
-        Swift.trace(true, @file)
-        Swift.db.execute(sql)
-
-        log = @file.rewind && @file.read
-        assert_match sql, log
-      end
-
-      it 'should trace commands in block form' do
-        sql1 = 'create table users (id integer, name text)'
-        sql2 = 'drop table users'
-
-        res = Swift.trace(true, @file) { Swift.db.execute(sql1) && 'foobar' }
-        assert_equal 'foobar', res
+        io  = StringIO.new
 
-        Swift.db.execute(sql2)
-
-        log = @file.rewind && @file.read
-        assert_match sql1, log
-        refute_match sql2, log
-      end
-
-      it 'should trace commands in block form and preserve state' do
-        sql1 = 'create table users (id integer, name text)'
-        sql2 = 'drop table users'
-
-        Swift.trace(true, @file)
-
-        Swift.trace(false) do
-          Swift.db.execute(sql1)
+        Swift.trace(io) do
+          Swift.db.execute(sql)
         end
 
-        Swift.db.execute(sql2)
-
-        log = @file.rewind && @file.read
-        refute_match sql1, log
-        assert_match sql2, log
+        assert_match sql, io.rewind && io.read
       end
 
-      it 'should cascade exceptions in block form trace' do
-        sql1 = 'create table users (id integer, name text)'
+      it 'should cascade exceptions in trace' do
+        sql = 'create table users (id integer, name text)'
 
         assert_raises(RuntimeError) do
-          Swift.trace(true, @file) do
-            Swift.db.execute(sql1)
+          Swift.trace(StringIO.new) do
+            Swift.db.execute(sql)
             raise "foo"
           end
         end
-
-        log = @file.rewind && @file.read
-        assert_match sql1, log
       end
     end
   end

data/test/test_timestamps.rb

@@ -1,7 +1,7 @@
 require_relative 'helper'
 
 describe 'Adapter' do
-  supported_by Swift::DB::Postgres do
+  supported_by Swift::Adapter::Postgres do
     %w(America/Chicago Australia/Melbourne).each do |timezone|
       describe 'time parsing in %s' % timezone do
         before do

data/test/test_transactions.rb

@@ -1,7 +1,7 @@
 require_relative 'helper'
 
 describe 'Adapter' do
-  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::Sqlite3 do
+  supported_by Swift::Adapter::Postgres, Swift::Adapter::Mysql, Swift::Adapter::Sqlite3 do
     describe 'transactions' do
       before do
         @name = 'test1 - transaction 1'
@@ -10,7 +10,7 @@ describe 'Adapter' do
         @db.execute %q{create table users(name text, created_at timestamp)}
 
         # In case of MyISAM default.
-        @db.kind_of?(Swift::DB::Mysql) && @db.execute('alter table users engine=innodb')
+        @db.kind_of?(Swift::Adapter::Mysql) && @db.execute('alter table users engine=innodb')
 
         @sth = @db.prepare('select count(*) as c from users where name = ?')
       end

data/test/test_types.rb

@@ -1,13 +1,13 @@
 require_relative 'helper'
 
 describe 'Adapter' do
-  supported_by Swift::DB::Postgres, Swift::DB::Mysql, Swift::DB::Sqlite3 do
+  supported_by Swift::Adapter::Postgres, Swift::Adapter::Mysql, Swift::Adapter::Sqlite3 do
     describe 'typecasting' do
       before do
         @db = Swift.db
         @db.execute %q{drop table if exists users}
         serial = case @db
-          when Swift::DB::Sqlite3 then 'integer primary key'
+          when Swift::Adapter::Sqlite3 then 'integer primary key'
           else 'serial'
         end
         @db.execute %Q{
@@ -40,7 +40,7 @@ describe 'Adapter' do
         assert_kind_of DateTime,   result[:updated]
 
         assert_equal   dt,         result[:updated].strftime('%F %T')
-        assert_equal   65000,      result[:updated].to_time.usec unless @db.kind_of?(Swift::DB::Mysql)
+        assert_equal   65000,      result[:updated].to_time.usec unless @db.kind_of?(Swift::Adapter::Mysql)
       end
     end
   end

data/test/test_validations.rb

@@ -3,7 +3,7 @@ require 'swift/validations'
 
 describe 'validations' do
   before do
-    @user = Class.new(Swift::Scheme) do
+    @user = Class.new(Swift::Record) do
       store     :users
       attribute :id,   Swift::Type::Integer, serial: true, key: true
       attribute :name, Swift::Type::String
@@ -40,7 +40,7 @@ describe 'validations' do
 
   describe 'errors' do
     it 'has relation' do
-      assert_kind_of Swift::Scheme, @user.new.validate.relation
+      assert_kind_of Swift::Record, @user.new.validate.relation
     end
   end
 end