ruote-ar 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4b7b347505cc36be76b7fc7916a83e77027aff0
-  data.tar.gz: cd78d89f63247f7be7acd618c6c19906a3f8f9a3
+  metadata.gz: d64ffb7cb111a0d9c00a7f815ee5f04df9160349
+  data.tar.gz: f52106125bb89b301673c239de8f4d58e731af68
 SHA512:
-  metadata.gz: b7027b92aa1f55f24bb7057fdca1f1a7d1a5b25afeaa1edc888ec3af5999b5e7954fda15f810067cbe54dc638aa4480eb19bd5e93b0728046d32f28a6e76dd8c
-  data.tar.gz: 3cf37629f9d2566a3a7913f4a35e382ce17ee08cebb9435b01d8fc9ed2544f4cca8b96e6433e9bea29da2433bab0828636aaa1b7013cfeec73c4ece56e570a8c
+  metadata.gz: 33be828e28671f0e83efbdd47b16948ac6f90fdfa96fb93e25a70cb7b4e80273c63970d80ea753f513b4406a331dd747c3db553a4191cb55ad37010ffcbe5692
+  data.tar.gz: 1b73c6f25e2bb5b3e8a7d227513c656121c7096b1c727f2324065be4958ffdd6e1a4c2be750c9d961e280ba327852a533d47c1852ae12dd84ab83fa6c6a3f850

data/lib/ruote/ar/storage.rb

@@ -34,6 +34,10 @@ module Ruote
       # return true if the update was affected more than one line.
       #
       def reserve(doc)
+        # doc is already this worker
+        return true if !doc['_worker'].nil? && doc['_worker'] == @worker
+
+        # try reserve this document
         um = Arel::UpdateManager.new Arel::Table.engine
         um.table table
         um.where table[:typ].eq(doc['type'].to_s).
@@ -130,8 +134,8 @@ module Ruote
 
         keys = key ? Array(key) : nil
         ds = ds.and(table[:wfid].in(keys)) if keys && keys.first.is_a?(String)
-        ds = ds.and(table[:worker].eq(nil)) if type == 'msgs'
-        
+        ds = ds.and(table[:worker].eq(nil).or(table[:worker].eq(@worker))) if type == 'msgs'
+
         ds = table.where(ds)
 
         return connection.select_value(ds.project(table[:wfid].count)) if opts[:count]
@@ -150,7 +154,9 @@ module Ruote
 
         docs = connection.select_all(ds.project('*'))
         docs = select_last_revs(docs)
-        docs = docs.collect { |d| Rufus::Json.decode(d['doc']) }
+
+        # TIP: append worker info to doc to use in reserve
+        docs = docs.collect { |d| Rufus::Json.decode(d['doc']).merge({'_worker' => d['worker']}) }
 
         if keys && keys.first.is_a?(Regexp)
           docs.select { |doc| keys.find { |k| k.match(doc['_id']) } }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruote-ar
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - pedroteixeira