db_lock 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1503d17317cf5228fe01da6a352ec350c2a4cbe0818ffbb92fd9cef52e0358f1
-  data.tar.gz: bee5dee60e1e58f3fb6b70d0d9f28383ac8dd4b915989bae98ed4db91d8389a6
+  metadata.gz: a421d9ec42cc7b443b198621952641959bb9726af41c3e76a7d5ce5e5e974fc0
+  data.tar.gz: d4b509db240d13dc43d1125b3ce57a868f8e2b812aca3b42d8939ddbf2c71503
 SHA512:
-  metadata.gz: aac77d25cf15fb0e7bc1c334cc2ceb677f06d7b905e32b349ef1442bd12361264fe737b8da5bfeb409a44b64e589e826a794b732962f9c157afddbc84b97f847
-  data.tar.gz: bea10e12220d6a98aab6a98731116a2f3b113ffe5a6087f58c8561ba7e9fdbe9e9b0b206da1d25f079c672f27dd18c8708d56f6a8ca57f56f623cd49397ee671
+  metadata.gz: 627cb66c61e7af78f1a8ace1e1eff8722561e7d8a9704ad0443ca9a7aeb774ec2cf83747598dcbca429fe9bd3e83841b6a2ff1eeb0a95834d319e35108e46fd4
+  data.tar.gz: 23cc2e806437a6b745391e1eedb4fb930bc8d32a5557426b5e4bb950934dd6b3229d2e2ed38f74bff4f453f457ae91ec2d73020e14867cbf04a8059eb86472ad

data/lib/db_lock.rb

@@ -4,6 +4,7 @@ module DBLock
   extend self
 
   autoload :Adapter, 'db_lock/adapter'
+  autoload :Lock, 'db_lock/lock'
 
   class AlreadyLocked < StandardError; end
 
@@ -13,42 +14,4 @@ module DBLock
     # this must be an active record base object or subclass
     @db_handler || ActiveRecord::Base
   end
-
-  module Lock
-    extend self
-    def get(name, timeout = 0)
-      timeout = timeout.to_f # catches nil
-      timeout = 0 if timeout.negative?
-      raise "Invalid lock name: #{name.inspect}" if name.empty?
-      raise AlreadyLocked, 'Already lock in progress' if locked?
-
-      name = generate_lock_name(name)
-
-      if Adapter.lock(name, timeout)
-        @locked = true
-        yield
-      else
-        raise AlreadyLocked, "Unable to obtain lock '#{name}' within #{timeout} seconds" unless locked?
-      end
-    ensure
-      Adapter.release(name) if locked?
-      @locked = false
-    end
-
-    def locked?
-      @locked ||= false
-    end
-
-    private
-
-    def generate_lock_name(name)
-      name = "#{Rails.application.class.parent_name}.#{Rails.env}#{name}" if name[0] == '.' && defined? Rails
-      # 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/lock.rb

@@ -0,0 +1,49 @@
+require 'digest/md5'
+
+module DBLock
+  module Lock
+    extend self
+    def get(name, timeout = 0)
+      timeout = timeout.to_f # catches nil
+      timeout = 0 if timeout.negative?
+      raise "Invalid lock name: #{name.inspect}" if name.empty?
+      raise AlreadyLocked, 'Already lock in progress' if locked?
+
+      name = generate_lock_name(name)
+
+      if Adapter.lock(name, timeout)
+        @locked = true
+        yield
+      else
+        raise AlreadyLocked, "Unable to obtain lock '#{name}' within #{timeout} seconds" unless locked?
+      end
+    ensure
+      Adapter.release(name) if locked?
+      @locked = false
+    end
+
+    def locked?
+      @locked ||= false
+    end
+
+    private
+
+    def generate_lock_name(name)
+      name = "#{rails_app_name}.#{Rails.env}#{name}" if name[0] == '.' && defined? Rails
+      # 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
+
+    def rails_app_name
+      if Gem::Version.new(Rails.version) >= Gem::Version.new('6.0.0')
+        Rails.application.class.module_parent_name
+      else
+        Rails.application.class.parent_name
+      end
+    end
+  end
+end

data/lib/db_lock/version.rb

@@ -1,3 +1,3 @@
 module DBLock
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.8.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db_lock
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - mkon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.78.0
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.78.0
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +72,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.37.1
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Obtain manual db locks to guard blocks of code from parallel execution.Currently
   only supports mysql and ms-sql-server.
 email:
@@ -82,13 +96,12 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
-- config/database_mssql_example.yml
-- config/database_mysql_example.yml
 - lib/db_lock.rb
 - lib/db_lock/adapter.rb
 - lib/db_lock/adapter/base.rb
 - lib/db_lock/adapter/mysql.rb
 - lib/db_lock/adapter/sqlserver.rb
+- lib/db_lock/lock.rb
 - lib/db_lock/version.rb
 homepage: https://github.com/mkon/db_lock
 licenses:

data/config/database_mssql_example.yml

@@ -1,17 +0,0 @@
-# rename/copy to database.yml and adjust to your local settings
-
-base: &base
-  adapter: sqlserver
-  host: 192.168.99.100
-  port: 50012
-  encoding: utf8
-  reconnect: false
-  pool: 5
-  username: root
-  password: dummy
-
-development:
-  <<: *base
-
-test:
-  <<: *base

data/config/database_mysql_example.yml

@@ -1,16 +0,0 @@
-# rename/copy to database.yml and adjust to your local settings
-
-base: &base
-  adapter: mysql2
-  host: localhost
-  encoding: utf8
-  reconnect: false
-  pool: 5
-  username: root
-  password: dummy
-
-development:
-  <<: *base
-
-test:
-  <<: *base