threaded_in_memory_queue 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38361b605ed853eeb5af0accecf034f729c7b31b
-  data.tar.gz: d34e9ac4ee7f2ae5facf364fbc0234d8f01e16e5
+  metadata.gz: 8caa931f0f7d256bef31f16943b720971a4aba33
+  data.tar.gz: 58779b11127871c2922e7d56ae1e65501e2e9264
 SHA512:
-  metadata.gz: e5c37e3dd37bb4d273d2195792023148f81d278cb17b19f6d13a5f3c54ccb202a6ddcf6525c8807f5366170f76ad2a9dc91a722b12a33c04978e250e120a60a7
-  data.tar.gz: 3ae6c5d6bd2f0ebc9a7301ed06defad3c63a537cef3ba6915449f103d48ed61c985c294df2bb6e77b43dd1b6dacffb9c5723bb03c8faec23879ae3ba2c45f17a
+  metadata.gz: 43b262f01b9b14826df1499106e037024d83d65098318831bd761ba32df9a91a2da57e001ea2390ddbb66682559ac2fb9b73c15119b65831cd11ede249124b07
+  data.tar.gz: 8754a70e9e7e994b89089cfeeeb2f84ba448e2f0d04953d473ab39a20652887846f5969280de16ca48cf677f33bab9e9034e6bf5eb73dafa93412b564ec9fab0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    threaded_in_memory_queue (0.0.1)
+    threaded_in_memory_queue (0.0.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/threaded_in_memory_queue.rb

@@ -3,14 +3,12 @@ require 'timeout'
 require 'logger'
 
 require 'threaded_in_memory_queue/version'
-require 'threaded_in_memory_queue/inline'
 require 'threaded_in_memory_queue/timeout'
 
 module ThreadedInMemoryQueue
-  extend Inline
-
   class << self
-    attr_accessor :logger
+    attr_accessor :logger, :inline
+    alias :inline? :inline
   end
 
   def self.start(options = {})
@@ -36,9 +34,13 @@ module ThreadedInMemoryQueue
     @master = master
   end
 
-  def self.enqueue(klass, *args)
-    raise NoWorkersError, "must start worker before enqueueing jobs" unless master
-    master.enqueue(klass, *args)
+  def self.enqueue(job, *args)
+    if inline?
+      job.call(*args)
+    else
+      raise NoWorkersError unless started?
+      master.enqueue(job, *args)
+    end
     return true
   end
 

data/lib/threaded_in_memory_queue/master.rb

@@ -2,7 +2,6 @@ module ThreadedInMemoryQueue
   class Master
     include ThreadedInMemoryQueue::Timeout
     attr_reader :workers, :logger
-    extend Inline
 
     DEFAULT_TIMEOUT = 60 # seconds, 1 minute
     DEFAULT_SIZE    = 16
@@ -42,13 +41,9 @@ module ThreadedInMemoryQueue
       return self
     end
 
-    def enqueue(klass, *json)
-      if self.class.inline?
-        klass.call(*json)
-      else
-        raise NoWorkersError, "No workers" unless alive?
-        @queue.enq([klass, json])
-      end
+    def enqueue(job, *json)
+      raise NoWorkersError unless alive?
+      @queue.enq([job, json])
       return true
     end
 

data/lib/threaded_in_memory_queue/version.rb

@@ -1,3 +1,3 @@
 module ThreadedInMemoryQueue
-  VERSION = "0.0.2"
-end
+  VERSION = "0.0.3"
+end

data/lib/threaded_in_memory_queue/worker.rb

@@ -38,7 +38,7 @@ module ThreadedInMemoryQueue
     private
     def create_thread
       Thread.new {
-        logger.info("Worker #{object_id} ready")
+        logger.info("Threaded In Memory Queue Worker '#{object_id}' ready")
         loop do
           payload   = queue.pop
           job, json = *payload
@@ -48,7 +48,7 @@ module ThreadedInMemoryQueue
             job.call(*json)
           end
         end
-        logger.info("Worker #{object_id} stopped")
+        logger.info("Threaded In Memory Queue Worker '#{object_id}' stopped")
       }
     end
   end

data/test/threaded_in_memory_queue_test.rb

@@ -11,6 +11,18 @@ class ThreadedInMemoryQueueTest < Test::Unit::TestCase
     refute ThreadedInMemoryQueue.started?
   end
 
+  def test_inline
+    Dummy.expects(:process).with(1).once
+    job = Proc.new {|x| Dummy.process(x) }
+
+    ThreadedInMemoryQueue.inline = true
+    ThreadedInMemoryQueue.enqueue(job, 1)
+    assert ThreadedInMemoryQueue.inline
+    assert ThreadedInMemoryQueue.stopped?
+  ensure
+    ThreadedInMemoryQueue.inline = false
+  end
+
   def test_enqueues
     Dummy.expects(:process).with(1).once
     Dummy.expects(:process).with(2).once
@@ -21,7 +33,6 @@ class ThreadedInMemoryQueueTest < Test::Unit::TestCase
 
     ThreadedInMemoryQueue.enqueue(job, 1)
     ThreadedInMemoryQueue.enqueue(job, 2)
-    ThreadedInMemoryQueue.stop
   ensure
     ThreadedInMemoryQueue.stop
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: threaded_in_memory_queue
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -53,7 +53,6 @@ files:
 - Rakefile
 - lib/threaded_in_memory_queue.rb
 - lib/threaded_in_memory_queue/errors.rb
-- lib/threaded_in_memory_queue/inline.rb
 - lib/threaded_in_memory_queue/master.rb
 - lib/threaded_in_memory_queue/timeout.rb
 - lib/threaded_in_memory_queue/version.rb

data/lib/threaded_in_memory_queue/inline.rb

@@ -1,15 +0,0 @@
-module ThreadedInMemoryQueue
-  module Inline
-    def inline
-      @inline
-    end
-
-    def inline?
-      inline
-    end
-
-    def inline=(inline)
-      @inline = inline
-    end
-  end
-end