monogamy 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZGZiODBiNGQyMWYzYzE4NTM2M2Q2MmM3NjM0MmNiOTNmODM0MWQyOA==
+  data.tar.gz: !binary |-
+    MDdlNzkxOGU5MTc5MDg0MzBkNjRhNGM0OGE5NmRmN2E4ODM0OTQ5Yw==
+SHA512:
+  metadata.gz: !binary |-
+    N2NjN2JmY2JlNTgzMTk5N2YxZDBiYThmYTlmNDM0NDdkODg3MTcyZTMyNzA5
+    Yzc5MWRkMDViZDc0NTEwYmZhZmUwYzcyMTJhYzZhNTk3NzQyMWQxOWU1ZjI4
+    ZmFjYTZjNzRmMTYzYjJhMjU4Y2FlMjJlNWZiZWNmZjYzNmMyOGI=
+  data.tar.gz: !binary |-
+    NjdlOTIyOWYzM2UxOGJlZGM3YWI1NzU0MzUzODhiZjdlNDM3ZjMyZmVkOTVh
+    ZWQwNzc1MWIzYTI1ZWIxODZlMTlkMTEwYzcyYWRiY2FhY2EwNzg1NmUxZDY5
+    MjBjZGI3YWY5ZTljZDYzNGJlNTBkYWZlZDg1N2MyNTdlZTk5ZGE=

data/.travis.yml

@@ -1,11 +1,14 @@
 language: ruby
 
 rvm:
-  - 1.8.7
   - 1.9.3
+  - 2.0.0
+
+gemfile:
+  - ci/Gemfile.rails-4.0.x
+  - ci/Gemfile.rails-3.2.x
 
 env:
-  - DB=sqlite
   - DB=mysql
   - DB=pg
 

data/README.md

@@ -1,6 +1,10 @@
-# Monogamy [![Build Status](https://api.travis-ci.org/mceachen/monogamy.png?branch=master)](https://travis-ci.org/mceachen/monogamy)
+# Monogamy
 
-Adds table-level locking to ActiveRecord 3.x. MySQL, PostgreSQL, and SQLite are supported.
+Adds table-level locking to ActiveRecord 3.2 and 4.0. MySQL and PostgreSQL are supported.
+
+[![Build Status](https://api.travis-ci.org/mceachen/monogamy.png?branch=master)](https://travis-ci.org/mceachen/monogamy)
+[![Gem Version](https://badge.fury.io/rb/monogamy.png)](http://rubygems.org/gems/monogamy)
+[![Dependency Status](https://gemnasium.com/mceachen/monogamy.png)](https://gemnasium.com/mceachen/monogamy)
 
 ## Usage
 
@@ -13,6 +17,9 @@ end
 While your code is inside the block, it will have exclusive read and write access to the model's
 table.
 
+A transaction will be opened and closed for you automatically during your block's execution.
+There's no need to wrap your call to ```with_table_lock``` with a ```transaction do```.
+
 If your block touches other tables, and you use table-level locking on those tables as well,
 read up about [deadlocks](http://en.wikipedia.org/wiki/Deadlock). **You have been warned.**
 

data/ci/Gemfile.rails-3.2.x

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec :path => '..'
+
+gem 'activerecord', '~> 3.2.0'

data/ci/Gemfile.rails-4.0.x

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec :path => '..'
+
+gem 'activerecord', '~> 4.0.0'

data/lib/monogamy/version.rb

@@ -1,3 +1,3 @@
 module Monogamy
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/monogamy/with_table_lock.rb

@@ -5,18 +5,15 @@
 
 require 'monogamy/mysql'
 require 'monogamy/postgresql'
-require 'monogamy/sqlite'
 
 module Monogamy
   module WithTableLock
     def with_table_lock(&block)
       adapter = case (connection.adapter_name.downcase)
-        when "postgresql"
+        when 'postgresql', 'empostgresql', 'postgis'
           Monogamy::PostgreSQL
-        when "mysql", "mysql2"
+        when 'mysql', 'mysql2'
           Monogamy::MySQL
-        when "sqlite"
-          Monogamy::SQLite
         else
           raise NotImplementedError, "Support for #{connection.adapter_name} has not been written"
       end

data/monogamy.gemspec

@@ -6,24 +6,23 @@ require 'monogamy/version'
 Gem::Specification.new do |gem|
   gem.name          = "monogamy"
   gem.version       = Monogamy::VERSION
-  gem.authors       = ["Matthew McEachen"]
-  gem.email         = ["matthew+github@mceachen.org"]
+  gem.authors       = ['Matthew McEachen']
+  gem.email         = ['matthew+github@mceachen.org']
   gem.description   = %q{Add table-level database locking to ActiveRecord}
   gem.summary       = gem.description
-  gem.homepage      = ""
+  gem.homepage      = 'https://github.com/mceachen/monogamy'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^test/})
   gem.require_paths = %w(lib)
 
-  gem.add_runtime_dependency 'activerecord', '>= 3.0.0'
+  gem.add_runtime_dependency 'activerecord', '>= 3.2'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'minitest'
   gem.add_development_dependency 'mysql2'
   gem.add_development_dependency 'pg'
-  gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'database_cleaner'
 end

data/test/database.yml

@@ -1,7 +1,3 @@
-sqlite:
-  adapter: <%= "jdbc" if defined? JRUBY_VERSION %>sqlite3
-  database: monogamy.sqlite3.db
-  pool: 50
 pg:
   adapter: postgresql
   username: postgres
@@ -13,4 +9,4 @@ mysql:
   host: localhost
   username: root
   database: monogamy_test
-  pool: 50
+  pool: 50

data/test/minitest_helper.rb

@@ -9,17 +9,14 @@ ActiveRecord::Base.establish_connection(ENV["DB"] || "sqlite")
 ActiveRecord::Migration.verbose = false
 
 require 'test_models'
-
-Tag.new # < make sure class has loaded
-
 require 'minitest/autorun'
 
 DatabaseCleaner.strategy = :deletion
 class MiniTest::Spec
-  before :each do
+  before do
     DatabaseCleaner.start
   end
-  after :each do
+  after do
     DatabaseCleaner.clean
   end
 end

data/test/monogamy_test.rb

@@ -16,15 +16,15 @@ describe "Monogamy" do
     Tag.connection.reconnect!
     if with_table_lock
       Tag.with_table_lock do
-        Tag.find_or_create_by_name(run_at.to_s)
+        Tag.where(name: run_at.to_s).first_or_create!
       end
     else
-      Tag.find_or_create_by_name(run_at.to_s)
+      Tag.where(name: run_at.to_s).first_or_create!
     end
   end
 
   def run_workers(with_table_lock)
-    start_time = Time.now.to_i + 2
+    start_time = Time.now.to_i + 3
     threads = @workers.times.collect do
       Thread.new do
         begin
@@ -40,6 +40,7 @@ describe "Monogamy" do
   end
 
   before :each do
+    Tag.connection.reconnect!
     @iterations = 5
     @workers = 7
   end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: monogamy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,23 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -152,10 +121,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- ci/Gemfile.rails-3.2.x
+- ci/Gemfile.rails-4.0.x
 - lib/monogamy.rb
 - lib/monogamy/mysql.rb
 - lib/monogamy/postgresql.rb
-- lib/monogamy/sqlite.rb
 - lib/monogamy/version.rb
 - lib/monogamy/with_table_lock.rb
 - monogamy.gemspec
@@ -163,35 +133,28 @@ files:
 - test/minitest_helper.rb
 - test/monogamy_test.rb
 - test/test_models.rb
-homepage: ''
+homepage: https://github.com/mceachen/monogamy
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3951791607027416484
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3951791607027416484
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Add table-level database locking to ActiveRecord
 test_files:
 - test/database.yml

data/lib/monogamy/sqlite.rb

@@ -1,33 +0,0 @@
-module Monogamy
-  module SQLite
-    # See http://sqlite.org/lang_transaction.html
-    def self.with_table_lock(connection, quoted_table_name, &block)
-      if connection.open_transactions > 0
-        raise NotImplementedError, "Support for nested transactions within sqlite has not been written"
-      end
-
-      begin
-        connection.execute("BEGIN EXCLUSIVE TRANSACTION")
-      rescue Exception => e
-        if e.message.include? "SQLite3::BusyException" # < Rails wraps BusyException in the message (!!!)
-          sleep 0.2
-          retry
-        else
-          raise e
-        end
-      end
-
-      begin
-        connection.increment_open_transactions
-        yield
-        connection.execute("COMMIT TRANSACTION")
-      rescue Exception => e
-        puts e
-        puts e.backtrace.join("\n")
-        connection.execute("ROLLBACK TRANSACTION")
-      ensure
-        connection.decrement_open_transactions
-      end
-    end
-  end
-end