db_lock 0.5.1 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19334766edb61a395f630243e0bec6c53827ddbf
-  data.tar.gz: 325f88fddbc51047c70be06820e398f5c01ea935
+  metadata.gz: daaa943a03637accade87635f95c4cc52e855d67
+  data.tar.gz: 211899d15e6544e477cc854f535e882515246423
 SHA512:
-  metadata.gz: 10f2acba08e807842a1ec99187f21619b1c2a051bdec0eb92e035ea5034e309fe5081297ac4adde3a9cf221168d9014931859dac75e6dac0660e25bbaf3cc11e
-  data.tar.gz: 40463f4ec1e2765239f583d73a3d00ef5516a616fcc4526dd9fc9cc9be278f4347face79d1bfe5a0681d03918aa75bf7f27cf8df031f2fb89dbb1623162cfcc7
+  metadata.gz: 761bd9af2d1940004962179670a347dda0f5a4ed1f2a3816e977b9e548ff97a50a771c9d319117de25768520ee2ee684b5d690ac71f2fba26839e6b37a0ae938
+  data.tar.gz: 43e564ea5c218cd1e4c89af02caa82e05adc543eaa6d1364ddeb755a7240bc3f9f111649c68754596728fa7a2ddb29deb5e3fa5a6ec5ddcf94f2cac9b5decaa5

data/README.md

@@ -28,8 +28,20 @@ The current implementation uses a class variable to store lock state so it is no
 ## Smart lock name
 
 If you prefix the lock with a `.` in a Rails application, `.` will be automatically replaced with `YourAppName.environment` (production/development/etc).
+If the lock name exceeds 64 characters, it will be replaced with a lock name of 64 characters, that consists of a pre- and suffix from the original lock name and a middle MD5 checksum.
 
 
 ## Development
 
-You will have to rename/copy `config/database_mysql_example.yml` to `config/database_mysql.yml` and adjust it to your local settings. Same with the MS SQL configuration file.
+Bundle with the adapter you want to use, for example
+
+```
+bundle --with mysql2
+```
+
+Run rspec with the database url env variables set. It will only run the specs it can run and skip the others.
+
+For example
+```
+MYSQL_URL=mysql2://root:dummy@localhost/test SQLSERVER_URL=sqlserver://root:dummy@localhost/test rspec
+```

data/lib/db_lock.rb

@@ -1,3 +1,5 @@
+require 'digest/md5'
+
 module DBLock
   extend self
 
@@ -12,38 +14,46 @@ module DBLock
     @db_handler || ActiveRecord::Base
   end
 
-  class Lock
-    class << self
-      def get(name, timeout=0)
-        timeout = timeout.to_f # catches nil
-        timeout = 0 if timeout < 0
-        raise "Invalid lock name: #{name.inspect}" if name.empty?
-        raise AlreadyLocked.new("Already lock in progress") if locked?
-
-        name = prefixed_lock_name(name)
-
-        if Adapter.lock(name, timeout)
-          @locked = true
-          yield
-        else
-          raise AlreadyLocked.new("Unable to obtain lock '#{name}' within #{timeout} seconds") unless locked?
-        end
-      ensure
-        if locked?
-          Adapter.release(name)
-        end
-        @locked = false
-      end
+  module Lock
+    extend self
+
+    def get(name, timeout=0)
+      timeout = timeout.to_f # catches nil
+      timeout = 0 if timeout < 0
+      raise "Invalid lock name: #{name.inspect}" if name.empty?
+      raise AlreadyLocked.new("Already lock in progress") if locked?
 
-      def locked?
-        @locked ||= false
+      name = generate_lock_name(name)
+
+      if Adapter.lock(name, timeout)
+        @locked = true
+        yield
+      else
+        raise AlreadyLocked.new("Unable to obtain lock '#{name}' within #{timeout} seconds") unless locked?
+      end
+    ensure
+      if locked?
+        Adapter.release(name)
       end
+      @locked = false
+    end
+
+    def locked?
+      @locked ||= false
+    end
 
-      private
+    private
 
-      def prefixed_lock_name(name)
-        (name[0] == "." && defined? Rails) ? "#{Rails.application.class.parent_name}.#{Rails.env}#{name}" : name
+    def generate_lock_name(name)
+      if (name[0] == "." && defined? Rails)
+        name = "#{Rails.application.class.parent_name}.#{Rails.env}#{name}"
+      end
+      # reduce lock names of > 64 chars in size
+      # MySQL 5.7 only supports 64 chars max, there might be similar limitations elsewhere
+      if name.length > 64
+        name = "#{name.chars.first(15).join}-#{Digest::MD5.hexdigest(name)}-#{name.chars.last(15).join}"
       end
+      name
     end
   end
 end

data/lib/db_lock/adapter.rb

@@ -3,8 +3,8 @@ module DBLock
     extend self
 
     autoload :Base, "db_lock/adapter/base"
-    autoload :MSSQL, "db_lock/adapter/mssql"
     autoload :MYSQL, "db_lock/adapter/mysql"
+    autoload :Sqlserver, "db_lock/adapter/sqlserver"
 
     delegate :lock, :release, to: :implementation
 
@@ -13,7 +13,7 @@ module DBLock
       when 'mysql2'
         MYSQL.instance
       when 'sqlserver'
-        MSSQL.instance
+        Sqlserver.instance
       else
         raise "#{DBLock.db_handler.connection.adapter_name} is not implemented"
       end

data/lib/db_lock/adapter/{mssql.rb → sqlserver.rb}

@@ -1,6 +1,6 @@
 module DBLock
   module Adapter
-    class MSSQL < Base
+    class Sqlserver < Base
       def lock(name, timeout=0)
         connection.execute_procedure 'sp_getapplock', Resource: name, LockMode: 'Exclusive', LockOwner: 'Session', LockTimeout: (timeout*1000).to_i, DbPrincipal: 'public'
         lock = connection.raw_connection.return_code

data/lib/db_lock/version.rb

@@ -1,3 +1,3 @@
 module DBLock
-  VERSION = "0.5.1"
+  VERSION = "0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db_lock
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: '0.6'
 platform: ruby
 authors:
 - mkon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -44,54 +44,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: tiny_tds
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: activerecord-sqlserver-adapter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
 description: Obtain manual db locks to guard blocks of code from parallel execution.
   Currently only supports mysql and ms-sql-server.
 email:
@@ -109,8 +61,8 @@ files:
 - lib/db_lock.rb
 - lib/db_lock/adapter.rb
 - lib/db_lock/adapter/base.rb
-- lib/db_lock/adapter/mssql.rb
 - lib/db_lock/adapter/mysql.rb
+- lib/db_lock/adapter/sqlserver.rb
 - lib/db_lock/version.rb
 homepage: https://github.com/mkon/db_lock
 licenses: