swift 0.10.0 → 0.11.0

data/test/test_swift.rb

@@ -0,0 +1,71 @@
+require 'tempfile'
+require_relative 'helper'
+
+describe 'Swift' do
+  supported_by Swift::DB::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
+
+        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)
+        end
+
+        Swift.db.execute(sql2)
+
+        log = @file.rewind && @file.read
+        refute_match sql1, log
+        assert_match sql2, log
+      end
+
+      it 'should cascade exceptions in block form trace' do
+        sql1 = 'create table users (id integer, name text)'
+
+        assert_raises(RuntimeError) do
+          Swift.trace(true, @file) do
+            Swift.db.execute(sql1)
+            raise "foo"
+          end
+        end
+
+        log = @file.rewind && @file.read
+        assert_match sql1, log
+      end
+    end
+  end
+end

metadata

@@ -1,63 +1,50 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: swift
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 10
-  - 0
-  version: 0.10.0
+version: !ruby/object:Gem::Version
+  version: 0.11.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Shane Hanna
 - Bharanee 'Barney' Rathna
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-04 00:00:00 +10:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-30 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: minitest
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &10219940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 7
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.7.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *10219940
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &10219160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *10219160
 description: A rational rudimentary database abstraction.
-email: 
+email:
 - shane.hanna@gmail.com
 - deepfryed@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - API.rdoc
 - LICENSE
 - README.rdoc
@@ -84,6 +71,7 @@ files:
 - ext/swift.h
 - lib/swift.rb
 - lib/swift/adapter.rb
+- lib/swift/adapter/sql.rb
 - lib/swift/attribute.rb
 - lib/swift/db.rb
 - lib/swift/header.rb
@@ -96,6 +84,7 @@ files:
 - swift.gemspec
 - test/helper.rb
 - test/house-explode.jpg
+- test/minitest_teardown_hack.rb
 - test/test_adapter.rb
 - test/test_encoding.rb
 - test/test_error.rb
@@ -103,58 +92,33 @@ files:
 - test/test_io.rb
 - test/test_pool.rb
 - test/test_scheme.rb
+- test/test_swift.rb
 - test/test_timestamps.rb
 - test/test_transactions.rb
 - test/test_types.rb
 - test/test_validations.rb
-- examples/async.rb
-- examples/db.rb
-- examples/scheme.rb
-has_rdoc: true
 homepage: http://github.com/shanna/swift
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: A rational rudimentary database abstraction.
-test_files: 
-- examples/async.rb
-- examples/db.rb
-- examples/scheme.rb
-- test/helper.rb
-- test/test_adapter.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_timestamps.rb
-- test/test_transactions.rb
-- test/test_types.rb
-- test/test_validations.rb
+test_files: []

data/examples/async.rb

@@ -1,65 +0,0 @@
-#!/usr/bin/ruby
-
-require_relative '../lib/swift'
-require_relative '../lib/swift/pool'
-
-adapter = ARGV.first =~ /mysql/i ? Swift::DB::Mysql : Swift::DB::Postgres
-puts "Using DB: #{adapter}"
-
-Swift.setup :default, adapter, db: 'swift'
-Swift.trace true
-
-# create test table
-Swift.db do |db|
-  puts '-- create --'
-  db.execute('DROP TABLE IF EXISTS users')
-  db.execute('CREATE TABLE users(id serial, name text, email text)')
-
-  sample = DATA.read.split(/\n/).map {|v| v.split(/\t+/) }
-
-  puts '-- insert --'
-  ins = db.prepare('insert into users(name, email) values(?, ?)')
-  9.times {|n| ins.execute(*sample[n%3]) }
-end
-
-sleep_clause = {
-  Swift::DB::Postgres => "case length(pg_sleep(%s)::text) when 0 then '%s' else '%s' end as sleep",
-  Swift::DB::Mysql    => "if (sleep(%s), '%s', '%s') as sleep"
-}
-
-puts '-- select 9 times with a pool of size 5 --'
-Swift.trace false
-Swift.pool(5) do |db|
-  (1..9).each do |n|
-    pause = '%0.3f' % ((20-n)/20.0)
-    pause = sleep_clause[adapter] % 3.times.map { pause }
-    db.execute("select *, #{pause} from users where id = ?", n) {|r| p r.first }
-  end
-end
-Swift.trace true
-
-puts '-- multiple pools: size 2, size 1 --'
-EM.run {
-  pool1 = Swift.pool(2)
-  pool2 = Swift.pool(1)
-
-  pool1.execute("select * from users limit 3 offset 0") do |rs|
-    puts '-- Inside pool1 #callback --'
-    rs.each {|r| p r }
-    pool1.execute("select * from users limit 3 offset 3") do |rs|
-      puts '-- Inside pool1 #callback again --'
-      rs.each {|r| p r }
-      EM.stop
-    end
-  end
-
-  pool2.execute("select * from users limit 3 offset 6") do |rs|
-    puts '-- Inside pool2 #callback --'
-    rs.each {|r| p r }
-  end
-}
-
-__END__
-Apple Arthurton	apple@example.com
-Benny Arthurton	benny@example.com
-James Arthurton	james@example.com

