actionable 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aba5c2dd61d34960608b12a00742c86eddeb904e
-  data.tar.gz: 0c9d7ab01b25b32b973c7a69e8cf254999a46eaf
+  metadata.gz: b187586cc793a33104a2f5c1710daefae5d25023
+  data.tar.gz: 77797479469c0474aa59cc8c545160086ba50033
 SHA512:
-  metadata.gz: b83923f9cde4a28559ac389a02f634541947c320cfe36655a3d42756ad400df0b6f419708ad1141ceaf82e4bce9959260b044ec73eea0f93580f733ad1492261
-  data.tar.gz: e8ad792fcfb39c41ee9f1edc8f71000b6a8018b4bc21d7686b6148deaf642ff47ed5232f63b1dc8ca52682a2b7b49ec133dc6191d334c6632faf57b3b03cffc2
+  metadata.gz: 535ef546df907bbdc4eb4b1564bf8272185cd8724842394f216f25c98f0dd77c65111add75475a412ebc88f945453f2e4a11d39659da394d3b144472a7479ec1
+  data.tar.gz: dd8b4beee3770047d760f8f126907358407931d072e9eca60825b2cc43d177e5c229ca2d7ab90b50e6e5a40eca5e7ac481f1cc388f17b4e9f9aa0e9b5c15ddcb

data/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'resque', github: 'resque/resque', branch: 'master'
+gem 'resque', '~> 1.24.1'
 gem 'mongoid', github: 'mongoid/mongoid', branch: 'master'
-gemspec
+gemspec

data/actionable.gemspec

@@ -27,7 +27,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rb-fsevent"
   spec.add_development_dependency "terminal-notifier-guard"
 
-  spec.add_dependency "resque", "~> 2.0.0.pre.1"
+  spec.add_dependency "activesupport", "~> 4.0.0"
+  spec.add_dependency "resque", "~> 1.24.1"
   spec.add_dependency "mongoid", "~> 4.0.0"
   spec.add_dependency "rufus-scheduler"
 

data/lib/actionable.rb

@@ -1,5 +1,6 @@
 require "mongoid"
 require "resque"
+require "active_support"
 
 require "actionable/version"
 

data/lib/actionable/resque.rb

@@ -1,16 +1,17 @@
 require 'actionable/sweep'
 
 module Resque
-  class MultiQueue
-  
-    alias :default_poll :poll
+  class Worker
 
-    def poll(t)
-      default_poll(t) || sweep
+    alias :default_reserve :reserve
+
+    def reserve
+      default_reserve || sweep
     end
 
     def sweep
       Resque.enqueue(Actionable::Sweep)
+      nil
     end
 
   end

data/lib/actionable/version.rb

@@ -1,3 +1,3 @@
 module Actionable
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

data/spec/job_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 class TestWorker
-  
+
   attr_accessor :pid
 
   def spawn
@@ -40,7 +40,7 @@ describe Actionable::Job do
     }
 
     before do
-     target.schedule_actionable(1.minute.ago,TestJob,{number:2})    
+     target.schedule_actionable(1.minute.ago,TestJob,{number:2})
     end
 
     it "should be executed by a worker manually" do
@@ -61,4 +61,4 @@ describe Actionable::Job do
 
   end
 
-end
+end

data/spec/recurrence_spec.rb

@@ -2,98 +2,110 @@ require "spec_helper"
 
 describe Actionable::Recurrence do
 
-  let(:every_five){ "*/5 * * * *" }
-  let(:new_args){
-    { recurrence_string:every_five, job_class: RecurringTestJob }
-  }
-
-  let(:recurrence) {
-    Actionable::Recurrence.create(new_args)
-  }
-
-  it "should be instantiated with a recurrence string and a job class" do
-    r = Actionable::Recurrence.new(new_args)
-    expect(r).to be_valid
-  end
+  context "every day at 2:00 AM" do
+    let(:every_day_at_2){ "0 2 * * *" }
 
-  it "should refuse to save with a bad recurrence string" do
-    new_args[:recurrence_string] = '* D * L * . *'
-    r = Actionable::Recurrence.new(new_args)
-    expect(r).to_not be_valid
+    it "should parse good" do
+      recurrence = Rufus::CronLine.new(every_day_at_2)
+    end
   end
 
-  it "should refuse to save with a non-existent class" do
-    new_args[:job_class] = "NonExistentJob"
-    r = Actionable::Recurrence.new(new_args)
-    expect(r).to_not be_valid
-  end
+  context "every five minutes" do
 
+    let(:every_five){ "*/5 * * * *" }
+    let(:new_args){
+      { recurrence_string:every_five, job_class: RecurringTestJob }
+    }
 
-  it "should not add to the database until saved" do
-    r = Actionable::Recurrence.new(new_args)
-    expect(Actionable::Recurrence.count).to eq(0)
-  end
+    let(:recurrence) {
+      Actionable::Recurrence.create(new_args)
+    }
 
