swift 1.1.0 → 1.2.0

data/README.md

@@ -264,11 +264,11 @@ which implicitly uses `rb_thread_wait_fd`
 or use the `swift/eventmachine` api.
 
 ```ruby
-  require 'swift/eventmachine'
-  require 'swift/adapter/postgres'
+  require 'swift'
+  require 'swift/adapter/em/postgres'
 
   EM.run do
-    pool = 3.times.map { Swift.setup(:default, Swift::Adapter::Postgres, db: "swift") }
+    pool = 3.times.map { Swift.setup(:default, Swift::Adapter::EM::Postgres, db: "swift") }
 
     3.times.each do |n|
       defer = pool[n].execute("select pg_sleep(3 - #{n}), #{n + 1} as qid")
@@ -287,13 +287,13 @@ or use the `swift/eventmachine` api.
 or use the `em-synchrony` api for `swift`
 
 ```ruby
-  require 'swift/synchrony'
-  require 'swift/adapter/postgres'
+  require 'swift'
+  require 'swift/adapter/synchrony/postgres'
 
   EM.run do
     3.times.each do |n|
       EM.synchrony do
-        db     = Swift.setup(:default, Swift::Adapter::Postgres, db: "swift")
+        db     = Swift.setup(:default, Swift::Adapter::Synchrony::Postgres, db: "swift")
         result = db.execute("select pg_sleep(3 - #{n}), #{n + 1} as qid")
 
         p result.first
@@ -312,7 +312,7 @@ require 'swift/fiber_connection_pool'
 
 EM.run do
   Swift.setup(:default) do
-    Swift::FiberConnectionPool.new(size: 5) {Swift::Adapter::Postgres.new(db: 'swift')}
+    Swift::FiberConnectionPool.new(size: 5) {Swift::Adapter::Synchrony::Postgres.new(db: 'swift')}
   end
 
   5.times do

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/swift/adapter/em/mysql.rb

@@ -0,0 +1,11 @@
+require 'swift/adapter/mysql'
+require 'swift/adapter/eventmachine'
+
+# TODO: use Module#prepend when backported
+module Swift
+  class Adapter
+    class Eventmachine::Mysql < Mysql
+      include Eventmachine
+    end # Eventmachine::Mysql
+  end # Adapter
+end # Swift

data/lib/swift/adapter/em/postgres.rb

@@ -0,0 +1,11 @@
+require 'swift/adapter/postgres'
+require 'swift/adapter/eventmachine'
+
+# TODO: use Module#prepend when backported
+module Swift
+  class Adapter
+    class Eventmachine::Postgres < Postgres
+      include Eventmachine
+    end # Eventmachine::Postgres
+  end # Adapter
+end # Swift

data/lib/swift/adapter/eventmachine.rb

@@ -0,0 +1,62 @@
+require 'eventmachine'
+require 'swift'
+
+module Swift
+  # Eventmachine Adapter Extensions.
+  #
+  # This replaces the Adapter#execute method with a non-blocking asynchronous version.
+  class Adapter
+    module Eventmachine
+      class Handler < EM::Connection
+        def initialize adapter, record, defer
+          @started = Time.now
+          @adapter = adapter
+          @record  = record
+          @defer   = defer
+        end
+
+        def notify_readable
+          detach
+          start, command, bind = @adapter.pending.shift
+          @adapter.log_command(start, command, bind) if @adapter.trace?
+
+          begin
+            @defer.succeed(@record ? Result.new(@record, @adapter.result) : @adapter.result)
+          rescue Exception => e
+            @defer.fail(e)
+          end
+        end
+      end # Handler
+
+      # Execute a command asynchronously.
+      #
+      # @example
+      #   defer = Swift.db.execute(User, "select * from users where id = ?", 1)
+      #   defer.callback do |user|
+      #     p user.id
+      #   end
+      #   defer.errback do |error|
+      #     p error
+      #   end
+      #
+      # @see  [Swift::Adapter]
+      def execute command, *bind
+        raise RuntimeError, 'Command already in progress' unless pending.empty?
+
+        record, command = command, bind.shift if command.kind_of?(Class) && command < Record
+        pending << [Time.now, command, bind]
+        query(command, *bind)
+
+        ::EM::DefaultDeferrable.new.tap do |defer|
+          ::EM.watch(fileno, Handler, self, record, defer) {|c| c.notify_readable = true}
+        end
+      end
+
+      def pending
+        @pending ||= []
+      end
+    end # Eventmachine
+
+    EM = Eventmachine
+  end # Adapter
+end # Swift

data/lib/swift/adapter/synchrony.rb

@@ -0,0 +1,48 @@
+require 'em-synchrony'
+
+module Swift
+  # em-synchrony support for Swift::Adapter
+  #
+  class Adapter
+    module Synchrony
+      # Execute a command asynchronously and pause the Fiber until the command finishes.
+      #
+      # @example
+      #   EM.run do
+      #     3.times.each do |n|
+      #       EM.synchrony do
+      #         db     = Swift.setup(:default, Swift::Adapter::Synchrony::Postgres, db: "swift_test")
+      #         result = db.execute("select pg_sleep(3 - #{n}), #{n + 1} as qid")
+      #
+      #         p result.first
+      #         EM.stop if n == 0
+      #       end
+      #     end
+      #   end
+      #
+      # @see [Swift::Adapter]
+      def execute *args
+        res = ::EM::Synchrony.sync super(*args)
+        if res.kind_of?(Error)
+          res.set_backtrace caller.reject {|subject| subject =~ %r{swift/fiber_connection_pool}}
+          raise res
+        end
+        yield res if block_given?
+        res
+      end
+
+      def transaction &block
+        Swift.scopes.push(self)
+        execute('begin')
+        res = yield(self)
+        execute('commit')
+        res
+      rescue => e
+        execute('rollback')
+        raise e
+      ensure
+        Swift.scopes.pop
+      end
+    end # Synchrony
+  end # Adapter
+end # Swift

data/lib/swift/adapter/synchrony/mysql.rb

@@ -0,0 +1,12 @@
+require 'swift/adapter/synchrony'
+require 'swift/adapter/em/mysql'
+
+module Swift
+  # em-synchrony support for Swift::Adapter
+  #
+  class Adapter
+    class Synchrony::Mysql < EM::Mysql
+      include Synchrony
+    end # Synchrony::Mysql
+  end # Adapter
+end # Swift

data/lib/swift/adapter/synchrony/postgres.rb

@@ -0,0 +1,12 @@
+require 'swift/adapter/synchrony'
+require 'swift/adapter/em/postgres'
+
+module Swift
+  # em-synchrony support for Swift::Adapter
+  #
+  class Adapter
+    class Synchrony::Postgres < EM::Postgres
+      include Synchrony
+    end # Synchrony::Postgres
+  end # Adapter
+end # Swift

data/lib/swift/fiber_connection_pool.rb

@@ -1,7 +1,5 @@
 # Based on EM::Synchrony::ConnectionPool
 
-require 'swift/synchrony'
-
 module Swift
   class FiberConnectionPool
 
@@ -76,19 +74,4 @@ module Swift
         end
       end
   end # FiberConnectionPool
-
-  class Adapter::Sql
-    def serialized_transaction &block
-      Swift.scopes.push(self)
-      execute('begin')
-      res = yield(self)
-      execute('commit')
-      res
-    rescue => e
-      execute('rollback')
-      raise e
-    ensure
-      Swift.scopes.pop
-    end
-  end # Adapter::Sql
 end # Swift

data/swift.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "swift"
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shane Hanna", "Bharanee 'Barney' Rathna"]
-  s.date = "2013-02-18"
+  s.date = "2013-03-10"
   s.description = "A rational rudimentary database abstraction."
   s.email = ["shane.hanna@gmail.com", "deepfryed@gmail.com"]
   s.extra_rdoc_files = [
@@ -24,12 +24,17 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/swift.rb",
     "lib/swift/adapter.rb",
+    "lib/swift/adapter/em/mysql.rb",
+    "lib/swift/adapter/em/postgres.rb",
+    "lib/swift/adapter/eventmachine.rb",
     "lib/swift/adapter/mysql.rb",
     "lib/swift/adapter/postgres.rb",
     "lib/swift/adapter/sql.rb",
     "lib/swift/adapter/sqlite3.rb",
+    "lib/swift/adapter/synchrony.rb",
+    "lib/swift/adapter/synchrony/mysql.rb",
+    "lib/swift/adapter/synchrony/postgres.rb",
     "lib/swift/attribute.rb",
-    "lib/swift/eventmachine.rb",
     "lib/swift/fiber_connection_pool.rb",
     "lib/swift/header.rb",
     "lib/swift/identity_map.rb",
@@ -37,7 +42,6 @@ Gem::Specification.new do |s|
     "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",

data/test/helper.rb

@@ -18,9 +18,6 @@ class MiniTest::Spec
     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..."

data/test/test_synchrony.rb

@@ -1,10 +1,10 @@
 require 'helper'
+require 'swift/fiber_connection_pool'
+require 'swift/adapter/synchrony/postgres'
 
 describe 'fiber connection pool' do
   before do
-    skip 'swift/synchrony re-defines Adapter#execute' unless ENV['TEST_SWIFT_SYNCHRONY']
 
-    require 'swift/fiber_connection_pool'
     EM.synchrony do
       Swift.setup(:default, Swift::Adapter::Postgres, db: 'swift_test')
       Swift.db.execute('drop table if exists users')
@@ -17,21 +17,25 @@ describe 'fiber connection pool' do
       end
 
       10.times { @user.create(name: 'test') }
+
+      # async on from now on
+      Swift.setup(:default) do
+        Swift::FiberConnectionPool.new(size: 2) do
+          Swift::Adapter::Synchrony::Postgres.new(db: 'swift_test')
+        end
+      end
       EM.stop
     end
   end
 
   it 'can synchronize queries across fibers' do
     EM.run do
-      Swift.setup(:default) { Swift::FiberConnectionPool.new(size: 2) {Swift::Adapter::Postgres.new(db: 'swift_test')}}
-
       @counts = []
       5.times do
         EM.synchrony do
           @counts << @user.execute('select * from users').selected_rows
         end
       end
-
       EM.add_timer(0.2) { EM.stop }
     end
 
@@ -42,7 +46,6 @@ describe 'fiber connection pool' do
   it 'sets appropriate backtrace for errors' do
     EM.synchrony do
       error = nil
-      Swift.setup(:default) { Swift::FiberConnectionPool.new(size: 2) {Swift::Adapter::Postgres.new(db: 'swift_test')}}
 
       begin
         Swift.db.execute 'foo bar baz'
@@ -51,7 +54,7 @@ describe 'fiber connection pool' do
       end
 
       assert error
-      assert_match %r{test/test_synchrony.rb:48}, error.backtrace.first
+      assert_match %r{test/test_synchrony.rb}, error.backtrace[0]
       EM.stop
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -45,12 +45,17 @@ files:
 - VERSION
 - lib/swift.rb
 - lib/swift/adapter.rb
+- lib/swift/adapter/em/mysql.rb
+- lib/swift/adapter/em/postgres.rb
+- lib/swift/adapter/eventmachine.rb
 - lib/swift/adapter/mysql.rb
 - lib/swift/adapter/postgres.rb
 - lib/swift/adapter/sql.rb
 - lib/swift/adapter/sqlite3.rb
+- lib/swift/adapter/synchrony.rb
+- lib/swift/adapter/synchrony/mysql.rb
+- lib/swift/adapter/synchrony/postgres.rb
 - lib/swift/attribute.rb
-- lib/swift/eventmachine.rb
 - lib/swift/fiber_connection_pool.rb
 - lib/swift/header.rb
 - lib/swift/identity_map.rb
@@ -58,7 +63,6 @@ files:
 - 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
@@ -89,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: -3874151873791212661
+      hash: -4534175981099401006
       version: '0'
       segments:
       - 0

data/lib/swift/eventmachine.rb

@@ -1,61 +0,0 @@
-require 'eventmachine'
-require 'swift'
-
-module Swift
-  # Eventmachine Adapter Extensions.
-  #
-  # This replaces the Adapter#execute method with a non-blocking asynchronous version.
-  class Adapter
-    alias :blocking_execute :execute
-
-    class EMHandler < EM::Connection
-      def initialize adapter, record, defer
-        @started = Time.now
-        @adapter = adapter
-        @record  = record
-        @defer   = defer
-      end
-
-      def notify_readable
-        detach
-        start, command, bind = @adapter.pending.shift
-        @adapter.log_command(start, command, bind) if @adapter.trace?
-
-        begin
-          @defer.succeed(@record ? Result.new(@record, @adapter.result) : @adapter.result)
-        rescue Exception => e
-          @defer.fail(e)
-        end
-      end
-    end
-
-    # Execute a command asynchronously.
-    #
-    # @example
-    #   defer = Swift.db.execute(User, "select * from users where id = ?", 1)
-    #   defer.callback do |user|
-    #     p user.id
-    #   end
-    #   defer.errback do |error|
-    #     p error
-    #   end
-    #
-    # @see  [Swift::Adapter]
-    def execute command, *bind
-      raise RuntimeError, 'Command already in progress' unless pending.empty?
-
-      start = Time.now
-      record, command = command, bind.shift if command.kind_of?(Class) && command < Record
-      pending << [start, command, bind]
-      query(command, *bind)
-
-      EM::DefaultDeferrable.new.tap do |defer|
-        EM.watch(fileno, EMHandler, self, record, defer) {|c| c.notify_readable = true }
-      end
-    end
-
-    def pending
-      @pending ||= []
-    end
-  end
-end

data/lib/swift/synchrony.rb

@@ -1,38 +0,0 @@
-require 'em-synchrony'
-require 'swift/eventmachine'
-
-module Swift
-  # em-synchrony support for Swift::Adapter
-  #
-  # This replaces the default Adapter#execute with a version that uses EM::Synchrony.sync to wait for the
-  # defered command to complete. It assumes that the execute method is called inside a em-synchrony Fiber.
-  class Adapter
-    alias :aexecute :execute
-
-    # Execute a command asynchronously and pause the Fiber until the command finishes.
-    #
-    # @example
-    #   EM.run do
-    #     3.times.each do |n|
-    #       EM.synchrony do
-    #         db     = Swift.setup(:default, Swift::Adapter::Postgres, db: "swift_test")
-    #         result = db.execute("select pg_sleep(3 - #{n}), #{n + 1} as qid")
-    #
-    #         p result.first
-    #         EM.stop if n == 0
-    #       end
-    #     end
-    #   end
-    #
-    # @see [Swift::Adapter]
-    def execute *args
-      res = EM::Synchrony.sync aexecute(*args)
-      if res.kind_of?(Error)
-        res.set_backtrace caller.reject {|subject| subject =~ %r{swift/fiber_connection_pool}}
-        raise res
-      end
-      yield res if block_given?
-      res
-    end
-  end
-end