with_advisory_lock 0.0.6 → 0.0.7

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MjRiZmQ3MDg3MTEwZDYwNzkzMDQ1YWFjNjc0Y2FmYmJlNTkyN2NjZQ==
+  data.tar.gz: !binary |-
+    ODk2NDU3MzZkMjk1YTIyZmU0Y2UzYmM1OGQzYjJmMWNmNTkwZTg5Mw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    OTU4OGVjMDQyNzI4Njg5N2RhZmYzOTk5ZmNjMGRjZDg4M2MyZWJhYTJjNDcx
+    OTYzMGU4Nzc5Y2Y3NWMxMTk5ZTUzNjU5M2M5OWI4MGRmMjQ1OTJlNDY4YTQ4
+    NGY3MmI5ZjRhODZmYjM5NTMyZDRiZjFiZTE4ZDYwMzZiMDBjMmQ=
+  data.tar.gz: !binary |-
+    ZWQ1NzY2N2QwM2JlNmRkMDg1N2NiZWVkOTU4MjUxMDA2NmQwZWRkZmQ0OWJj
+    ZDE4Yzg0ZDBkODQwYzI2M2JjZGQ0YmZhNzFlZGVhYWFiMDViNDA1ZjU0MGI4
+    Y2RkNTRlOWFiMDZmMzQ0N2RlOGE0ZWEyNjNmMjQ1ODg2N2IwNTY=

data/.travis.yml

@@ -1,9 +1,17 @@
 language: ruby
 
 rvm:
+  - 2.0.0
   - 1.8.7
   - 1.9.3
 
+gemfile:
+# TODO: reenable once tests pass with 4.0
+  - ci/Gemfile.rails-4.0.x
+  - ci/Gemfile.rails-3.2.x
+  - ci/Gemfile.rails-3.1.x
+  - ci/Gemfile.rails-3.0.x
+
 env:
   - DB=sqlite
   - DB=mysql
@@ -15,3 +23,41 @@ before_script:
   - mysql -e 'create database with_advisory_lock_test'
   - psql -c 'create database with_advisory_lock_test' -U postgres
 
+matrix:
+  exclude:
+    - rvm: 1.8.7
+      gemfile: ci/Gemfile.rails-4.0.x
+      env: DB=sqlite
+    - rvm: 1.8.7
+      gemfile: ci/Gemfile.rails-4.0.x
+      env: DB=mysql
+    - rvm: 1.8.7
+      gemfile: ci/Gemfile.rails-4.0.x
+      env: DB=postgresql
+    - rvm: 2.0.0
+      gemfile: ci/Gemfile.rails-3.0.x
+      env: DB=sqlite
+    - rvm: 2.0.0
+      gemfile: ci/Gemfile.rails-3.0.x
+      env: DB=mysql
+    - rvm: 2.0.0
+      gemfile: ci/Gemfile.rails-3.0.x
+      env: DB=postgresql
+    - rvm: 2.0.0
+      gemfile: ci/Gemfile.rails-3.1.x
+      env: DB=sqlite
+    - rvm: 2.0.0
+      gemfile: ci/Gemfile.rails-3.1.x
+      env: DB=mysql
+    - rvm: 2.0.0
+      gemfile: ci/Gemfile.rails-3.1.x
+      env: DB=postgresql
+    - rvm: 2.0.0
+      gemfile: ci/Gemfile.rails-3.2.x
+      env: DB=sqlite
+    - rvm: 2.0.0
+      gemfile: ci/Gemfile.rails-3.2.x
+      env: DB=mysql
+    - rvm: 2.0.0
+      gemfile: ci/Gemfile.rails-3.2.x
+      env: DB=postgresql

data/README.md

@@ -91,6 +91,11 @@ aren't going to be commonly applicable, and they can be a source of
 
 ## Changelog
 
+### 0.0.7
+
+* Added Travis tests for Rails 3.0, 3.1, 3.2, and 4.0
+* Fixed MySQL bug with select_value returning a string instead of an integer when using AR 3.0.x
+
 ### 0.0.6
 
 * Only require ActiveRecord >= 3.0.x

data/ci/Gemfile.rails-3.0.x

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+gemspec :path => '..'
+
+gem 'activerecord', '~> 3.0.0'
+gem 'mysql2', '< 0.3.0' # See https://github.com/brianmario/mysql2/issues/155

data/ci/Gemfile.rails-3.1.x

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

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,5 @@
+source 'https://rubygems.org'
+gemspec :path => '..'
+
+# rspec-rails reverts to 2.3.1 (old and broken) unless you fetch the whole rails enchilada:
+gem 'rails', '4.0.0.rc2'

data/lib/with_advisory_lock/mysql.rb

@@ -14,7 +14,7 @@ module WithAdvisoryLock
       # 0 if the attempt timed out (for example, because another client has
       # previously locked the name), or NULL if an error occurred
       # (such as running out of memory or the thread was killed with mysqladmin kill).
-      1 == connection.select_value("SELECT GET_LOCK(#{quoted_lock_name}, 0)")
+      1 == connection.select_value("SELECT GET_LOCK(#{quoted_lock_name}, 0)").to_i
     end
 
     def release_lock
@@ -22,7 +22,7 @@ module WithAdvisoryLock
       # 0 if the lock was not established by this thread (
       # in which case the lock is not released), and
       # NULL if the named lock did not exist.
-      1 == connection.select_value("SELECT RELEASE_LOCK(#{quoted_lock_name})")
+      1 == connection.select_value("SELECT RELEASE_LOCK(#{quoted_lock_name})").to_i
     end
 
     def already_locked?

data/lib/with_advisory_lock/postgresql.rb

@@ -6,11 +6,11 @@ module WithAdvisoryLock
     def try_lock
       # pg_try_advisory_lock will either obtain the lock immediately
       # and return true, or return false if the lock cannot be acquired immediately
-      "t" == connection.select_value("SELECT pg_try_advisory_lock(#{numeric_lock})")
+      "t" == connection.select_value("SELECT pg_try_advisory_lock(#{numeric_lock})").to_s
     end
 
     def release_lock
-      "t" == connection.select_value("SELECT pg_advisory_unlock(#{numeric_lock})")
+      "t" == connection.select_value("SELECT pg_advisory_unlock(#{numeric_lock})").to_s
     end
 
     def numeric_lock

data/lib/with_advisory_lock/version.rb

@@ -1,3 +1,3 @@
 module WithAdvisoryLock
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/database.yml

@@ -14,4 +14,4 @@ mysql:
   host: localhost
   username: root
   database: with_advisory_lock_test
-  pool: 50
+  pool: 50

data/test/minitest_helper.rb

@@ -1,14 +1,13 @@
 require 'erb'
 require 'active_record'
 require 'with_advisory_lock'
-require 'database_cleaner'
 require 'tmpdir'
 
 db_config = File.expand_path("database.yml", File.dirname(__FILE__))
 ActiveRecord::Base.configurations = YAML::load(ERB.new(IO.read(db_config)).result)
 
 def env_db
-  ENV["DB"] || "sqlite"
+  ENV["DB"] || "mysql"
 end
 
 ActiveRecord::Base.establish_connection(env_db)
@@ -21,14 +20,14 @@ require 'mocha/setup'
 
 Thread.abort_on_exception = true
 
-DatabaseCleaner.strategy = :deletion
 class MiniTest::Spec
   before do
     ENV['FLOCK_DIR'] = Dir.mktmpdir
-    DatabaseCleaner.start
+    Tag.delete_all
+    TagAudit.delete_all
+    Label.delete_all
   end
   after do
-    DatabaseCleaner.clean
     FileUtils.remove_entry_secure ENV['FLOCK_DIR']
   end
 end

data/test/parallelism_test.rb

@@ -1,5 +1,12 @@
 require 'minitest_helper'
 
+parallelism_is_broken = begin
+  # Rails < 3.2 has known bugs with parallelism
+  (ActiveRecord::VERSION::MAJOR <= 3 && ActiveRecord::VERSION::MINOR < 2) ||
+    # SQLite doesn't support parallel writes
+    ENV["DB"] =~ /sqlite/
+end
+
 describe "parallelism" do
   def find_or_create_at(run_at, with_advisory_lock)
     ActiveRecord::Base.connection.reconnect!
@@ -15,13 +22,13 @@ describe "parallelism" do
     else
       task.call
     end
-    ActiveRecord::Base.connection.close
+    ActiveRecord::Base.connection.close if ActiveRecord::Base.connection.respond_to?(:close)
   end
 
   def run_workers(with_advisory_lock)
     skip if env_db == "sqlite"
     @iterations.times do
-      time = (Time.now.to_i + 2).to_f
+      time = (Time.now.to_i + 4).to_f
       threads = @workers.times.collect do
         Thread.new do
           find_or_create_at(time, with_advisory_lock)
@@ -39,14 +46,9 @@ describe "parallelism" do
 
   it "parallel threads create multiple duplicate rows" do
     run_workers(with_advisory_lock = false)
-    if Tag.connection.adapter_name == "SQLite" && RUBY_VERSION == "1.9.3"
-      oper = :== # sqlite doesn't run in parallel.
-    else
-      oper = :> # Everything else should create duplicate rows.
-    end
-    Tag.all.size.must_be oper, @iterations # <- any duplicated rows will make me happy.
-    TagAudit.all.size.must_be oper, @iterations # <- any duplicated rows will make me happy.
-    Label.all.size.must_be oper, @iterations # <- any duplicated rows will make me happy.
+    Tag.all.size.must_be :>, @iterations # <- any duplicated rows will make me happy.
+    TagAudit.all.size.must_be :>, @iterations # <- any duplicated rows will make me happy.
+    Label.all.size.must_be :>, @iterations # <- any duplicated rows will make me happy.
   end
 
   it "parallel threads with_advisory_lock don't create multiple duplicate rows" do
@@ -92,4 +94,4 @@ describe "parallelism" do
     t2_acquired_lock.must_be_false
     t2_return_value.must_be_false
   end
-end
+end unless parallelism_is_broken

data/tests.sh

@@ -1,13 +1,14 @@
 #!/bin/sh -e
 export BUNDLE_GEMFILE RMI DB
 
-for RMI in 1.8.7-p370 1.9.3-p327
-do
-  rbenv local $RMI
-  bundle --quiet
-  for DB in sqlite mysql postgresql
-  do
-    echo $DB $BUNDLE_GEMFILE `ruby -v`
-    bundle exec rake
+for RMI in ree-1.8.7-2011.03 1.9.3-p327 ; do
+  for BUNDLE_GEMFILE in ci/Gemfile.rails-3.0.x ci/Gemfile.rails-3.1.x ci/Gemfile.rails-3.2.x ; do
+    rbenv local $RMI
+    bundle --quiet
+    for DB in sqlite mysql postgresql
+    do
+      echo $DB $BUNDLE_GEMFILE `ruby -v`
+      bundle exec rake
+    done
   done
-done
+done

data/with_advisory_lock.gemspec

@@ -27,5 +27,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'mysql2'
   gem.add_development_dependency 'pg'
   gem.add_development_dependency 'sqlite3'
-  gem.add_development_dependency 'database_cleaner'
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: with_advisory_lock
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !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: minitest-great_expectations
   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: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,23 +132,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: database_cleaner
-  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
@@ -184,6 +149,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- ci/Gemfile.rails-3.0.x
+- ci/Gemfile.rails-3.1.x
+- ci/Gemfile.rails-3.2.x
+- ci/Gemfile.rails-4.0.x
 - lib/with_advisory_lock.rb
 - lib/with_advisory_lock/base.rb
 - lib/with_advisory_lock/concern.rb
@@ -203,33 +172,26 @@ files:
 - with_advisory_lock.gemspec
 homepage: ''
 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: -4256670677892025284
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4256670677892025284
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Advisory locking for ActiveRecord
 test_files:
 - test/concern_test.rb