micro_q 0.7.0 → 0.8.0

data/spec/lib/queue/default_spec.rb

@@ -18,7 +18,7 @@ describe MicroQ::Queue::Default do
   describe '#sync_push' do
     it_behaves_like 'Queue#sync_push'
 
-    describe 'when given the "when" key' do
+    describe 'when given the \'when\' key' do
       let(:worker) { [item, { 'when' => (Time.now + 100).to_i }] }
 
       it 'should add to the later' do
@@ -37,9 +37,7 @@ describe MicroQ::Queue::Default do
       end
 
       it 'should process the middleware chain' do
-        MicroQ.middleware.client.should_receive(:call) do |w, payload, options|
-          w.should == 'MyWorker'
-
+        MicroQ.middleware.client.should_receive(:call) do |payload, options|
           payload['class'].should == 'MyWorker'
           payload['args'].should == [4]
           options['when'].should == (Time.now + 100).to_i

data/spec/lib/queue/redis_spec.rb

@@ -6,7 +6,7 @@ describe MicroQ::Queue::Redis do
   describe '#sync_push' do
     it_behaves_like 'Queue#sync_push'
 
-    describe 'when given the "when" key' do
+    describe 'when given the \'when\' key' do
       let(:worker) { [item, { 'when' => (Time.now + 100).to_i }] }
 
       it 'should add to the later' do
@@ -22,9 +22,7 @@ describe MicroQ::Queue::Redis do
       end
 
       it 'should process the middleware chain' do
-        MicroQ.middleware.client.should_receive(:call) do |w, payload, options|
-          w.should == 'MyWorker'
-
+        MicroQ.middleware.client.should_receive(:call) do |payload, options|
           payload['class'].should == 'MyWorker'
           payload['args'].should == [4]
           options['when'].should == (Time.now + 100).to_i

data/spec/lib/statistics/default_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+describe MicroQ::Statistics::Default do
+  describe '.stats' do
+    it 'should yield a default statistics obj' do
+      MicroQ::Statistics::Default.stats {|stats| stats.class.should == MicroQ::Statistics::Default }
+    end
+
+    it 'should memoize the instance' do
+      items = []
+      2.times { MicroQ::Statistics::Default.stats {|stats| items << stats.object_id } }
+
+      items.uniq.length.should == 1
+    end
+  end
+
+  describe '.instance' do
+    it 'should be the statistics obj' do
+      MicroQ::Statistics::Default.instance.class.should == MicroQ::Statistics::Default
+    end
+
+    it 'should memoize the instance' do
+      2.times.collect { MicroQ::Statistics::Default.instance }.uniq.length.should == 1
+    end
+  end
+
+  describe '#increment' do
+    it 'should be a hash' do
+      subject.increment.should == {}
+    end
+  end
+
+  describe '#incr' do
+    before do
+      subject.incr('key_name')
+      subject.incr(:other)
+    end
+
+    it 'should add/increment the key' do
+      subject.increment.should == {
+        'key_name' => 1,
+        'other' => 1
+      }
+    end
+
+    describe 'when called again' do
+      before do
+        3.times { subject.incr('other') }
+      end
+
+      it 'should increment the key' do
+        subject.increment.should == {
+          'key_name' => 1,
+          'other' => 4
+        }
+      end
+    end
+
+    describe 'when given many keys' do
+      before do
+        2.times { subject.incr('other', 'a-new-key') }
+      end
+
+      it 'should incr each key' do
+        subject.increment.should == {
+          'key_name' => 1,
+          'other' => 3,
+          'a-new-key' => 2
+        }
+      end
+    end
+  end
+end

data/spec/lib/statistics/redis_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+describe MicroQ::Statistics::Redis do
+  describe '.stats' do
+    it 'should yield a default statistics obj' do
+      MicroQ::Statistics::Redis.stats {|stats| stats.class.should == MicroQ::Statistics::Redis }
+    end
+
+    it 'should memoize the instance' do
+      items = []
+      2.times { MicroQ::Statistics::Redis.stats {|stats| items << stats.object_id } }
+
+      items.uniq.length.should == 1
+    end
+  end
+
+  describe '.instance' do
+    it 'should be the statistics obj' do
+      MicroQ::Statistics::Redis.instance.class.should == MicroQ::Statistics::Redis
+    end
+
+    it 'should memoize the instance' do
+      2.times.collect { MicroQ::Statistics::Redis.instance }.uniq.length.should == 1
+    end
+  end
+
+  describe '#increment' do
+    it 'should be a hash' do
+      subject.increment.should == {}
+    end
+  end
+
+  describe '#incr' do
+    before do
+      subject.incr('key_name')
+      subject.incr(:other)
+    end
+
+    it 'should add/increment the key' do
+      subject.increment.should == {
+        'key_name' => 1,
+        'other' => 1
+      }
+    end
+
+    describe 'when called again' do
+      before do
+        3.times { subject.incr('other') }
+      end
+
+      it 'should increment the key' do
+        subject.increment.should == {
+          'key_name' => 1,
+          'other' => 4
+        }
+      end
+    end
+
+    describe 'when given may keys' do
+      before do
+        2.times { subject.incr('other', 'another-key') }
+      end
+
+      it 'should increment each key' do
+        subject.increment.should == {
+          'key_name' => 1,
+          'other' => 3,
+          'another-key' => 2,
+        }
+      end
+    end
+  end
+end

data/spec/lib/util_spec.rb

@@ -10,7 +10,7 @@ describe MicroQ::Util do
       MicroQ::Util.constantize('MicroQ::Util').should == MicroQ::Util
     end
 
-    it 'should work for "root" complex class names' do
+    it 'should work for \'root\' complex class names' do
       MicroQ::Util.constantize('::MicroQ::Util').should == MicroQ::Util
     end
 

data/spec/lib/worker/standard_spec.rb

@@ -4,11 +4,14 @@ describe MicroQ::Worker::Standard do
   let(:worker) { {'class' => 'MyWorker', 'args' => [1, 'value']} }
   let(:other_worker) { {'class' => 'MyWorker', 'method' => 'process', 'args' => [2, 'other-value']} }
 
+  let(:manager) { mock(MicroQ::Manager::Default, :work_done! => nil) }
+  subject { MicroQ::Worker::Standard.new(manager) }
+
   class MyWorker
-    def self.seed(*args); "SEEDED #{args.inspect}" end
-    def ar_perform(*args);"AR PERFORM! #{args.inspect}" end
-    def perform(*args);   "PERFORMED! #{args.inspect}" end
-    def process(*args);   "PROCESSED! #{args.inspect}" end
+    def self.seed(*) end
+    def ar_perform(*) end
+    def perform(*) end
+    def process(*) end
   end
 
   describe '#perform' do
@@ -16,9 +19,11 @@ describe MicroQ::Worker::Standard do
       subject.perform(item)
     end
 
-    it 'should call the method' do
-      perform(worker).should == 'PERFORMED! [1, "value"]'
-      perform(other_worker).should == 'PROCESSED! [2, "other-value"]'
+    it 'should call the methods' do
+      MyWorker.any_instance.should_receive(:perform).with(1, 'value')
+      MyWorker.any_instance.should_receive(:process).with(2, 'other-value')
+
+      perform(worker); perform(other_worker)
     end
 
     it 'should process the middleware chain' do
@@ -43,6 +48,12 @@ describe MicroQ::Worker::Standard do
       perform(other_worker)
     end
 
+    it 'should inform the manager that it finished' do
+      manager.should_receive(:work_done!).with(subject)
+
+      perform(worker)
+    end
+
     describe 'when using the class loader' do
       let(:class_worker) { {'class' => 'MyWorker', 'method' => 'seed', 'args' => [3, 45], 'loader' => {}} }
 
@@ -53,7 +64,9 @@ describe MicroQ::Worker::Standard do
       end
 
       it 'should call the method' do
-        perform(class_worker).should == "SEEDED [3, 45]"
+        MyWorker.should_receive(:seed)
+
+        perform(class_worker)
       end
     end
 
@@ -61,7 +74,7 @@ describe MicroQ::Worker::Standard do
       let(:ar_worker) { {'class' => 'MyWorker', 'method' => 'ar_perform', 'args' => [1, 2], 'loader' => {'method' => 'find', 'args' => [456]}} }
 
       before do
-        @model = mock("Model", :ar_perform => nil)
+        @model = mock('Model', :ar_perform => nil)
         MyWorker.stub(:find).with(456).and_return(@model)
       end
 
@@ -78,10 +91,12 @@ describe MicroQ::Worker::Standard do
       end
 
       it 'should call the method b' do
-        worker = MyWorker.new
+        worker = mock(MyWorker)
         MyWorker.stub(:find).with(456).and_return(worker)
 
-        perform(ar_worker).should == 'AR PERFORM! [1, 2]'
+        worker.should_receive(:ar_perform).with(1, 2)
+
+        perform(ar_worker)
       end
     end
   end

data/spec/lib/wrappers/action_mailer_spec.rb

@@ -7,7 +7,7 @@ describe MicroQ::Wrapper::ActionMailer do
   end
 
   describe '#perform' do
-    let(:mail) { mock("email", :deliver => nil) }
+    let(:mail) { mock('email', :deliver => nil) }
 
     def perform
       subject.perform('MyMailer', 'mail_me', 1, 2)
@@ -36,7 +36,7 @@ describe MicroQ::Wrapper::ActionMailer do
     end
 
     describe 'when the email does not work' do
-      let(:mail) { mock("email without deliver") }
+      let(:mail) { mock('email without deliver') }
 
       before do
         mail.stub(:respond_to?).with(:deliver).and_return(false)

data/spec/spec_helper.rb

@@ -56,7 +56,7 @@ RSpec.configure do |config|
     class WorkerClass; end
 
     @worker = WorkerClass.new
-    @payload = { 'class' => 'WorkerClass', 'args' => [1, 2]}
+    @payload = { 'class' => 'WorkerClass', 'args' => [1, 2], 'queue' => 'a-queue'}
   end
 end
 

metadata

@@ -1,190 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: micro_q
 version: !ruby/object:Gem::Version
-  version: 0.7.0
-  prerelease: 
+  version: 0.8.0
 platform: ruby
 authors:
 - Brian Norton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-17 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mock_redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -195,6 +172,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .ruby-version
 - .travis.yml
 - Gemfile
 - LICENSE
@@ -205,15 +183,18 @@ files:
 - lib/micro_q/dsl.rb
 - lib/micro_q/manager.rb
 - lib/micro_q/manager/default.rb
-- lib/micro_q/methods.rb
 - lib/micro_q/methods/action_mailer.rb
 - lib/micro_q/methods/active_record.rb
 - lib/micro_q/methods/class.rb
 - lib/micro_q/methods/instance.rb
 - lib/micro_q/middleware.rb
 - lib/micro_q/middleware/chain.rb
+- lib/micro_q/middleware/client/statistics.rb
 - lib/micro_q/middleware/server/connection.rb
 - lib/micro_q/middleware/server/retry.rb
+- lib/micro_q/middleware/server/statistics.rb
+- lib/micro_q/middleware/server/timeout.rb
+- lib/micro_q/middleware/util.rb
 - lib/micro_q/proxies.rb
 - lib/micro_q/proxies/action_mailer.rb
 - lib/micro_q/proxies/base.rb
@@ -223,11 +204,13 @@ files:
 - lib/micro_q/queue/default.rb
 - lib/micro_q/queue/redis.rb
 - lib/micro_q/redis.rb
+- lib/micro_q/statistics/base.rb
+- lib/micro_q/statistics/default.rb
+- lib/micro_q/statistics/redis.rb
 - lib/micro_q/util.rb
 - lib/micro_q/version.rb
 - lib/micro_q/worker.rb
 - lib/micro_q/worker/standard.rb
-- lib/micro_q/wrappers.rb
 - lib/micro_q/wrappers/action_mailer.rb
 - micro_q.gemspec
 - spec/helpers/methods_examples.rb
@@ -241,41 +224,45 @@ files:
 - spec/lib/methods/instance_spec.rb
 - spec/lib/micro_q_spec.rb
 - spec/lib/middleware/chain_spec.rb
+- spec/lib/middleware/client/statistics_spec.rb
 - spec/lib/middleware/server/connection_spec.rb
 - spec/lib/middleware/server/retry_spec.rb
+- spec/lib/middleware/server/statistics_spec.rb
+- spec/lib/middleware/server/timeout_spec.rb
 - spec/lib/proxies/action_mailer_spec.rb
 - spec/lib/proxies/base_spec.rb
 - spec/lib/proxies/class_spec.rb
 - spec/lib/proxies/instance_spec.rb
 - spec/lib/queue/default_spec.rb
 - spec/lib/queue/redis_spec.rb
+- spec/lib/statistics/default_spec.rb
+- spec/lib/statistics/redis_spec.rb
 - spec/lib/util_spec.rb
 - spec/lib/worker/standard_spec.rb
 - spec/lib/wrappers/action_mailer_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/bnorton/micro-q
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ''
 test_files:
 - spec/helpers/methods_examples.rb
@@ -289,16 +276,20 @@ test_files:
 - spec/lib/methods/instance_spec.rb
 - spec/lib/micro_q_spec.rb
 - spec/lib/middleware/chain_spec.rb
+- spec/lib/middleware/client/statistics_spec.rb
 - spec/lib/middleware/server/connection_spec.rb
 - spec/lib/middleware/server/retry_spec.rb
+- spec/lib/middleware/server/statistics_spec.rb
+- spec/lib/middleware/server/timeout_spec.rb
 - spec/lib/proxies/action_mailer_spec.rb
 - spec/lib/proxies/base_spec.rb
 - spec/lib/proxies/class_spec.rb
 - spec/lib/proxies/instance_spec.rb
 - spec/lib/queue/default_spec.rb
 - spec/lib/queue/redis_spec.rb
+- spec/lib/statistics/default_spec.rb
+- spec/lib/statistics/redis_spec.rb
 - spec/lib/util_spec.rb
 - spec/lib/worker/standard_spec.rb
 - spec/lib/wrappers/action_mailer_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/micro_q/methods.rb

@@ -1,7 +0,0 @@
-# add Class and Instance methods first then
-# override with additional extensions
-
-require 'micro_q/methods/class'
-require 'micro_q/methods/instance'
-require 'micro_q/methods/active_record'
-require 'micro_q/methods/action_mailer'

data/lib/micro_q/wrappers.rb

@@ -1 +0,0 @@
-require 'micro_q/wrappers/action_mailer'