-  it "should add to the database afer being committed" do
-    r = Actionable::Recurrence.new(new_args)
-    r.save
-    expect(Actionable::Recurrence.count).to eq(1)
-  end
+    it "should be instantiated with a recurrence string and a job class" do
+      r = Actionable::Recurrence.new(new_args)
+      expect(r).to be_valid
+    end
 
-  it "should know its job class" do
-    expect(recurrence.send(:job_class)).to eq(RecurringTestJob)
-  end
+    it "should refuse to save with a bad recurrence string" do
+      new_args[:recurrence_string] = '* D * L * . *'
+      r = Actionable::Recurrence.new(new_args)
+      expect(r).to_not be_valid
+    end
+
+    it "should refuse to save with a non-existent class" do
+      new_args[:job_class] = "NonExistentJob"
+      r = Actionable::Recurrence.new(new_args)
+      expect(r).to_not be_valid
+    end
 
-  it "should create an actionable upon creation" do
-    expect(Actionable::Action.count).to eq(0)
-    Actionable::Recurrence.create(new_args)
-    expect(Actionable::Action.count).to eq(1)
-  end
 
-  context "when time passes" do
+    it "should not add to the database until saved" do
+      r = Actionable::Recurrence.new(new_args)
+      expect(Actionable::Recurrence.count).to eq(0)
+    end
+
+    it "should add to the database afer being committed" do
+      r = Actionable::Recurrence.new(new_args)
+      r.save
+      expect(Actionable::Recurrence.count).to eq(1)
+    end
 
-    before do
-      Resque.inline = true
-      recurrence.valid?
-      Timecop.travel(5.minutes.from_now)
+    it "should know its job class" do
+      expect(recurrence.send(:job_class)).to eq(RecurringTestJob)
     end
-  
-    it "should run the first action and create a new one on sweep" do
+
+    it "should create an actionable upon creation" do
+      expect(Actionable::Action.count).to eq(0)
+      Actionable::Recurrence.create(new_args)
       expect(Actionable::Action.count).to eq(1)
-      Actionable::Sweep.perform
-      expect(Actionable::Action.count).to eq(2)
     end
 
-  end
+    context "when time passes" do
 
-  context "when no time passes" do
+      before do
+        Resque.inline = true
+        recurrence.valid?
+        Timecop.travel(5.minutes.from_now)
+      end
 
-    before do
-      Resque.inline = true
-      recurrence.valid?
-    end
+      it "should run the first action and create a new one on sweep" do
+        expect(Actionable::Action.count).to eq(1)
+        2.times { Actionable::Sweep.perform }
+        expect(Actionable::Action.count).to eq(2)
+      end
 
-    it "should not run the first action or create a new one" do
-      expect(Actionable::Action.count).to eq(1)
-      Actionable::Sweep.perform
-      expect(Actionable::Action.count).to eq(1)
     end
 
-  end
+    context "when no time passes" do
 
-  context "over the course of an hour" do
+      before do
+        Resque.inline = true
+        recurrence.valid?
+      end
 
-    it "should create and perform the job 11 times" do
-      RecurringTestJob.should_receive(:go).at_least(11).times
-      Timecop.travel(1.hour.from_now.change(minutes:0))
-      recurrence.valid?
-      60.times do
+      it "should not run the first action or create a new one" do
+        expect(Actionable::Action.count).to eq(1)
         Actionable::Sweep.perform
-        Timecop.travel(1.minute.from_now)
+        expect(Actionable::Action.count).to eq(1)
       end
-      expect(Actionable::Action.count).to be_within(1).of(12)
+
+    end
+
+    context "over the course of an hour" do
+
+      it "should create and perform the job 11 times" do
+        RecurringTestJob.should_receive(:go).at_least(11).times
+        Timecop.travel(1.hour.from_now.change(minutes:0))
+        recurrence.valid?
+        60.times do
+          Actionable::Sweep.perform
+          Timecop.travel(1.minute.from_now)
+        end
+        expect(Actionable::Action.count).to be_within(1).of(12)
+      end
+
     end
 
   end
 
-end
+end

data/spec/sweep_spec.rb

@@ -26,15 +26,15 @@ describe Actionable::Sweep do
 
     it "should enqueue a job that knows the id for its target" do
       Actionable::Sweep.perform
-      expect(Resque.queue('actionable').pop['args'].first).to eq(target.actionables.first.id.to_s)
+      expect(Resque.pop('actionable')['args'].first).to eq(target.actionables.first.id.to_s)
     end
 
     it "should update the actionable's status to 'enqueued'" do
-      expect(target.actionables.first.status).to eq(:late)    
+      expect(target.actionables.first.status).to eq(:late)
       Actionable::Sweep.perform
       expect(target.actionables.first.status).to eq(:enqueued)
     end
 
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionable
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Daniel Luxemburg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,20 +122,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.1
+        version: 1.24.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.1
+        version: 1.24.1
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement