lunar 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/lunar.rb

@@ -4,7 +4,7 @@ require 'nest'
 require 'text'
 
 module Lunar
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 
   autoload :Connection,     "lunar/connection"
   autoload :LunarNest,      "lunar/lunar_nest"
@@ -83,7 +83,7 @@ module Lunar
   # @return Lunar::ResultSet an Enumerable object.
   def self.search(namespace, options, finder = lambda { |id| namespace[id] })
     sets = find_and_combine_sorted_sets_for(namespace, options)
-    key  = try_intersection_of_sorted_sets(namespace, sets)
+    key  = try_intersection_of_sorted_sets(namespace, sets, options)
 
     ResultSet.new(key, nest[namespace], finder)
   end
@@ -121,7 +121,9 @@ private
     end
   end
 
-  def self.try_intersection_of_sorted_sets(namespace, sets)
+  def self.try_intersection_of_sorted_sets(namespace, sets, options)
+    return if sets.empty?
+
     if sets.size == 1
       sets.first
     else

data/lib/lunar/keyword_matches.rb

@@ -11,6 +11,8 @@ module Lunar
     end
 
     def distkey
+      return if keys.flatten.empty?
+
       nest[{ att => value }.hash].tap do |dk|
         dk.zunionstore keys.flatten
       end
@@ -29,4 +31,4 @@ module Lunar
       Words.new(value).map { |word| Lunar.metaphone(word) }
     end
   end
-end
+end

data/lib/lunar/result_set.rb

@@ -33,6 +33,8 @@ module Lunar
     end
 
     def each
+      return if not distkey
+
       objects(distkey.zrange(0, -1)).each { |e| yield e }
     end
 
@@ -86,6 +88,8 @@ module Lunar
     # @return [Array] Array of objects as defined by the `finder`.
     # @see http://code.google.com/p/redis/wiki/SortCommand
     def sort(opts = {})
+      return [] if not distkey
+
       opts[:by] = sortables[opts[:by]]  if opts[:by]
       objects(distkey.sort(opts))
     end

data/lunar.gemspec

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

data/test/test_lunar.rb

@@ -67,6 +67,19 @@ class TestLunar < Test::Unit::TestCase
       assert_equal %w{1003}, q(:q => '9000')
     end
 
+    test "searching non-existent words" do
+      assert_equal [], q(:q => "ericson")
+      assert_equal [], q(:q => "ericson", :title => "apple")
+      assert_equal [], q(:q => "ericson", :description => "nokia")
+      assert_equal [], q(:q => "ericson", :description => "FooBar")
+      assert_equal [], q(:q => "ericson", :fuzzy => { :code => "a" })
+      assert_equal [], q(:q => "ericson", :price => 150..200)
+    end
+
+    test "sorting empty result sets" do
+      assert_equal [], Lunar.search(Gadget, :q => "ericson").sort(:by => :price)
+    end
+
     test "fulltext searching with key value pairs" do
       assert_equal %w{1001}, q(:q => 'apple', :tags => 'mobile')
       assert_equal %w{1001}, q(:q => 'apple', :tags => 'smartphone')
@@ -178,4 +191,4 @@ class TestLunar < Test::Unit::TestCase
       assert_equal %w{1001}, q(:q => 'apple', :fuzzy => { :code => 'mobile' })
     end
   end
-end
+end

metadata

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