active_record_mutex 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6401837d63b0c70a4c0e1cb8c0a6a4cb9c05761c
-  data.tar.gz: 8277512688081db3c74b963736e68f559995b427
+  metadata.gz: 57edd5b2783fbaca9577d0d8844995db0da452af
+  data.tar.gz: f10aceb1edeb6b41e44fdab8d64121bc9b409bfc
 SHA512:
-  metadata.gz: 4dcb37cb5b17af31b5c6c808370e840b2d1e8172614027886c0e8fefcd554788b45e0fce4c93e688534924ebd51698efdf955b07483c1d2fd5b806586652bd60
-  data.tar.gz: d71542f82f69f4eb426891750e95b87bf92dc538d9dfa8571c1f3188fc9d7a09976c46137e0319ddcc20d5cb11cebebffa47c7f03b1aa2c25e148861ded2d9ea
+  metadata.gz: d427e2a1befb62f430afd4f2dcf648f797ea8782147161d867188ec606ce8b0c23d0b0f48427c508381a19103257c94170a0a46ed5c3706814e40e360a87c013
+  data.tar.gz: fc1165348c415d5561c6b0607555697082aa1339e17e14a93a24b0f0ea225703a9d7c461189be949d23a0ac598c9a8f30c7b850fb42dad41ca69827fa400fb08

data/.gitignore

@@ -1,5 +1,6 @@
 .*.sw[pon]
 .DS_Store
+.byebug_history
 Gemfile.lock
 coverage
 pkg

data/.travis.yml

@@ -11,3 +11,4 @@ before_script:
     - mysql -e 'create database test;'
 env:
   - CODECLIMATE_REPO_TOKEN=316615e61480039c3444f59bf124cf810d31110326e51f133e9cc9852de14892
+sudo: false

data/README.md

@@ -42,6 +42,7 @@ Now you can send all messages directly to the Mutex instance.
 
 ## Changes
 
+* 2016-08-19 Make locks rails environments independent
 * 2014-12-12 Release 2.0.0
 * 2014-12-12 Add license information
 * 2014-12-09 Adapt to newer Rails versions' API

data/Rakefile

@@ -12,12 +12,13 @@ GemHadar do
   description  'Mutex that can be used to synchronise ruby processes via an ActiveRecord'\
                ' datababase connection. (Only Mysql is supported at the moment.)'
   test_dir    'test'
-  ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', '.DS_Store', 'coverage'
+  ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', '.DS_Store', 'coverage',
+    '.byebug_history'
   readme      'README.md'
   licenses    << 'GPL-2'
 
   dependency             'mysql2', '~>0.3.0'
-  dependency             'activerecord'
+  dependency             'activerecord', '~> 4.0'
   development_dependency 'test-unit', '~>3.0'
   development_dependency 'byebug'
   development_dependency 'simplecov'

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.2.0

data/active_record_mutex.gemspec

@@ -1,22 +1,22 @@
 # -*- encoding: utf-8 -*-
-# stub: active_record_mutex 2.0.0 ruby lib
+# stub: active_record_mutex 2.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "active_record_mutex"
-  s.version = "2.0.0"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Florian Frank"]
-  s.date = "2014-12-12"
+  s.date = "2016-08-19"
   s.description = "Mutex that can be used to synchronise ruby processes via an ActiveRecord datababase connection. (Only Mysql is supported at the moment.)"
   s.email = "flori@ping.de"
   s.extra_rdoc_files = ["README.md", "lib/active_record/database_mutex.rb", "lib/active_record/database_mutex/implementation.rb", "lib/active_record/database_mutex/version.rb", "lib/active_record/mutex.rb", "lib/active_record_mutex.rb"]
-  s.files = [".gitignore", ".travis.yml", "CHANGES", "COPYING", "Gemfile", "README.md", "Rakefile", "VERSION", "active_record_mutex.gemspec", "lib/active_record/database_mutex.rb", "lib/active_record/database_mutex/implementation.rb", "lib/active_record/database_mutex/version.rb", "lib/active_record/mutex.rb", "lib/active_record_mutex.rb", "test/database_mutex_test.rb", "test/test_helper.rb"]
+  s.files = [".gitignore", ".travis.yml", "COPYING", "Gemfile", "README.md", "Rakefile", "VERSION", "active_record_mutex.gemspec", "lib/active_record/database_mutex.rb", "lib/active_record/database_mutex/implementation.rb", "lib/active_record/database_mutex/version.rb", "lib/active_record/mutex.rb", "lib/active_record_mutex.rb", "test/database_mutex_test.rb", "test/test_helper.rb"]
   s.homepage = "http://github.com/flori/active_record_mutex"
   s.licenses = ["GPL-2"]
   s.rdoc_options = ["--title", "ActiveRecordMutex - Implementation of a Mutex for Active Record", "--main", "README.md"]
-  s.rubygems_version = "2.4.4"
+  s.rubygems_version = "2.5.1"
   s.summary = "Implementation of a Mutex for Active Record"
   s.test_files = ["test/database_mutex_test.rb", "test/test_helper.rb"]
 
@@ -24,26 +24,26 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>, ["~> 0.3.2"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 1.7.1"])
       s.add_development_dependency(%q<test-unit>, ["~> 3.0"])
       s.add_development_dependency(%q<byebug>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_runtime_dependency(%q<mysql2>, ["~> 0.3.0"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 4.0"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 0.3.2"])
+      s.add_dependency(%q<gem_hadar>, ["~> 1.7.1"])
       s.add_dependency(%q<test-unit>, ["~> 3.0"])
       s.add_dependency(%q<byebug>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<mysql2>, ["~> 0.3.0"])
-      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<activerecord>, ["~> 4.0"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 0.3.2"])
+    s.add_dependency(%q<gem_hadar>, ["~> 1.7.1"])
     s.add_dependency(%q<test-unit>, ["~> 3.0"])
     s.add_dependency(%q<byebug>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<mysql2>, ["~> 0.3.0"])
-    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<activerecord>, ["~> 4.0"])
   end
 end

data/lib/active_record/database_mutex.rb

@@ -17,7 +17,7 @@ module ActiveRecord
     # moment and lock was called again.
     class MutexLocked < MutexError; end
 
-    class MutexInvalidState <  MutexError; end
+    class MutexInvalidState < MutexError; end
 
     def self.included(modul)
       modul.instance_eval do
@@ -25,7 +25,7 @@ module ActiveRecord
       end
     end
 
-    # XXX
+    # Return a mutex implementation for the mutex named +name+.
     def self.for(name)
       Implementation.new(:name => name)
     end
@@ -33,7 +33,9 @@ module ActiveRecord
     module ClassMethods
       # Returns a mutex instance for this ActiveRecord subclass.
       def mutex
-        @mutex ||= Implementation.new(:name => name)
+        @mutex ||= Implementation.new(
+          :name => [ name, ENV['RAILS_ENV'] ].compact * ?@
+        )
       end
     end
 

data/lib/active_record/database_mutex/implementation.rb

@@ -24,13 +24,12 @@ module ActiveRecord
       # ends after that many seconds and the method returns immediately if the
       # lock couldn't be aquired during that time.
       def synchronize(opts = {})
-        locked_before = aquired_lock?
         locked = lock(opts) or return
         yield
       rescue ActiveRecord::DatabaseMutex::MutexLocked
         return nil
       ensure
-        locked_before or locked && unlock
+        locked && unlock
       end
 
       # Locks the mutex and returns true if successful. If the mutex is
@@ -65,7 +64,8 @@ module ActiveRecord
         end
       end
 
-      # XXX
+      # Unlock this mutex and return self if successful, otherwise (the mutex
+      # was not locked) nil is returned.
       def unlock?(*a)
         unlock(*a)
         self

data/lib/active_record/database_mutex/version.rb

@@ -1,6 +1,6 @@
 module ActiveRecord::DatabaseMutex
   # ActiveRecord::DatabaseMutex version
-  VERSION         = '2.0.0'
+  VERSION         = '2.2.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/test/database_mutex_test.rb

@@ -17,10 +17,28 @@ class DatabaseMutexTest < Test::Unit::TestCase
     end
   end
 
-  def test_class_methods
+  def test_class_method_mutex
+    old, ENV['RAILS_ENV'] = ENV['RAILS_ENV'], nil
+    Foo.instance_eval do
+      @mutex = nil
+    end
     mutex = Foo.mutex
     assert_kind_of ActiveRecord::DatabaseMutex::Implementation, mutex
-    assert_equal mutex.name, Foo.name
+    assert_equal Foo.name, mutex.name
+  ensure
+    ENV['RAILS_ENV'] = old
+  end
+
+  def test_class_method_mutex_within_env
+    old, ENV['RAILS_ENV'] = ENV['RAILS_ENV'], 'test'
+    Foo.instance_eval do
+      @mutex = nil
+    end
+    mutex = Foo.mutex
+    assert_kind_of ActiveRecord::DatabaseMutex::Implementation, mutex
+    assert_equal "#{Foo.name}@test", mutex.name
+  ensure
+    ENV['RAILS_ENV'] = old
   end
 
   def test_instance_method
@@ -31,7 +49,7 @@ class DatabaseMutexTest < Test::Unit::TestCase
     assert_equal true, instance.save
     mutex = instance.mutex
     assert_kind_of ActiveRecord::DatabaseMutex::Implementation, mutex
-    assert_equal mutex.name, "#{instance.id}@#{Foo.name}"
+    assert_equal "#{instance.id}@#{Foo.name}", mutex.name
   end
 
   def test_factory_method_for
@@ -101,4 +119,12 @@ class DatabaseMutexTest < Test::Unit::TestCase
     end
     assert mutex.unlocked?
   end
+
+  def test_synchronize_already_locked
+    mutex = Implementation.new(:name => 'Sync4')
+    def mutex.lock(*)
+      raise ActiveRecord::DatabaseMutex::MutexLocked
+    end
+    assert_nil mutex.synchronize {}
+  end
 end

data/test/test_helper.rb

@@ -2,9 +2,15 @@ if ENV.key?('CODECLIMATE_REPO_TOKEN')
   require "codeclimate-test-reporter"
   CodeClimate::TestReporter.start
 end
+if ENV['START_SIMPLECOV'].to_i == 1
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "#{File.basename(File.dirname(__FILE__))}/"
+  end
+end
 
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'active_record'
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'active_record/database_mutex'
 
 ActiveRecord::Base.establish_connection(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_mutex
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 1.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 description: Mutex that can be used to synchronise ruby processes via an ActiveRecord
   datababase connection. (Only Mysql is supported at the moment.)
 email: flori@ping.de
@@ -109,7 +109,6 @@ extra_rdoc_files:
 files:
 - ".gitignore"
 - ".travis.yml"
-- CHANGES
 - COPYING
 - Gemfile
 - README.md
@@ -147,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Implementation of a Mutex for Active Record