m4dbi 0.8.9 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9b6b21860211863ed3ef697886bc4dd8d017743
-  data.tar.gz: 75fb2e328554c618b22c8919c05b3039d9a7f750
+  metadata.gz: 183465eef922074a8e4a27eaad19aeeda0d085c2
+  data.tar.gz: 115540f28694f243b8d580993fe44d8cedef8df3
 SHA512:
-  metadata.gz: 333d1c3056960225ab40c2d1db68e397637b8dad22265c1e604ddc20130720a4afa757fb7f25ef3912228db18a8a78a2ddc848f952c8a62e304817af7c61fcc0
-  data.tar.gz: c971fd38a928c3a4bae6f63e633344728bb1208dc0f5a99d1e9ec0fd12ba5e05cfd421e3aa04982dc9d6fd4471c46e993a62f5d57929922181d0220922a0db80
+  metadata.gz: de7799bcc987608482bdf9be412f3cd58214575ef09887b90806d8610c31cc00450c5dcd4a3a765b3e711f020bdaafdd5b9eb1c232ceb373c77f32fac3d6e18b
+  data.tar.gz: e843a99ae4027eaaf7c72f6b841751794179935f9d0fd1189b49165fd2f7af419b6e66d05629f04c3efc4289d7401b1f2a6b1930fdb27b28807d74c8d2a567f9

data/CHANGELOG

@@ -1,3 +1,7 @@
+## 0.9.0
+
+- Now thread safe.
+
 ## 0.6.1
 
 - Fixed major Hash#slice bug that only surfaced in Ruby 1.8.6 and earier.

data/lib/m4dbi/database.rb

@@ -1,17 +1,31 @@
+require 'thread'
+
 module M4DBI
 
   class Database
 
     def initialize( rdbi_dbh )
       @dbh = rdbi_dbh
+      @mutex = Mutex.new
+    end
+
+    def synchronize
+      @mutex.synchronize do
+        yield
+      end
     end
 
     def prepare( *args )
-      Statement.new( @dbh.prepare(*args) )
+      self.synchronize do
+        Statement.new( @dbh.prepare(*args), self )
+      end
     end
 
     def execute( *args )
-      result = @dbh.execute(*args)
+      result = nil
+      self.synchronize do
+        result = @dbh.execute(*args)
+      end
       if defined?( RDBI::Driver::PostgreSQL ) && RDBI::Driver::PostgreSQL === @dbh.driver
         result.finish
       end
@@ -19,8 +33,12 @@ module M4DBI
     end
 
     def select( sql, *bindvars )
-      result = @dbh.execute( sql, *bindvars )
-      rows = result.fetch( :all, RDBI::Result::Driver::Struct )
+      result = nil
+      rows = nil
+      self.synchronize do
+        result = @dbh.execute( sql, *bindvars )
+        rows = result.fetch( :all, RDBI::Result::Driver::Struct )
+      end
       if defined?( RDBI::Driver::PostgreSQL ) && RDBI::Driver::PostgreSQL === @dbh.driver
         result.finish
       end
@@ -32,8 +50,12 @@ module M4DBI
     end
 
     def select_column( sql, *bindvars )
-      result = @dbh.execute( sql, *bindvars )
-      rows = result.fetch( 1, RDBI::Result::Driver::Array )
+      result = nil
+      rows = nil
+      self.synchronize do
+        result = @dbh.execute( sql, *bindvars )
+        rows = result.fetch( 1, RDBI::Result::Driver::Array )
+      end
       if defined?( RDBI::Driver::PostgreSQL ) && RDBI::Driver::PostgreSQL === @dbh.driver
         result.finish
       end

data/lib/m4dbi/statement.rb

@@ -1,19 +1,34 @@
+require 'thread'
+
 module M4DBI
   class Statement
-    def initialize( rdbi_statement )
+    def initialize( rdbi_statement, m4dbi_dbh = nil )
       @st = rdbi_statement
+      @synchronizer = m4dbi_dbh || Mutex.new
+    end
+
+    def synchronize
+      @synchronizer.synchronize do
+        yield
+      end
     end
 
     def execute( *args )
-      @st.execute *args
+      self.synchronize do
+        @st.execute *args
+      end
     end
 
     def finish
-      @st.finish
+      self.synchronize do
+        @st.finish
+      end
     end
 
     def select( *bindvars )
-      @st.execute( *bindvars ).fetch( :all, RDBI::Result::Driver::Struct )
+      self.synchronize do
+        @st.execute( *bindvars ).fetch( :all, RDBI::Result::Driver::Struct )
+      end
     end
 
     def select_one( *bindvars )
@@ -21,7 +36,10 @@ module M4DBI
     end
 
     def select_column( *bindvars )
-      rows = @st.execute( *bindvars ).fetch( 1, RDBI::Result::Driver::Array )
+      rows = nil
+      self.synchronize do
+        rows = @st.execute( *bindvars ).fetch( 1, RDBI::Result::Driver::Array )
+      end
       if rows.any?
         rows[0][0]
       else

