rufus-cloche 0.1.2 → 0.1.3

data/CHANGELOG.txt

@@ -1,9 +1,17 @@
 
 = rufus-cloche CHANGELOG.txt
 
+
+== rufus-cloche - 0.1.3    released 2009/12/10
+
+- added the :limit option to Cloche#get_many
+- Cloche#get_many sorting by filenames (not by id anymore)
+
+
 == rufus-cloche - 0.1.2    released 2009/12/09
 
 - avoiding dir beginning with a '.' (dot)
 
+
 == rufus-cloche - 0.1.1    released 2009/11/16
 

data/lib/rufus/cloche.rb

@@ -57,7 +57,7 @@ module Rufus
       end
     end
 
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
 
     attr_reader :dir
 
@@ -161,26 +161,44 @@ module Rufus
     #
     # Will return an empty Hash if there is no documents for a given type.
     #
-    def get_many (type, key_match=nil)
+    # == opts
+    #
+    # The only option know for now is :limit, which limits the number of
+    # documents returned.
+    #
+    def get_many (type, key_match=nil, opts={})
 
       d = dir_for(type)
 
       return [] unless File.exist?(d)
 
-      Dir[File.join(d, '**', '*.json')].inject([]) { |a, fn|
+      docs = []
+      limit = opts[:limit]
+
+      files = Dir[File.join(d, '**', '*.json')].sort { |p0, p1|
+        File.basename(p0) <=> File.basename(p1)
+      }
+
+      files.each do |fn|
 
         key = File.basename(fn, '.json')
 
         if (not key_match) || key.match(key_match)
 
           doc = get(type, key)
-          a << doc if doc
+          docs << doc if doc
+
+          break if limit && (docs.size >= limit)
         end
+      end
 
-        a
-      }.sort { |doc0, doc1|
-        doc0['_id'] <=> doc1['_id']
-      }
+      # WARNING : there is a twist here, the filenames may have a different
+      #           sort order from actual _ids...
+
+      #docs.sort { |doc0, doc1| doc0['_id'] <=> doc1['_id'] }
+        # let's trust filename order
+
+      docs
     end
 
     protected

data/test/test.rb

@@ -106,11 +106,7 @@ class ClocheTest < Test::Unit::TestCase
 
   def test_get_many
 
-    @c.put({ '_id' => 'john', 'type' => 'person', 'eyes' => 'green' })
-    @c.put({ '_id' => 'jami', 'type' => 'person', 'eyes' => 'blue' })
-    @c.put({ '_id' => 'minehiko', 'type' => 'person', 'eyes' => 'brown' })
-    @c.put({ '_id' => 'hiro', 'type' => 'person', 'eyes' => 'brown' })
-    @c.put({ '_id' => 'chicko-chan', 'type' => 'animal', 'eyes' => 'black' })
+    load_people
 
     assert_equal(
       %w[ blue brown brown green ],
@@ -119,28 +115,29 @@ class ClocheTest < Test::Unit::TestCase
 
   def test_get_many_with_key_match
 
-    @c.put({ '_id' => 'john', 'type' => 'person', 'eyes' => 'green' })
-    @c.put({ '_id' => 'jami', 'type' => 'person', 'eyes' => 'blue' })
-    @c.put({ '_id' => 'minehiko', 'type' => 'person', 'eyes' => 'brown' })
-    @c.put({ '_id' => 'hiro', 'type' => 'person', 'eyes' => 'brown' })
-    @c.put({ '_id' => 'chicko-chan', 'type' => 'animal', 'eyes' => 'black' })
+    load_people
 
     assert_equal 2, @c.get_many('person', /^j/).size
   end
 
   def test_get_many_key_order
 
-    @c.put({ '_id' => 'john', 'type' => 'person', 'eyes' => 'green' })
-    @c.put({ '_id' => 'jami', 'type' => 'person', 'eyes' => 'blue' })
-    @c.put({ '_id' => 'minehiko', 'type' => 'person', 'eyes' => 'brown' })
-    @c.put({ '_id' => 'hiro', 'type' => 'person', 'eyes' => 'brown' })
-    @c.put({ '_id' => 'chicko-chan', 'type' => 'animal', 'eyes' => 'black' })
+    load_people
 
     assert_equal(
       %w[ hiro jami john minehiko ],
       @c.get_many('person').collect { |e| e['_id'] })
   end
 
+  def test_get_many_limit
+
+    load_people
+
+    assert_equal(
+      %w[ hiro jami ],
+      @c.get_many('person', nil, :limit => 2).collect { |e| e['_id'] })
+  end
+
   def test_dot_id
 
     @c.put({ '_id' => 'something.0', 'type' => 'nothing', 'color' => 'blue' })
@@ -152,6 +149,15 @@ class ClocheTest < Test::Unit::TestCase
 
   protected
 
+  def load_people
+
+    @c.put({ '_id' => 'john', 'type' => 'person', 'eyes' => 'green' })
+    @c.put({ '_id' => 'jami', 'type' => 'person', 'eyes' => 'blue' })
+    @c.put({ '_id' => 'minehiko', 'type' => 'person', 'eyes' => 'brown' })
+    @c.put({ '_id' => 'hiro', 'type' => 'person', 'eyes' => 'brown' })
+    @c.put({ '_id' => 'chicko-chan', 'type' => 'animal', 'eyes' => 'black' })
+  end
+
   def fetch (type, key)
 
     s = File.read(File.join(ROOT, 'tcloche', type, key[-2, 2], "#{key}.json"))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-cloche
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - John Mettraux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-09 00:00:00 +09:00
+date: 2009-12-10 00:00:00 +09:00
 default_executable: 
 dependencies: []