active_record_mutex 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aafe3c705988ad9cab9db8346d85935f1b94de2c
-  data.tar.gz: be7b71975f7740d6adaac306fa64fad71305a1d6
+  metadata.gz: 624916896cfdc77c6a74fde8700a9b07ff587250
+  data.tar.gz: dea7261a14573e0202de967869d123b473785d86
 SHA512:
-  metadata.gz: bfc5ae34fd11e782db2e317c568c7fe490eb76d896f9e35e6b1dd3161572a7bcda616b566515f3ca451a42c7d3ddca04dea808a4c9835cc532a0bb4f45c547d9
-  data.tar.gz: cb27416ab27496bebe7e06f36214c7a010a9a8a27c3e4604c0a6687e883e673842d99b8cc65aacf2f66e070b8dc1d96a6bf8710e81c27b7d6fa6703a03a1d552
+  metadata.gz: fa68c4dd7ba5c49f7a17fabdb17afbbdf7943e994fea75c1d6b61aeed001a1793326b69bc24b5422987c84dfe573a803d87642539516050607bd141a70f7ea57
+  data.tar.gz: 4d86b6ebca7510b1f9f4276c1380a7a16655404ed57f91b6c1f3038a827d8e260daa2407dceddf63e309fa22230a37f062586f2ac3dd9e92eee850cad25602c2

data/Rakefile

@@ -17,9 +17,10 @@ GemHadar do
   readme      'README.md'
   licenses    << 'GPL-2'
 
-  dependency             'mysql2', '~>0.3.0'
+  dependency             'mysql2',       '~>0.3.0'
   dependency             'activerecord', '~> 4.0'
-  development_dependency 'test-unit', '~>3.0'
+  dependency             'tins',         '~> 1.12.0'
+  development_dependency 'test-unit',    '~>3.0'
   development_dependency 'byebug'
   development_dependency 'simplecov'
 end

data/VERSION

@@ -1 +1 @@
-2.3.2
+2.3.3

data/active_record_mutex.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: active_record_mutex 2.3.2 ruby lib
+# stub: active_record_mutex 2.3.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "active_record_mutex"
-  s.version = "2.3.2"
+  s.version = "2.3.3"
 
   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 = "2016-08-23"
+  s.date = "2016-08-24"
   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"]
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_runtime_dependency(%q<mysql2>, ["~> 0.3.0"])
       s.add_runtime_dependency(%q<activerecord>, ["~> 4.0"])
+      s.add_runtime_dependency(%q<tins>, ["~> 1.12.0"])
     else
       s.add_dependency(%q<gem_hadar>, ["~> 1.7.1"])
       s.add_dependency(%q<test-unit>, ["~> 3.0"])
@@ -37,6 +38,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<mysql2>, ["~> 0.3.0"])
       s.add_dependency(%q<activerecord>, ["~> 4.0"])
+      s.add_dependency(%q<tins>, ["~> 1.12.0"])
     end
   else
     s.add_dependency(%q<gem_hadar>, ["~> 1.7.1"])
@@ -45,5 +47,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<mysql2>, ["~> 0.3.0"])
     s.add_dependency(%q<activerecord>, ["~> 4.0"])
+    s.add_dependency(%q<tins>, ["~> 1.12.0"])
   end
 end

data/lib/active_record/database_mutex/implementation.rb

@@ -1,8 +1,26 @@
 require 'base64'
+require 'tins/xt/string_version'
 
 module ActiveRecord
   module DatabaseMutex
     class Implementation
+
+      class << self
+        def db
+          ActiveRecord::Base.connection
+        end
+
+        def check_size?
+          if defined? @check_size
+            @check_size
+          else
+            version = db.execute("SHOW VARIABLES LIKE 'version'").first.last.
+              delete('^0-9.').version
+            @check_size = version >= '5.7'.version
+          end
+        end
+      end
+
       # Creates a mutex with the name given with the option :name.
       def initialize(opts = {})
         @name = opts[:name] or raise ArgumentError, "mutex requires a :name argument"
@@ -121,7 +139,7 @@ module ActiveRecord
       def counter
         encoded_name = ?$ + Base64.encode64(name).delete('^A-Za-z0-9+/').
           gsub(/[+\/]/, ?+ => ?_, ?/ => ?.)
-        if encoded_name.size <= 64 # mysql 5.7 only allows size <=64 variable names
+        if !self.class.check_size? || encoded_name.size <= 64 # mysql 5.7 only allows size <=64 variable names
           "@#{encoded_name}"
         end
       end
@@ -161,7 +179,7 @@ module ActiveRecord
       end
 
       def query(sql)
-        if result = ActiveRecord::Base.connection.execute(sql)
+        if result = self.class.db.execute(sql)
           result = result.first.first.to_i
           $DEBUG and warn %{query("#{sql}") = #{result}}
         end

data/lib/active_record/database_mutex/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_mutex
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: tins
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.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