redis-search 0.7.0 → 0.7.1

data/README.markdown

@@ -2,6 +2,8 @@
 
 High performance real-time search (Support Chinese), index in Redis for Rails application
 
+[中文介绍和使用说明](https://github.com/huacnlee/redis-search/wiki/Usage-in-Chinese)
+
 ## Status
 
 [![CI Status](https://secure.travis-ci.org/huacnlee/redis-search.png)](http://travis-ci.org/huacnlee/redis-search)
@@ -26,9 +28,10 @@ in Rails application Gemfile
 
     gem 'redis','>= 2.1.1'
     gem 'chinese_pinyin', '0.4.1'
+    # add rmmseg if you need search by segment words
     gem 'rmmseg-cpp-huacnlee', '0.2.9'
     gem 'redis-namespace','~> 1.1.0'
-    gem 'redis-search', '0.6.3'
+    gem 'redis-search', '0.7.1'
 
 install bundlers
 
@@ -51,6 +54,8 @@ create file in: config/initializers/redis_search.rb
       config.redis = redis
       config.complete_max_length = 100
       config.pinyin_match = true
+      # use rmmseg, true to disable it, it can save memroy
+      config.disable_rmmseg = false
     end
 
 ## Usage
@@ -124,4 +129,4 @@ There is my performance test result.
     
 ## Demo
 
-You can try the search feature in [`zheye.org`](http://zheye.org) | [`shu.im`](http://shu.im)
+You can try the search feature in [`zheye.org`](http://zheye.org) | [`ruby-china`](http://ruby-china.org) | [`shu.im`](http://shu.im)

data/lib/redis/search/base.rb

@@ -34,7 +34,6 @@ class Redis
             exts
           end
 
-          # after_create :redis_search_index_create
           def redis_search_index_create
             s = Search::Index.new(:title => self.#{title_field}, 
                                   :id => self.id, 
@@ -46,11 +45,13 @@ class Redis
             s.save
             # release s
             s = nil
+            true
           end
 
           before_destroy :redis_search_index_destroy
           def redis_search_index_destroy
             Search::Index.remove(:id => self.id, :title => self.#{title_field}, :type => self.class.to_s)
+            true
           end
           
           def redis_search_index_need_reindex
@@ -85,13 +86,15 @@ class Redis
             if self.redis_search_index_need_reindex
               Search::Index.remove(:id => self.id, :title => self.#{title_field}_was, :type => self.class.to_s)
             end
+            true
           end
 
           after_save :redis_search_index_update
           def redis_search_index_update
-            if self.redis_search_index_need_reindex
+            if self.redis_search_index_need_reindex or self.new_record?
               self.redis_search_index_create
             end
+            true
           end
         )
       end

data/lib/redis/search/config.rb

@@ -1,5 +1,4 @@
 # coding: utf-8
-require "rmmseg"
 class Redis
   module Search
     class << self
@@ -7,6 +6,12 @@ class Redis
     
       def configure
         yield self.config ||= Config.new
+        
+        if not self.config.disable_rmmseg
+          require "rmmseg"
+          # loading RMMSeg chinese word dicts.
+          RMMSeg::Dictionary.load_dictionaries
+        end
       end
     end
   
@@ -25,14 +30,15 @@ class Redis
       # When you search "de" will -> 得|的|德...
       # When you search "得" will -> "de" -> 得|的|德...
       attr_accessor :pinyin_match
+      # Disable RMMSeg, if you don't need, disable this will save memory. (true|false) default = true
+      attr_accessor :disable_rmmseg
     
       def initialize
         self.debug = false
         self.redis = nil
         self.complete_max_length = 100
         self.pinyin_match = false
-        # loading RMMSeg chinese word dicts.
-        RMMSeg::Dictionary.load_dictionaries
+        self.disable_rmmseg = false        
       end
     end
   end

data/lib/redis/search/finder.rb

@@ -1,6 +1,5 @@
 # coding: utf-8
 require 'chinese_pinyin'
-
 class Redis
   module Search
     # use rmmseg to split words
@@ -165,7 +164,7 @@ class Redis
       end
       
       # 根据需要的数量取出 ids
-      ids = Redis::Search.config.redis.sort(temp_store_key,
+      ids = Search.config.redis.sort(temp_store_key,
                                             :limit => [0,limit], 
                                             :by => Search.mk_score_key(type,"*"),
                                             :order => "desc")
@@ -182,6 +181,9 @@ class Redis
   
     private
       def self._split(text)
+        # return chars if disabled rmmseg
+        return text.split("") if Search.config.disable_rmmseg
+          
         algor = RMMSeg::Algorithm.new(text)
         words = []
         loop do
@@ -193,7 +195,7 @@ class Redis
       end
     
       def self.warn(msg)
-        return if not Search.config.debug
+        return if not Redis::Search.config.debug
         msg = "\e[33m[Redis::Search] #{msg}\e[0m"
         if defined?(Rails) == 'constant' && Rails.class == Class
           ::Rails.logger.warn(msg)
@@ -203,7 +205,7 @@ class Redis
       end
       
       def self.info(msg)
-        return if not Search.config.debug
+        return if not Redis::Search.config.debug
         msg = "\e[32m[Redis::Search] #{msg}\e[0m"
         if defined?(Rails) == 'constant' && Rails.class == Class
           ::Rails.logger.debug(msg)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-search
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-17 00:00:00.000000000Z
+date: 2012-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chinese_pinyin
-  requirement: &2156513140 !ruby/object:Gem::Requirement
+  requirement: &70187052370880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156513140
-- !ruby/object:Gem::Dependency
-  name: rmmseg-cpp-huacnlee
-  requirement: &2156512660 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.2.8
-  type: :runtime
-  prerelease: false
-  version_requirements: *2156512660
+  version_requirements: *70187052370880
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &2156512200 !ruby/object:Gem::Requirement
+  requirement: &70187052368920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +32,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156512200
+  version_requirements: *70187052368920
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &2156511720 !ruby/object:Gem::Requirement
+  requirement: &70187052364560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +43,7 @@ dependencies:
         version: 2.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156511720
+  version_requirements: *70187052364560
 description: High performance real-time search (Support Chinese), index in Redis for
   Rails application.
 email:
@@ -91,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: High performance real-time search (Support Chinese), index in Redis for Rails