rufus-cloche 0.1.17 → 0.1.18

data/CHANGELOG.txt

@@ -2,6 +2,12 @@
 = rufus-cloche CHANGELOG.txt
 
 
+== rufus-cloche - 0.1.18    released 2010/08/05
+
+- get_many(type, regex, :count => true)
+- get_many(type, regex, :skip => 100, :limit => 25) (added :skip)
+
+
 == rufus-cloche - 0.1.17    released 2010/05/04
 
 - for ruote-beanstalk : put/get_many now accept strings or symbols as opts keys

data/Rakefile

@@ -40,7 +40,7 @@ Strives to be process-safe and thread-safe.
 
   #gem.add_dependency 'yajl-ruby'
   #gem.add_dependency 'json'
-  gem.add_dependency 'rufus-json', '>= 0.2.0'
+  gem.add_dependency 'rufus-json', '>= 0.2.4'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'jeweler'

data/lib/rufus/cloche.rb

@@ -43,7 +43,7 @@ module Rufus
   #
   class Cloche
 
-    VERSION = '0.1.17'
+    VERSION = '0.1.18'
 
     WIN = (RUBY_PLATFORM.match(/mswin|mingw/) != nil)
 
@@ -172,8 +172,10 @@ module Rufus
     #
     # == opts
     #
-    # The only option know for now is :limit, which limits the number of
-    # documents returned.
+    # :skip and :limit are understood (pagination).
+    #
+    # If :count => true, the query will simply return the number of documents
+    # that matched.
     #
     def get_many (type, key_match=nil, opts={})
 
@@ -184,7 +186,11 @@ module Rufus
       return [] unless File.exist?(d)
 
       docs = []
+      skipped = 0
+
       limit = opts['limit']
+      skip = opts['skip']
+      count = opts['count'] ? 0 : nil
 
       files = Dir[File.join(d, '**', '*.json')].sort { |p0, p1|
         File.basename(p0) <=> File.basename(p1)
@@ -194,12 +200,21 @@ module Rufus
 
         key = File.basename(fn, '.json')
 
-        if (not key_match) || key.match(key_match)
+        if (not key_match) or key.match(key_match)
+
+          skipped = skipped + 1
+          next if skip and skipped <= skip
 
           doc = get(type, key)
-          docs << doc if doc
+          next unless doc
+
+          if count
+            count = count + 1
+          else
+            docs << doc
+          end
 
-          break if limit && (docs.size >= limit)
+          break if limit and docs.size >= limit
         end
       end
 
@@ -209,7 +224,7 @@ module Rufus
       #docs.sort { |doc0, doc1| doc0['_id'] <=> doc1['_id'] }
         # let's trust filename order
 
-      docs
+      count ? count : docs
     end
 
     # Removes entirely documents of a given type.

data/rufus-cloche.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-cloche}
-  s.version = "0.1.17"
+  s.version = "0.1.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux"]
-  s.date = %q{2010-05-04}
+  s.date = %q{2010-08-05}
   s.description = %q{
 A very stupid JSON hash store.
 
@@ -53,18 +53,18 @@ Strives to be process-safe and thread-safe.
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rufus-json>, [">= 0.2.0"])
+      s.add_runtime_dependency(%q<rufus-json>, [">= 0.2.4"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<rufus-json>, [">= 0.2.0"])
+      s.add_dependency(%q<rufus-json>, [">= 0.2.4"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rufus-json>, [">= 0.2.0"])
+    s.add_dependency(%q<rufus-json>, [">= 0.2.4"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/test/test.rb

@@ -169,15 +169,6 @@ class ClocheTest < Test::Unit::TestCase
       @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' })
@@ -209,6 +200,21 @@ class ClocheTest < Test::Unit::TestCase
     assert_equal %w[ chicko-chan ], @c.real_ids('animal')
   end
 
+  def test_get_many_options
+
+    load_people
+
+    assert_equal(
+      %w[ hiro jami ],
+      @c.get_many('person', nil, :limit => 2).collect { |e| e['_id'] })
+    assert_equal(
+      %w[ john minehiko ],
+      @c.get_many('person', nil, :skip => 2, :limit => 2).collect { |e| e['_id'] })
+
+    assert_equal(4, @c.get_many('person', nil, :count => true))
+    assert_equal(2, @c.get_many('person', /^j/, :count => true))
+  end
+
   protected
 
   def load_people

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 17
-  version: 0.1.17
+  - 18
+  version: 0.1.18
 platform: ruby
 authors: 
 - John Mettraux
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-04 00:00:00 +09:00
+date: 2010-08-05 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 0
-        version: 0.2.0
+        - 4
+        version: 0.2.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency