sequel_transaction 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 291725d79047d1a1f4c80c0656bc5bb2fea694fb
-  data.tar.gz: 3c1b86850814c5b9b94c65be0e43948a3fc5e170
+  metadata.gz: 7c94a44b3723846b77896b44f234d32cc5d9816a
+  data.tar.gz: a45131e6c4ef28d65a419b33bdb3eccb41743dfb
 SHA512:
-  metadata.gz: 75a01655c78712c1b25e8d6b6e49c303bc99d821b7cb52497b9aa4931678b3967202f0d69128c7cc549e254b3cbca6f751be5e187f52fe64b35ed6c4bd3dfbf8
-  data.tar.gz: 7125283eb1c2ebae2c89a5d2a6a24bd92eff9f5c633921c52fa30de33bea0010d50bf94442e494677bda49541645b5e05c1e131abd242995bdee2fd49011fd6d
+  metadata.gz: e7113e0a3d63636afb275c31e81842a31b0ceeb2af90e565f607e37575cabdfa821dd8306f0b66e88daf45b4f7244c861f158ff5541b5ccf90427bd33333fb23
+  data.tar.gz: 1d17a95216fc70ff2aefe9cad6996c7272666c4779132415a1a6e5da8555f9bf8ac7c0a7a42c31d397fcd148f83e4de89f03d8ada1f12babef8b111f6228ee6f

data/README.md

@@ -14,10 +14,24 @@ Or install it yourself as:
 
 ## Sidekiq Wireup
 
+To automatically wrap Sidekiq work processes in a transaction, add the following:
+
 ```ruby
 Sidekiq.configure_server do |c|
   c.server_middleware do |chain|
-    chain.add Sidekiq::Middleware::SequelTransaction,
+    chain.add Sidekiq::Middleware::Server::Transaction,
+      connection: Sequel.connect('sqlite:///')
+  end
+end
+```
+
+It may be useful to ensure the transaction has been committed before queuing up
+work by adding the following:
+
+```ruby
+Sidekiq.configure_client do |c|
+  c.client_middleware do |chain|
+    chain.add Sidekiq::Middleware::Client::AfterCommit,
       connection: Sequel.connect('sqlite:///')
   end
 end
@@ -25,8 +39,10 @@ end
 
 ## Rack Wireup
 
+To automatically wrap requests in a transaction, add the following:
+
 ```ruby
-use Rack::SequelTransaction,
+use Rack::Transaction,
   connection: Sequel.connect('sqlite:///')
 ```
 

data/lib/sequel_transaction/rack/{middleware.rb → transaction.rb}

@@ -1,5 +1,5 @@
 module Rack
-  class SequelTransaction
+  class Transaction
     def initialize(inner, settings)
       @inner = inner
       @connection = settings.fetch(:connection)

data/lib/sequel_transaction/rack.rb

@@ -1 +1 @@
-require 'sequel_transaction/rack/middleware'
+require 'sequel_transaction/rack/transaction'

data/lib/sequel_transaction/sidekiq/middleware/client/after_commit.rb

@@ -0,0 +1,17 @@
+module Sidekiq
+  module Middleware
+    module Client
+      class AfterCommit
+        def initialize(settings)
+          @connection = settings.fetch(:connection)
+        end
+
+        def call(*args)
+          @connection.after_commit do
+            yield
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sequel_transaction/sidekiq/middleware/server/transaction.rb

@@ -0,0 +1,17 @@
+module Sidekiq
+  module Middleware
+    module Server
+      class Transaction
+        def initialize(settings)
+          @connection = settings.fetch(:connection)
+        end
+
+        def call(*args)
+          @connection.transaction do
+            yield
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sequel_transaction/sidekiq.rb

@@ -1 +1,2 @@
-require 'sequel_transaction/sidekiq/middleware'
+require 'sequel_transaction/sidekiq/middleware/client/after_commit'
+require 'sequel_transaction/sidekiq/middleware/server/transaction'

data/lib/sequel_transaction/version.rb

@@ -1,3 +1,3 @@
 module SequelTransaction
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/sequel_transaction/rack/{middleware_spec.rb → transaction_spec.rb}

@@ -1,14 +1,14 @@
 require 'spec_helper'
 require 'sequel_transaction/rack'
 
-describe Rack::SequelTransaction do
+describe Rack::Transaction do
   let(:inner) { mock }
   let(:env) { { 'field' => 'variable' } }
   let(:table_name) { :rack }
   let(:dataset) { connection[table_name] }
   let(:error) { RuntimeError.new }
 
-  subject { Rack::SequelTransaction.new inner, connection: connection }
+  subject { Rack::Transaction.new inner, connection: connection }
 
   before do
     connection.create_table table_name do

data/spec/sequel_transaction/sidekiq/middleware/client/after_commit_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+require 'sequel_transaction/sidekiq'
+
+describe Sidekiq::Middleware::Client::AfterCommit do
+  let(:table_name) { :sidekiq }
+  let(:dataset) { connection[table_name] }
+  let(:error) { RuntimeError.new }
+
+  subject { Sidekiq::Middleware::Client::AfterCommit.new connection: connection }
+
+  before do
+    connection.create_table table_name do
+      column :name, String, null: false
+    end
+  end
+
+  after { connection.drop_table table_name }
+
+  it 'defers yield until after committing a transaction' do
+    called = false
+    connection.transaction do
+      subject.call do
+        called = true
+      end
+      called.must_equal false
+    end
+    called.must_equal true
+  end
+
+  it 'yields immediately without transaction' do
+    called = false
+    subject.call do
+      called = true
+    end
+    called.must_equal true
+  end
+
+  it 'does not yield after failing to commit transaction' do
+    called = false
+    begin
+      connection.transaction do
+        subject.call do
+          called = true
+        end
+        raise
+      end
+    rescue
+    end
+    called.must_equal false
+  end
+end

data/spec/sequel_transaction/sidekiq/{middleware_spec.rb → middleware/server/transaction_spec.rb}

@@ -1,15 +1,12 @@
 require 'spec_helper'
 require 'sequel_transaction/sidekiq'
 
-describe Rack::SequelTransaction do
-  let(:worker_class) { mock }
-  let(:msg) { mock }
-  let(:queue) { mock }
+describe Sidekiq::Middleware::Server::Transaction do
   let(:table_name) { :sidekiq }
   let(:dataset) { connection[table_name] }
   let(:error) { RuntimeError.new }
 
-  subject { Sidekiq::Middleware::SequelTransaction.new connection: connection }
+  subject { Sidekiq::Middleware::Server::Transaction.new connection: connection }
 
   before do
     connection.create_table table_name do
@@ -20,7 +17,7 @@ describe Rack::SequelTransaction do
   after { connection.drop_table table_name }
 
   it 'commits transaction' do
-    subject.call worker_class, msg, queue do
+    subject.call do
       dataset.insert name: 'first'
       dataset.insert name: 'second'
     end
@@ -30,7 +27,7 @@ describe Rack::SequelTransaction do
   it 'rolls back transaction' do
     actual_error = nil
     begin
-      subject.call worker_class, msg, queue do
+      subject.call do
         dataset.insert name: 'first'
         raise error
       end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: sequel_transaction
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - vyrak.bunleang@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 description: Middlewares for Sequel transactions
@@ -30,7 +30,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Guardfile
 - LICENSE
@@ -38,13 +38,15 @@ files:
 - Rakefile
 - lib/sequel_transaction.rb
 - lib/sequel_transaction/rack.rb
-- lib/sequel_transaction/rack/middleware.rb
+- lib/sequel_transaction/rack/transaction.rb
 - lib/sequel_transaction/sidekiq.rb
-- lib/sequel_transaction/sidekiq/middleware.rb
+- lib/sequel_transaction/sidekiq/middleware/client/after_commit.rb
+- lib/sequel_transaction/sidekiq/middleware/server/transaction.rb
 - lib/sequel_transaction/version.rb
 - sequel_transaction.gemspec
-- spec/sequel_transaction/rack/middleware_spec.rb
-- spec/sequel_transaction/sidekiq/middleware_spec.rb
+- spec/sequel_transaction/rack/transaction_spec.rb
+- spec/sequel_transaction/sidekiq/middleware/client/after_commit_spec.rb
+- spec/sequel_transaction/sidekiq/middleware/server/transaction_spec.rb
 - spec/spec_helper.rb
 homepage: 
 licenses: []
@@ -55,21 +57,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Middlewares for Sequel transactions
 test_files:
-- spec/sequel_transaction/rack/middleware_spec.rb
-- spec/sequel_transaction/sidekiq/middleware_spec.rb
+- spec/sequel_transaction/rack/transaction_spec.rb
+- spec/sequel_transaction/sidekiq/middleware/client/after_commit_spec.rb
+- spec/sequel_transaction/sidekiq/middleware/server/transaction_spec.rb
 - spec/spec_helper.rb

data/lib/sequel_transaction/sidekiq/middleware.rb

@@ -1,15 +0,0 @@
-module Sidekiq
-  module Middleware
-    class SequelTransaction
-      def initialize(settings)
-        @connection = settings.fetch(:connection)
-      end
-
-      def call(worker_class, message, queue)
-        @connection.transaction do
-          yield
-        end
-      end
-    end
-  end
-end