findler 0.0.5 → 0.0.6

data/README.md

@@ -104,9 +104,9 @@ class Findler::Filters
 end
 
 f = Findler.new "/Users/mrm"
-f.add_extensions ".jpg", ".jpeg", ".cr2", ".nef"
+f.add_extensions %w(.jpg .jpeg .cr2 .nef)
 f.case_insensitive!
-f.add_filter(:exif_only)
+f.add_filter :exif_only
 ```
 
 ### Filter implementation notes
@@ -123,6 +123,10 @@ Because procs and lambdas aren't ```Marshal```able, and I didn't want to use som
 
 ## Changelog
 
+### 0.0.6
+ * ```add_filters``` takes an array, not a glob
+ * added tests for order_by_mtime filters
+
 ### 0.0.5
  * ```add_patterns``` and ```add_extensions``` take an array, not a glob
 

data/lib/findler.rb

@@ -86,7 +86,7 @@ class Findler
     (@filters ||= [])
   end
 
-  def add_filters(*filter_symbols)
+  def add_filters(filter_symbols)
     filter_symbols.each { |ea| add_filter(ea) }
   end
 

data/lib/findler/filters.rb

@@ -11,12 +11,12 @@ class Findler::Filters
 
   # order by the mtime of each file. Oldest files first.
   def self.order_by_mtime_asc(paths)
-    preserve_sort_by(paths)  { |ea| ea.mtime }
+    preserve_sort_by(paths)  { |ea| ea.mtime.to_i }
   end
 
   # reverse order by the mtime of each file. Newest files first.
   def self.order_by_mtime_desc(paths)
-    preserve_sort_by(paths)  { |ea| -ea.mtime }
+    preserve_sort_by(paths)  { |ea| -1 * ea.mtime.to_i }
   end
 
   # order by the name of each file.

data/lib/findler/version.rb

@@ -1,3 +1,3 @@
 class Findler
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/filters_test.rb

@@ -1,15 +1,30 @@
 require 'minitest_helper'
 
 describe Findler::Filters do
-  it "should preserve sort order with no result" do
+  it "preserves sort order with no result" do
     a = %w(h a p p y)
     b = Findler::Filters.preserve_sort_by(a) { 0 }
     b.must_equal a
   end
 
-  it "should preserve sort order" do
+  it "preserves sort order" do
     a = [3.5, 3.1, 1.1, 2.0, 1.5, 1.3]
     b = Findler::Filters.preserve_sort_by(a) { |ea| ea.to_i }
     b.must_equal [1.1, 1.5, 1.3, 2.0, 3.5, 3.1]
   end
+
+  it "sorts by mtime" do
+    with_tmp_dir do
+      srand(8675309) # <- stable rand()
+      names = 10.times.collect { rand_alphanumeric + ".txt" }
+      names.each_with_index do |ea, index|
+        FileUtils.touch ea, :mtime => (Time.now.to_i + index)
+      end
+      paths = names.collect { |ea| Pathname.new(ea) }
+      glob = Pathname.glob("*.txt")
+      glob.wont_equal(paths) # because the order was random.
+      Findler::Filters.order_by_mtime_asc(glob).must_equal(paths)
+      Findler::Filters.order_by_mtime_desc(glob).must_equal(paths.reverse)
+    end
+  end
 end

data/test/findler_test.rb

@@ -199,7 +199,7 @@ describe Findler do
         :subdirs_per_dir => 1,
     }) do |dir|
       f = Findler.new(dir)
-      f.add_filters :order_by_name, :files_first
+      f.add_filters([:order_by_name, :files_first])
       expected = %W(tmp-0.a tmp-1.a dir-0/tmp-0.a dir-0/tmp-1.a)
       collect_files(f.iterator).must_equal expected
       f.add_filter :reverse
@@ -214,7 +214,7 @@ describe Findler do
         :subdirs_per_dir => 1,
     }) do |dir|
       f = Findler.new(dir)
-      f.add_filters :order_by_name, :directories_first
+      f.add_filters([:order_by_name, :directories_first])
       expected = %W(dir-0/tmp-0.a dir-0/tmp-1.a tmp-0.a tmp-1.a)
       collect_files(f.iterator).must_equal expected
       f.add_filter :reverse

data/test/minitest_helper.rb

@@ -74,3 +74,10 @@ def fs_case_sensitive?
     `rm CASETEST`
   end
 end
+
+ALPHANUMERIC = (('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a).freeze
+def rand_alphanumeric(length = 10)
+  (0..length).collect do
+    ALPHANUMERIC[rand(ALPHANUMERIC.length)]
+  end.join
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: findler
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -130,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -249993079478696622
+      hash: 1051954001939010091
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -249993079478696622
+      hash: 1051954001939010091
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23