lunar 0.5.2 → 0.5.3

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/lib/lunar.rb

@@ -110,11 +110,15 @@ private
         sets << RangeMatches.new(nest[namespace], key, value).distkey
       elsif key == :fuzzy
         fuzzy_matches = value.map { |fuzzy_key, fuzzy_value|
-          FuzzyMatches.new(nest[namespace], fuzzy_key, fuzzy_value).distkey
+          unless fuzzy_value.to_s.empty?
+            FuzzyMatches.new(nest[namespace], fuzzy_key, fuzzy_value).distkey
+          end
         }
-        sets.push(*fuzzy_matches)
+        sets.push(*fuzzy_matches.compact)
       else
-        sets << KeywordMatches.new(nest[namespace], key, value).distkey
+        unless value.to_s.empty?
+          sets << KeywordMatches.new(nest[namespace], key, value).distkey
+        end
       end
 
       sets

data/lib/lunar/result_set.rb

@@ -89,11 +89,22 @@ module Lunar
     # @see http://code.google.com/p/redis/wiki/SortCommand
     def sort(opts = {})
       return [] if not distkey
-
+      
       opts[:by] = sortables[opts[:by]]  if opts[:by]
+
+      if opts[:start] && opts[:limit]
+        opts[:limit] = [opts[:start], opts[:limit]]
+      end
+
       objects(distkey.sort(opts))
     end
 
+    def size
+      return 0 if not distkey
+
+      distkey.zcard
+    end
+
   protected
     def objects(ids)
       ids.map(&@finder)

data/lunar.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lunar}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril David"]

data/test/test_lunar.rb

@@ -76,6 +76,14 @@ class TestLunar < Test::Unit::TestCase
       assert_equal [], q(:q => "ericson", :price => 150..200)
     end
 
+    test "searching combinations of empty strings" do
+      assert_equal %w{1001}, q(:q => 'apple', :tags => 'mobile', :title => "")
+      assert_equal %w{1001}, q(:q => 'apple', :tags => 'smartphone', :title => "")
+      assert_equal %w{1001}, q(:q => 'apple', :tags => 'apple', :title => "")
+
+      assert_equal %w{1001 1002 1003}, q(:q => 'mobile', :tags => 'smartphone', :title => "")
+    end
+
     test "sorting empty result sets" do
       assert_equal [], Lunar.search(Gadget, :q => "ericson").sort(:by => :price)
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Cyril David