data/lib/m4dbi/version.rb

@@ -1,3 +1,3 @@
 module M4DBI
-  VERSION = '0.8.9'
+  VERSION = '0.9.0'
 end

data/spec/database.rb

@@ -9,76 +9,80 @@ describe 'M4DBI.last_dbh' do
   end
 end
 
-describe 'M4DBI::Database#select_column' do
-
-  it 'selects one column' do
-    name = $dbh.select_column(
-      "SELECT name FROM authors LIMIT 1"
-    )
-    name.class.should.not.equal Array
-    name.should.equal 'author1'
-
-    null = $dbh.select_column(
-      "SELECT c4 FROM many_col_table WHERE c3 = 40"
-    )
-    null.should.be.nil
-
-    should.raise( RDBI::Error ) do
-      $dbh.select_column( "SELECT name FROM authors WHERE 1+1 = 3" )
+describe 'M4DBI::Database' do
+
+  describe '#select_column' do
+
+    it 'selects one column' do
+      name = $dbh.select_column(
+        "SELECT name FROM authors LIMIT 1"
+      )
+      name.class.should.not.equal Array
+      name.should.equal 'author1'
+
+      null = $dbh.select_column(
+        "SELECT c4 FROM many_col_table WHERE c3 = 40"
+      )
+      null.should.be.nil
+
+      should.raise( RDBI::Error ) do
+        $dbh.select_column( "SELECT name FROM authors WHERE 1+1 = 3" )
+      end
+
+      begin
+        $dbh.select_column( "SELECT name FROM authors WHERE 1+1 = 3" )
+      rescue RDBI::Error => e
+        e.message.should.match /SELECT name FROM authors WHERE 1\+1 = 3/
+      end
     end
 
-    begin
-      $dbh.select_column( "SELECT name FROM authors WHERE 1+1 = 3" )
-    rescue RDBI::Error => e
-      e.message.should.match /SELECT name FROM authors WHERE 1\+1 = 3/
+    it 'selects one column of first row' do
+      name = $dbh.select_column(
+        "SELECT name FROM authors ORDER BY name DESC"
+      )
+      name.should.equal 'author3'
     end
-  end
 
-  it 'selects one column of first row' do
-    name = $dbh.select_column(
-      "SELECT name FROM authors ORDER BY name DESC"
-    )
-    name.should.equal 'author3'
+    it 'selects first column of first row' do
+      name = $dbh.select_column(
+        "SELECT name, id FROM authors ORDER BY name DESC"
+      )
+      name.should.equal 'author3'
+    end
   end
 
-  it 'selects first column of first row' do
-    name = $dbh.select_column(
-      "SELECT name, id FROM authors ORDER BY name DESC"
-    )
-    name.should.equal 'author3'
-  end
-end
+  describe 'row accessors' do
 
-describe 'row accessors' do
+    it 'provide read access via #fieldname' do
+      row = $dbh.select_one(
+        "SELECT * FROM posts ORDER BY author_id DESC LIMIT 1"
+      )
+      row.should.not.equal nil
 
-  it 'provide read access via #fieldname' do
-    row = $dbh.select_one(
-      "SELECT * FROM posts ORDER BY author_id DESC LIMIT 1"
-    )
-    row.should.not.equal nil
+      row.author_id.should.be.same_as row[ 'author_id' ]
+      row.text.should.be.same_as row[ 'text' ]
 
-    row.author_id.should.be.same_as row[ 'author_id' ]
-    row.text.should.be.same_as row[ 'text' ]
+      row.text.should.equal 'Second post.'
+    end
 
-    row.text.should.equal 'Second post.'
-  end
+    it 'provide in-memory (non-syncing) write access via #fieldname=' do
+      row = $dbh.select_one(
+        "SELECT * FROM posts ORDER BY author_id DESC LIMIT 1"
+      )
+      row.should.not.equal nil
+
+      old_id = row[ :id ]
+      row[ :id ] = old_id + 1
+      row[ :id ].should.not.equal old_id
+      row[ :id ].should.equal( old_id + 1 )
+
+      old_text = row.text
+      new_text = 'This is the new post text.'
+      row.text = new_text
+      row.text.should.not.equal old_text
+      row.text.should.equal new_text
+    end
 
-  it 'provide in-memory (non-syncing) write access via #fieldname=' do
-    row = $dbh.select_one(
-      "SELECT * FROM posts ORDER BY author_id DESC LIMIT 1"
-    )
-    row.should.not.equal nil
-
-    old_id = row[ :id ]
-    row[ :id ] = old_id + 1
-    row[ :id ].should.not.equal old_id
-    row[ :id ].should.equal( old_id + 1 )
-
-    old_text = row.text
-    new_text = 'This is the new post text.'
-    row.text = new_text
-    row.text.should.not.equal old_text
-    row.text.should.equal new_text
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m4dbi
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.9.0
 platform: ruby
 authors:
 - Pistos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metaid