lunar 0.5.5 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.6.0

data/lib/lunar.rb

@@ -4,15 +4,15 @@ require 'nest'
 require 'text'
 
 module Lunar
-  VERSION = '0.5.3'
+  VERSION = '0.6.0'
 
   autoload :Connection,     "lunar/connection"
-  autoload :LunarNest,      "lunar/lunar_nest"
   autoload :Index,          "lunar/index"
   autoload :Scoring,        "lunar/scoring"
   autoload :Words,          "lunar/words"
   autoload :Stopwords,      "lunar/stopwords"
   autoload :FuzzyWord,      "lunar/fuzzy_word"
+  autoload :NumberMatches,  "lunar/number_matches"
   autoload :KeywordMatches, "lunar/keyword_matches"
   autoload :RangeMatches,   "lunar/range_matches"
   autoload :FuzzyMatches,   "lunar/fuzzy_matches"
@@ -36,7 +36,7 @@ module Lunar
   #   end
   #
   # @see Lunar::Index#initialize
-  # @param [String, Symbol, Class] namespace the namespace if this document.
+  # @param [String, Symbol, Class] namespace the namespace of this document.
   # @yield [Lunar::Index] an instance of Lunar::Index.
   # @return [Lunar::Index] returns the yielded Lunar::Index.
   def self.index(namespace)
@@ -95,12 +95,12 @@ module Lunar
 
   # @private abstraction of how encoding should be done for Lunar.
   def self.encode(word)
-    Base64.encode64(word).strip
+    Base64.encode64(word).gsub("\n", "")
   end
 
   # @private convenience method for getting a scoped Nest.
   def self.nest
-    LunarNest.new(:Lunar, redis)
+    Nest.new(:Lunar, redis)
   end
 
 private
@@ -115,6 +115,13 @@ private
           end
         }
         sets.push(*fuzzy_matches.compact)
+      elsif key == :numbers
+        number_matches = value.map { |num_key, num_value|
+          unless num_value.to_s.empty?
+            matches = NumberMatches.new(nest[namespace], num_key, num_value)
+            sets << matches.distkey  if matches.distkey
+          end
+        }
       else
         unless value.to_s.empty?
           sets << KeywordMatches.new(nest[namespace], key, value).distkey

data/lib/lunar/fuzzy_matches.rb

@@ -20,7 +20,9 @@ module Lunar
 
   protected
     def keys
-      Words.new(value, false).map { |w| nest[:Fuzzies][att][Lunar.encode(w)] }
+      Words.new(value, [:downcase]).map { |w| 
+        nest[:Fuzzies][att][Lunar.encode(w)] 
+      }
     end
   end
 end

data/lib/lunar/index.rb

@@ -6,7 +6,27 @@ module Lunar
   # @see Lunar::index
   # @see Lunar::delete
   class Index
+    # This constant is in place to maintain a certain level of performance.
+    # Fuzzy searching internally stores an index per letter i.e. for Quentin
+    # q
+    # qu
+    # que
+    # quen
+    # quent
+    # quenti
+    # quentin
+    # 
+    # This can become pretty unweildy very fast, so we limit the length
+    # of all fuzzy fields.
     FUZZY_MAX_LENGTH = 100
+ 
+    # The following are all used to construct redis keys
+    TEXT       = :Text
+    METAPHONES = :Metaphones
+    NUMBERS    = :Numbers
+    SORTABLES  = :Sortables
+    FUZZIES    = :Fuzzies
+    FIELDS     = :Fields
 
     MissingID = Class.new(StandardError)
     FuzzyFieldTooLong = Class.new(StandardError)
@@ -16,6 +36,7 @@ module Lunar
     attr :numbers
     attr :sortables
     attr :fuzzies
+    attr :fields
 
     # This is actually wrapped by `Lunar.index` and is not inteded to be
     # used directly.
@@ -24,10 +45,11 @@ module Lunar
     # @return [Lunar::Index]
     def initialize(namespace)
       @nest       = Lunar.nest[namespace]
-      @metaphones = @nest[:Metaphones]
-      @numbers    = @nest[:Numbers]
-      @sortables  = @nest[:Sortables]
-      @fuzzies    = @nest[:Fuzzies]
+      @metaphones = @nest[METAPHONES]
+      @numbers    = @nest[NUMBERS]
+      @sortables  = @nest[SORTABLES]
+      @fuzzies    = @nest[FUZZIES]
+      @fields     = @nest[FIELDS]
     end
 
     # Get / Set the id of the document
@@ -81,23 +103,16 @@ module Lunar
     #
     # @return [Array<String>] all the metaphones added for the document.
     def text(att, value)
-      old = metaphones[id][att].smembers
-      new = []
+      clear_text_field(att)
 
       Scoring.new(value).scores.each do |word, score|
         metaphone = Lunar.metaphone(word)
 
         nest[att][metaphone].zadd(score, id)
         metaphones[id][att].sadd(metaphone)
-        new << metaphone
       end
 
-      (old - new).each do |metaphone|
-        nest[att][metaphone].zrem(id)
-        metaphones[id][att].srem(metaphone)
-      end
-
-      return new
+      fields[TEXT].sadd(att)
     end
 
     # Adds a numeric index for `att` with `value`.
@@ -117,8 +132,20 @@ module Lunar
     # @param [Numeric] value the numeric value of `att`.
     #
     # @return [Boolean] whether or not the value was added
-    def number(att, value)
+    def number(att, value, purge = true)
+      if value.kind_of?(Enumerable)
+        clear_number_field(att)
+
+        value.each { |v| number(att, v, false) } and return
+      end
+      
+      clear_number_field(att)  if purge
+
       numbers[att].zadd(value, id)
+      numbers[att][value].zadd(1, id)
+      numbers[id][att].sadd(value)
+
+      fields[NUMBERS].sadd att
     end
 
     # Adds a sortable index for `att` with `value`.
@@ -156,6 +183,8 @@ module Lunar
     # @return [String] the response from the redis server.
     def sortable(att, value)
       sortables[id][att].set(value)
+
+      fields[SORTABLES].sadd att
     end
 
     # Deletes everything related to an existing document given its `id`.
@@ -168,63 +197,80 @@ module Lunar
       delete_numbers
       delete_sortables
       delete_fuzzies
+
+      delete_field_meta
     end
 
     def fuzzy(att, value)
-      if value.to_s.length > FUZZY_MAX_LENGTH
-        raise FuzzyFieldTooLong,
-          "#{att} has a value #{value} exceeding the max #{FUZZY_MAX_LENGTH}"
-      end
+      assert_valid_fuzzy(value, att)
 
-      words = Words.new(value).uniq
+      clear_fuzzy_field(att)
+
+      words = Words.new(value, [:downcase, :uniq])
 
       fuzzy_words_and_parts(words) do |word, parts|
-        parts.each do |part, encoded|
-          fuzzies[att][encoded].zadd(1, id)
-        end
+        parts.each { |part, encoded| fuzzies[att][encoded].zadd(1, id) }
         fuzzies[id][att].sadd word
       end
 
-      delete_fuzzies_for(att, fuzzies[id][att].smembers - words, words)
+      fields[FUZZIES].sadd att
     end
 
   private
+    def assert_valid_fuzzy(value, att)
+      if value.to_s.length > FUZZY_MAX_LENGTH
+        raise FuzzyFieldTooLong,
+          "#{att} has a value #{value} exceeding the max #{FUZZY_MAX_LENGTH}"
+      end
+    end
+
     def delete_metaphones
-      metaphones[id]['*'].matches.each do |key, att|
-        key.smembers.each do |metaphone|
-          nest[att][metaphone].zrem id
-        end
+      fields[TEXT].smembers.each do |att|
+        clear_text_field(att)
+      end
+    end
 
-        key.del
+    def clear_text_field(att)
+      metaphones[id][att].smembers.each do |metaphone|
+        nest[att][metaphone].zrem id
       end
+
+      metaphones[id][att].del
     end
 
     def delete_numbers
-      numbers['*'].matches.each do |key, att|
+      fields[NUMBERS].smembers.each do |att|
+        clear_number_field(att)
+      end
+    end
+
+    def clear_number_field(att)
+      numbers[id][att].smembers.each do |number|
+        numbers[att][number].zrem(id)
         numbers[att].zrem(id)
       end
+
+      numbers[id][att].del
     end
 
+
     def delete_sortables
-      sortables[id]['*'].keys.each do |key|
-        Lunar.redis.del key
-      end
+      fields[SORTABLES].smembers.each { |att| sortables[id][att].del }
     end
 
     def delete_fuzzies
-      fuzzies[id]['*'].matches.each do |key, att|
-        delete_fuzzies_for(att, key.smembers)
-        key.del
+      fields[FUZZIES].smembers.each do |att|
+        clear_fuzzy_field(att)
       end
     end
-
-    def delete_fuzzies_for(att, words_to_delete, existing_words = [])
-      fuzzy_words_and_parts(words_to_delete) do |word, parts|
+  
+    def clear_fuzzy_field(att)
+      fuzzy_words_and_parts(fuzzies[id][att].smembers) do |word, parts|
         parts.each do |part, encoded|
-          next if existing_words.grep(/^#{part}/u).any?
           fuzzies[att][encoded].zrem(id)
         end
-        fuzzies[id][att].srem word
+
+        fuzzies[id][att].del
       end
     end
 
@@ -238,5 +284,12 @@ module Lunar
         yield word, partials
       end
     end
+
+    def delete_field_meta
+      fields[TEXT].del
+      fields[NUMBERS].del
+      fields[SORTABLES].del
+      fields[FUZZIES].del
+    end
   end
 end

data/lib/lunar/keyword_matches.rb

@@ -21,14 +21,16 @@ module Lunar
   protected
     def keys
       if att == :q
-        metaphones.map { |m| nest['*'][m].keys }
+        metaphones.map { |m| 
+          nest[Index::FIELDS][Index::TEXT].smembers.map { |att| nest[att][m] }
+        }
       else
         metaphones.map { |m| nest[att][m] }
       end
     end
 
     def metaphones
-      Words.new(value).map { |word| Lunar.metaphone(word) }
+      Words.new(value, [:stopwords]).map { |word| Lunar.metaphone(word) }
     end
   end
 end

data/lib/lunar/number_matches.rb

@@ -0,0 +1,33 @@
+module Lunar
+  # @private Used internally by Lunar::search to get all the fuzzy matches
+  # given `nest`, `att` and it's `val`.
+  class NumberMatches
+    attr :nest
+    attr :att
+    attr :values
+
+    def initialize(nest, att, value)
+      @nest   = nest
+      @att    = att
+      @values = value.kind_of?(Enumerable) ? value : [value]
+    end
+
+    def distkey
+      case keys.size
+      when 0 then nil
+      when 1 then keys.first
+      else
+        nest[{ att => values }.hash].tap do |dk|
+          dk.zunionstore keys.flatten
+        end
+      end
+    end
+
+  protected
+    def keys
+      values.
+        reject { |v| v.to_s.empty? }.
+        map    { |v| nest[:Numbers][att][v] }
+    end
+  end
+end

data/lib/lunar/scoring.rb

@@ -3,11 +3,11 @@ module Lunar
   # of a given text.
   class Scoring
     def initialize(words)
-      @words = Words.new(words)
+      @words = Words.new(words, [:stopwords, :downcase])
     end
 
     def scores
-      @words.inject(Hash.new(0)) { |a, w| a[w.downcase] += 1 and a }
+      @words.inject(Hash.new(0)) { |a, w| a[w] += 1 and a }
     end
   end
-end
+end

data/lib/lunar/stopwords.rb

@@ -3,15 +3,15 @@ module Lunar
   # common words like an, the, etc.
   module Stopwords
     def include?(word)
-      stopwords.include?(word)
+      stopwords.include?(word.downcase)
     end
+    module_function :include?
 
   private
     def stopwords
       %w(an and are as at be but by for if in into is it no not of on or s 
          such t that the their then there these they this to was will with)
     end
-
-    module_function :stopwords, :include?
+    module_function :stopwords
   end
 end

data/lib/lunar/words.rb

@@ -4,22 +4,47 @@ module Lunar
   # @private Internally used to determine the words given some str.
   # i.e. Words.new("the quick brown") == %w(the quick brown)
   class Words < Array
+    UnknownFilter = Class.new(ArgumentError)
+
     SEPARATOR = /\s+/
+    FILTERS   = [:stopwords, :downcase, :uniq]
 
-    def initialize(str, stopwords = true)
+    def initialize(str, filters = [])
       words = str.split(SEPARATOR).
         reject { |w| w.to_s.strip.empty? }.
         map    { |w| sanitize(w) }
-
-      words.reject! { |w| Stopwords.include?(w) }  if stopwords
+    
+      apply_filters(words, filters)
 
       super(words)
     end
 
   private
+    def apply_filters(words, filters)
+      filters.each do |filter|
+        unless FILTERS.include?(filter)
+          raise UnknownFilter, "Unknown filter: #{ filter }"
+        end
+        
+        send(filter, words)
+      end
+    end
+
+    def stopwords(words)
+      words.reject! { |w| Stopwords.include?(w) }
+    end
+
+    def downcase(words)
+      words.each { |w| w.downcase! }
+    end
+
+    def uniq(words)
+      words.uniq!
+    end
+
     def sanitize(str)
-      Iconv.iconv('UTF-8//IGNORE', 'UTF-8', str)[0].to_s.
-        gsub(/[^a-zA-Z0-9\-_]/, '').downcase
+      Iconv.iconv('UTF-8//IGNORE//TRANSLIT', 'UTF-8', str)[0].to_s.
+        gsub(/["'\.,@!$%\^&\*\(\)\[\]\+\-\_\:\;\<\>\\\/\?\`\~]/, '')
     end
   end
 end

data/lunar.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lunar}
-  s.version = "0.5.5"
+  s.version = "0.6.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-31}
+  s.date = %q{2010-06-30}
   s.description = %q{Features full text searching via metaphones, range querying for numbers, fuzzy searching and sorting based on custom fields}
   s.email = %q{cyx.ucron@gmail.com}
   s.extra_rdoc_files = [
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
      "lib/lunar/fuzzy_word.rb",
      "lib/lunar/index.rb",
      "lib/lunar/keyword_matches.rb",
-     "lib/lunar/lunar_nest.rb",
+     "lib/lunar/number_matches.rb",
      "lib/lunar/range_matches.rb",
      "lib/lunar/result_set.rb",
      "lib/lunar/scoring.rb",
@@ -40,13 +40,14 @@ Gem::Specification.new do |s|
      "test/test_index.rb",
      "test/test_lunar.rb",
      "test/test_lunar_fuzzy_word.rb",
-     "test/test_lunar_nest.rb",
+     "test/test_lunar_words.rb",
+     "test/test_number_search.rb",
      "test/test_scoring.rb"
   ]
   s.homepage = %q{http://github.com/sinefunc/lunar}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A redis based full text search engine}
   s.test_files = [
     "test/helper.rb",
@@ -54,7 +55,8 @@ Gem::Specification.new do |s|
      "test/test_index.rb",
      "test/test_lunar.rb",
      "test/test_lunar_fuzzy_word.rb",
-     "test/test_lunar_nest.rb",
+     "test/test_lunar_words.rb",
+     "test/test_number_search.rb",
      "test/test_scoring.rb"
   ]
 
@@ -62,7 +64,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<redis>, [">= 2.0.0"])
       s.add_runtime_dependency(%q<nest>, [">= 0.0.4"])
       s.add_runtime_dependency(%q<text>, [">= 0"])

data/test/test_index.rb

@@ -22,6 +22,8 @@ class IndexTest < Test::Unit::TestCase
 
       assert_equal %w{APL IFN KS SMRTFN},
         Lunar.nest[:Gadget][:Metaphones][1001][:title].smembers.sort
+
+      assert_equal %w(title), Lunar.redis.smembers('Lunar:Gadget:Fields:Text')
     end
 
     test "deleting non-repeating words scenario" do
@@ -38,6 +40,8 @@ class IndexTest < Test::Unit::TestCase
       assert_equal 0, nest('smartphone').zcard
 
       assert_equal 0, Lunar.nest[:Gadget][1001][:title].scard
+
+      assert ! Lunar.redis.exists('Lunar:Gadget:Fields:Text')
     end
 
     test "with multiple word instances and stopwords" do
@@ -86,22 +90,65 @@ class IndexTest < Test::Unit::TestCase
       assert_equal ['1001'], nest('apple').zrangebyscore(1, 1)
       assert_equal ['1001'], nest('iphone').zrangebyscore(1, 1)
       assert_equal ['1001'], nest('3g').zrangebyscore(1, 1)
-
+      
       assert nest('3gs').zrange(0, -1).empty?
       assert nest('smartphone').zrange(0, -1).empty?
+
+      assert_equal %w(title), Lunar.redis.smembers("Lunar:Gadget:Fields:Text")
     end
   end
 
   describe "indexing numbers" do
+    def numbers
+      Lunar.nest[:Gadget][:Numbers]
+    end
+
     test "works for integers and floats" do
       Lunar.index :Gadget do |i|
         i.id 1001
         i.number :price, 200
         i.number :score, 25.5
+        i.number :category_ids, %w(100 101 102)
       end
 
-      assert_equal '200',  Lunar.nest[:Gadget][:Numbers][:price].zscore(1001)
-      assert_equal '25.5', Lunar.nest[:Gadget][:Numbers][:score].zscore(1001)
+      assert_equal '200',  numbers[:price].zscore(1001)
+      assert_equal '25.5', numbers[:score].zscore(1001)
+
+      assert_equal '1', numbers[:price]["200"].zscore(1001)
+     
+      assert_equal '1', numbers[:category_ids]["100"].zscore(1001)
+      assert_equal '1', numbers[:category_ids]["101"].zscore(1001)
+      assert_equal '1', numbers[:category_ids]["102"].zscore(1001)
+
+      assert_equal %w(category_ids price score), 
+        Lunar.redis.smembers("Lunar:Gadget:Fields:Numbers").sort
+    end
+    
+    test "reindexing" do
+      Lunar.index :Gadget do |i|
+        i.id 1001
+        i.number :price, 200
+        i.number :author_ids, [10, 20, 30]
+      end
+
+      Lunar.index :Gadget do |i|
+        i.id 1001
+        i.number :price, 150
+        i.number :author_ids, [40, 50, 60]
+      end
+
+      assert_nil numbers[:price]["200"].zrank(1001)
+      assert_equal '1', numbers[:price]["150"].zscore(1001)
+      
+      assert_nil numbers[:author_ids]["10"].zrank(1001)
+      assert_nil numbers[:author_ids]["20"].zrank(1001)
+      assert_nil numbers[:author_ids]["30"].zrank(1001)
+      assert_equal '1', numbers[:author_ids]["40"].zscore(1001)
+      assert_equal '1', numbers[:author_ids]["50"].zscore(1001)
+      assert_equal '1', numbers[:author_ids]["60"].zscore(1001)
+
+      assert_equal %w(author_ids price), 
+        Lunar.redis.smembers("Lunar:Gadget:Fields:Numbers").sort
     end
 
     test "allows deletion" do
@@ -113,8 +160,11 @@ class IndexTest < Test::Unit::TestCase
 
       Lunar.delete :Gadget, 1001
 
-      assert_nil Lunar.nest[:Gadget][:Numbers][:price].zrank(1001)
-      assert_nil Lunar.nest[:Gadget][:Numbers][:score].zrank(1001)
+      assert_nil numbers[:price].zrank(1001)
+      assert_nil numbers[:score].zrank(1001)
+      assert_nil numbers[:price]["200"].zrank(1001)
+
+      assert ! Lunar.redis.exists("Lunar:Gadget:Fields:Numbers")
     end
   end
 
@@ -130,6 +180,9 @@ class IndexTest < Test::Unit::TestCase
       assert_equal 'iphone', Lunar.nest[:Gadget][:Sortables][1001][:name].get
       assert_equal '200',    Lunar.nest[:Gadget][:Sortables][1001][:price].get
       assert_equal '25.5',   Lunar.nest[:Gadget][:Sortables][1001][:score].get
+
+      assert_equal %w(name price score), 
+        Lunar.redis.smembers("Lunar:Gadget:Fields:Sortables").sort
     end
 
     test "deletes sortable fields" do
@@ -142,9 +195,11 @@ class IndexTest < Test::Unit::TestCase
 
       Lunar.delete :Gadget, 1001
 
-      assert_nil Lunar.nest[:Gadget][1001][:name].get
-      assert_nil Lunar.nest[:Gadget][1001][:price].get
-      assert_nil Lunar.nest[:Gadget][1001][:score].get
+      assert_nil Lunar.nest[:Gadget][:Sortables][1001][:name].get
+      assert_nil Lunar.nest[:Gadget][:Sortables][1001][:price].get
+      assert_nil Lunar.nest[:Gadget][:Sortables][1001][:score].get
+
+      assert ! Lunar.redis.exists("Lunar:Gadget:Fields:Sortables")
     end
   end
-end
+end

data/test/test_lunar_words.rb

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+
+require "helper"
+
+class LunarWordsTest < Test::Unit::TestCase
+  test "german words" do
+    str = "Der schnelle braune Fuchs springt über den faulen Hund"
+    metaphones = %w(TR SXNL BRN FXS SPRNKT BR TN FLN HNT)
+
+    words = Lunar::Words.new(str)
+    
+    assert_equal metaphones, words.map { |w| Lunar.metaphone(w) }
+  end
+end

data/test/test_number_search.rb

@@ -0,0 +1,69 @@
+require "helper"
+
+class NumberSearchTest < Test::Unit::TestCase
+  class Gadget < Struct.new(:id)
+    def self.[](id)
+      new(id)
+    end
+  end
+
+  setup do
+    Lunar.index Gadget do |i|
+      i.id 1001
+      i.number :price, 200
+      i.number :category_ids, %w(100 101 102)
+    end
+  end
+
+  test "doing straight searches for numbers" do
+    search = Lunar.search Gadget, numbers: { price: 200 }
+    
+    assert_equal ["1001"], search.map(&:id)
+  end
+
+  test "also doing range searches" do
+    search = Lunar.search Gadget, price: 150..200
+    
+    assert_equal ["1001"], search.map(&:id)
+  end
+
+  test "searching both" do
+    search = Lunar.search Gadget, price: 150..200, numbers: { price: 200 }
+    
+    assert_equal ["1001"], search.map(&:id)
+  end
+
+  test "searching for a multi-id individually" do
+    search100 = Lunar.search Gadget, numbers: { category_ids: 100 }
+    search101 = Lunar.search Gadget, numbers: { category_ids: 101 }
+    search102 = Lunar.search Gadget, numbers: { category_ids: 102 }
+
+    assert_equal ["1001"], search100.map(&:id)
+    assert_equal ["1001"], search101.map(&:id)
+    assert_equal ["1001"], search102.map(&:id)
+  end
+
+  test "searching for a valid multi-id at the same time" do
+    search = Lunar.search Gadget, numbers: { category_ids: %w(100 101 102) }
+
+    assert_equal ["1001"], search.map(&:id)
+  end
+
+  test "searching with one invalid multi-id at the same time" do
+    search = Lunar.search Gadget, numbers: { category_ids: %w(100 101 102 103) }
+
+    assert_equal ["1001"], search.map(&:id)
+  end
+  
+  test "searching with all invalid multi-id" do
+    search = Lunar.search Gadget, numbers: { category_ids: %w(103 104 105) }
+    assert_equal 0, search.size
+  end
+
+  test "searching with valid category_ids and an empty price array" do
+    search = Lunar.search(Gadget, numbers: { category_ids: %w(100 101 102),
+                                             price: [""]})
+
+    assert_equal ["1001"], search.map(&:id)
+  end
+end

data/test/test_scoring.rb

@@ -33,4 +33,4 @@ class LunarScoringTest < Test::Unit::TestCase
       assert_equal 1, scoring.scores['17']
     end
   end
-end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 5
-  version: 0.5.5
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Cyril David
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-31 00:00:00 +08:00
+date: 2010-06-30 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -35,6 +36,7 @@ dependencies:
   name: nest
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -49,6 +51,7 @@ dependencies:
   name: text
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -61,6 +64,7 @@ dependencies:
   name: contest
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -90,7 +94,7 @@ files:
 - lib/lunar/fuzzy_word.rb
 - lib/lunar/index.rb
 - lib/lunar/keyword_matches.rb
-- lib/lunar/lunar_nest.rb
+- lib/lunar/number_matches.rb
 - lib/lunar/range_matches.rb
 - lib/lunar/result_set.rb
 - lib/lunar/scoring.rb
@@ -102,7 +106,8 @@ files:
 - test/test_index.rb
 - test/test_lunar.rb
 - test/test_lunar_fuzzy_word.rb
-- test/test_lunar_nest.rb
+- test/test_lunar_words.rb
+- test/test_number_search.rb
 - test/test_scoring.rb
 has_rdoc: true
 homepage: http://github.com/sinefunc/lunar
@@ -114,6 +119,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -121,6 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -130,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A redis based full text search engine
@@ -140,5 +147,6 @@ test_files:
 - test/test_index.rb
 - test/test_lunar.rb
 - test/test_lunar_fuzzy_word.rb
-- test/test_lunar_nest.rb
+- test/test_lunar_words.rb
+- test/test_number_search.rb
 - test/test_scoring.rb

data/lib/lunar/lunar_nest.rb

@@ -1,19 +0,0 @@
-module Lunar
-  # @private Provides convenience methods to look up keys.
-  # Since the Redis KEYS command is actually pretty slow,
-  # i'm considering an alternative approach of manually maintaining
-  # the sets to manage all the groups of keys.
-  class LunarNest < Nest
-    def keys
-      redis.keys self
-    end
-
-    def matches
-      regex = Regexp.new(self.gsub('*', '(.*)'))
-      keys.map { |key|
-        match = key.match(regex)
-        [LunarNest.new(key, redis), *match[1, match.size - 1]]
-      }
-    end
-  end
-end

data/test/test_lunar_nest.rb

@@ -1,46 +0,0 @@
-require "helper"
-
-class LunarNestTest < Test::Unit::TestCase
-  test "retrieving keys for a pattern" do
-    Lunar.redis.set("Foo:1:Bar", 1)
-    Lunar.redis.set("Foo:2:Bar", 2)
-
-    nest = Lunar::LunarNest.new("Foo", Lunar.redis)['*']["Bar"]
-
-    assert_equal ['Foo:1:Bar', 'Foo:2:Bar'], nest.keys.sort
-  end
-
-  test "retrieving keys and their matches" do
-    Lunar.redis.set("Foo:1:Bar", 1)
-    Lunar.redis.set("Foo:2:Bar", 2)
-
-    nest = Lunar::LunarNest.new("Foo", Lunar.redis)['*']["Bar"]
-
-    matches = []
-
-    nest.matches.each do |key, m|
-      matches << m
-    end
-
-    assert_equal ['1', '2'], matches.sort
-  end
-
-  test "retrieving keys and their matches when more than one *" do
-    Lunar.redis.set("Foo:1:Bar:3:Baz", 1)
-    Lunar.redis.set("Foo:2:Bar:4:Baz", 2)
-
-    nest = Lunar::LunarNest.new("Foo", Lunar.redis)['*']["Bar"]["*"]["Baz"]
-
-    matches1 = []
-    matches2 = []
-
-    nest.matches.each do |key, m1, m2|
-      matches1 << m1
-      matches2 << m2
-    end
-
-    assert_equal ['1', '2'], matches1.sort
-    assert_equal ['3', '4'], matches2.sort
-  end
-
-end