qs 0.6.1 → 0.7.0

data/test/unit/queue_tests.rb

@@ -162,11 +162,11 @@ class Qs::Queue
 
     should "know its custom inspect" do
       reference = '0x0%x' % (subject.object_id << 1)
-      expected = "#<#{subject.class}:#{reference} " \
-                   "@name=#{subject.name.inspect} " \
-                   "@job_handler_ns=#{subject.job_handler_ns.inspect} " \
-                   "@event_handler_ns=#{subject.event_handler_ns.inspect}>"
-      assert_equal expected, subject.inspect
+      exp = "#<#{subject.class}:#{reference} " \
+            "@name=#{subject.name.inspect} " \
+            "@job_handler_ns=#{subject.job_handler_ns.inspect} " \
+            "@event_handler_ns=#{subject.event_handler_ns.inspect}>"
+      assert_equal exp, subject.inspect
     end
 
     should "require a name when initialized" do

data/test/unit/runner_tests.rb

@@ -25,7 +25,7 @@ class Qs::Runner
 
     should have_readers :handler_class, :handler
     should have_readers :logger, :message, :params
-    should have_imeths :run
+    should have_imeths :run, :halt
 
     should "know its handler class and handler" do
       assert_equal @handler_class, subject.handler_class
@@ -56,6 +56,14 @@ class Qs::Runner
       assert_raises(NotImplementedError){ subject.run }
     end
 
+    should "halt execution with its halt method" do
+      something = nil
+      @runner_class.new(@handler_class).tap do |runner|
+        catch(:halt){ runner.halt; something = Factory.string }
+      end
+      assert_nil something
+    end
+
   end
 
   class TestJobHandler

data/test/unit/test_runner_tests.rb

@@ -39,7 +39,7 @@ class Qs::TestRunner
     end
     subject{ @runner }
 
-    should have_imeths :run
+    should have_imeths :halted?, :run
 
     should "know its standard args" do
       assert_equal @args[:logger],  subject.logger
@@ -71,6 +71,17 @@ class Qs::TestRunner
       assert_nil @handler.after_called
     end
 
+    should "not be halted by default" do
+      assert_false subject.halted?
+    end
+
+    should "not call `run` on its handler if halted when run" do
+      catch(:halt){ subject.halt }
+      assert_true subject.halted?
+      subject.run
+      assert_nil @handler.run_called
+    end
+
     should "stringify and encode the params passed to it" do
       key, value = Factory.string.to_sym, Factory.string
       params = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: qs
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-04-05 00:00:00 Z
+date: 2016-06-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.15.1
+        version: 2.16.1
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -29,7 +29,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.1
+        version: 3.0.2
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -39,7 +39,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: 0.6.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -49,7 +49,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -59,29 +59,19 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: ns-options
+  name: much-timeout
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.6
+        version: 0.1.0
   type: :runtime
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: SystemTimer
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.2"
-  type: :runtime
-  version_requirements: *id007
 description: Define message queues. Process jobs and events. Profit.
 email: 
 - kelly@kellyredding.com
@@ -137,7 +127,7 @@ files:
 - log/.gitkeep
 - qs.gemspec
 - test/helper.rb
-- test/support/app_daemon.rb
+- test/support/app_queue.rb
 - test/support/client_spy.rb
 - test/support/config.qs
 - test/support/config_files/empty.qs
@@ -194,13 +184,13 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - &id008 
+  - &id007 
     - ">="
     - !ruby/object:Gem::Version 
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id008
+  - *id007
 requirements: []
 
 rubyforge_project: 
@@ -210,7 +200,7 @@ specification_version: 4
 summary: Define message queues. Process jobs and events. Profit.
 test_files: 
 - test/helper.rb
-- test/support/app_daemon.rb
+- test/support/app_queue.rb
 - test/support/client_spy.rb
 - test/support/config.qs
 - test/support/config_files/empty.qs

data/test/support/app_daemon.rb

