agis 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c2efcb1eba59940bd4c9fa4c63baa465d2324a7
-  data.tar.gz: 936b33de7cfcdcb35eba8d0cf8400472968383fc
+  metadata.gz: 1a3007830c900d69b3a8729fac5816644820e9ac
+  data.tar.gz: 9bba42fe778b4362540c6792d54b0e8f788f0fa4
 SHA512:
-  metadata.gz: b598596dc39f627f3efdc55ef62001a885cf59fcb930710f30523289dc1bb198558ad4641aeeec3b3fd5e81a3c307d2b890b31256e7844fcdea5d6370736c77e
-  data.tar.gz: 47ff87901ca0673f24085843de435f136283d5b8f234ccc1fcef7d0957ff4ee4392c4e7b2b77c48ca75b1110c8850fb9a12dfc35bde28dbf3247a83a6d603775
+  metadata.gz: b44f8bc9278c767fbdc9e83c4d29d30a6ad15dba40fa03684f51b01c0db9486b173cf36e1cb188b139c4b8e0a8985fe860da19cb957b6bb8d27c2843f984cd93
+  data.tar.gz: 5ab8555f66a9a617d96dd8bef79264351e4fb32a4099aad06c0ab3b7ceaedf3a057f286bf23922c673a28a64da1928c0b27aa3c1cf2e31ed674c65ec382c006e

data/lib/agis.rb

@@ -86,31 +86,31 @@ module Agis
   end
   
   # create a method with no parameters
-  def agis_defm0(name, timeout=nil, &b)
+  def agis_defm0(name, mode=:retry, timeout=nil, &b)
     @agis_methods ||= Hash.new
-    @agis_methods[name] = [0, b, timeout]
+    @agis_methods[name] = {arity: 0, method: b, mode: mode, timeout: timeout}
   end
   
   # create a method with one parameter
-  def agis_defm1(name, timeout=nil, &b)
+  def agis_defm1(name, mode=:retry, timeout=nil, &b)
     @agis_methods ||= Hash.new
-    @agis_methods[name] = [1, b, timeout]
+    @agis_methods[name] = {arity: 1, method: b, mode: mode, timeout: timeout}
   end
   
   # create a method with two parameters
-  def agis_defm2(name, timeout=nil, &b)
+  def agis_defm2(name, mode=:retry, timeout=nil, &b)
     @agis_methods ||= Hash.new
-    @agis_methods[name] = [2, b, timeout]
+    @agis_methods[name] = {arity: 2, method: b, mode: mode, timeout: timeout}
   end
   
   # create a method with three parameters
-  def agis_defm3(name, timeout=nil, &b)
+  def agis_defm3(name, mode=:retry, timeout=nil, &b)
     @agis_methods ||= Hash.new
-    @agis_methods[name] = [3, b, timeout]
+    @agis_methods[name] = {arity: 3, method: b, mode: mode, timeout: timeout}
   end
   
   # alias for agis_defm3
-  def agis_def(name, timeout=nil, &b)
+  def agis_def(name, mode=:retry, timeout=nil, &b)
     agis_defm3(name, timeout, b)
   end
   
@@ -154,8 +154,9 @@ module Agis
         return nil
       end
       mn        = mni[2..-1]
-      mc        = @agis_methods[mn.to_sym][0]
-      meti      = @agis_methods[mn.to_sym][1]
+      mc        = @agis_methods[mn.to_sym][:arity]
+      meti      = @agis_methods[mn.to_sym][:method]
+      mrm       = @agis_methods[mn.to_sym][:mode]
       case meti
       when Proc
         met = meti
@@ -172,6 +173,7 @@ module Agis
         #rescue Redis::Lock::LockNotAcquired
         #  raise Agis::RedisLockExpired
         #end
+        popfive(redis) if mrm == :once
         case mc
         when 0
           ret = agis_aconv(met.call())
@@ -184,7 +186,7 @@ module Agis
         end
         redis.multi do
           redis.hset self.agis_returnbox, lusig, ret
-          popfive redis
+          popfive(redis) if mrm == :retry
         end
         return :next
       rescue Agis::RedisLockExpired => e
@@ -262,7 +264,7 @@ module Agis
   # only be called inside an Agis method, where the box
   # is already guaranteed to be locked
   def agis_recall(mn, arg1=nil, arg2=nil, arg3=nil)
-    meti = @agis_methods[mn.to_sym][1]
+    meti = @agis_methods[mn.to_sym][:method]
     case meti
     when Proc
       met = meti
@@ -272,7 +274,7 @@ module Agis
       met = self.method(mn.to_sym) # when proc is Nil, call the class methods all the same
     end
     
-    case @agis_methods[mn.to_sym][0]
+    case @agis_methods[mn.to_sym][:arity]
     when 0
       return met.call()
     when 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agis
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Gert Oja
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-07 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -70,4 +70,3 @@ signing_key:
 specification_version: 4
 summary: Messagebox Redis Actors for Ruby
 test_files: []
-has_rdoc: