sidekiq-apriori 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3203f8525a25c20fa3a2809bbc431ee64b27ee81
-  data.tar.gz: 8dc78be48780cf4eb5c9c010d73fae05f0a24f31
+  metadata.gz: afd46659ed78b4be97a6a3a3fb2fa6abce7c1818
+  data.tar.gz: aef21efe430abb2fabafeaef22cf333e2ce1f63c
 SHA512:
-  metadata.gz: 3227506019efd51481e045ebb7fc613a624687b5c64e351d609847445522babf56956add7474f4e017bb042d5750196a335b504001f11ce170b46affa93e65af
-  data.tar.gz: 4b924a010def90fa31bd661c54366e12aee79c58f67a0a6e747b37913f6164b00aed989155713895f55cc68f6ea3a68148dc644a86bea95239b0735e02c3f385
+  metadata.gz: bb4148906994f507b4b7064b0a5a6e3eab2d48305bf9479b08802751cbed4745ee90bab92f2690f3bc32a34ca1c950607385181c55fab50e022e0b500ed249d1
+  data.tar.gz: 4dcdc931bc462cd284e7c8e5a1cf90711546c5e72d062fe3e86490fd5c5b39de35944c9a9dea098278af1d685a7554b38e98e78ca68465d2aceb9a34050dd449

data/.travis.yml

@@ -2,4 +2,3 @@ language: ruby
 rvm:
   - 2.0.0
   - 1.9.3
-  - 1.8.7

data/README.md

@@ -42,8 +42,10 @@ want to disallow unset priorities, leave the nil in.
 sidekiq-apriori is inspired by (a response to?) [sidekiq-priority](https://github.com/socialpandas/sidekiq-priority), in which the
 order of the priorities is important. Contrary to the approach taken by
 sidekiq-priority, sidekiq-apriori uses sidekiq's built in mechanism for
-configuring the order of processing. So, for example, if your sidekiq.yml
-currently looks like this:
+configuring the order of processing. As such, the ordering of priorities is
+accomplished in the sidekiq.yml.
+
+So, for example, if your sidekiq.yml currently looks like this:
 
 ```yaml
 ## sidekiq.yml
@@ -56,7 +58,7 @@ verbose: false
   - background
 ```
 
-you might want to change the 'queues' entry to look more like this:
+You might want to change the 'queues' entry to look more like this:
 
 ```yaml
 :queues:
@@ -68,8 +70,14 @@ you might want to change the 'queues' entry to look more like this:
   - background
 ```
 
-Use
----
+To route an item to a prioritized queue, append an options hash of the form
+```{ :priority => 'wut' }``` to the end of the arguments. If you're using ruby 2
+& have included ```Sidekiq::Apriori::Worker``` in your worker class then this
+should be enough. Otherwise, you'll need to update that method to optionally
+take an additional argument
+
+Additional Utility
+------------------
 
 In addition to the use described in the PRIORITIES section, some tooling is
 provided for active record classes with priority as an attribute:
@@ -107,10 +115,13 @@ end
 
 If you're lucky enough to be using ruby 2, you can save yourself some work by
 including ```Sidekiq::Apriori::Worker``` instead of ```Sidekiq::Worker``` in your
-worker classes. This will have the nifty side effect of saving you the effort of
-changing the definition of the classes' perform method & its invocation.
-```Sidekiq::Apriori::Worker``` uses ```prepend``` to define a perform which will
-take an optional hash containing a priority designation.
+worker classes. This will save you the effort of changing the definition of the
+classes' perform method & all of its invocations. ```Sidekiq::Apriori::Worker```
+uses ```prepend``` to define a perform which will take an optional hash containing
+a priority designation.
+
+If you're not using ruby 2, you'll need to redefine your perform method to take an
+additional, optional argument
 
 License
 -------

data/lib/sidekiq-apriori/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Apriori
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/sidekiq-apriori/worker.rb

@@ -4,6 +4,8 @@ module Sidekiq::Apriori
       base.class_eval do
         include Sidekiq::Worker if defined?(Sidekiq::Worker)
 
+        ## Prepend is only available for ruby > 2.0.0
+        #
         version = RUBY_VERSION.split(/\./).map(&:to_i) rescue []
         prepend ClassMethods if version.first > 1
       end
@@ -12,17 +14,36 @@ module Sidekiq::Apriori
 
   module ClassMethods
     def perform(*args)
-      retried = false
+      super(*args)
+    rescue ArgumentError => err
+      raise err unless has_priority?(args.last)
+      super(*args[0..-2])
+    end
+
+    def has_priority?(options)
+      return false unless hashlike?(options)
+      stringify_keys(options).has_key?('priority')
+    end
+    private :has_priority?
 
-      begin
-        super(*args)
-      rescue ArgumentError => err
-        raise err unless
-          args.last.is_a?(Hash) && args.last.has_key?(:priority)
+    def stringify_keys(hashish)
+      duplicate = hashish.dup
 
-        args = args[0..-2]
-        (retried = true ) && retry
+      if hashlike?(hashish)
+        duplicate.keys.each do |key|
+          duplicate[key.to_s] = duplicate.delete(key)
+        end
       end
+
+      duplicate
     end
+    private :stringify_keys
+
+    def hashlike?(hashish)
+      [ :keys, :has_key?, :[] ].
+        map { |method| hashish.respond_to?(method) }.all?
+    end
+    private :hashlike?
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-apriori
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Blake Thomas