redis-search 0.4 → 0.5.2

data/README.markdown

@@ -7,7 +7,8 @@ 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 ActiveRecord, Mongoid and others ORM
+* Support ActiveRecord and Mongoid
+* Sort results by one field
 
 ## Requirements
 
@@ -17,9 +18,9 @@ High performance real-time search (Support Chinese), index in Redis for Rails ap
 
 in Rails application Gemfile
 
-	gem 'redis','>= 2.1.1'
-	gem "rmmseg-cpp-huacnlee", "0.2.8"
-	gem 'redis-search', '0.4'
+  gem 'redis','>= 2.1.1'
+  gem "rmmseg-cpp-huacnlee", "0.2.8"
+  gem 'redis-search', '0.5'
 
 install bundlers
 
@@ -48,11 +49,13 @@ bind Redis::Search callback event, it will to rebuild search indexes when data c
   
       field :title
       field :body
+      field :hits
   
       belongs_to :user
       belongs_to :category
   
       redis_search_index(:title_field => :title,
+                         :score_field => :hits,
                          :ext_fields => [:category_name])
   
       def category_name
@@ -67,9 +70,11 @@ bind Redis::Search callback event, it will to rebuild search indexes when data c
       field :name
       field :tagline
       field :email
+      field :followers_count
       
       redis_search_index(:title_field => :name,
                          :prefix_index_enable => true,
+                         :score_field => :followers_count,
                          :ext_fields => [:email,:tagline])
     end
 
@@ -91,6 +96,10 @@ If you are first install it in you old project, or your Redis cache lose, you ca
 
     $ rake redis_search:index
 
+## Documentation
+
+see [Rdoc.info redis-search](http://rubydoc.info/gems/redis-search)
+
 ## Benchmark test
 
 * [https://gist.github.com/1150933](https://gist.github.com/1150933)

data/lib/redis/search/base.rb

@@ -4,11 +4,20 @@ class Redis
     extend ActiveSupport::Concern
 
     module ClassMethods
+      # Config redis-search index for Model
+      # == Params:
+      #   title_field   Query field for Search
+      #   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
         prefix_index_enable = options[:prefix_index_enable] || false
         ext_fields = options[:ext_fields] || []
-      
+        score_field = options[:score_field] || :created_at
+        # Add score field to ext_fields
+        ext_fields << score_field if !ext_fields.include?(score_field)
+        
         # store Model name to indexed_models for Rake tasks
         Search.indexed_models = [] if Search.indexed_models == nil
         Search.indexed_models << self
@@ -28,6 +37,7 @@ class Redis
                            :id => self.id, 
                            :exts => self.redis_search_ext_fields(#{ext_fields.inspect}), 
                            :type => self.class.to_s,
+                           :score => self.#{score_field}.to_i,
                            :prefix_index_enable => #{prefix_index_enable})
             s.save
             # release s
@@ -44,7 +54,12 @@ class Redis
             index_fields_changed = false
             #{ext_fields.inspect}.each do |f|
               next if f.to_s == "id"
-              if instance_eval(f.to_s + "_changed?")
+              field_method = f.to_s + "_changed?"
+              if !self.methods.include?(field_method.to_sym)
+                ::Rails.logger.debug("[redis-search] warring! #{self.class.name} model reindex on update need "+field_method+" method.")
+                next
+              end
+              if instance_eval(field_method)
                 index_fields_changed = true
               end
             end

data/lib/redis/search/finder.rb

@@ -21,6 +21,10 @@ class Redis
     def self.mk_sets_key(type, key)
       "#{type}:#{key.downcase}"
     end
+    
+    def self.mk_score_key(type, id)
+      "#{type}:_score_:#{id}"
+    end
   
     def self.mk_complete_key(type)
       "Compl#{type}"
@@ -77,9 +81,15 @@ class Redis
           Redis::Search.config.redis.expire(temp_store_key,86400)
         end
         # 根据需要的数量取出 ids
-        ids = Redis::Search.config.redis.sort(temp_store_key,:limit => [0,limit])
+        ids = Redis::Search.config.redis.sort(temp_store_key,
+                                              :limit => [0,limit], 
+                                              :by => Search.mk_score_key(type,"*"),
+                                              :order => "desc")
       else
-        ids = Redis::Search.config.redis.sort(words.first,:limit => [0,limit])
+        ids = Redis::Search.config.redis.sort(words.first,
+                                              :limit => [0,limit], 
+                                              :by => Search.mk_score_key(type,"*"),
+                                              :order => "desc")
       end
       return [] if ids.blank?
       hmget(type,ids)
@@ -101,6 +111,7 @@ class Redis
       limit = options[:limit] || 10
       sort_field = options[:sort_field] || "id"
       words = words.collect { |w| Search.mk_sets_key(type,w) }
+      word_score = words.collect { |w| "#{w}:*" }
       return result if words.blank?
       temp_store_key = "tmpinterstore:#{words.join("+")}"
       if words.length > 1
@@ -111,10 +122,16 @@ class Redis
           Redis::Search.config.redis.expire(temp_store_key,86400)
         end
         # 根据需要的数量取出 ids
-        ids = Redis::Search.config.redis.sort(temp_store_key,:limit => [0,limit])
+        ids = Redis::Search.config.redis.sort(temp_store_key,
+                                              :limit => [0,limit], 
+                                              :by => Search.mk_score_key(type,"*"),
+                                              :order => "desc")
       else
         # 根据需要的数量取出 ids
-        ids = Redis::Search.config.redis.sort(words.first,:limit => [0,limit])
+        ids = Redis::Search.config.redis.sort(words.first,
+                                              :limit => [0,limit], 
+                                              :by => Search.mk_score_key(type,"*"),
+                                              :order => "desc")
       end
       hmget(type,ids, :sort_field => sort_field)
     end

data/lib/redis/search/index.rb

@@ -1,7 +1,7 @@
 class Redis
   module Search
     class Index
-      attr_accessor :type, :title, :id, :exts, :prefix_index_enable
+      attr_accessor :type, :title, :id,:score, :exts, :prefix_index_enable
       def initialize(options = {})
         self.exts = []
         options.keys.each do |k|
@@ -24,6 +24,7 @@ class Redis
         words.each do |word|
           key = Search.mk_sets_key(self.type,word)
           Redis::Search.config.redis.sadd(key, self.id)
+          Redis::Search.config.redis.set(Search.mk_score_key(self.type,self.id),self.score)
         end
 
         # 建立前最索引
@@ -50,6 +51,7 @@ class Redis
         words.each do |word|
           key = Search.mk_sets_key(type,word)
           Redis::Search.config.redis.srem(key, options[:id])
+          Redis::Search.config.redis.del(Search.mk_score_key(type,options[:id]))
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-search
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-22 00:00:00.000000000Z
+date: 2011-09-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmmseg-cpp-huacnlee
-  requirement: &2153202040 !ruby/object:Gem::Requirement
+  requirement: &2151875920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *2153202040
+  version_requirements: *2151875920
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &2153198300 !ruby/object:Gem::Requirement
+  requirement: &2151873980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 2.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153198300
+  version_requirements: *2151873980
 description: High performance real-time search (Support Chinese), index in Redis for
   Rails application.
 email: