services 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa15ea76009e9ba974b7e3faf90a467368917660
-  data.tar.gz: 5c0dcc6db009e65fb210e9883feb604329d1bf5b
+  metadata.gz: 633721b985b22ab22c0f05134d9d596cb1c3e8e7
+  data.tar.gz: 296c454079604408722442164aec3999a842ca54
 SHA512:
-  metadata.gz: d3684cdccaf566dae3c4f018127efe9d947692488ec30bb714c8ebaca9d134dd876750483b6794b4bc9b26a589966e0e533a455b98e4ac1bdcbb85fcb810c682
-  data.tar.gz: 5c98b4049291181ccd59abf71c6ade54a8aac194521ed5c2ad2c9e70380ee88930ebb94734138fea1496229491ee88d231c21401ecd46c4e0719f50f7f6356f5
+  metadata.gz: fd8b3a5e499a3c6ba052d6a6dd6fb84dc25be6677571aca9d8aeb6192ebb54334f3d4604cf51da3181a60c93d0b70550b5ef396dbfe9b76ac66ffdfbbf9499ee
+  data.tar.gz: 1766463f9ab6d43dcc242dccaa2c0e6d585945f6613e59b17627bfceb99868c112ce2594d83435aff94982e9faa6059e5e07f1efa69b02bb9387c56fb1bf7baf

data/lib/services/modules/uniqueness_checker.rb

@@ -30,13 +30,11 @@ module Services
           when :fail
             raise_non_unique_error
           when :reschedule
-            @error_count = (Services.configuration.redis.get(error_count_key) || 0).to_i
-            if @error_count >= MAX_RETRIES
+            if error_count >= MAX_RETRIES
               raise_non_unique_error
             else
-              @error_count += 1
+              increase_error_count
               reschedule
-              Services.configuration.redis.setex error_count_key, retry_delay + ONE_HOUR, @error_count
             end
           end
           false
@@ -64,21 +62,38 @@ module Services
         raise self.class::NotUniqueError, message
       end
 
+      def convert_for_rescheduling(arg)
+        case arg
+        when Array
+          arg.map do |array_arg|
+            convert_for_rescheduling array_arg
+          end
+        when Fixnum, String, TrueClass, FalseClass, NilClass
+          arg
+        when service_class
+          arg.id
+        else
+          raise "Don't know how to convert arg #{arg.inspect} for rescheduling."
+        end
+      end
+
       def reschedule
         # Convert service args to fixnums first
         reschedule_args = @service_args.map do |arg|
-          case arg
-          when Fixnum, String, TrueClass, FalseClass, NilClass
-            arg
-          when service_class && arg.respond_to?(:id)
-            arg.id
-          else
-            raise "Don't know how to convert arg #{arg.inspect} for rescheduling."
-          end
+          convert_for_rescheduling arg
         end
         self.class.perform_in retry_delay, *reschedule_args
       end
 
+      def error_count
+        (Services.configuration.redis.get(error_count_key) || 0).to_i
+      end
+
+      def increase_error_count
+        Services.configuration.redis.incr error_count_key
+        Services.configuration.redis.setex error_count_key, retry_delay + ONE_HOUR, error_count
+      end
+
       def uniqueness_key(args)
         [
           KEY_PREFIX,
@@ -99,7 +114,7 @@ module Services
       end
 
       def retry_delay
-        (@error_count ** 3) + 5
+        (error_count ** 3) + 5
       end
     end
   end

data/lib/services/version.rb

@@ -1,3 +1,3 @@
 module Services
-  VERSION = '0.2.12'
+  VERSION = '0.2.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Manuel Meurer