redis-search 0.7.1 → 0.8.0

data/README.markdown

@@ -13,6 +13,7 @@ High performance real-time search (Support Chinese), index in Redis for Rails ap
 * Real-time search
 * High performance
 * Segment words search and prefix match search
+* Support match with alias
 * Support ActiveRecord and Mongoid
 * Sort results by one field
 * Homophone search, pinyin search
@@ -31,7 +32,7 @@ in Rails application Gemfile
     # 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.7.1'
+    gem 'redis-search', '0.8.0'
 
 install bundlers
 

data/lib/redis/search/base.rb

@@ -7,11 +7,13 @@ class Redis
       # Config redis-search index for Model
       # == Params:
       #   title_field   Query field for Search
+      #   alias_field   Alias field for search, can accept multi field (String or Array type), it type is String, redis-search will split by comma
       #   prefix_index_enable   Is use prefix index search
       #   ext_fields    What kind fields do you need inlucde to search indexes
       #   score_field   Give a score for search sort, need Integer value, default is `created_at`
       def redis_search_index(options = {})
         title_field = options[:title_field] || :title
+        alias_field = options[:alias_field] || nil
         prefix_index_enable = options[:prefix_index_enable] || false
         ext_fields = options[:ext_fields] || []
         score_field = options[:score_field] || :created_at
@@ -33,9 +35,20 @@ class Redis
             end
             exts
           end
+          
+          def redis_search_alias_value(field)
+            return [] if field.blank? or field == "_was"
+            val = instance_eval("self.\#{field}").clone
+            return [] if !val.class.in?([String,Array])
+            if val.is_a?(String)
+              val = val.to_s.split(",")
+            end
+            val
+          end
 
           def redis_search_index_create
             s = Search::Index.new(:title => self.#{title_field}, 
+                                  :aliases => self.redis_search_alias_value(#{alias_field.inspect}), 
                                   :id => self.id, 
                                   :exts => self.redis_search_fields_to_hash(#{ext_fields.inspect}), 
                                   :type => self.class.to_s,
@@ -47,13 +60,25 @@ class Redis
             s = nil
             true
           end
+          
+          def redis_search_index_delete(titles)
+            titles.uniq.each do |title|
+              Search::Index.remove(:id => self.id, :title => title, :type => self.class.to_s)
+            end
+            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)
+          before_destroy do
+            titles = []
+            titles = redis_search_alias_value("#{alias_field}")
+            titles << self.#{title_field}
+            
+            redis_search_index_delete(titles)
             true
           end
           
+          
           def redis_search_index_need_reindex
             index_fields_changed = false
             #{ext_fields.inspect}.each do |f|
@@ -68,7 +93,10 @@ class Redis
               end
             end
             begin
-              if(self.#{title_field}_changed?)
+              if self.#{title_field}_changed?
+                index_fields_changed = true
+              end
+              if self.#{alias_field || title_field}_changed?
                 index_fields_changed = true
               end
             rescue
@@ -76,15 +104,12 @@ class Redis
             return index_fields_changed
           end
           
-          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}
+          after_update do
             if self.redis_search_index_need_reindex
-              Search::Index.remove(:id => self.id, :title => self.#{title_field}_was, :type => self.class.to_s)
+              titles = []
+              titles = redis_search_alias_value("#{alias_field}_was")
+              titles << self.#{title_field}_was
+              redis_search_index_delete(titles)
             end
             true
           end

data/lib/redis/search/index.rb

@@ -1,17 +1,20 @@
 class Redis
   module Search
     class Index
-      attr_accessor :type, :title, :id,:score, :exts, :condition_fields, :prefix_index_enable
+      attr_accessor :type, :title, :id,:score, :aliases, :exts, :condition_fields, :prefix_index_enable
       def initialize(options = {})
         # default data
         self.condition_fields = []
         self.exts = []
+        self.aliases = []
         self.prefix_index_enable = false
         
         # set attributes value from params
         options.keys.each do |k|
           eval("self.#{k} = options[k]")
         end
+        self.aliases << self.title
+        self.aliases.uniq!
       end
       
       def save
@@ -23,26 +26,26 @@ class Redis
 
         # 将原始数据存入 hashes
         res = Redis::Search.config.redis.hset(self.type, self.id, data.to_json)
-        # 保存 sets 索引，以分词的单词为key，用于后面搜索，里面存储 ids
-        words = Search::Index.split_words_for_index(self.title)
-        return if words.blank?
-        words.each do |word|
-          key = Search.mk_sets_key(self.type,word)
-          # word index for item id
-          Redis::Search.config.redis.sadd(key, self.id)
-          # score for search sort
-          Redis::Search.config.redis.set(Search.mk_score_key(self.type,self.id),self.score)
-        end
         
         # 将目前的编号保存到条件(conditions)字段所创立的索引上面
         self.condition_fields.each do |field|
           Redis::Search.config.redis.sadd(Search.mk_condition_key(self.type,field,data[field.to_sym]), self.id)
         end
-
-        # 建立前最索引
-        if prefix_index_enable
-          save_prefix_index
-        end     
+        
+        # score for search sort
+        Redis::Search.config.redis.set(Search.mk_score_key(self.type,self.id),self.score)
+        
+        # 保存 sets 索引，以分词的单词为key，用于后面搜索，里面存储 ids
+        self.aliases.each do |val|
+          words = Search::Index.split_words_for_index(val)
+          return if words.blank?
+          words.each do |word|
+            Redis::Search.config.redis.sadd(Search.mk_sets_key(self.type,word), self.id)
+          end
+        end  
+        
+        # 建立前缀索引
+        save_prefix_index if prefix_index_enable
       end
       
       def self.remove(options = {})
@@ -50,8 +53,7 @@ class Redis
         Redis::Search.config.redis.hdel(type,options[:id])
         words = Search::Index.split_words_for_index(options[:title])
         words.each do |word|
-          key = Search.mk_sets_key(type,word)
-          Redis::Search.config.redis.srem(key, options[:id])
+          Redis::Search.config.redis.srem(Search.mk_sets_key(type,word), options[:id])
           Redis::Search.config.redis.del(Search.mk_score_key(type,options[:id]))
         end
         
@@ -70,23 +72,24 @@ class Redis
         end
         
         def save_prefix_index
-          words = []
-          words << self.title.downcase
-          Redis::Search.config.redis.sadd(Search.mk_sets_key(self.type,self.title), self.id)
-          if Search.config.pinyin_match
-            pinyin = Pinyin.t(self.title.downcase,'')
-            words << pinyin
-            Redis::Search.config.redis.sadd(Search.mk_sets_key(self.type,pinyin), self.id)
-          end
-          
-          words.each do |word|
+          self.aliases.each do |val|
+            words = []
+            words << val.downcase
+            Redis::Search.config.redis.sadd(Search.mk_sets_key(self.type,val), self.id)
+            if Search.config.pinyin_match
+              pinyin = Pinyin.t(val.downcase,'')
+              words << pinyin
+              Redis::Search.config.redis.sadd(Search.mk_sets_key(self.type,pinyin), self.id)
+            end
             
-            key = Search.mk_complete_key(self.type)
-            (1..(word.length)).each do |l|
-              prefix = word[0...l]
-              Redis::Search.config.redis.zadd(key, 0, prefix)
+            words.each do |word|
+              key = Search.mk_complete_key(self.type)
+              (1..(word.length)).each do |l|
+                prefix = word[0...l]
+                Redis::Search.config.redis.zadd(key, 0, prefix)
+              end
+              Redis::Search.config.redis.zadd(key, 0, word + "*")
             end
-            Redis::Search.config.redis.zadd(key, 0, word + "*")
           end
         end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-search
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000 Z
+date: 2012-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chinese_pinyin
-  requirement: &70187052370880 !ruby/object:Gem::Requirement
+  requirement: &70259274984740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70187052370880
+  version_requirements: *70259274984740
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70187052368920 !ruby/object:Gem::Requirement
+  requirement: &70259274983840 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70187052368920
+  version_requirements: *70259274983840
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70187052364560 !ruby/object:Gem::Requirement
+  requirement: &70259274983120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 2.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70187052364560
+  version_requirements: *70259274983120
 description: High performance real-time search (Support Chinese), index in Redis for
   Rails application.
 email:
@@ -80,9 +80,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: High performance real-time search (Support Chinese), index in Redis for Rails
   application.
 test_files: []
+has_rdoc: