asynchronic 3.0.2 → 4.0.2

data/lib/asynchronic/queue_engine/synchronic.rb

@@ -5,7 +5,7 @@ module Asynchronic
       attr_reader :stubs
 
       def initialize(options={})
-        @environment = options[:environment]
+        @options = options
         @stubs = {}
       end
 
@@ -14,7 +14,7 @@ module Asynchronic
       end
 
       def environment
-        @environment ||= Asynchronic.environment
+        @environment ||= options.fetch(:environment, Asynchronic.environment)
       end
 
       def [](name)
@@ -22,7 +22,7 @@ module Asynchronic
       end
 
       def stub(job, &block)
-        @stubs[job] = block
+        stubs[job] = block
       end
 
       def asynchronic?
@@ -33,6 +33,10 @@ module Asynchronic
         [Asynchronic.connection_name]
       end
 
+      private
+
+      attr_reader :options
+
 
       class Queue
 
@@ -41,37 +45,45 @@ module Asynchronic
         end
 
         def push(message)
-          process = @engine.environment.load_process(message)
+          process = engine.environment.load_process(message)
 
-          if @engine.stubs[process.type]
+          if engine.stubs[process.type]
             job = process.job
-            block = @engine.stubs[process.type]
+            block = engine.stubs[process.type]
             process.define_singleton_method :job do
-              MockJob.new job, process, &block
+              MockJob.new job, process, block
             end
           end
 
           process.execute
         end
 
+        private
+
+        attr_reader :engine
+
       end
 
 
       class MockJob < TransparentProxy
 
-        def initialize(job, process, &block)
+        def initialize(job, process, block)
           super job
           @process = process
           @block = block
         end
 
         def call
-          @block.call @process
+          block.call process
         end
 
         def before_finalize
         end
 
+        private
+
+        attr_reader :process, :block
+
       end
 
     end

data/lib/asynchronic/version.rb

@@ -1,3 +1,3 @@
 module Asynchronic
-  VERSION = '3.0.2'
+  VERSION = '4.0.2'
 end

data/lib/asynchronic/worker.rb

@@ -1,24 +1,21 @@
 class Asynchronic::Worker
 
-  attr_reader :queue
-  attr_reader :queue_name
-  attr_reader :env
-  attr_reader :listener
+  attr_reader :queue, :queue_name, :environment, :listener
 
-  def initialize(queue_name, env)
+  def initialize(queue_name, environment)
     @queue_name = queue_name
-    @queue = env.queue_engine[queue_name]
-    @env = env
-    @listener = env.queue_engine.listener
+    @queue = environment.queue_engine[queue_name]
+    @environment = environment
+    @listener = environment.queue_engine.listener
   end
 
   def start
     Asynchronic.logger.info('Asynchronic') { "Starting worker of #{queue_name} (#{Process.pid})" }
 
     Signal.trap('QUIT') { stop }
-    
+
     listener.listen(queue) do |pid|
-      env.load_process(pid).execute
+      environment.load_process(pid).execute
     end
   end
 

data/lib/asynchronic.rb

@@ -23,6 +23,8 @@ module Asynchronic
   attr_config :logger, Logger.new($stdout)
   attr_config :retry_timeout, 30
   attr_config :garbage_collector_timeout, 30
+  attr_config :redis_client, Redic
+  attr_config :redis_settings, 'redis://localhost:6379'
   attr_config :redis_data_store_sync_timeout, 0.01
   attr_config :keep_alive_timeout, 1
   attr_config :connection_name, "HOST=#{Socket.gethostname},PID=#{::Process.pid},UUID=#{SecureRandom.uuid}"
@@ -43,6 +45,12 @@ module Asynchronic
     @garbage_collector ||= GarbageCollector.new environment, garbage_collector_timeout
   end
 
+  def self.establish_redis_connection(options={})
+    redis_client = options.fetch(:redis_client, Asynchronic.redis_client)
+    redis_settings = options.fetch(:redis_settings, Asynchronic.redis_settings)
+    redis_client.new redis_settings
+  end
+
   def self.retry_execution(klass, message)
     begin
       result = yield

data/spec/data_store/data_store_examples.rb

@@ -1,5 +1,11 @@
 module DataStoreExamples
-  
+
+  extend Minitest::Spec::DSL
+
+  after do
+    data_store.clear
+  end
+
   it 'Get/Set value' do
     data_store[:key] = 123
     data_store[:key].must_equal 123
@@ -32,8 +38,8 @@ module DataStoreExamples
     data_store.delete_cascade Asynchronic::DataStore::Key[:key_1]
 
     data_store.keys.sort.must_equal [
-      Asynchronic::DataStore::Key[:key_2], 
-      Asynchronic::DataStore::Key[:key_2][:key_2_1], 
+      Asynchronic::DataStore::Key[:key_2],
+      Asynchronic::DataStore::Key[:key_2][:key_2_1],
       Asynchronic::DataStore::Key[:key_2][:key_2_2]
     ]
   end
@@ -110,18 +116,20 @@ module DataStoreExamples
 
   it 'Synchronization' do
     sum = 0
-    threads = 1.upto(100).map do |i|
+
+    threads = 10.times.map do
       Thread.new do
-        data_store.synchronize('xxx') do
+        data_store.synchronize('lock_key') do
           temp = sum
-          sleep 0
+          sleep 0.01
           sum = temp + 1
         end
       end
     end
+
     threads.each(&:join)
-      
-    sum.must_equal 100
+
+    sum.must_equal threads.count
   end
-  
+
 end

data/spec/data_store/in_memory_spec.rb

@@ -1,6 +1,4 @@
 require 'minitest_helper'
-require_relative './data_store_examples'
-require_relative './lazy_value_examples'
 
 describe Asynchronic::DataStore::InMemory do
 

data/spec/data_store/key_spec.rb

@@ -56,5 +56,5 @@ describe Asynchronic::DataStore::Key do
     key.remove_last.must_equal 'foo|bar'
     key.remove_last(2).must_equal 'foo'
   end
-  
+
 end

data/spec/data_store/lazy_value_examples.rb

@@ -1,5 +1,7 @@
 module LazyValueExamples
 
+  extend Minitest::Spec::DSL
+
   def lazy_value(key)
     Asynchronic::DataStore::LazyValue.new data_store, key
   end
@@ -7,25 +9,25 @@ module LazyValueExamples
   it 'Get' do
     value = lazy_value :key
     value.must_be_nil
-    
-    data_store[:key] =  1
+
+    data_store[:key] = 1
     value.must_equal 1
   end
 
   it 'Reload' do
     value = lazy_value :key
 
-    data_store[:key] =  1
+    data_store[:key] = 1
     value.must_equal 1
 
-    data_store[:key] =  2
+    data_store[:key] = 2
     value.must_equal 1
     value.reload.must_equal 2
   end
 
   it 'Transparent proxy' do
     value = lazy_value :key
-    data_store[:key] =  1
+    data_store[:key] = 1
     value.must_equal 1
   end
 

data/spec/data_store/redis_spec.rb

@@ -1,17 +1,15 @@
 require 'minitest_helper'
-require_relative './data_store_examples'
-require_relative './lazy_value_examples'
 
 describe Asynchronic::DataStore::Redis do
 
   let(:data_store) { Asynchronic::DataStore::Redis.new :asynchronic_test }
 
-  after do
-    data_store.clear
-  end
-
   include DataStoreExamples
 
+  describe 'LazyValue' do
+    include LazyValueExamples
+  end
+
   it 'Safe deserialization' do
     SampleClass = Class.new
 
@@ -24,8 +22,4 @@ describe Asynchronic::DataStore::Redis do
     data_store[:instance].must_be_instance_of String
   end
 
-  describe 'LazyValue' do
-    include LazyValueExamples
-  end
-
 end

data/spec/expectations.rb

@@ -15,10 +15,10 @@ module MiniTest::Assertions
   def assert_be_initialized(process)
     process.must_be :pending?
     process.wont_be :finalized?
-    
+
     process.processes.must_be_empty
     process.error.must_be_nil
-    
+
     process.created_at.must_be_instance_of Time
     process.queued_at.must_be_nil
     process.started_at.must_be_nil

data/spec/facade_spec.rb

@@ -6,7 +6,7 @@ describe Asynchronic, 'Facade' do
     Asynchronic.environment.data_store.clear
     Asynchronic.environment.queue_engine.clear
   end
-  
+
   it 'Default queue' do
     Asynchronic.default_queue.must_equal :asynchronic_test
   end
@@ -40,7 +40,7 @@ describe Asynchronic, 'Facade' do
   end
 
   it 'List processes' do
-    ids = 3.times.map do 
+    ids = 3.times.map do
       process = Asynchronic.environment.create_process SequentialJob
       process.id
     end
@@ -51,7 +51,7 @@ describe Asynchronic, 'Facade' do
 
   it 'Enqueue' do
     id = BasicJob.enqueue input: 100
-    
+
     Asynchronic.environment.tap do |env|
       process = env.load_process id
       process.type.must_equal BasicJob

data/spec/jobs.rb

@@ -9,8 +9,8 @@ class SequentialJob < Asynchronic::Job
 
   def call
     async Step1, input: params[:input]
-    
-    async Step2, dependency: Step1, 
+
+    async Step2, dependency: Step1,
                  input: params[:input]
 
     nil
@@ -32,7 +32,7 @@ end
 
 
 class GraphJob < Asynchronic::Job
-  
+
   def call
     async Sum, input: params[:input]
 
@@ -113,13 +113,13 @@ class AliasJob < Asynchronic::Job
   def call
     async Write, alias: :word_1,
                  text: 'Take'
-    
-    async Write, alias: :word_2, 
-                 text: 'it', 
+
+    async Write, alias: :word_2,
+                 text: 'it',
                  prefix: result(:word_1)
-    
-    async Write, alias: :word_3, 
-                 text: 'easy', 
+
+    async Write, alias: :word_3,
+                 text: 'easy',
                  prefix: result(:word_2)
 
     result :word_3
@@ -402,4 +402,4 @@ class BeforeFinalizeExceptionOnAbortedJob < Asynchronic::Job
   def before_finalize
     raise 'Before finalize error'
   end
-end
+end

data/spec/minitest_helper.rb

@@ -9,9 +9,11 @@ require 'expectations'
 require 'timeout'
 require 'pry-nav'
 
-class Module
-  include Minitest::Spec::DSL
-end
+require_relative 'data_store/data_store_examples'
+require_relative 'data_store/lazy_value_examples'
+require_relative 'process/life_cycle_examples'
+require_relative 'queue_engine/queue_engine_examples'
+require_relative 'worker/worker_examples'
 
 Asynchronic.logger.level = Logger::FATAL
 
@@ -20,13 +22,4 @@ class Minitest::Spec
     Asynchronic.restore_default_configuration
     Asynchronic.default_queue = :asynchronic_test
   end
-end
-
-module Asynchronic::DataStore::Helper
-  def dump
-    puts 'DataStore:'
-    each do |k,v|
-      puts "#{k}: #{v}"
-    end
-  end
 end

data/spec/process/life_cycle_examples.rb

@@ -1,5 +1,7 @@
 module LifeCycleExamples
-  
+
+  extend Minitest::Spec::DSL
+
   let(:env) { Asynchronic::Environment.new queue_engine, data_store, notifier }
 
   let(:queue) { env.default_queue }
@@ -29,7 +31,7 @@ module LifeCycleExamples
 
     process.must_have_connection_name
     process.wont_be :dead?
-    
+
     process.send(:connected?).must_be_true
 
     env.queue_engine.stub(:active_connections, ->() { raise 'Forced error' }) do
@@ -138,7 +140,7 @@ module LifeCycleExamples
     process[GraphJob::Total].must_be_pending
     process[GraphJob::Total].must_have_params '10%' => nil, '20%' => nil
     queue.must_enqueued process[GraphJob::Sum]
-    
+
     execute queue
 
     process.must_be_waiting
@@ -294,7 +296,7 @@ module LifeCycleExamples
     process[:word_3].result.must_equal 'Take it easy'
     queue.must_be_empty
   end
-  
+
   it 'Custom queue' do
     process = create CustomQueueJob, input: 'hello'
 
@@ -308,7 +310,7 @@ module LifeCycleExamples
 
     process.must_be_queued
     process.processes.must_be_empty
-    
+
     env.queue(:queue_1).must_enqueued process
     env.queue(:queue_2).must_be_empty
     env.queue(:queue_3).must_be_empty
@@ -318,7 +320,7 @@ module LifeCycleExamples
     process.must_be_waiting
     process[CustomQueueJob::Reverse].must_be_queued
     process[CustomQueueJob::Reverse].must_have_params input: 'hello'
-    
+
     env.queue(:queue_1).must_be_empty
     env.queue(:queue_2).must_enqueued process[CustomQueueJob::Reverse]
     env.queue(:queue_3).must_be_empty
@@ -329,7 +331,7 @@ module LifeCycleExamples
     process.result.must_equal 'olleh'
     process[CustomQueueJob::Reverse].must_be_completed
     process[CustomQueueJob::Reverse].result.must_equal 'olleh'
-    
+
     env.queue(:queue_1).must_be_empty
     env.queue(:queue_2).must_be_empty
     env.queue(:queue_3).must_be_empty
@@ -485,7 +487,7 @@ module LifeCycleExamples
 
   it 'Data' do
     process = create DataJob, input: 1
-  
+
     process.enqueue
     execute queue
 
@@ -497,7 +499,7 @@ module LifeCycleExamples
   it 'Nested job with error in child' do
     process = create NestedJobWithErrorInChildJob
 
-    process.enqueue 
+    process.enqueue
 
     Timeout.timeout(1) do
       until process.status == :aborted
@@ -511,17 +513,17 @@ module LifeCycleExamples
   it 'Nested job with error in parent' do
     process = create NestedJobWithErrorInParentJob
 
-    process.enqueue 
+    process.enqueue
 
     execute queue
- 
+
     process.real_error.must_equal "Error in parent"
   end
 
   it 'Abort queued After error' do
     process = create AbortQueuedAfterErrorJob
 
-    process.enqueue 
+    process.enqueue
 
     execute queue
 
@@ -602,27 +604,27 @@ module LifeCycleExamples
 
     execute queue
 
-    process.full_status.must_equal 'NestedJob'         => :waiting, 
+    process.full_status.must_equal 'NestedJob'         => :waiting,
                                    'NestedJob::Level1' => :queued
 
     execute queue
 
-    process.full_status.must_equal 'NestedJob'                 => :waiting, 
-                                   'NestedJob::Level1'         => :waiting, 
+    process.full_status.must_equal 'NestedJob'                 => :waiting,
+                                   'NestedJob::Level1'         => :waiting,
                                    'NestedJob::Level1::Level2' => :queued
 
     process.cancel!
 
     process.real_error.must_equal Asynchronic::Process::CANCELED_ERROR_MESSAGE
 
-    process.full_status.must_equal 'NestedJob'                 => :aborted, 
-                                   'NestedJob::Level1'         => :waiting, 
+    process.full_status.must_equal 'NestedJob'                 => :aborted,
+                                   'NestedJob::Level1'         => :waiting,
                                    'NestedJob::Level1::Level2' => :queued
 
     execute queue
 
-    process.full_status.must_equal 'NestedJob'                 => :aborted, 
-                                   'NestedJob::Level1'         => :aborted, 
+    process.full_status.must_equal 'NestedJob'                 => :aborted,
+                                   'NestedJob::Level1'         => :aborted,
                                    'NestedJob::Level1::Level2' => :aborted
   end
 
@@ -650,7 +652,7 @@ module LifeCycleExamples
     process_1 = create AliasJob
     process_1.enqueue
     4.times { execute queue }
-    
+
     process_2 = create AliasJob
     process_2.enqueue
     execute queue
@@ -670,7 +672,7 @@ module LifeCycleExamples
     data_store.keys.select { |k| k.start_with? pid_3 }.count.must_equal 7
 
     gc = Asynchronic::GarbageCollector.new env, 0.001
-    
+
     gc.add_condition('Finalized', &:finalized?)
     gc.add_condition('Waiting', &:waiting?)
     gc.add_condition('Exception') { raise 'Invalid condition' }
@@ -678,7 +680,7 @@ module LifeCycleExamples
     gc.conditions_names.must_equal ['Finalized', 'Waiting', 'Exception']
 
     gc.remove_condition 'Waiting'
-    
+
     gc.conditions_names.must_equal ['Finalized', 'Exception']
 
     Thread.new do

data/spec/process/life_cycle_in_memory_spec.rb

@@ -1,5 +1,4 @@
 require 'minitest_helper'
-require_relative './life_cycle_examples.rb'
 
 describe Asynchronic::Process, 'Life cycle - InMemory' do
 

data/spec/process/life_cycle_redis_spec.rb

@@ -1,5 +1,4 @@
 require 'minitest_helper'
-require_relative './life_cycle_examples.rb'
 
 describe Asynchronic::Process, 'Life cycle - Redis' do
 

data/spec/queue_engine/in_memory_spec.rb

@@ -1,11 +1,9 @@
 require 'minitest_helper'
-require_relative './queue_engine_examples'
 
 describe Asynchronic::QueueEngine::InMemory do
 
   let(:engine) { Asynchronic::QueueEngine::InMemory.new }
-  let(:listener) { Asynchronic::QueueEngine::InMemory::Listener.new }
 
   include QueueEngineExamples
-  
+
 end

data/spec/queue_engine/ost_spec.rb

@@ -1,19 +1,13 @@
 require 'minitest_helper'
-require_relative './queue_engine_examples'
 
 describe Asynchronic::QueueEngine::Ost do
 
   let(:engine) { Asynchronic::QueueEngine::Ost.new }
-  let(:listener) { Asynchronic::QueueEngine::Ost::Listener.new }
 
-  before do
-    engine.clear
-  end
-  
   include QueueEngineExamples
 
   it 'Engine and queues use same redis connection' do
     engine.redis.must_equal queue.redis
   end
-  
+
 end

data/spec/queue_engine/queue_engine_examples.rb

@@ -1,26 +1,34 @@
 module QueueEngineExamples
-  
+
+  extend Minitest::Spec::DSL
+
   let(:queue) { engine[:test_queue] }
 
+  let(:listener) { engine.listener }
+
+  after do
+    engine.clear
+  end
+
   it 'Engine' do
-    engine.queues.must_be_empty
-    
+    engine.queue_names.must_be_empty
+
     queue = engine[:test_engine]
     queue.must_be_instance_of engine.class.const_get(:Queue)
-    engine.queues.must_equal [:test_engine]
-    
+    engine.queue_names.must_equal [:test_engine]
+
     engine[:test_engine].must_equal queue
-    
+
     engine.clear
-    engine.queues.must_be_empty
+    engine.queue_names.must_be_empty
   end
 
   it 'Queue (push/pop)' do
     queue.must_be_empty
-    
+
     queue.push 'msg_1'
     queue.push 'msg_2'
-    
+
     queue.size.must_equal 2
     queue.to_a.must_equal %w(msg_1 msg_2)
 

data/spec/queue_engine/synchronic_spec.rb

@@ -22,7 +22,7 @@ describe Asynchronic::QueueEngine::Synchronic do
     Asynchronic.queue_engine.stub BasicJob do |process|
       process.params[:input] + 19
     end
-    
+
     pid = BasicJob.enqueue input: 1
     process = Asynchronic[pid]
     process.result.must_equal 20

data/spec/worker/in_memory_spec.rb

@@ -1,5 +1,4 @@
 require 'minitest_helper'
-require_relative './worker_examples'
 
 describe Asynchronic::Worker, 'InMemory' do
 
@@ -8,5 +7,5 @@ describe Asynchronic::Worker, 'InMemory' do
   let(:notifier) { Asynchronic::Notifier::InMemory.new }
 
   include WorkerExamples
-  
+
 end