Bugs/broken subdir mode

VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

lib/history_file.rb

@@ -1,2 +1,2 @@
-require 'history_file/file_delegator'
-require 'history_file/history_file'
+require_relative 'history_file/file_delegator'
+require_relative 'history_file/history_file'

lib/history_file/file_delegator.rb

@@ -114,7 +114,11 @@ def file_fallback(original_filename, target_filename)
       return false unless @fallback_glob
       dir   = File.dirname(original_filename.to_s)
       file  = File.basename(original_filename.to_s)
-      glob  = File.join(dir, @fallback_glob+file)
+      if @subdir
+        glob = File.join(dir, @fallback_glob, file)
+      else
+        glob  = File.join(dir, "#{@fallback_glob}-#{file}")
+      end
       candidates = Dir[glob].sort.select do |c|
         c < target_filename
       end.last

lib/history_file/history_file.rb

@@ -36,7 +36,7 @@ def self.mode=(mode)
   def self.[](offset)
     validate_offset(offset)
     use_subdirs = @mode == :subdir
-    fallback_glob = "[0-9][0-9][0-9][0-9].[0-9][0-9].[0-9][0-9]-"
+    fallback_glob = "[0-9][0-9][0-9][0-9].[0-9][0-9].[0-9][0-9]"
     FileDelegator.new(prefix: prefix(offset),
                       fallback_glob: fallback_glob,
                       use_subdirs: use_subdirs)

spec/history_file/history_file_spec.rb

@@ -97,36 +97,43 @@
   # We run these tests twice
   [:subdir, :filename].each do |mode|
 
-    HistoryFile.mode = mode
     context "falling back to older files in #{mode} mode" do
-      before(:all) do
-        [1,2,3,6,7].each do |i|
+      it "sets up things correctly" do
+        HistoryFile.mode = mode
+        [2,3,6,7,8].each do |i|
           date = DateTime.now - i
-          HistoryFile[date].open("ht.txt", "w") do |file|
+          HistoryFile[date].open("ht_#{mode}.txt", "w") do |file|
             file.write "Day #{i} #{mode}"
           end
         end
       end
 
-      after(:all) do
-        [1,2,3,6,7].each do |i|
-          date = DateTime.now - i
-          HistoryFile[date].unlink("ht.txt")
-        end
-        Dir.unlink("some_prefix") rescue nil
-      end
-
-      it "to yesterday's file" do
+      it "to a four days old file" do
+        HistoryFile.mode = mode
         date = DateTime.now - 4
-        HistoryFile[date].read("ht.txt").should == "Day 6 #{mode}"
+        HistoryFile[date].read("ht_#{mode}.txt").should == "Day 6 #{mode}"
       end
 
       it "to an error if nothing older exists" do
+        HistoryFile.mode = mode
         expect{
-          date = DateTime.now - 8
-          HistoryFile[date].read("ht.txt")
+          date = DateTime.now - 9
+          HistoryFile[date].read("ht_#{mode}.txt")
         }.to raise_error(Errno::ENOENT)
       end
+
+      it "removes stuff we assumed we created" do
+        HistoryFile.mode = mode
+        [2,3,6,7,8].each do |i|
+          date = DateTime.now - i
+          HistoryFile[date].unlink("ht_#{mode}.txt")
+          if mode == :subdir
+            dir = File.dirname(HistoryFile[date].prefixed_filename("ht_#{mode}.txt"))
+            Dir.unlink(dir)
+          end
+        end
+      end
+
     end
   end
 end