swift 1.0.2 → 1.0.3

data/API.rdoc

@@ -13,18 +13,26 @@ Public API minus the optional stuff like Pool, IdentityMap, Migrations etc.
     # Abstract.
     Adapter
       .new           #=> Adapter
-      #begin         #=> Adapter
-      #commit
       #create        #=> Record or Result
       #delete        #=> Result
       #execute       #=> Result
-      #async_execute #=> Result
       #get           #=> Record
       #prepare       #=> Statement
+      #update        #=> Record or Result
+
+    # Adapter::Sql
+      #begin
+      #commit
       #rollback
       #transaction   #=> Adapter
-      #update        #=> Record or Result
-      #reconnect
+      #ping          #=> true or false
+      #close         #=> true or false
+      #closed?       #=> true or false
+      #escape        #=> String
+      #query
+      #fileno        #=> Integer
+      #result        #=> Result
+      #write         #=> Result
 
     # Concrete.
     DB
@@ -34,17 +42,16 @@ Public API minus the optional stuff like Pool, IdentityMap, Migrations etc.
 
     # Enumerable collection of Record or Hash tuples.
     Result
-      .new         #=> Result
-      #insert_id   #=> Numeric
-      #fields      #=> [Symbol, ...] # Field names identical to .first.keys if rows > 0
-      #field_types #=> [String, ...] # Type names: boolean, integer, float, numeric, timestamp, date, time, blob, text
-      #rows        #=> Fixnum
-      #columns     #=> Fixnum
+      .new           #=> Result
+      #insert_id     #=> Numeric
+      #fields        #=> [Symbol, ...] # Field names identical to .first.keys if rows > 0
+      #types         #=> [String, ...] # Type names: boolean, integer, float, numeric, timestamp, date, time, blob, text
+      #selected_rows #=> Fixnum
+      #affected_rows #=> Fixnum
 
     Statement
       .new     #=> Statement
       #execute #=> Result
-      #command #=> String # The SQL command executed or to be executed
 
     Record
       .attribute #=> Type

data/README.md

@@ -236,25 +236,26 @@ creating temporary files.
 
 ### Asynchronous API
 
-`Swift::Adapter#async_execute` returns a `Swift::Result` instance. You can either poll the corresponding
-`Swift::Adapter#fileno` and then call `Swift::Result#retrieve` when ready or use a block form like below
+`Swift::Adapter::Sql#query` runs a query asynchronously. You can either poll the corresponding
+`Swift::Adapter::Sql#fileno` and then call `Swift::Adapter::Sql#result` when ready or use a block form like below
 which implicitly uses `rb_thread_wait_fd`
 
 ```ruby
   require 'swift'
+  require 'swift/adapter/postgres'
 
   pool = 3.times.map.with_index {|n| Swift.setup n, Swift::Adapter::Postgres, db: 'swift' }
 
   Thread.new do
-    pool[0].async_execute('select pg_sleep(3), 1 as qid') {|row| p row}
+    pool[0].query('select pg_sleep(3), 1 as qid') {|row| p row}
   end
 
   Thread.new do
-    pool[1].async_execute('select pg_sleep(2), 2 as qid') {|row| p row}
+    pool[1].query('select pg_sleep(2), 2 as qid') {|row| p row}
   end
 
   Thread.new do
-    pool[2].async_execute('select pg_sleep(1), 3 as qid') {|row| p row}
+    pool[2].query('select pg_sleep(1), 3 as qid') {|row| p row}
   end
 
   Thread.list.reject {|thread| Thread.current == thread}.each(&:join)
@@ -264,6 +265,7 @@ or use the `swift/eventmachine` api.
 
 ```ruby
   require 'swift/eventmachine'
+  require 'swift/adapter/postgres'
 
   EM.run do
     pool = 3.times.map { Swift.setup(:default, Swift::Adapter::Postgres, db: "swift") }
@@ -286,6 +288,7 @@ or use the `em-synchrony` api for `swift`
 
 ```ruby
   require 'swift/synchrony'
+  require 'swift/adapter/postgres'
 
   EM.run do
     3.times.each do |n|

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/swift.rb

@@ -1,12 +1,3 @@
-# try to require home_run in older rubies
-unless %r{^1\.9\.[3-9]|^2\.}.match(RUBY_VERSION)
-  begin
-    require 'home_run'
-  rescue LoadError => e
-    warn "WARNING: DateTime parsing will be slow without home_run gem on Rubies older than 1.9.3"
-  end
-end
-
 # Extension.
 require_relative 'swift/adapter'
 require_relative 'swift/adapter/sql'
@@ -75,7 +66,6 @@ module Swift
     # @option options [Integer] :port     (DB default)
     # @return [Swift::Adapter]
     #
-    # @see Swift::DB
     # @see Swift::Adapter
     def setup name, type, options = {}
       unless type.kind_of?(Class) && type < Swift::Adapter
@@ -103,9 +93,8 @@ module Swift
     #--
     # I pilfered the logic from DM but I don't really understand what is/isn't thread safe.
     def db name = nil, &block
-      scopes     = (Thread.current[:swift_db] ||= [])
       repository = if name || scopes.empty?
-        @repositories[name || :default] or raise "Unknown db '#{name || :default}', did you forget to #setup?"
+        @repositories[name || :default] or raise "Unknown db '#{name || :default}', did you forget to #setup ?"
       else
         scopes.last
       end
@@ -133,5 +122,12 @@ module Swift
     def trace io = $stdout, &block
       Swift.db.trace(io, &block)
     end
+
+    def scopes
+      Thread.current[:swift_db] ||= []
+    end
   end
+
+  class Error        < StandardError; end
+  class RuntimeError < Error; end
 end # Swift

data/lib/swift/adapter.rb

@@ -222,7 +222,9 @@ module Swift
     private
 
     def log_command start, command, bind
-      @trace.print Time.now.strftime('%F %T.%N'), ' - ', (Time.now - start).to_f, ' - ', command, ' ', bind, $/
+      @trace.print Time.now.strftime('%F %T.%N'), ' - %.9f' % (Time.now - start).to_f, ' - ', command
+      @trace.print ' ', bind if bind && bind.size > 0
+      @trace.print $/
     end
   end # Adapter
 end # Swift

data/lib/swift/eventmachine.rb

@@ -17,6 +17,7 @@ module Swift
 
       def notify_readable
         detach
+        @adapter.pending.shift
         begin
           @defer.succeed(@record ? Result.new(@record, @adapter.result) : @adapter.result)
         rescue Exception => e
@@ -38,12 +39,20 @@ module Swift
     #
     # @see  [Swift::Adapter]
     def execute command, *bind
-      start = Time.now
+      raise RuntimeError, 'Command already in progress' unless pending.empty?
+
+      pending << command
+      start    = Time.now
       record, command = command, bind.shift if command.kind_of?(Class) && command < Record
       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/migrations.rb

@@ -34,8 +34,8 @@ module Swift
       #
       # @see Swift::Adapter::Sql
       def migrate! record
-        keys   =  record.header.keys
-        fields =  record.header.map{|p| field_definition(p)}.join(', ')
+        keys    = record.header.keys
+        fields  = record.header.map{|p| field_definition(p)}.join(', ')
         fields += ", primary key (#{keys.join(', ')})" unless keys.empty?
 
         execute("drop table if exists #{record.store} cascade")
@@ -45,7 +45,7 @@ module Swift
   end # Migrations
 
   def self.migrate! name = nil
-    schema.each{|record| record.migrate!(db(name)) }
+    schema.each {|record| record.migrate!(db(name))}
   end
 
   class Record

data/lib/swift/synchrony.rb

@@ -30,9 +30,6 @@ module Swift
       raise res if res.kind_of?(Error)
       yield res if block_given?
       res
-    rescue => e
-      $stderr.puts e, e.backtrace.join($/)
-      nil
     end
   end
 end

data/swift.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "swift"
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shane Hanna", "Bharanee 'Barney' Rathna"]
-  s.date = "2012-08-24"
+  s.date = "2012-09-21"
   s.description = "A rational rudimentary database abstraction."
   s.email = ["shane.hanna@gmail.com", "deepfryed@gmail.com"]
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest