soulmate 1.0.0 → 1.1.0

data/Gemfile

@@ -6,7 +6,7 @@ group :development do
   gem 'jeweler',    '~> 1.5'
 end
 
-gem 'redis',      '>= 2.0'
+gem 'redis',      '>= 3.0'
 gem 'vegas',      '>= 0.1.0'
 gem 'sinatra',    '>= 1.0'
 gem 'multi_json', '>= 1.0'

data/README.markdown

@@ -110,6 +110,14 @@ Add this to gemfile:
 
 Then you can query soulmate at the /sm url, for example: http://localhost:3000/sm/search?types[]=venues&limit=6&term=kitten
 
+You can also config your redis instance:
+
+    # config/initializers/soulmate.rb
+    
+    Soulmate.redis = 'redis://127.0.0.1:6379/0'
+    # or you can asign an existing instance of Redis, Redis::Namespace, etc.
+    # Soulmate.redis = $redis
+
 ### Rendering an autocompleter
 
 Soulmate doesn't include any client-side code necessary to render an autocompleter, but Mitch Crowe put together a pretty cool looking jquery plugin designed for exactly that: <a href="https://github.com/mcrowe/soulmate.js">soulmate.js</a>.

data/lib/soulmate.rb

@@ -1,45 +1,12 @@
-require 'uri'
 require 'multi_json'
-require 'redis'
 
 require 'soulmate/version'
 require 'soulmate/helpers'
 require 'soulmate/base'
 require 'soulmate/matcher'
 require 'soulmate/loader'
+require 'soulmate/config'
 
 module Soulmate
-
-  extend self
-
-  MIN_COMPLETE = 2
-  DEFAULT_STOP_WORDS = ["vs", "at", "the"]
-
-  def redis=(url)
-    @redis = nil
-    @redis_url = url
-    redis
-  end
-
-  def redis
-    @redis ||= (
-      url = URI(@redis_url || ENV["REDIS_URL"] || "redis://127.0.0.1:6379/0")
-
-      ::Redis.new({
-        :host => url.host,
-        :port => url.port,
-        :db => url.path[1..-1],
-        :password => url.password
-      })
-    )
-  end
-
-  def stop_words
-    @stop_words ||= DEFAULT_STOP_WORDS
-  end
-
-  def stop_words=(arr)
-    @stop_words = Array(arr).flatten
-  end
-
+  extend Config
 end

data/lib/soulmate/config.rb

@@ -0,0 +1,52 @@
+require 'uri'
+require 'redis'
+
+module Soulmate
+  module Config
+    DEFAULT_MIN_COMPLETE = 2
+    DEFAULT_STOP_WORDS = ["vs", "at", "the"]
+
+    attr_writer :min_complete
+
+    def min_complete
+      @min_complete ||= DEFAULT_MIN_COMPLETE
+    end
+
+    # Accepts:
+    #   1. A Redis URL String 'redis://host:port/db'
+    #   2. An existing instance of Redis, Redis::Namespace, etc.
+    def redis=(server)
+      if server.is_a?(String)
+        @redis = nil
+        @redis_url = server
+      else
+        @redis = server
+      end
+
+      redis
+    end
+
+    # Returns the current Redis connection. If none has been created, will
+    # create a new one.
+    def redis
+      @redis ||= (
+        url = URI(@redis_url || ENV["REDIS_URL"] || "redis://127.0.0.1:6379/0")
+
+        ::Redis.new({
+          :host => url.host,
+          :port => url.port,
+          :db => url.path[1..-1],
+          :password => url.password
+        })
+      )
+    end
+
+    def stop_words
+      @stop_words ||= DEFAULT_STOP_WORDS
+    end
+
+    def stop_words=(arr)
+      @stop_words = Array(arr).flatten
+    end
+  end
+end

data/lib/soulmate/helpers.rb

@@ -8,7 +8,7 @@ module Soulmate
         Soulmate.stop_words.include?(w)
       end
       words.map do |w|
-        (MIN_COMPLETE-1..(w.length-1)).map{ |l| w[0..l] }
+        (Soulmate.min_complete-1..(w.length-1)).map{ |l| w[0..l] }
       end.flatten.uniq
     end
 

data/lib/soulmate/loader.rb

@@ -61,4 +61,4 @@ module Soulmate
       end
     end
   end
-end
+end

data/lib/soulmate/matcher.rb

@@ -6,14 +6,14 @@ module Soulmate
       options = { :limit => 5, :cache => true }.merge(options)
       
       words = normalize(term).split(' ').reject do |w|
-        w.size < MIN_COMPLETE or Soulmate.stop_words.include?(w)
+        w.size < Soulmate.min_complete or Soulmate.stop_words.include?(w)
       end.sort
 
       return [] if words.empty?
 
       cachekey = "#{cachebase}:" + words.join('|')
 
-      if !options[:cache] || !Soulmate.redis.exists(cachekey)
+      if !options[:cache] || !Soulmate.redis.exists(cachekey) || Soulmate.redis.exists(cachekey) == 0
         interkeys = words.map { |w| "#{base}:#{w}" }
         Soulmate.redis.zinterstore(cachekey, interkeys)
         Soulmate.redis.expire(cachekey, 10 * 60) # expire after 10 minutes
@@ -29,4 +29,4 @@ module Soulmate
       end
     end
   end
-end
+end

data/lib/soulmate/version.rb

@@ -1,7 +1,7 @@
 module Soulmate
   module Version
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')

data/soulmate.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "soulmate"
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Waller"]
-  s.date = "2013-02-04"
+  s.date = "2014-05-15"
   s.description = "Soulmate is a tool to help solve the common problem of developing a fast autocomplete feature. It uses Redis's sorted sets to build an index of partial words and corresponding top matches, and provides a simple sinatra app to query them. Soulmate finishes your sentences."
   s.email = "eric@seatgeek.com"
   s.executables = ["soulmate", "soulmate-web"]
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "bin/soulmate-web",
     "lib/soulmate.rb",
     "lib/soulmate/base.rb",
+    "lib/soulmate/config.rb",
     "lib/soulmate/helpers.rb",
     "lib/soulmate/loader.rb",
     "lib/soulmate/matcher.rb",
@@ -43,14 +44,14 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/seatgeek/soulmate"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.23.2"
   s.summary = "Redis-backed service for fast autocompleting - extracted from SeatGeek"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<redis>, [">= 2.0"])
+      s.add_runtime_dependency(%q<redis>, [">= 3.0"])
       s.add_runtime_dependency(%q<vegas>, [">= 0.1.0"])
       s.add_runtime_dependency(%q<sinatra>, [">= 1.0"])
       s.add_runtime_dependency(%q<multi_json>, [">= 1.0"])
@@ -58,7 +59,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5"])
     else
-      s.add_dependency(%q<redis>, [">= 2.0"])
+      s.add_dependency(%q<redis>, [">= 3.0"])
       s.add_dependency(%q<vegas>, [">= 0.1.0"])
       s.add_dependency(%q<sinatra>, [">= 1.0"])
       s.add_dependency(%q<multi_json>, [">= 1.0"])
@@ -67,7 +68,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.5"])
     end
   else
-    s.add_dependency(%q<redis>, [">= 2.0"])
+    s.add_dependency(%q<redis>, [">= 3.0"])
     s.add_dependency(%q<vegas>, [">= 0.1.0"])
     s.add_dependency(%q<sinatra>, [">= 1.0"])
     s.add_dependency(%q<multi_json>, [">= 1.0"])

data/test/test_soulmate.rb

@@ -108,7 +108,9 @@ class TestSoulmate < Test::Unit::TestCase
     assert_equal ["te", "tes", "test", "testi", "testin", "th", "thi", "this"], loader.prefixes_for_phrase("testin' this")
     assert_equal ["te", "tes", "test"], loader.prefixes_for_phrase("test test")
     assert_equal ["so", "sou", "soul", "soulm", "soulma", "soulmat", "soulmate"], loader.prefixes_for_phrase("SoUlmATE")
-
     assert_equal ['测试', '测试中', '测试中文', 'te', 'tes', 'test'], loader.prefixes_for_phrase('测试中文 test')
+
+    Soulmate.min_complete = 4
+    assert_equal ['同华东生', '同华东生产', '同华东生产队', 'abcd', 'abcde'], loader.prefixes_for_phrase('同华东生产队 abcde')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soulmate
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: vegas
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +145,7 @@ files:
 - bin/soulmate-web
 - lib/soulmate.rb
 - lib/soulmate/base.rb
+- lib/soulmate/config.rb
 - lib/soulmate/helpers.rb
 - lib/soulmate/loader.rb
 - lib/soulmate/matcher.rb
@@ -172,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2119288237740455138
+      hash: 3570037129997399612
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -181,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: Redis-backed service for fast autocompleting - extracted from SeatGeek