redis-search 0.6.2 → 0.6.3

data/README.markdown

@@ -2,6 +2,10 @@
 
 High performance real-time search (Support Chinese), index in Redis for Rails application
 
+## Status
+
+[![CI Status](https://secure.travis-ci.org/huacnlee/redis-search.png)](http://travis-ci.org/huacnlee/redis-search)
+
 ## Features
 
 * Real-time search
@@ -19,10 +23,10 @@ High performance real-time search (Support Chinese), index in Redis for Rails ap
 
 in Rails application Gemfile
 
-  gem 'redis','>= 2.1.1'
-  gem 'chinese_pinyin', '0.3.0'
-  gem 'rmmseg-cpp-huacnlee', '0.2.8'
-  gem 'redis-search', '0.6'
+    gem 'redis','>= 2.1.1'
+    gem 'chinese_pinyin', '0.4.1'
+    gem 'rmmseg-cpp-huacnlee', '0.2.9'
+    gem 'redis-search', '0.6.2'
 
 install bundlers
 
@@ -33,9 +37,9 @@ install bundlers
 create file in: config/initializers/redis_search.rb
 
     require "redis-search"
+    # don't forget change namespace
     redis = Redis.new(:host => "127.0.0.1",:port => "6379")
-    # change redis database to 3, you need use a special database for search feature.
-    redis.select(3)
+    redis = Redis::Namespace.new("your_app_name:redis_search", :redis => redis)
     Redis::Search.configure do |config|
       config.redis = redis
       config.complete_max_length = 100

data/lib/redis/search/base.rb

@@ -73,6 +73,11 @@ class Redis
           
           after_update :redis_search_index_remove
           def redis_search_index_remove
+            # DEBUG info
+            # puts '>>>>>>>>>>>>>>>>>>>>>>' 
+            # puts self.redis_search_index_need_reindex
+            # puts self.#{title_field}_was
+            # puts self.#{title_field}
             if self.redis_search_index_need_reindex
               Search::Index.remove(:id => self.id, :title => self.#{title_field}_was, :type => self.class.to_s)
             end

data/lib/redis/search/config.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+require "rmmseg"
 class Redis
   module Search
     class << self
@@ -30,6 +31,8 @@ class Redis
         self.redis = nil
         self.complete_max_length = 100
         self.pinyin_match = false
+        # loading RMMSeg chinese word dicts.
+        RMMSeg::Dictionary.load_dictionaries
       end
     end
   end

data/lib/redis/search/finder.rb

@@ -1,5 +1,4 @@
 # coding: utf-8
-require "rmmseg"
 require 'chinese_pinyin'
 
 class Redis
@@ -21,6 +20,7 @@ class Redis
     # * Redis::Search.complete("Tag","red") => ["Redis", "Redmine"]
     # * Redis::Search.complete("Tag","redi") => ["Redis"]
     def self.complete(type, w, options = {})
+      return [] if w.blank? or type.blank?
       limit = options[:limit] || 10 
 
       prefix_matchs = []
@@ -155,11 +155,23 @@ class Redis
       end
     
       def self.warn(msg)
-        ::Rails.logger.warn("\e[33m[Redis::Search] #{msg}\e[0m")
+        return if not Search.config.debug
+        msg = "\e[33m[Redis::Search] #{msg}\e[0m"
+        if defined?(Rails) == 'constant' && Rails.class == Class
+          ::Rails.logger.warn(msg)
+        else
+          puts msg
+        end
       end
       
       def self.info(msg)
-        ::Rails.logger.debug("\e[32m[Redis::Search] #{msg}\e[0m")
+        return if not Search.config.debug
+        msg = "\e[32m[Redis::Search] #{msg}\e[0m"
+        if defined?(Rails) == 'constant' && Rails.class == Class
+          ::Rails.logger.debug(msg)
+        else
+          puts msg
+        end
       end
   
       # 生成 uuid，用于作为 hashes 的 field, sets 关键词的值
@@ -181,7 +193,7 @@ class Redis
         return result if ids.blank?
         Redis::Search.config.redis.hmget(type,*ids).each do |r|
           begin
-            result << JSON.parse(r)
+            result << JSON.parse(r) if !r.blank?
           rescue => e
             Search.warn("Search.query failed: #{e}")
           end

data/lib/redis/search/index.rb

@@ -44,6 +44,9 @@ class Redis
           Redis::Search.config.redis.srem(key, options[:id])
           Redis::Search.config.redis.del(Search.mk_score_key(type,options[:id]))
         end
+        
+        # remove set for prefix index key
+        Redis::Search.config.redis.srem(Search.mk_sets_key(type,options[:title]),options[:id])
       end
       
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-search
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-06 00:00:00.000000000Z
+date: 2011-10-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chinese_pinyin
-  requirement: &70317013355480 !ruby/object:Gem::Requirement
+  requirement: &2156524340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70317013355480
+  version_requirements: *2156524340
 - !ruby/object:Gem::Dependency
   name: rmmseg-cpp-huacnlee
-  requirement: &70317013355000 !ruby/object:Gem::Requirement
+  requirement: &2156523860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: 0.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *70317013355000
+  version_requirements: *2156523860
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
+  requirement: &2156523400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156523400
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70317013354520 !ruby/object:Gem::Requirement
+  requirement: &2156522920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +54,7 @@ dependencies:
         version: 2.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70317013354520
+  version_requirements: *2156522920
 description: High performance real-time search (Support Chinese), index in Redis for
   Rails application.
 email:
@@ -80,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: High performance real-time search (Support Chinese), index in Redis for Rails