data/examples/db.rb

@@ -1,44 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'pp'
-require 'swift'
-require 'swift/migrations'
-
-class User < Swift::Scheme
-  store     :users
-  attribute :id,    Swift::Type::Integer, serial: true, key: true
-  attribute :name,  Swift::Type::String
-  attribute :email, Swift::Type::String
-end # User
-
-adapter = ARGV.first =~ /mysql/i ? Swift::DB::Mysql : Swift::DB::Postgres
-puts "Using DB: #{adapter}"
-
-Swift.setup :default, adapter, db: 'swift'
-Swift.trace true
-
-Swift.db do |db|
-  db.migrate! User
-
-  puts '-- create --'
-  db.create(User,
-    {name: 'Apple Arthurton', email: 'apple@arthurton.local'},
-    {name: 'Benny Arthurton', email: 'benny@arthurton.local'}
-  )
-
-  puts '', '-- select --'
-  pp users = db.prepare(User, 'select * from users').execute.to_a
-
-  puts '', '-- update --'
-  db.update(User, *users.map!{|user| user.name = 'Fred Nurk'; user})
-  pp db.prepare(User, 'select * from users').execute.to_a
-
-  puts '', '-- get --'
-  pp db.get(User, id: 1)
-
-  puts '', '-- destroy --'
-  pp db.destroy(User, id: 1).map(&:rows).first
-end
-

data/examples/scheme.rb

@@ -1,54 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'pp'
-require 'swift'
-require 'swift/migrations'
-require 'swift/validations'
-
-class User < Swift::Scheme
-  store     :users
-  attribute :id,       Swift::Type::Integer,  serial: true, key: true
-  attribute :name,     Swift::Type::String
-  attribute :email,    Swift::Type::String
-  attribute :active,   Swift::Type::Boolean
-  attribute :created,  Swift::Type::Time,     default: proc { Time.now }
-  attribute :optional, Swift::Type::String,   default: 'woot'
-
-  validations do |errors|
-    errors << [:name, 'is blank'] if name.to_s.empty?
-  end
-end # User
-
-adapter = ARGV.first =~ /mysql/i ? Swift::DB::Mysql : Swift::DB::Postgres
-puts "Using DB: #{adapter}"
-
-Swift.setup :default, adapter, db: 'swift'
-Swift.trace true
-
-puts '-- migrate! --'
-User.migrate!
-
-puts '', '-- create --'
-User.create name: 'Apple Arthurton', email: 'apple@arthurton.local'
-User.create name: 'Benny Arthurton', email: 'benny@arthurton.local'
-
-puts '', '-- all --'
-pp User.all.to_a
-
-puts '', '-- first --'
-pp User.first(':name like ?', '%Arthurton')
-
-puts '', '-- get --'
-pp user = User.get(id: 2)
-pp user = User.get(id: 2)
-
-puts '', '-- update --'
-user.update(name: 'Jimmy Arthurton')
-
-puts '', '-- destroy --'
-user.destroy
-
-puts '', '-- all --'
-pp User.all.to_a