mongoid-sphinx 0.1.3 → 0.1.4

data/lib/mongoid_sphinx.rb

@@ -6,7 +6,7 @@ require 'mongoid_sphinx/context'
 require 'mongoid_sphinx/index'
 require 'mongoid_sphinx/mongoid/identity'
 require 'mongoid_sphinx/mongoid/sphinx'
-require 'mongoid_sphinx/railtie'
+require 'mongoid_sphinx/railtie' if defined?(Rails)
 
 module MongoidSphinx
   
@@ -52,4 +52,4 @@ module MongoidSphinx
     end
   end
   
-end
+end

data/lib/mongoid_sphinx/configuration.rb

@@ -19,22 +19,25 @@ module MongoidSphinx
       ondisk_dict overshort_step phrase_boundary phrase_boundary_step preopen
       stopwords stopwords_step wordforms )
     
+    attr_accessor :allow_star
     attr_accessor :searchd_file_path, :model_directories, :indexed_models
     attr_accessor :source_options, :index_options
     attr_accessor :configuration, :controller
     
     def initialize
+      init_root_env
       @configuration = Riddle::Configuration.new
-      @configuration.searchd.pid_file   = "#{Rails.root}/log/searchd.#{Rails.env}.pid"
-      @configuration.searchd.log        = "#{Rails.root}/log/searchd.log"
-      @configuration.searchd.query_log  = "#{Rails.root}/log/searchd.query.log"
+      @configuration.searchd.pid_file   = "#{@root}/log/searchd.#{@env}.pid"
+      @configuration.searchd.log        = "#{@root}/log/searchd.log"
+      @configuration.searchd.query_log  = "#{@root}/log/searchd.query.log"
       
-      @controller = Riddle::Controller.new @configuration, "#{Rails.root}/config/#{Rails.env}.sphinx.conf"
+      @controller = Riddle::Controller.new @configuration, "#{@root}/config/#{@env}.sphinx.conf"
       
       self.address              = "127.0.0.1"
       self.port                 = 9312
