rufus-cloche 0.1.18 → 0.1.19

data/CHANGELOG.txt

@@ -2,6 +2,13 @@
 = rufus-cloche CHANGELOG.txt
 
 
+== rufus-cloche - 0.1.19    not yet released
+
+- get_many(type, regexes) where regexes might be strings (end of key) or Regexp
+  instances
+- get_many(type, regex, :count => true) bug fix (when empty)
+
+
 == rufus-cloche - 0.1.18    released 2010/08/05
 
 - get_many(type, regex, :count => true)

data/lib/rufus/cloche.rb

@@ -43,7 +43,7 @@ module Rufus
   #
   class Cloche
 
-    VERSION = '0.1.18'
+    VERSION = '0.1.19'
 
     WIN = (RUBY_PLATFORM.match(/mswin|mingw/) != nil)
 
@@ -177,13 +177,15 @@ module Rufus
     # If :count => true, the query will simply return the number of documents
     # that matched.
     #
-    def get_many (type, key_match=nil, opts={})
+    def get_many (type, regex=nil, opts={})
 
       opts = opts.inject({}) { |h, (k, v)| h[k.to_s] = v; h }
 
       d = dir_for(type)
 
-      return [] unless File.exist?(d)
+      return (opts['count'] ? 0 : []) unless File.exist?(d)
+
+      regexes = regex ? Array(regex) : nil
 
       docs = []
       skipped = 0
@@ -200,7 +202,7 @@ module Rufus
 
         key = File.basename(fn, '.json')
 
-        if (not key_match) or key.match(key_match)
+        if regexes.nil? or match?(key, regexes)
 
           skipped = skipped + 1
           next if skip and skipped <= skip
@@ -260,6 +262,13 @@ module Rufus
 
     protected
 
+    def match? (key, regexes)
+
+      regexes.first.is_a?(Regexp) ?
+        regexes.find { |regex| regex.match(key) } :
+        regexes.find { |s| key[-s.length..-1] == s }
+    end
+
     def self.neutralize (s)
 
       s.to_s.strip.gsub(/[ \/:;\*\\\+\?]/, '_')

data/rufus-cloche.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-cloche}
-  s.version = "0.1.18"
+  s.version = "0.1.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux"]
-  s.date = %q{2010-08-05}
+  s.date = %q{2010-08-09}
   s.description = %q{
 A very stupid JSON hash store.
 

data/test/test.rb

@@ -158,6 +158,7 @@ class ClocheTest < Test::Unit::TestCase
     load_people
 
     assert_equal 2, @c.get_many('person', /^j/).size
+    assert_equal 2, @c.get_many('person', 'o').size
   end
 
   def test_get_many_key_order
@@ -200,6 +201,15 @@ class ClocheTest < Test::Unit::TestCase
     assert_equal %w[ chicko-chan ], @c.real_ids('animal')
   end
 
+  def test_get_many_count
+
+    assert_equal(0, @c.get_many('person', nil, :count => true))
+
+    load_people
+
+    assert_equal(4, @c.get_many('person', nil, :count => true))
+  end
+
   def test_get_many_options
 
     load_people
@@ -215,6 +225,17 @@ class ClocheTest < Test::Unit::TestCase
     assert_equal(2, @c.get_many('person', /^j/, :count => true))
   end
 
+  # it's not necessary to differentiate select_id and select_doc ...
+
+  def test_get_many_keys
+
+    load_people
+
+    assert_equal(
+      %w[ jami john ],
+      @c.get_many('person', [ /jami/, /john/ ]).collect { |d| d['_id'] })
+  end
+
   protected
 
   def load_people

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 18
-  version: 0.1.18
+  - 19
+  version: 0.1.19
 platform: ruby
 authors: 
 - John Mettraux
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-05 00:00:00 +09:00
+date: 2010-08-09 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency