adrian 1.4.0 → 1.5.0

data/lib/adrian/queue.rb

@@ -15,7 +15,9 @@ module Adrian
     end
 
     def pop
-      verify_age!(pop_item)
+      item = pop_item
+      item.queue = self if item
+      verify_age!(item)
     end
 
     def push(item)

data/lib/adrian/queue_item.rb

@@ -1,6 +1,7 @@
 module Adrian
   class QueueItem
     attr_reader :value, :created_at
+    attr_accessor :queue
 
     def initialize(value, created_at = Time.now)
       @value      = value

data/lib/adrian/version.rb

@@ -1,3 +1,3 @@
 module Adrian
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

data/test/composite_queue_test.rb

@@ -26,6 +26,14 @@ describe Adrian::CompositeQueue do
       @q1.pop.must_be_nil
       @q2.pop.must_be_nil
     end
+
+    it 'sets the original queue on the item' do
+      @q1.push(1)
+      @q2.push(2)
+
+      @q.pop.queue.must_equal @q1
+      @q.pop.queue.must_equal @q2
+    end
   end
 
   describe "pushing" do

data/test/queue_test.rb

@@ -25,6 +25,24 @@ describe Adrian::Queue do
       @q.push(item)
       lambda { @q.pop }.must_raise(Adrian::Queue::ItemTooOldError)
     end
+
+  end
+
+  it 'sets the queue on the items' do
+    q = TestQueue.new
+
+    item = Adrian::QueueItem.new('value', Time.now)
+
+    item.queue.must_be_nil
+
+    q.push(item)
+
+    item.queue.must_be_nil
+
+    popped_item = q.pop
+
+    popped_item.must_equal item
+    item.queue.must_equal q
   end
 
 end

data/test/rotating_directory_queue_test.rb

@@ -7,10 +7,12 @@ describe Adrian::RotatingDirectoryQueue do
   before do
     @root_path = Dir.mktmpdir('dir_queue_test')
     @q = Adrian::RotatingDirectoryQueue.create(:path => @root_path)
+    Timecop.freeze
   end
 
   after do
-   FileUtils.rm_r(@root_path, :force => true)
+    Timecop.return
+    FileUtils.rm_r(@root_path, :force => true)
   end
 
   describe 'pop' do
@@ -19,20 +21,18 @@ describe Adrian::RotatingDirectoryQueue do
       @item2 = Adrian::FileItem.new(Tempfile.new('item2').path)
       @item3 = Adrian::FileItem.new(Tempfile.new('item3').path)
 
-      Time.stub(:now, Time.now) do
-        todays_directory    = File.join(@root_path, Time.now.strftime('%Y-%m-%d'))
-        tomorrows_directory = File.join(@root_path, (Time.now + 60 * 60 * 24).strftime('%Y-%m-%d'))
+      todays_directory    = File.join(@root_path, Time.now.strftime('%Y-%m-%d'))
+      tomorrows_directory = File.join(@root_path, (Time.now + 60 * 60 * 24).strftime('%Y-%m-%d'))
 
-        FileUtils.mkdir_p(todays_directory)
-        FileUtils.mkdir_p(tomorrows_directory)
+      FileUtils.mkdir_p(todays_directory)
+      FileUtils.mkdir_p(tomorrows_directory)
 
-        @item1.move(todays_directory)
-        @item2.move(tomorrows_directory)
-        @item3.move(@root_path)
+      @item1.move(todays_directory)
+      @item2.move(tomorrows_directory)
+      @item3.move(@root_path)
 
-        @q.pop.must_equal @item1
-        @q.pop.must_be_nil
-      end
+      @q.pop.must_equal @item1
+      @q.pop.must_be_nil
     end
   end
 
@@ -42,15 +42,13 @@ describe Adrian::RotatingDirectoryQueue do
     end
 
     it 'moves the file to the time-stamped available directory' do
-      Time.stub(:now, Time.now) do
-        original_path = @item.path
-        @q.push(@item)
+      original_path = @item.path
+      @q.push(@item)
 
-        assert_equal false, File.exist?(original_path)
-        assert_equal true,  File.exist?(File.join(@q.available_path, @item.name))
+      assert_equal false, File.exist?(original_path)
+      assert_equal true,  File.exist?(File.join(@q.available_path, @item.name))
 
-        @item.path.must_equal File.join(@root_path, Time.now.strftime('%Y-%m-%d'), @item.name)
-      end
+      @item.path.must_equal File.join(@root_path, Time.now.strftime('%Y-%m-%d'), @item.name)
     end
   end
 

data/test/test_helper.rb

@@ -10,3 +10,4 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'adrian'
 
 require 'minitest/autorun'
+require 'timecop'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adrian
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake