kungfuig 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a0b46dbfa1f0a7552ee0d0402229d32610e5471
-  data.tar.gz: 0ff22f3f9ca89fc09c2d91b0edf6315d976adaf9
+  metadata.gz: c46ca10e03faa3bb4f6d9eeb8216011c5dbb10f8
+  data.tar.gz: b6c314ca7222809ffdc2693c6d497f81c93a0948
 SHA512:
-  metadata.gz: d76c042ca4cb9b223fd161dfe0ad9ddd3f378a9b41067cc9f1f2532b84656412df6fca2638bd8342c71c7e98031d67a04806b2978c793462517ce306c0967991
-  data.tar.gz: c01808c5f08bfe545bedb768e41de95fc4c371ed4a5bfb5044e8caac78ff13d5b8e5e0daae1ac130a5838e2cc36c948226d600627043e02955ed0b8525556625
+  metadata.gz: c57384f359cf7f73a3acf92a5aa2914619e0d126c2fcbd62049e4bb5f26da953ade875cdc1a801b91df012a9f25dd6ba9b8c40e779888a28b3ab4416f61cfbe4
+  data.tar.gz: 8ffb336572f9d1a222c4e416046b14d9a505f61ce14f7f1509cb4e7dcbc2fc8246355261b4a4ea687ad40750e1446ff6e8ca01f0ef5f6f30a81b23243564e95e

data/.rubocop.yml

@@ -17,13 +17,13 @@ Metrics/LineLength:
   Max: 180
 
 Metrics/MethodLength:
-  Max: 42
+  Max: 50
 
 Metrics/PerceivedComplexity:
-  Max: 20
+  Max: 30
 
 Metrics/AbcSize:
-  Max: 42
+  Max: 50
 
 Style/EmptyCaseCondition:
   Exclude:

data/kungfuig.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'hashie', '~> 3'
   spec.add_dependency 'sidekiq', '~> 3.5', '>= 3.5.2'
+  spec.add_dependency 'redis', '~> 3.2'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
@@ -34,5 +35,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'rspec-sidekiq', '~> 2'
   spec.add_development_dependency 'flexmock', '~> 1.3'
-  # spec.add_development_dependency 'mock_redis', '~> 0.17'
+  spec.add_development_dependency 'mock_redis', '~> 0.17'
 end

data/lib/kungfuig/jobber.rb

@@ -30,11 +30,42 @@ module Kungfuig
 
   # Generic helper for massive attaching aspects
   class Jobber
+    RESPOND_TO = ->(m, r) { r.respond_to? m.to_sym }
+
+    class Dummy
+      prepend Kungfuig::Worker
+
+      def perform digest: nil, delay: nil, worker: nil, worker_params: nil
+        Sidekiq.redis { |redis| redis.set(digest, worker_params.to_json) }
+        DummyExecutor.perform_in(delay, digest: digest, worker: worker)
+      end
+    end
+
+    class DummyExecutor
+      prepend Kungfuig::Worker
+
+      def perform digest: nil, worker: nil
+        params = Sidekiq.redis do |redis|
+          redis.multi do
+            redis.get(digest)
+            redis.del(digest)
+          end
+        end
+        Kernel.const_get(worker).perform_async(atomize_keys(params.first)) if params.last > 0
+      end
+
+      private
+
+      def atomize_keys params
+        params = JSON.parse(params) if params.is_a?(String)
+        params.map { |k, v| [k.to_sym, v] }.to_h
+      end
+    end
+
     class << self
       # 'Test':
       #   '*': 'YoJob'
       def bulk(hos)
-        @delayed ||= {}
         @hash = Kungfuig.load_stuff hos
         Kungfuig::Aspector.bulk(
           @hash.map do |klazz, hash|
@@ -44,27 +75,21 @@ module Kungfuig
       end
 
       def bottleneck(method: nil, receiver: nil, result: nil, **params)
-        respond_to = ->(m, r) { r.respond_to? m.to_sym }
-
-        r = case receiver
-            when Hash, Array, String then receiver
-            when respond_to.curry[:to_hash] then receiver.to_hash
-            when respond_to.curry[:to_h] then receiver.to_h
-            else receiver
-            end
         return unless (receiver_class = receiver.class.ancestors.detect do |c|
           @hash[c.name] && @hash[c.name][method]
         end)
 
-        destination = Kernel.const_get(destination(receiver_class.name, method))
-        destination.send(:prepend, Kungfuig::Worker) unless destination.ancestors.include? Kungfuig::Worker
+        r, worker = patch_receiver(receiver_class.name, method)
+        worker_params = { receiver: r, method: method, result: result, **params }
         if (delay = delay(receiver_class.name, method))
-          digest = digest(result, receiver_class.name, method)
-          Sidekiq::Queue.new(destination.sidekiq_options_hash['queue'])
-                        .find_job(@delayed.delete(digest)).tap { |j| j.delete if j }
-          @delayed[digest] = destination.perform_in(delay, receiver: r, method: method, result: result, **params)
+          Dummy.perform_async(
+            digest: digest(result, receiver_class.name, method),
+            delay: delay,
+            worker: worker,
+            worker_params: worker_params
+          )
         else
-          destination.perform_async(receiver: r, method: method, result: result, **params)
+          worker.perform_async(worker_params)
         end
       rescue => e
         Kungfuig.✍(receiver: [
@@ -74,14 +99,28 @@ module Kungfuig
         ].join($/), method: method, result: result, args: params)
       end
 
-      def destination target, name
-        case @hash[target][name]
-        when NilClass then nil
-        when String, Symbol then @hash[target][name]
-        when Hash then @hash[target][name]['class']
+      ##########################################################################
+
+      def primitivize(receiver)
+        case receiver
+        when Hash, Array, String then receiver
+        when RESPOND_TO.curry[:to_hash] then receiver.to_hash
+        when RESPOND_TO.curry[:to_h] then receiver.to_h
+        else receiver
         end
       end
 
+      def patch_receiver target, name
+        klazz = case @hash[target][name]
+                when String, Symbol then @hash[target][name]
+                when Hash then @hash[target][name]['class']
+                else return
+                end
+        [klazz, Kernel.const_get(klazz).tap do |c|
+          c.send(:prepend, Kungfuig::Worker) unless c.ancestors.include? Kungfuig::Worker
+        end]
+      end
+
       def delay target, name
         @hash[target][name].is_a?(Hash) && @hash[target][name]['delay'].to_i || nil
       end

data/lib/kungfuig/version.rb

@@ -1,3 +1,3 @@
 module Kungfuig
-  VERSION = '0.9.0'.freeze
+  VERSION = '0.10.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kungfuig
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Kantox LTD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-24 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -44,6 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.2
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +170,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: mock_redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
 description: Config with goodnesses.
 email:
 - aleksei.matiushkin@kantox.com