@@ -1,143 +0,0 @@
-require 'qs'
-
-LOGGER = Logger.new(ROOT_PATH.join('log/app_daemon.log').to_s)
-LOGGER.datetime_format = "" # turn off the datetime in the logs
-
-AppQueue = Qs::Queue.new do
-  name 'qs-app-main'
-
-  job_handler_ns 'AppHandlers'
-
-  job 'basic',   'Basic'
-  job 'error',   'Error'
-  job 'timeout', 'Timeout'
-  job 'slow',    'Slow'
-
-  event_handler_ns 'AppHandlers'
-
-  event 'qs-app', 'basic',   'BasicEvent'
-  event 'qs-app', 'error',   'ErrorEvent'
-  event 'qs-app', 'timeout', 'TimeoutEvent'
-  event 'qs-app', 'slow',    'SlowEvent'
-end
-
-class AppDaemon
-  include Qs::Daemon
-
-  name 'qs-app'
-
-  logger LOGGER
-  verbose_logging true
-
-  queue AppQueue
-
-  error do |exception, context|
-    return unless (message = context.message)
-    payload_type = message.payload_type
-    route_name   = message.route_name
-    case(route_name)
-    when 'error', 'timeout', 'qs-app:error', 'qs-app:timeout'
-      error = "#{exception.class}: #{exception.message}"
-      Qs.redis.with{ |c| c.set("qs-app:last_#{payload_type}_error", error) }
-    when 'slow', 'qs-app:slow'
-      error = exception.class.to_s
-      Qs.redis.with{ |c| c.set("qs-app:last_#{payload_type}_error", error) }
-    end
-  end
-
-end
-
-DISPATCH_LOGGER = Logger.new(ROOT_PATH.join('log/app_dispatcher_daemon.log').to_s)
-DISPATCH_LOGGER.datetime_format = "" # turn off the datetime in the logs
-
-class DispatcherDaemon
-  include Qs::Daemon
-
-  name 'qs-app-dispatcher'
-
-  logger DISPATCH_LOGGER
-  verbose_logging true
-
-  # we build a "custom" dispatcher because we can't rely on Qs being initialized
-  # when this is required
-  queue Qs::DispatcherQueue.new({
-    :queue_class            => Qs.config.dispatcher_queue_class,
-    :queue_name             => 'qs-app-dispatcher',
-    :job_name               => Qs.config.dispatcher.job_name,
-    :job_handler_class_name => Qs.config.dispatcher.job_handler_class_name
-  })
-end
-
-module AppHandlers
-
-  class Basic
-    include Qs::JobHandler
-
-    def run!
-      Qs.redis.with{ |c| c.set("qs-app:#{params['key']}", params['value']) }
-    end
-  end
-
-  class Error
-    include Qs::JobHandler
-
-    def run!
-      raise params['error_message']
-    end
-  end
-
-  class Timeout
-    include Qs::JobHandler
-
-    timeout 0.2
-
-    def run!
-      sleep 2
-    end
-  end
-
-  class Slow
-    include Qs::JobHandler
-
-    def run!
-      sleep 5
-      Qs.redis.with{ |c| c.set('qs-app:slow', 'finished') }
-    end
-  end
-
-  class BasicEvent
-    include Qs::EventHandler
-
-    def run!
-      Qs.redis.with{ |c| c.set("qs-app:#{params['key']}", params['value']) }
-    end
-  end
-
-  class ErrorEvent
-    include Qs::EventHandler
-
-    def run!
-      raise params['error_message']
-    end
-  end
-
-  class TimeoutEvent
-    include Qs::EventHandler
-
-    timeout 0.2
-
-    def run!
-      sleep 2
-    end
-  end
-
-  class SlowEvent
-    include Qs::EventHandler
-
-    def run!
-      sleep 5
-      Qs.redis.with{ |c| c.set('qs-app:slow:event', 'finished') }
-    end
-  end
-
-end