threasy 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e72cd2a275c0cc94bcac05463b285062788c4bd
-  data.tar.gz: 37d0d9082bca7164f370fca2f1e8c7ec057db9f8
+  metadata.gz: 864b05c24ba407f0763f65f7a07e1af3d9678efd
+  data.tar.gz: c83f33b9c2ea06fa1783ba51b51b07948920e359
 SHA512:
-  metadata.gz: 4f4f468799a33bea2755f2bf99ff971940197296c3ace39a4a55737c8d2f06c5250f1a27c8d1e1d33ea5ba72eba143f0f1901a4d7fdc844ff0ab4c3b582c1064
-  data.tar.gz: 46f254797c31d50e690c36d6c388b79053997e5e0e0f59af72f1c59938965c4369a975c4b33f552e14e6c70407a2e595dcaa97ec64d6cec3c23e25d57fe01c0c
+  metadata.gz: cb206f8de354b6192c0bb5153cedda328b9d928abedf86423bcdc1e601c720bdb312c87b9bde65353d73a03f8f1a0ccc7384ffe80c60e837c7be53c443751a48
+  data.tar.gz: ca0f60b71576b34b325cf7bc2a3c94a793f1c52ede65fe9ef79914414417303c59a54d5a7c04828c333fdda89c5be4d17e37a4b85f0cdaa17b4c3d576fd5ad72

data/lib/threasy/version.rb

@@ -1,3 +1,3 @@
 module Threasy
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/threasy/work.rb

@@ -46,6 +46,10 @@ module Threasy
       worker.work
     end
 
+    def clear
+      queue.clear
+    end
+
     def log(msg)
       Threasy.logger.debug msg
     end

data/spec/spec_helper.rb

@@ -3,4 +3,14 @@ require 'timecop'
 
 require File.join(File.dirname(__FILE__), "..", "lib", "threasy")
 
+def async(timeout = 10)
+  t = Thread.new do
+    Thread.stop
+  end
+  yield -> { t.wakeup }
+  raise "Example's time limit exceeded" unless t.join(20)
+end
+
+Threasy.config.max_sleep = 0.1
+
 # Threasy.config.logger.level = Logger::DEBUG

data/spec/threasy/schedule/entry_spec.rb

@@ -19,4 +19,12 @@ describe Threasy::Schedule::Entry do
     end
   end
 
+  describe "#at" do
+    it "should default to now + every interval" do
+      Timecop.freeze do
+        expect(subject.new(nil, every: 0.1).at).to eq(Time.now + 0.1)
+      end
+    end
+  end
+
 end

data/spec/threasy/schedule_spec.rb

@@ -1,76 +1,50 @@
 describe "Threasy::Schedule" do
   let(:job){ double("job") }
-  let(:work){ double("work") }
-  subject{ Threasy::Schedule.new(work) }
+  subject { Threasy.schedules }
+
+  after(:each) { subject.clear }
 
   describe "#add" do
     it "should allow a job to be processed after specified delay" do
-      expect(work).to receive(:enqueue).with(job)
-      subject.add(job, in: 0.1)
-      sleep 0.3
+      async do |done|
+        subject.add(-> { done.() }, in: 0.01)
+      end
     end
 
     it "should allow a job to be processed at the specified time" do
-      expect(work).to receive(:enqueue).with(job)
-      subject.add(job, at: Time.now + 0.1)
-      sleep 0.3
+      async do |done|
+        subject.add(-> { done.() }, at: Time.now + 0.01)
+      end
     end
 
     it "should allow a job to be repeated at the specified interval" do
-      expect(work).to receive(:enqueue).with(job).at_least(:twice)
-      subject.add(job, every: 0.1, in: 0.1)
-      sleep 0.5
-    end
-
-    it "should allow blocks to be processed on schedule" do
-      block_job = ->{ 1 + 1 }
-      expect(work).to receive(:enqueue).with(block_job)
-      subject.add(in: 0.1, &block_job)
-      sleep 0.3
-    end
-
-    it "should allow string expressions to be processed on schedule" do
-      expect(work).to receive(:enqueue).with("TestScheduledJob")
-      subject.add("TestScheduledJob", in: 0.1)
-      sleep 0.3
-    end
-
-    it "should default first run to now + every_interval" do
-      expect(work).to receive(:enqueue).with(job).at_least(:twice)
-      subject.add(job, every: 0.1)
-      sleep 0.5
+      async do |done|
+        repeats = 0
+        subject.add(every: 0.01, in: 0.01) do
+          repeats += 1
+          done.() if repeats == 2
+        end
+      end
     end
   end
 
   describe "#remove" do
     it "should be possible to remove a job from the schedule" do
-      expect(work).to receive(:enqueue).with(job).at_least(:once)
-
-      entry = subject.add(job, every: 0.1)
-      sleep 0.3
-
+      entry = subject.add(job, every: 0.01)
+      expect(subject).to receive(:remove_entry).with(entry)
       entry.remove
-
-      expect(work).not_to receive(:enqueue)
-      sleep 0.3
     end
   end
 
   context "when laptop suspends" do
-    subject{ Threasy::Schedule.new }
-    let(:hour) { 60*60 }
+    let(:hour) { 60 * 60 }
 
     it "should recover in a few seconds when time suddenly jumps forward" do
-      Threasy.config.max_sleep = 0.1
-      job_ran = false
-      job = -> { job_ran = true }
-      subject.add(in: hour + 1, &job)
-
-      Timecop.travel(Time.now + hour) do
-        Timeout.timeout(6) do
-          loop { job_ran ? break : sleep(0.1) }
-        end
+      async do |done|
+        subject.add(-> { done.() }, in: hour + 0.01)
+        Timecop.travel(Time.now + hour)
       end
+      Timecop.return
     end
 
   end

data/spec/threasy/work_spec.rb

@@ -1,38 +1,40 @@
 class TestJob
+  def initialize(resolver)
+    @resolver = resolver
+  end
+
+  def perform
+    @resolver.()
+  end
 end
 
 describe "Threasy::Work" do
-  before :each do
-    @work = Threasy::Work.new
-  end
+  subject { Threasy::Work.new }
+  after(:each) { subject.clear }
 
   describe "#enqueue" do
     it "should have a method for enqueing" do
-      expect(@work.respond_to?(:enqueue)).to eq(true)
+      expect(subject.respond_to?(:enqueue)).to eq(true)
     end
 
     it "should allow a job object to be enqueued and worked" do
-      job = double("job")
-      expect(job).to receive(:perform).once
-      @work.enqueue job
-      sleep 0.1
+      async do |done|
+        subject.enqueue TestJob.new(done)
+      end
     end
 
     it "should allow a job block to be enqueued and worked" do
-      i = 0
-      @work.enqueue do
-        sleep 0.1
-        i += 1
+      async do |done|
+        subject.enqueue { done.() }
       end
-      expect(i).to eq(0)
-      sleep 0.2
-      expect(i).to eq(1)
     end
 
     it "should allow a string expression to be enqueued and worked" do
-      expect(TestJob).to receive(:perform).once
-      @work.enqueue "TestJob"
-      sleep 0.1
+      async do |done|
+        expect(TestJob).to receive(:perform).once
+        subject.enqueue "TestJob"
+        subject.enqueue { done.() }
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: threasy
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Carl Zulauf