lunar 0.3.0 → 0.4.0

data/DATA

@@ -0,0 +1,41 @@
+
+Item
+- id: 1
+- name: 'iphone 3g'
+- tags: 'apple mobile'
+
+Item
+- id: 2
+- name: 'nokia n95'
+- tags: 'symbian mobile'
+
+q: mobile
+
+
+Item:name:iphone => 1004 1001
+Item:name:3gs => 1001
+Item:name:apple => 1004 1003 1002
+Item:name:macbook => 1003 1002
+Item:name:pro => 1003 1002
+Item:name:17 => 1003 1002
+Item:desc:iphone => 1004 1003 1002
+Item:desc:4g => 1004 1003
+
+Keywords Only
+-------------
+iphone => 1004 1001 1003 1002
+3gs    => 1001
+apple  => 1004 1003 1002
+macbook => 1002 1003
+pro     => 1002 1003
+17      => 17
+4g      => 1003 1004
+
+Key value pairs
+---------------
+name: iphone => 1001 1004
+name: iphone, desc: iphone => 1004
+name: iphone, desc: 4g => 1004
+name: apple, desc: iphone => 1002, 1003, 1004
+name: apple macbook pro, desc: iphone => 1002 1003
+name: apple macbook pro 17, desc: 4g => 1003

data/README.md

@@ -69,3 +69,12 @@ Examples
     # Or using the pagination gem with this:
     @items = Lunar.search(Item, "iphone")
     paginate @items, :per_page => 10, :page => 1
+
+    # If you want to be cheap about CPU cycles you can increase the
+    # default `:ttl` of search results (which is 30)
+
+    # Somewhere in config/initializers or init.rb, you decide...
+    Lunar.ttl = 300 # search results would be the same for 5 minutes.
+                    # for high write public sites, this may be a good
+                    # option as people don't really expect their stuff to
+                    # be searchable right away on public content sites.

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/lunar.rb

@@ -7,6 +7,7 @@ module Lunar
   autoload :Words,             'lunar/words'
   autoload :Search,            'lunar/search'
   autoload :Sets,              'lunar/sets'
+  autoload :FuzzySets,         'lunar/sets'
   autoload :SortedResultSet,   'lunar/result_set'
   autoload :UnsortedResultSet, 'lunar/result_set'
   autoload :FuzzyWord,         'lunar/fuzzy_word'

data/lib/lunar/result_set.rb

@@ -20,7 +20,6 @@ module Lunar
       limit  = Integer(options[:limit] || 0)
       finish = start + limit - 1
       
-      puts "Getting: #{key}, #{Lunar.redis.zrange(key, start, finish)}" if $GAME
       Lunar.redis.zrevrange(key, start, finish).map(&@block)
     end
 

data/lib/lunar/search.rb

@@ -1,6 +1,6 @@
 module Lunar
   class Search
-    attr :sets, :prefix, :search_identifier, :fuzzy_sets
+    attr :sets, :prefix, :search_identifier, :fuzzy_sets, :key_value_sets
 
     def initialize(prefix, keywords)
       if keywords.is_a?(Hash)
@@ -10,9 +10,9 @@ module Lunar
           }
           @search_identifier = fuzzy_hash.hash
         else
-          @sets = keywords.inject([]) { |a, (field, query)| 
-            a | Sets.new(prefix, query, field) 
-          }
+          @key_value_sets = 
+            keywords.map { |field, val| Sets.new(prefix, val, field) }.flatten
+
           @search_identifier = keywords.hash
         end
       else
@@ -39,6 +39,13 @@ module Lunar
           end
           SortedResultSet.new(dist_key, &block)
         end
+      elsif key_value_sets
+        if key_value_sets.empty?
+          return []
+        else
+          Lunar.redis.zinter dist_key, key_value_sets.size, *key_value_sets
+          SortedResultSet.new(dist_key, &block)
+        end
       elsif fuzzy_sets
         if fuzzy_sets.empty?
           return []

data/lunar.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lunar}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril David"]
-  s.date = %q{2010-05-06}
+  s.date = %q{2010-05-10}
   s.description = %q{uses sorted sets and sets, sorting by score}
   s.email = %q{cyx.ucron@gmail.com}
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "DATA",
      "LICENSE",
      "README.md",
      "Rakefile",

data/test/test_lunar_search.rb

@@ -16,6 +16,7 @@ end
 
 class LunarSearchTest < Test::Unit::TestCase
   setup do
+    Lunar.redis(Redis.new(:host => "127.0.0.1", :port => 6380))
     Lunar.redis.flushdb
   end
 
@@ -43,7 +44,17 @@ class LunarSearchTest < Test::Unit::TestCase
     end
   end
 
-  context "given an Item named iphone 3GS and apple macbook pro 17 exists" do
+  # This is how the scheme appears
+  # Item:name:iphone => 1004 1001
+  # Item:name:3gs => 1001
+  # Item:name:apple => 1004 1003 1002
+  # Item:name:macbook => 1003 1002
+  # Item:name:pro => 1003 1002
+  # Item:name:17 => 1003 1002
+  # Item:desc:iphone => 1004 1003 1002
+  # Item:desc:4g => 1004 1003
+  # 
+  context "given the schema appearing above" do
     setup do
       Lunar::Index.create "Item" do |i|
         i.key 1001
@@ -64,82 +75,77 @@ class LunarSearchTest < Test::Unit::TestCase
         i.float   :voting_quotient, '35.5'
       end
 
+      Lunar::Index.create "Item" do |i|
+        i.key 1004
+        i.attr    :name, 'iphone apple'
+        i.attr    :desc, 'iphone 4G'
+      end
     end
 
-    should "be able to search by keyword iphone" do
-      items = Lunar.search(Item, "iphone") { |id| Item.new(id) }
-
-      assert items.map(&:id).include?('1001')
-      assert items.map(&:id).include?('1002')
-    end
-
-    should "be able to search by keyword iphone apple and return the 2 items" do
-      items = Lunar.search(Item, "iphone apple") { |id| Item.new(id) }
+    should "return all 4 when searching iphone" do
+      items = Lunar.search(Item, "iphone")
 
-      assert items.map(&:id).include?('1001')
-      assert items.map(&:id).include?('1002')
+      assert_equal %w(1001 1002 1003 1004), items.map(&:id).sort
     end
 
-    should "be able to search 17 and return the macbook pro" do
-      items = Lunar.search(Item, "17") { |id| Item.new(id) }
+    should "return only 1001 when searching 3gs" do
+      items = Lunar.search(Item, '3gs')
 
-      assert items.map(&:id).include?('1002')
+      assert_equal %w(1001), items.map(&:id)
     end
 
-    should 'be able to search 17 with quote and return the macbook pro' do
-      items = Lunar.search(Item, '17"') { |id| Item.new(id) }
+    should "return only 1002 1003 1004 when searching apple" do
+      items = Lunar.search(Item, 'APPle')
 
-      assert items.map(&:id).include?('1002')
+      assert_equal %w(1002 1003 1004), items.map(&:id).sort
     end
 
-    should "not return item 1001 when searching apple only" do
-      items = Lunar.search(Item, "apple") { |id| Item.new(id) }
+    should "return only 1002 1003 when searching macbook, pro, or 17" do
+      macbook = Lunar.search(Item, 'macbook')
+      pro     = Lunar.search(Item, 'pro')
+      _17     = Lunar.search(Item, '17')
+      all     = Lunar.search(Item, 'macbook pro 17')
 
-      assert ! items.map(&:id).include?('1001')
+      assert_equal %w(1002 1003), macbook.map(&:id).sort
+      assert_equal %w(1002 1003), pro.map(&:id).sort
+      assert_equal %w(1002 1003), _17.map(&:id).sort
+      assert_equal %w(1002 1003), all.map(&:id).sort
     end
 
-    should "by default try and find using a bracket syntax" do
-      items = Lunar.search(Item, "apple")
+    should "return only 1003 1004 when searching 4g" do
+      items = Lunar.search(Item, '4g')
 
-      assert items.map(&:id).include?('1002')
+      assert_equal %w(1003 1004), items.map(&:id).sort
     end
 
-    should "be able to search by name: 'iphone'" do
+    should "return 1001 1004 given name: iphone" do
       items = Lunar.search(Item, :name => 'iphone')
-
-      assert items.map(&:id).include?('1001')
-      assert ! items.map(&:id).include?('1002')
+      assert_equal %w(1001 1004), items.map(&:id).sort
     end
-    
-    should "be able to search by name: ['iphone', 'apple']" do
-      items = Lunar.search(Item, :name => ['iphone', 'apple'])
 
-      assert items.map(&:id).include?('1001')
-      assert items.map(&:id).include?('1002')
-      assert items.map(&:id).include?('1003')
+    should "return 1004 given name: iphone, desc: iphone" do
+      items = Lunar.search(Item, :name => 'iphone', :desc => 'iphone')
+      assert_equal %w(1004), items.map(&:id).sort
     end
 
-    should "be able to search by desc: ['iphone', 'apple']" do
-      items = Lunar.search(Item, :name => ['iphone', 'apple'])
-
-      assert items.map(&:id).include?('1001')
-      assert items.map(&:id).include?('1002')
-      assert items.map(&:id).include?('1003')
+    should "return 1004 given name: iphone, desc: 4g" do
+      items = Lunar.search(Item, :name => 'iphone', :desc => '4g')
+      assert_equal %w(1004), items.map(&:id).sort
     end
 
-    should "be able to search by name: 'IPHONE'" do
-      items = Lunar.search(Item, 'IPHONE')
-
-      assert items.map(&:id).include?('1001')
-      assert items.map(&:id).include?('1002')
-      assert items.map(&:id).include?('1003')
+    should "return 1002 1003 1004 given name: apple, desc: iphone" do
+      items = Lunar.search(Item, :name => 'apple', :desc => 'iphone')
+      assert_equal %w(1002 1003 1004), items.map(&:id).sort
+    end
+    
+    should "return 1002 1003 given name: apple macbook pro, desc: iphone" do
+      items = Lunar.search(Item, :name => 'apple macbook pro', :desc => 'iphone')
+      assert_equal %w(1002 1003), items.map(&:id).sort
     end
 
-    should "be able to search by name: 'iphone' desc: 'iphone'" do
-      items = Lunar.search(Item, :name => 'iphone', :desc => 'iphone')
-
-      assert items.map(&:id).include?('1001')
-      assert items.map(&:id).include?('1002')
+    should "return 1003 given name: apple macbook pro 17, desc: 4g" do
+      items = Lunar.search(Item, :name => 'apple macbook pro 17', :desc => '4g')
+      assert_equal %w(1003), items.map(&:id).sort
     end
 
     should "be able to search by cost range: 2000..2700" do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Cyril David
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 +08:00
+date: 2010-05-10 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,6 +53,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- DATA
 - LICENSE
 - README.md
 - Rakefile