redis_autocomplete 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/redis_autocomplete.rb

@@ -1,17 +1,23 @@
 require 'redis'
 
 class RedisAutocomplete
+  DEFAULT_DISALLOWED_CHARS = /[^a-zA-Z0-9_-]/
+  DEFAULT_TERMINAL = '+'
+  DEFAULT_CASE_SENSITIVITY = true
+
   attr_reader :redis, :terminal
 
-  def initialize(set, disallowed_chars = /[^a-zA-Z0-9_-]/, terminal = '+')
+  def initialize(set, opts = {})
     @set = set
     @redis = Redis.new
-    @disallowed_chars = disallowed_chars
-    @terminal = terminal
+    @disallowed_chars = opts[:disallowed_chars] || DEFAULT_DISALLOWED_CHARS
+    @terminal = opts[:terminal] || DEFAULT_TERMINAL
+    @case_sensitive = opts[:case_sensitive].nil? ? DEFAULT_CASE_SENSITIVITY : opts[:case_sensitive]
   end
 
   def add_word(word)
     w = word.gsub(@disallowed_chars, '')
+    w.downcase! if !@case_sensitive
     (1..(w.length)).each { |i| @redis.zadd(@set, 0, w.slice(0, i)) }
     @redis.zadd(@set, 0, "#{w}#{@terminal}")
   end

data/redis_autocomplete.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{redis_autocomplete}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Johnston (simple10)", "Ben Woosley (Empact)", "Salvatore Sanfilippo (antirez)"]

data/spec/redis_autocomplete_spec.rb

@@ -3,67 +3,118 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 #require 'redis_autocomplete'
 
 describe RedisAutocomplete do
-  before do
+  before :all do
     @names = %w[
-      ynes
-      ynez
-      yoko
-      yolanda
-      yolande
+      Ynes
+      Ynez
+      Yoko
+      Yolanda
+      Yolande
       yolane
       yolanthe
-      aaren
-      aarika
-      abagael
-      abagail
-      catherine
-      cathi
+      Aaren
+      Aarika
+      Abagael
+      Abagail
+      Catherine
+      Cathi
       cathie
       cathleen
       cathlene
-      cathrin
-      cathrine
-      cathryn
-      cathy
-      cathyleen
-      cati
-      catie
-      catina
-      catlaina
-      catlee
-      catlin
+      Cathrin
+      Cathrine
+      Cathryn
+      Cathy
+      Cathyleen
+      Cati
+      Catie
+      Catina
+      Catlaina
+      Catlee
+      Catlin
     ]
     @set = :test_female_names
-    @r = RedisAutocomplete.new(@set)
-    #todo: drop female_names set
-    @r.add_words(@names)
   end
 
-  describe "#suggest" do
-    it "should include words matching prefix" do
-      @r.suggest('c').should == %w[
-        catherine
-        cathi
-        cathie
-        cathleen
-        cathlene
-        cathrin
-        cathrine
-        cathryn
-        cathy
-        cathyleen
-      ]
+  context "with default case sensitivity" do
+    before do
+      @r = RedisAutocomplete.new(@set)
+      @r.redis.zremrangebyscore(@set, 0, 0)
+      @r.add_words(@names)
     end
-    it "should not include words not matching prefix" do
-      @r.suggest('cati').should_not include('cathy')
+
+    describe "#suggest" do
+      it "should include words matching prefix" do
+        @r.suggest('C').should == %w[
+          Catherine
+          Cathi
+          Cathrin
+          Cathrine
+          Cathryn
+          Cathy
+          Cathyleen
+          Cati
+          Catie
+          Catina
+        ]
+      end
+
+      it "should not include words not matching prefix" do
+        @r.suggest('Cati').should_not include('Cathy')
+      end
+
+      it "should not include uppercase when searching on lowercase" do
+        @r.suggest('Y').should_not include('yolane', 'yolanthe')
+        @r.suggest('Y').should == %w[Ynes Ynez Yoko Yolanda Yolande]
+      end
+
+      context "when a max count is supplied" do
+        it "should not include more than 10 matches" do
+          @r.suggest('C').length.should == 10
+        end
+
+        it "should not include more matches than the supplied count" do
+          @r.suggest('C', 4).length.should == 4
+        end
+      end
+    end
+  end
+
+  context "with :case_sensitive => false" do
+    before do
+      @r = RedisAutocomplete.new(@set, :case_sensitive => false)
+      @r.redis.zremrangebyscore(@set, 0, 0)
+      @r.add_words(@names)
     end
 
-    context "when a max count is supplied" do
-      it "should not include more than 10 matches" do
-        @r.suggest('c').length.should == 10
+    describe "#suggest" do
+      it "should include words matching prefix" do
+        @r.suggest('c').should == %w[
+          catherine
+          cathi
+          cathie
+          cathleen
+          cathlene
+          cathrin
+          cathrine
+          cathryn
+          cathy
+          cathyleen
+        ]
       end
-      it "should not include more matches than the supplied count" do
-        @r.suggest('c', 4).length.should == 4
+
+      it "should not include words not matching prefix" do
+        @r.suggest('cati').should_not include('cathy')
+      end
+
+      context "when a max count is supplied" do
+        it "should not include more than 10 matches" do
+          @r.suggest('c').length.should == 10
+        end
+
+        it "should not include more matches than the supplied count" do
+          @r.suggest('c', 4).length.should == 4
+        end
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: redis_autocomplete
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Joe Johnston (simple10)
@@ -106,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1355877188138504025
+      hash: 1956628192009044186
       segments: 
       - 0
       version: "0"