-      self.searchd_file_path    = "#{Rails.root}/db/sphinx/#{Rails.env}"
-      self.model_directories    = ["#{Rails.root}/app/models/"] + Dir.glob("#{Rails.root}/vendor/plugins/*/app/models/")
+      self.searchd_file_path    = "#{@root}/db/sphinx/#{@env}"
+      self.allow_star           = false
+      self.model_directories    = ["#{@root}/app/models/"] + Dir.glob("#{@root}/vendor/plugins/*/app/models/")
       self.indexed_models       = []
       
       self.source_options  = {
@@ -156,15 +159,45 @@ module MongoidSphinx
     private
     
     def parse_config
-      path = "#{Rails.root}/config/sphinx.yml"
+      path = "#{@root}/config/sphinx.yml"
       return unless File.exists?(path)
       
-      conf = YAML::load(ERB.new(IO.read(path)).result)[Rails.env]
+      conf = YAML::load(ERB.new(IO.read(path)).result)[@env]
       
-      conf.each do |key,value|
-        self.send("#{key}=", value) if self.respond_to?("#{key}=")
+      unless conf.nil?
+        conf.each do |key,value|
+          self.send("#{key}=", value) if self.respond_to?("#{key}=")
+          
+          set_sphinx_setting self.source_options, key, value, SourceOptions
+          set_sphinx_setting self.index_options,  key, value, IndexOptions
+          set_sphinx_setting @configuration.searchd, key, value
+          set_sphinx_setting @configuration.indexer, key, value
+        end
+      end
+      
+      if self.allow_star
+        self.index_options[:enable_star]    = true
+        self.index_options[:min_prefix_len] = 1
       end
     end
     
+    def init_root_env
+      if defined?(Rails)
+        @root = Rails.root
+        @env = Rails.env
+      else
+        @root = Dir.pwd
+        @env = ENV['RACK_ENV'] || 'development'
+      end
+    end
+    
+    def set_sphinx_setting(object, key, value, allowed = {})
+      if object.is_a?(Hash)
+        object[key.to_sym] = value if allowed.include?(key.to_s)
+      else
+        object.send("#{key}=", value) if object.respond_to?("#{key}")
+        send("#{key}=", value) if self.respond_to?("#{key}")
+      end
+    end
   end
-end
+end

data/lib/mongoid_sphinx/delta.rb

@@ -0,0 +1,74 @@
+module MongoidSphinx
+  module Delta
+    extend ActiveSupport::Concern
+    included do
+      after_save :update_index
+      after_save :index_delta
+    end
+    
+    def index_delta
+      config = MongoidSphinx::Configuration.instance
+      rotate = MongoidSphinx.sphinx_running? ? "--rotate" : ""
+      
+      output = `#{config.bin_path}#{config.indexer_binary_name} --config "#{config.config_file}" #{rotate} #{model.sphinx_index.delta_name.join(' ')}`      
+    end
+    
+    def update_indeces      
+      attrs = self.changes.select do |key, value|
+        self.search_fields.include?(key) || self.search_attributes.include?(key)
+      end
+      
+      attribute_names = attrs.keys.collect{|key| key.to_s}
+      
+      # Prepare attributes for indexing
+      self.search_attributes.each do |key, value|
+        case value.class
+        when Hash
+          entries = []
+          self.document_hash[key.to_s].to_a.each do |entry|                    
+            entries << entry.join(" : ")
+          end
+          attrs[key] = entries.join(", ")
+        when Array
+          attrs[key] = self.document_hash[key.to_s].join(", ")
+        when Date
+          attrs[key] = self.document_hash[key.to_s].to_time.to_i
+        when DateTime || Time
+          attrs[key] = self.document_hash[key.to_s].to_i
+        when Boolean
+          attrs[key] = self.document_hash[key.to_s] ? 1 : 0
+        else
+          attrs[key] = self.document_hash[key.to_s].to_s
+        end
+      end
+      
+      # Prepare fields for indexing
+      self.search_fields.each do |key|
+        if document_hash[key.to_s].is_a?(Array)
+          attrs[key] = "<#{key}><![CDATA[[#{document_hash[key.to_s].join(", ")}]]></#{key}>"                
+        elsif document_hash[key.to_s].is_a?(Hash)
+          entries = []
+          document_hash[key.to_s].to_a.each do |entry|                    
+            entries << entry.join(" : ")
+          end
+          attrs[key] = "<#{key}><![CDATA[[#{entries.join(", ")}]]></#{key}>"
+        else
+          attrs[key] = "<#{key}><![CDATA[[#{document_hash[key.to_s]}]]></#{key}>"
+        end
+      end
+      
+      attribute_values = attrs.values
+      # Update core first (update existing records)
+      update_index self.class.sphinx_index.core_name, attribute_names, attribute_values
+      # Update delta (new records)
+      update_index self.class.sphinx_index.delta_name, attribute_names, attribute_values
+    end
+    
+    def update_index(index_name, attribute_names, attribute_values)
+        client = MongoidSphinx::Configuration.instance.client
+        if self.class.seach_ids(self.sphinx_id..self.sphinx_id, :index => index_name,:raw => true)
+          client.update index_name, attribute_names, {self.sphinx_id => attribute_values} 
+        end
+    end    
+  end
+end

data/lib/mongoid_sphinx/index.rb

@@ -7,13 +7,21 @@ module MongoidSphinx
       @model        = model
       @options      = model.index_options
       @source       = Riddle::Configuration::XMLSource.new( "#{core_name}_0", config.source_options[:type])
-      @source.xmlpipe_command = "RAILS_ENV=#{Rails.env} script/rails runner '#{model.to_s}.sphinx_stream'"
+      if defined?(Rails)
+        @source.xmlpipe_command = "RAILS_ENV=#{Rails.env} script/rails runner '#{model.to_s}.sphinx_stream'"
+      else
+        @source.xmlpipe_command = "script/runner '#{model.to_s}.sphinx_stream'"
+      end
     end
     
     def core_name
       "#{name}_core"
     end
     
+    def delta_name
+      "#{name}_delta"
+    end
+    
     def self.name_for(model)
       model.name.underscore.tr(':/\\', '_')
     end

data/lib/mongoid_sphinx/mongoid/sphinx.rb

@@ -5,19 +5,22 @@ module Mongoid
   module Sphinx
     extend ActiveSupport::Concern
     included do
-      SPHINX_TYPE_MAPPING = {
-        'Date' => 'timestamp',
-        'DateTime' => 'timestamp',
-        'Time' => 'timestamp',
-        'Float' => 'float',
-        'Integer' => 'int',
-        'BigDecimal' => 'float',
-        'Boolean' => 'bool'
-      }
+      unless defined?(SPHINX_TYPE_MAPPING)
+        SPHINX_TYPE_MAPPING = {
+          'Date' => 'timestamp',
+          'DateTime' => 'timestamp',
+          'Time' => 'timestamp',
+          'Float' => 'float',
+          'Integer' => 'int',
+          'BigDecimal' => 'float',
+          'Boolean' => 'bool'
+        }
+      end
       
       cattr_accessor :search_fields
       cattr_accessor :search_attributes
       cattr_accessor :index_options
+      cattr_accessor :sphinx_index
     end
     
     module ClassMethods
@@ -34,7 +37,7 @@ module Mongoid
       end
       
       def internal_sphinx_index
-        MongoidSphinx::Index.new(self)
+        self.sphinx_index ||= MongoidSphinx::Index.new(self)
       end
       
       def has_sphinx_indexes?
@@ -62,22 +65,50 @@ module Mongoid
         end
         puts '</sphinx:schema>'
         
-        self.all.each do |document|
+        self.all.entries.each do |document|
           sphinx_compatible_id = document['_id'].to_s.to_i - 100000000000000000000000
           if sphinx_compatible_id > 0
             puts "<sphinx:document id=\"#{sphinx_compatible_id}\">"
             
             puts "<classname>#{self.to_s}</classname>"
             self.search_fields.each do |key|
-              puts "<#{key}><![CDATA[#{document.send(key.to_s)}]]></#{key}>"
+              if document.respond_to?(key.to_sym)
+                if document[key.to_s].is_a?(Array)
+                  puts "<#{key}><![CDATA[[#{document[key.to_s].join(", ")}]]></#{key}>"
+                elsif document[key.to_s].is_a?(Hash)
+                  entries = []
+                  document[key.to_s].to_a.each do |entry|
+                    entries << entry.join(" : ")
+                  end
+                  puts "<#{key}><![CDATA[[#{entries.join(", ")}]]></#{key}>"
+                else
+                  puts "<#{key}><![CDATA[[#{document[key.to_s]}]]></#{key}>"
+                end
+              end
             end
             self.search_attributes.each do |key, value|
-              value = case value
-                when 'bool' : document[key.to_s] ? 1 : 0
-                when 'timestamp' : document[key.to_s].to_i
-                else document[key.to_s].to_s
-              end 
-              puts "<#{key}>#{value}</#{key}>"
+              if document.respond_to?(key.to_sym)
+                value = case value
+                  when 'bool' 
+                    document[key.to_s] ? 1 : 0
+                  when 'timestamp'
+                    document[key.to_s].is_a?(Date) ? document[key.to_s].to_time.to_i : document[key.to_s].to_i
+                  else 
+                    if document[key.to_s].is_a?(Array)
+                      document[key.to_s].join(", ")
+                    elsif document[key.to_s].is_a?(Hash)
+                      entries = []
+                      document[key.to_s].to_a.each do |entry|                    
+                        entries << entry.join(" : ")
+                      end
+                      entries.join(", ")
+                    else
+                      document[key.to_s].to_s
+                    end
+                  end
+                end 
+                puts "<#{key}>#{value}</#{key}>"
+              end
             end
             
             puts '</sphinx:document>'
@@ -126,5 +157,38 @@ module Mongoid
       end
     end
     
+    def search_ids(id_range, options = {})
+      client = MongoidSphinx::Configuration.instance.client
+      
+      if id_range.is_a?(Range)
+        client.id_range = id_range
+      elsif id_range.is_a?(Fixnum)
+        client.id_range = id_range..id_range
+      else
+        return []
+      end
+      
+      client.match_mode = :extended
+      client.limit = options[:limit] if options.key?(:limit)
+      client.max_matches = options[:max_matches] if options.key?(:max_matches)
+      
+      result = client.query("* @classname #{self.to_s}")
+      
+      if result and result[:status] == 0 and (matches = result[:matches])
+        ids = matches.collect do |row|
+          (100000000000000000000000 + row[:doc]).to_s rescue nil
+        end.compact
+        
+        return ids if options[:raw] or ids.empty?
+        return self.find(ids)
+      else
+        return false
+      end
+    end    
+    
+    private
+    def sphinx_id
+      self._id.to_s.to_i - 100000000000000000000000
+    end
   end
 end

data/lib/mongoid_sphinx/version.rb

@@ -1,3 +1,3 @@
 module MongoidSphinx #:nodoc
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,69 +1,48 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mongoid-sphinx
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+version: !ruby/object:Gem::Version
+  version: 0.1.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Matt Hodgson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-14 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-11-24 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: &70258246962200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 62196421
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 19
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0.beta.19
   type: :runtime
-  name: mongoid
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70258246962200
+- !ruby/object:Gem::Dependency
+  name: riddle
+  requirement: &70258246960920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-  name: riddle
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *70258246960920
 description: A full text indexing extension for MongoDB using Sphinx and Mongoid.
-email: 
+email:
 - mhodgson@redbeard-tech.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/mongoid_sphinx/configuration.rb
 - lib/mongoid_sphinx/context.rb
+- lib/mongoid_sphinx/delta.rb
 - lib/mongoid_sphinx/index.rb
 - lib/mongoid_sphinx/mongoid/identity.rb
 - lib/mongoid_sphinx/mongoid/sphinx.rb
@@ -72,41 +51,31 @@ files:
 - lib/mongoid_sphinx/version.rb
 - lib/mongoid_sphinx.rb
 - README.markdown
-has_rdoc: true
 homepage: http://github.com/redbeard-tech/mongoid-sphinx
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1605454523821668766
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A full text indexing extension for MongoDB using Sphinx and Mongoid.
+summary: MongoDB full text search using Sphinx and Mongoid.
 test_files: []
-