pg_lock 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c92e38fab7329deb1a573eafce48291e38b3198baf0ce39a4500d305a1b01081
-  data.tar.gz: 3c14d574202f72524728cc3f1ffb5af3d2dc16b6980bfa9efe130fa84a6f5c00
+  metadata.gz: 6e644648b686652e6f40413bd18485cc8ecc9dc255782ad3b26793230ff0730b
+  data.tar.gz: de7e5592063b90ef9b3a5779b7877095fb31c0776749d5508cbec8f5a2f31291
 SHA512:
-  metadata.gz: 67be6b9ef5ff32f10cd6f8a98d6b58af010c9d03e480617372c6e43787fbdeb704d349d573d22b1e2eb7fa4c6a05c97106f6b30a7e3ff72f6247a73cba63d781
-  data.tar.gz: 17efa281393055a6facdfb44bbca361a49f00ae20454fe3557c89d3e971aeb0e6b7c742609409d6080345814bf8bc0d8ad1c09fb465d9dcacb2d37d5cd548013
+  metadata.gz: 321829a4a295725340247266fb2f869461f9d9e549cce0b36f9f736775e3a0a601f3224bbc23de7c15be89266e6156eb605d924f5d6d4ffafd156e05f700ea9d
+  data.tar.gz: 155e96f2a5b5aedc38da672c5ea45d4c176d72188e17ab55614d6c7fce54bc171aa1e7e9ec8035e57225a48e5bf4bc2583998124cb5a158824a631f355346cbb

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Master - unreleased
 
+## 0.2.1
+
+- Fix regression where a block that returned a `false` would cause the `lock!` method to incorrectly raise an error (https://github.com/heroku/pg_lock/pull/15)
+
 ## 0.2.0
 
 - Return the result evaluated inside the block (https://github.com/heroku/pg_lock/pull/10)

data/lib/pg_lock.rb

@@ -26,6 +26,7 @@ class PgLock
     end
   end
   UnableToLock = UnableToLockError
+  NO_LOCK = Object.new
 
   def initialize(name:, attempts: 3, attempt_interval: 1, ttl: 60, connection: DEFAULT_CONNECTION_CONNECTOR.call, log: DEFAULT_LOGGER.call, return_result: true)
     self.name               = name
@@ -41,26 +42,18 @@ class PgLock
 
   # Runs the given block if an advisory lock is able to be acquired.
   def lock(&block)
-    if create
-      result = nil
-      begin
-        result = Timeout::timeout(ttl, &block) if block_given?
-      ensure
-        delete
-      end
-      return_result ? result : true
-    else
-      return false
-    end
+    result = internal_lock(&block)
+    return false if result == NO_LOCK
+    result
   end
 
   # A PgLock::UnableToLock is raised if the lock is not acquired.
   def lock!(exception_klass = PgLock::UnableToLockError)
-    if lock { yield self if block_given? }
-      # lock successful, do nothing
-    else
+    result = internal_lock { yield self if block_given? }
+    if result == NO_LOCK
       raise exception_klass.new(name: name, attempts: max_attempts)
     end
+    return result
   end
 
   def create
@@ -91,6 +84,20 @@ class PgLock
   end
   alias :has_lock? :aquired?
 
+  private def internal_lock(&block)
+    if create
+      result = nil
+      begin
+        result = Timeout::timeout(ttl, &block) if block_given?
+      ensure
+        delete
+      end
+      return_result ? result : true
+    else
+      return NO_LOCK
+    end
+  end
+
   private
     attr_accessor :max_attempts
     attr_accessor :attempt_interval

data/lib/pg_lock/version.rb

@@ -1,3 +1,3 @@
 class PgLock
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_lock
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - mikehale
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2019-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg