ultrasphinx 1.7 → 1.8

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v1.8. Update client for compatibility with Sphinx 0.9.8 r1112. This is a breaking release! You need to update Sphinx along with Ultrasphinx. Float range bugfix; text faceting on association_include bugfix. Postgres users, please note that the return type of CRC32() has changed to bigint.
+
 v1.7. Deployment docs. Postgres fixes. Support association_name instead of class_name (Daniel Higginbotham). 
 
 v1.6.7. Fix GROUP_CONCAT aggregate problem. Discourage enable_star in default.base. Allow faceting on includes.

data/README

@@ -5,17 +5,19 @@ Ruby on Rails configurator and client to the Sphinx full text search engine.
 
 == License
 
-Copyright 2007 Cloudburst, LLC. Licensed under the AFL 3. See the included LICENSE file. Some portions copyright Pat Allan, distributed under the MIT license, and used with permission. Some portions copyright PJ Hyett and Mislav Marohnić, distributed under the MIT license, and used with permission. 
+Copyright 2008 Cloudburst, LLC. Licensed under the AFL 3. See the included LICENSE file. Some portions copyright Pat Allan, distributed under the MIT license, and used with permission. Some portions copyright PJ Hyett and Mislav Marohnić, distributed under the MIT license, and used with permission. 
 
-The public certificate for the gem is at http://rubyforge.org/frs/download.php/25331/evan_weaver-original-public_cert.pem.
+The public certificate for the gem is here[http://rubyforge.org/frs/download.php/25331/evan_weaver-original-public_cert.pem]. 
+
+If you use this software, please {make a donation}[http://blog.evanweaver.com/donate/], or {recommend Evan}[http://www.workingwithrails.com/person/7739-evan-weaver] at Working with Rails.
 
 == Requirements
 
 * MySQL 5.0, or PostgreSQL 8.2
-* Sphinx 0.9.8-dev r871
-* Rails 1.2.3
+* Sphinx 0.9.8-dev r1112
+* Rails 2.0.2
 
-More recent versions than listed are ok.
+More recent versions than listed are usually ok.
 
 == Features
 
@@ -45,7 +47,7 @@ And some other things.
 
 == Installation
   
-First, install Sphinx itself. Get the 0.9.8 development snapshot (http://www.sphinxsearch.com), then run <tt>./configure</tt>, <tt>make</tt>, and <tt>sudo make install</tt>. Make sure to set your <tt>./configure</tt> flags : <tt>--prefix</tt> if necessary, and also <tt>--with-pgsql</tt> if you need Postgres support.
+First, install Sphinx itself. Get the {0.9.8 snapshot}[http://www.sphinxsearch.com/downloads.html], then run <tt>./configure</tt>, <tt>make</tt>, and <tt>sudo make install</tt>. Make sure to set your <tt>./configure</tt> flags: <tt>----prefix</tt> if necessary, and also <tt>----with-pgsql</tt> if you need Postgres support.
 
 You also need the <tt>chronic</tt> gem:
   sudo gem install chronic
@@ -53,7 +55,7 @@ You also need the <tt>chronic</tt> gem:
 Then, install the plugin:
   script/plugin install -x svn://rubyforge.org/var/svn/fauna/ultrasphinx/trunk
  
-Next, copy the <tt>example/default.base</tt> file to <tt>RAILS_ROOT/config/ultrasphinx/default.base</tt>. This file sets up the  Sphinx daemon options such as port, host, and index location.
+Next, copy the <tt>examples/default.base</tt> file to <tt>RAILS_ROOT/config/ultrasphinx/default.base</tt>. This file sets up the  Sphinx daemon options such as port, host, and index location.
   
 If you need per-environment configuration, you can use <tt>RAILS_ROOT/config/ultrasphinx/development.base</tt>, etc. 
 
@@ -109,10 +111,12 @@ PostgreSQL 8.2 and higher are well supported. However, make sure you have execut
 
 == Reporting problems
 
-* http://rubyforge.org/forum/forum.php?forum_id=14244
+The support forum is here[http://rubyforge.org/forum/forum.php?forum_id=14244].
 
 Patches and contributions are very welcome. Please note that contributors are required to assign copyright for their additions to Cloudburst, LLC. 
 
 == Further resources
 
+* http://sphinxsearch.com/doc.html
+* http://sphinxsearch.com/forum/forum.html?id=1
 * http://blog.evanweaver.com/articles/2007/07/09/ultrasphinx-searching-the-world-in-231-seconds

data/examples/default.base

@@ -53,9 +53,8 @@ client
 source
 {
   # Individual SQL source options
+  sql_ranged_throttle = 0  
   sql_range_step = 5000   
-  strip_html = 0
-  index_html_attrs =
   sql_query_post =
 }
 
@@ -67,6 +66,10 @@ index
   morphology = stem_en
   stopwords = # /path/to/stopwords.txt
   min_word_len = 1
+
+  # HTML-specific options
+  html_strip = 0
+  html_index_attrs =
   
   # Enable these if you need wildcard searching. They will slow down indexing significantly.
   #   min_infix_len = 1    

data/lib/ultrasphinx/associations.rb

@@ -14,12 +14,13 @@ module Ultrasphinx
     end
     
     def get_association_model(klass, entry)
-      get_association(klass, entry).class_name.constantize
-    end    
-    
-    def entry_identifies_association?(entry)
-      entry['class_name'] || entry['association_name']
-    end
-    
+      association = get_association(klass, entry)
+      if association
+        association.class_name.constantize
+      else
+        entry['class_name'].constantize
+      end
+    end  
+          
   end
 end

data/lib/ultrasphinx/configure.rb

@@ -185,7 +185,7 @@ module Ultrasphinx
 
       def build_regular_fields(klass, fields, entries, column_strings, join_strings, group_bys, remaining_columns)          
         entries.to_a.each do |entry|
-          source_string = "#{entry['table']}.#{entry['field']}"
+          source_string = "#{entry['table_alias']}.#{entry['field']}"
           group_bys << source_string
           column_strings, remaining_columns = install_field(fields, source_string, entry['as'], entry['function_sql'], entry['facet'], column_strings, remaining_columns)
         end
@@ -207,17 +207,17 @@ module Ultrasphinx
           raise ConfigurationError, "Unknown association from #{klass} to #{entry['class_name'] || entry['association_name']}" if not association and not entry['association_sql']
           
           join_strings = install_join_unless_association_sql(entry['association_sql'], nil, join_strings) do 
-            "LEFT OUTER JOIN #{join_klass.table_name} AS #{entry['table']} ON " + 
+            "LEFT OUTER JOIN #{join_klass.table_name} AS #{entry['table_alias']} ON " + 
             if (macro = association.macro) == :belongs_to 
-              "#{entry['table']}.#{join_klass.primary_key} = #{klass.table_name}.#{association.primary_key_name}" 
+              "#{entry['table_alias']}.#{join_klass.primary_key} = #{klass.table_name}.#{association.primary_key_name}" 
             elsif macro == :has_one
-              "#{klass.table_name}.#{klass.primary_key} = #{entry['table']}.#{association.primary_key_name}" 
+              "#{klass.table_name}.#{klass.primary_key} = #{entry['table_alias']}.#{association.primary_key_name}" 
             else
               raise ConfigurationError, "Unidentified association macro #{macro.inspect}. Please use the :association_sql key to manually specify the JOIN syntax."
             end
           end
           
-          source_string = "#{entry['table']}.#{entry['field']}"
+          source_string = "#{entry['table_alias']}.#{entry['field']}"
           group_bys << source_string
           column_strings, remaining_columns = install_field(fields, source_string, entry['as'], entry['function_sql'], entry['facet'], column_strings, remaining_columns)                         
         end
@@ -228,7 +228,7 @@ module Ultrasphinx
         
       def build_concatenations(klass, fields, entries, column_strings, join_strings, group_bys, use_distinct, remaining_columns)
         entries.to_a.each do |entry|
-          if entry_identifies_association?(entry) and entry['field']
+          if entry['field']
             # Group concats
   
             # Only has_many's or explicit sql right now
@@ -241,11 +241,11 @@ module Ultrasphinx
             join_strings = install_join_unless_association_sql(entry['association_sql'], nil, join_strings) do 
               # XXX make sure foreign key is right for polymorphic relationships
               association = get_association(klass, entry)
-              "LEFT OUTER JOIN #{join_klass.table_name} AS #{entry['table']} ON #{klass.table_name}.#{klass.primary_key} = #{entry['table']}.#{association.primary_key_name}" + 
+              "LEFT OUTER JOIN #{join_klass.table_name} AS #{entry['table_alias']} ON #{klass.table_name}.#{klass.primary_key} = #{entry['table_alias']}.#{association.primary_key_name}" + 
                 (entry['conditions'] ? " AND (#{entry['conditions']})" : "")
             end
             
-            source_string = "#{entry['table']}.#{entry['field']}"
+            source_string = "#{entry['table_alias']}.#{entry['field']}"
             # We are using the field in an aggregate, so we don't want to add it to group_bys
             source_string = SQL_FUNCTIONS[ADAPTER]['group_concat']._interpolate(source_string)
             use_distinct = true
@@ -255,7 +255,7 @@ module Ultrasphinx
           elsif entry['fields']
             # Regular concats
             source_string = "CONCAT_WS(' ', " + entry['fields'].map do |subfield| 
-              "#{entry['table']}.#{subfield}"
+              "#{entry['table_alias']}.#{subfield}"
             end.each do |subsource_string|
               group_bys << subsource_string
             end.join(', ') + ")"
@@ -290,7 +290,7 @@ module Ultrasphinx
         
         # Generate hashed integer fields for text grouping
         if with_facet
-          column_strings << "CRC32(#{source_string}) AS #{as}_facet"
+          column_strings << "#{SQL_FUNCTIONS[ADAPTER]['hash']._interpolate(source_string)} AS #{as}_facet"
           remaining_columns.delete("#{as}_facet")
         end
         [column_strings, remaining_columns]

data/lib/ultrasphinx/core_extensions.rb

@@ -56,7 +56,18 @@ class Hash
     end.join("\n")
     section ? "#{section} {\n#{inner}\n}\n" : inner
   end
-
+  
+  unless Hash.new.respond_to? :except
+    # Rails 1.2.6 compatibility
+    def except(*keys)
+      rejected = Set.new(respond_to?(:convert_key) ? keys.map { |key| convert_key(key) } : keys)
+      reject { |key,| rejected.include?(key) }
+    end
+    def except!(*keys)
+      replace(except(*keys))
+    end
+  end 
+  
 end
 
 ### Filter type coercion methods

data/lib/ultrasphinx/fields.rb

@@ -17,7 +17,7 @@ This is a special singleton configuration class that stores the index field conf
       'datetime' => 'date',
       'timestamp' => 'date',
       'float' => 'float',
-      'boolean' => 'integer'
+      'boolean' => 'bool'
     }
         
     attr_accessor :classes, :types
@@ -49,12 +49,16 @@ This is a special singleton configuration class that stores the index field conf
         classes[field] = [klass]
 
         @groups << case new_type
-          when 'float', 'integer'
-            "sql_group_column = #{field}"
+          when 'integer'
+            "sql_attr_uint = #{field}"
+          when 'float'
+            "sql_attr_float = #{field}"
+          when 'bool'
+            "sql_attr_bool = #{field}"
           when 'date'
-            "sql_date_column = #{field}"
+            "sql_attr_timestamp = #{field}"
           when 'text' 
-            "sql_str2ordinal_column = #{field}" if string_sortable
+            "sql_attr_str2ordinal = #{field}" if string_sortable
         end
       end
     end
@@ -73,7 +77,7 @@ This is a special singleton configuration class that stores the index field conf
       case types[field]
         when 'text'
           "''"
-        when 'integer', 'float'
+        when 'integer', 'float', 'bool'
           "0"
         when 'date'
           "18000" # Midnight on 1/1/1970
@@ -152,14 +156,20 @@ This is a special singleton configuration class that stores the index field conf
     end
     
     def extract_table_alias!(entry, klass)
-      unless entry['table']
-        # Getting run twice; don't know why
-        if entry['field'] and entry['field'].include? "."
-          # This field is referenced by a table alias
-          entry['table'], entry['field'] = entry['field'].split(".")
+      unless entry['table_alias']
+        entry['table_alias'] = if entry['field'] and entry['field'].include? "." and entry['association_sql']
+          # This field is referenced by a table alias in association_sql
+          table_alias, entry['field'] = entry['field'].split(".")
+          table_alias
+        elsif get_association(klass, entry)
+          # Refers to the association
+          get_association(klass, entry).name
+        elsif entry['association_sql']
+          # Refers to the association_sql class's table
+          entry['class_name'].constantize.table_name
         else
-          klass = get_association_model(klass, entry) if entry_identifies_association?(entry)
-          entry['table'] = klass.table_name
+          # Refers to this class
+          klass.table_name
         end
       end
     end

data/lib/ultrasphinx/is_indexed.rb

@@ -117,7 +117,7 @@ Note how setting the <tt>:conditions</tt> on Comment is enough to configure a po
 
 == Association scoping
 
-A common use case is to only search records that belong to a particular parent model. Ultrasphinx configures Sphinx to support a <tt>:filter</tt> element on any date or numeric field, so any <tt>*_id</tt> fields you have will be filterable.
+A common use case is to only search records that belong to a particular parent model. Ultrasphinx configures Sphinx to support a <tt>:filters</tt> element on any date or numeric field, so any <tt>*_id</tt> fields you have will be filterable.
 
 For example, say a Company <tt>has_many :users</tt> and each User <tt>has_many :articles</tt>. If you want to to filter Articles by Company, add <tt>company_id</tt> to the Article's <tt>is_indexed</tt> method. The best way is to grab it from the User association:
 
@@ -128,7 +128,7 @@ For example, say a Company <tt>has_many :users</tt> and each User <tt>has_many :
 Now you can run:
 
  @search = Ultrasphinx::Search.new('something', 
-   :filter => {'company_id' => 493})
+   :filters => {'company_id' => 493})
  
 If the associations weren't just <tt>has_many</tt> and <tt>belongs_to</tt>, you would need to use the <tt>:association_sql</tt> key to set up a custom JOIN. 
 

data/lib/ultrasphinx/postgresql/crc32.sql

@@ -2,6 +2,14 @@
 /* Fake CRC32 */
 
 CREATE OR REPLACE FUNCTION crc32(text)
-RETURNS int AS $$
-  SELECT hex_to_int(SUBSTRING(MD5($1) FROM 1 FOR 8))::int
-$$ VOLATILE LANGUAGE SQL;
+RETURNS bigint AS $$
+  DECLARE
+    tmp bigint;
+  BEGIN
+    tmp = (hex_to_int(SUBSTRING(MD5($1) FROM 1 FOR 8))::bigint);
+    IF tmp < 0 THEN
+      tmp = 4294967296 + tmp;
+    END IF;
+    return tmp;
+  END
+$$ IMMUTABLE STRICT LANGUAGE plpgsql;

data/lib/ultrasphinx/search.rb

@@ -319,7 +319,8 @@ Note that your database is never changed by anything Ultrasphinx does.
   
   
     # Overwrite the configured content accessors with excerpted and highlighted versions of themselves.
-    # Runs run if it hasn't already been done.
+    # Runs run if it hasn't already been done. Please note that this does not change the @attributes
+    # hash in the record; only the accessor.
     def excerpt
     
       require_run         
@@ -356,7 +357,7 @@ Note that your database is never changed by anything Ultrasphinx does.
       responses = responses.in_groups_of(Ultrasphinx::Search.excerpting_options['content_methods'].size)
       
       results_with_content_methods.each_with_index do |result_and_methods, i|
-        # override the individual model accessors with the excerpted data
+        # Override the individual model accessors with the excerpted data
         result, methods = result_and_methods
         methods.each_with_index do |method, j|
           result._metaclass.send('define_method', method) { responses[i][j] } if method

data/lib/ultrasphinx/search/internals.rb

@@ -61,12 +61,16 @@ module Ultrasphinx
         # XXX We should coerce based on the Field values, not on the class
         Array(opts['filters']).each do |field, value|          
           field = field.to_s
-          unless Fields.instance.types[field]
+          type = Fields.instance.types[field]
+          unless type
             raise UsageError, "field #{field.inspect} is invalid"
           end
+          
           begin
             case value
               when Integer, Float, BigDecimal, NilClass, Array
+                # XXX Hack to force floats to be floats
+                value = value.to_f if type == 'float'
                 # Just bomb the filter in there
                 request.filters << Riddle::Client::Filter.new(field, Array(value), false)
               when Range
@@ -74,6 +78,8 @@ module Ultrasphinx
                 min, max = [value.begin, value.end].map {|x| x._to_numeric }
                 raise NoMethodError unless min <=> max and max <=> min
                 min, max = max, min if min > max
+                # XXX Hack to force floats to be floats
+                min, max = min.to_f, max.to_f if type == 'float'
                 request.filters << Riddle::Client::Filter.new(field, min..max, false)
               when String
                 # XXX Hack to move text filters into the query
@@ -185,17 +191,24 @@ module Ultrasphinx
             when 'fields'
               [configuration['field'], ""]
             when 'include'
-              association_model = get_association_model(klass, configuration)
               # XXX Only handles the basic case. No test coverage.
-              ["included.#{configuration['field']}", 
-                (configuration['association_sql'] or "LEFT OUTER JOIN #{configuration['table']} AS included ON included.#{association_model.primary_key} = #{klass.table_name}.#{association_model.class_name.underscore}_id")
+              
+              table_alias = configuration['table_alias']
+              association_model = if configuration['class_name']
+                configuration['class_name'].constantize
+              else
+                get_association_model(klass, configuration)
+              end
+              
+              ["table_alias.#{configuration['field']}", 
+                (configuration['association_sql'] or "LEFT OUTER JOIN #{association_model.table_name} AS table_alias ON table_alias.#{association_model.primary_key} = #{klass.table_name}.#{association_model.class_name.underscore}_id")
               ]
             when 'concatenate'
               # Wait for someone to complain before worrying about this
               raise "Concatenation text facets have not been implemented"
           end
           
-          klass.connection.execute("SELECT #{field_string} AS value, CRC32(#{field_string}) AS hash FROM #{klass.table_name} #{join_string} GROUP BY value").each do |value, hash|
+          klass.connection.execute("SELECT #{field_string} AS value, #{SQL_FUNCTIONS[ADAPTER]['hash']._interpolate(field_string)} AS hash FROM #{klass.table_name} #{join_string} GROUP BY value").each do |value, hash|
             FACET_CACHE[facet][hash.to_i] = value
           end                            
           klass

data/lib/ultrasphinx/ultrasphinx.rb

@@ -59,12 +59,14 @@ module Ultrasphinx
   SQL_FUNCTIONS = {
     'mysql' => {
       'group_concat' => "CAST(GROUP_CONCAT(DISTINCT ? SEPARATOR ' ') AS CHAR)",
+      'hash' => "CAST(CRC32(?) AS unsigned)",
       'range_cast' => "?",
       'stored_procedures' => {}
     },
     'postgresql' => {
       'group_concat' => "GROUP_CONCAT(?)",
       'range_cast' => "cast(coalesce(?,1) AS integer)",
+      'hash' => "CRC32(?)",
       'stored_procedures' => Hash[*(
         ['hex_to_int', 'group_concat', 'concat_ws', 'unix_timestamp', 'crc32'].map do |name|
           [name, load_stored_procedure(name)]

data/tasks/ultrasphinx.rake

@@ -25,7 +25,7 @@ namespace :ultrasphinx do
     rotate = ultrasphinx_daemon_running?
     mkdir_p Ultrasphinx::INDEX_SETTINGS['path']
     
-    cmd = "indexer --config #{Ultrasphinx::CONF_PATH}"
+    cmd = "indexer --config '#{Ultrasphinx::CONF_PATH}'"
     cmd << " #{ENV['OPTS']} " if ENV['OPTS']
     cmd << " --rotate" if rotate
     cmd << " #{Ultrasphinx::UNIFIED_INDEX_NAME}"
@@ -51,7 +51,7 @@ namespace :ultrasphinx do
     task :start => [:_environment] do
       FileUtils.mkdir_p File.dirname(Ultrasphinx::DAEMON_SETTINGS["log"]) rescue nil
       raise Ultrasphinx::DaemonError, "Already running" if ultrasphinx_daemon_running?
-      system "searchd --config #{Ultrasphinx::CONF_PATH}"
+      system "searchd --config '#{Ultrasphinx::CONF_PATH}'"
       sleep(4) # give daemon a chance to write the pid file
       if ultrasphinx_daemon_running?
         say "started successfully"

data/test/integration/app/app/models/person/user.rb

@@ -1,9 +1,9 @@
 class User < ActiveRecord::Base
-  has_one   :seller
+  has_one   :specific_seller, :class_name => "Seller"
   has_one   :address, :class_name => "Geo::Address"
 
   is_indexed :fields => ['login', 'email', 'deleted'], 
-    :include => [{:class_name => 'Seller', :field => 'company_name', :as => 'company'},
+    :include => [{:association_name => 'specific_seller', :field => 'company_name', :as => 'company'},
       {:class_name => 'Seller', :field => 'sellers_two.company_name', :as => 'company_two', 'association_sql' => 'LEFT OUTER JOIN sellers AS sellers_two ON users.id = sellers_two.user_id', 'function_sql' => "REPLACE(?, '6', ' replacement ')"}],
     :conditions => "deleted = '0'"
   

data/test/integration/app/config/boot.rb

@@ -55,8 +55,10 @@ module Rails
 
     def load_rails_gem
       if version = self.class.gem_version
+        STDERR.puts "Boot.rb loading version #{version}"
         gem 'rails', version
       else
+        STDERR.puts "Boot.rb loading latest available version"
         gem 'rails'
       end
     rescue Gem::LoadError => load_error

data/test/integration/app/config/environment.rb

@@ -1,11 +1,12 @@
 
-RAILS_GEM_VERSION = ENV['MULTIRAILS_RAILS_VERSION'] if ENV['MULTIRAILS_RAILS_VERSION']
-
 require File.join(File.dirname(__FILE__), 'boot')
 require 'action_controller'
 
 Rails::Initializer.run do |config|
-  config.action_controller.session = { :session_key => "_myapp_session", :secret => "7c74979e7db2230f84adbb4b3eb77d05" }
+  if ActionController::Base.respond_to? 'session='
+    config.action_controller.session = {:session_key => '_app_session', :secret => '22cde4d5c1a61ba69a81795322cde4d5c1a61ba69a817953'}
+  end
+  
   config.load_paths << "#{RAILS_ROOT}/app/models/person" # moduleless model path
 end
 

data/test/integration/app/config/ultrasphinx/default.base

@@ -1,8 +1,22 @@
+
 #
 # Sphinx/Ultrasphinx user-configurable options.
 #
-# Copy this file to RAILS_ROOT/config/ultrasphinx.
-# You can use individual namespaces if you want (e.g. "development.base").
+# Copy this file to RAILS_ROOT/config/ultrasphinx. You can use individual 
+# namespaces if you want (e.g. development.base, production.base,
+# test.base).
+#
+# This file should not be handed directly to Sphinx. Use the rake task 
+#
+#   rake ultrasphinx::configure
+#
+# to generate a parallel default.conf file. This is the file that Sphinx itself will
+# use. The Ultrasphinx rake tasks automatically pass the correct file to 
+# to Sphinx.
+# 
+# It is safe to edit .base files by hand. It is not safe to edit the generated 
+# .conf files. Do not symlink the .conf file to the .base file! I don't know why 
+# people think they need to do that. It's wrong.
 #
 
 indexer
@@ -16,7 +30,8 @@ searchd
   # Daemon options
   # What interface the search daemon should listen on and where to store its logs
   address = 0.0.0.0
-  port = 3313
+  port = 3312
+  seamless_rotate = 1
   log = /tmp/sphinx/searchd.log
   query_log = /tmp/sphinx/query.log
   read_timeout = 5
@@ -28,29 +43,38 @@ searchd
 client
 {
   # Client options
-  dictionary_name = ts
+  # Name of the Aspell dictionary (two letters max)
+  dictionary_name = ap
   # How your application connects to the search daemon (not necessarily the same as above)
   server_host = localhost
-  server_port = 3313
+  server_port = 3312
 }
 
 source
 {
   # Individual SQL source options
-  sql_range_step = 20000   
-  strip_html = 0
-  index_html_attrs =
+  sql_ranged_throttle = 0 
+  sql_range_step = 5000   
   sql_query_post =
 }
 
 index
 {
   # Index building options
-  path = /tmp/sphinx/
+  path = /tmp/sphinx
   docinfo = extern # just leave this alone
   morphology = stem_en
   stopwords = # /path/to/stopwords.txt
   min_word_len = 1
+
+  # HTML-specific options
+  html_strip = 0
+  html_index_attrs =
+  
+  # Enable these if you need wildcard searching. They will slow down indexing significantly.
+  #   min_infix_len = 1    
+  #   enable_star = 1 
+    
   charset_type = utf-8 # or sbcs (Single Byte Character Set)
   charset_table = 0..9, A..Z->a..z, -, _, ., &, a..z, U+410..U+42F->U+430..U+44F, U+430..U+44F,U+C5->U+E5, U+E5, U+C4->U+E4, U+E4, U+D6->U+F6, U+F6, U+16B, U+0c1->a, U+0c4->a, U+0c9->e, U+0cd->i, U+0d3->o, U+0d4->o, U+0da->u, U+0dd->y, U+0e1->a, U+0e4->a, U+0e9->e, U+0ed->i, U+0f3->o, U+0f4->o, U+0fa->u, U+0fd->y, U+104->U+105, U+105, U+106->U+107, U+10c->c, U+10d->c, U+10e->d, U+10f->d, U+116->U+117, U+117, U+118->U+119, U+11a->e, U+11b->e, U+12E->U+12F, U+12F, U+139->l, U+13a->l, U+13d->l, U+13e->l, U+141->U+142, U+142, U+143->U+144, U+144,U+147->n, U+148->n, U+154->r, U+155->r, U+158->r, U+159->r, U+15A->U+15B, U+15B, U+160->s, U+160->U+161, U+161->s, U+164->t, U+165->t, U+16A->U+16B, U+16B, U+16e->u, U+16f->u, U+172->U+173, U+173, U+179->U+17A, U+17A, U+17B->U+17C, U+17C, U+17d->z, U+17e->z,
 }

data/test/integration/app/config/ultrasphinx/development.conf.canonical

@@ -1,5 +1,5 @@
 
-# Auto-generated at Sat Jan 12 08:05:26 -0500 2008.
+# Auto-generated at Tue Feb 05 04:49:29 -0500 2008.
 # Hand modifications will be overwritten.
 # /Users/eweaver/Desktop/projects/chow/vendor/plugins/ultrasphinx/test/integration/app/config/ultrasphinx/default.base
 indexer {
@@ -9,9 +9,10 @@ searchd {
   read_timeout = 5
   max_children = 300
   log = /tmp/sphinx/searchd.log
-  port = 3313
+  port = 3312
   max_matches = 100000
   query_log = /tmp/sphinx/query.log
+  seamless_rotate = 1
   pid_file = /tmp/sphinx/searchd.pid
   address = 0.0.0.0
 }
@@ -20,10 +21,9 @@ searchd {
 
 source geo__states
 {
-  strip_html = 0
-  sql_range_step = 20000
-  index_html_attrs = 
+  sql_range_step = 5000
   sql_query_post = 
+  sql_ranged_throttle = 0
 
 type = mysql
 sql_query_pre = SET SESSION group_concat_max_len = 65535
@@ -36,13 +36,13 @@ sql_user = root
 sql_query_range = SELECT MIN(id) ,  MAX(id) FROM states
 sql_query = SELECT (states.id * 5 + 0) AS id, CAST(GROUP_CONCAT(DISTINCT addresses.name SEPARATOR ' ') AS CHAR) AS address_name, 0 AS capitalization, 'Geo::State' AS class, 0 AS class_id, '' AS company, '' AS company_name, 0 AS company_name_facet, '' AS company_two, '' AS content, 18000 AS created_at, 0 AS deleted, '' AS email, '' AS login, '' AS mission_statement, '' AS name, '' AS state, 0 AS user_id FROM states LEFT OUTER JOIN addresses AS addresses ON states.id = addresses.state_id WHERE states.id >= $start AND states.id <= $end GROUP BY states.id
 
-sql_group_column = capitalization
-sql_group_column = class_id
-sql_group_column = company_name_facet
-sql_date_column = created_at
-sql_group_column = deleted
-sql_str2ordinal_column = mission_statement
-sql_group_column = user_id
+sql_attr_float = capitalization
+sql_attr_uint = class_id
+sql_attr_uint = company_name_facet
+sql_attr_timestamp = created_at
+sql_attr_bool = deleted
+sql_attr_str2ordinal = mission_statement
+sql_attr_uint = user_id
 sql_query_info = SELECT * FROM states WHERE states.id = (($id - 0) / 5)
 }
 
@@ -51,10 +51,9 @@ sql_query_info = SELECT * FROM states WHERE states.id = (($id - 0) / 5)
 
 source sellers
 {
-  strip_html = 0
-  sql_range_step = 20000
-  index_html_attrs = 
+  sql_range_step = 5000
   sql_query_post = 
+  sql_ranged_throttle = 0
 
 type = mysql
 sql_query_pre = SET SESSION group_concat_max_len = 65535
@@ -65,15 +64,15 @@ sql_host = localhost
 sql_pass = 
 sql_user = root
 sql_query_range = SELECT MIN(id) ,  MAX(id) FROM sellers
-sql_query = SELECT (sellers.id * 5 + 1) AS id, '' AS address_name, sellers.capitalization AS capitalization, 'Seller' AS class, 1 AS class_id, '' AS company, sellers.company_name AS company_name, CRC32(sellers.company_name) AS company_name_facet, '' AS company_two, '' AS content, UNIX_TIMESTAMP(sellers.created_at) AS created_at, 0 AS deleted, '' AS email, '' AS login, sellers.mission_statement AS mission_statement, '' AS name, '' AS state, sellers.user_id AS user_id FROM sellers WHERE sellers.id >= $start AND sellers.id <= $end GROUP BY sellers.id
-
-sql_group_column = capitalization
-sql_group_column = class_id
-sql_group_column = company_name_facet
-sql_date_column = created_at
-sql_group_column = deleted
-sql_str2ordinal_column = mission_statement
-sql_group_column = user_id
+sql_query = SELECT (sellers.id * 5 + 1) AS id, '' AS address_name, sellers.capitalization AS capitalization, 'Seller' AS class, 1 AS class_id, '' AS company, sellers.company_name AS company_name, CAST(CRC32(sellers.company_name) AS unsigned) AS company_name_facet, '' AS company_two, '' AS content, UNIX_TIMESTAMP(sellers.created_at) AS created_at, 0 AS deleted, '' AS email, '' AS login, sellers.mission_statement AS mission_statement, '' AS name, '' AS state, sellers.user_id AS user_id FROM sellers WHERE sellers.id >= $start AND sellers.id <= $end GROUP BY sellers.id
+
+sql_attr_float = capitalization
+sql_attr_uint = class_id
+sql_attr_uint = company_name_facet
+sql_attr_timestamp = created_at
+sql_attr_bool = deleted
+sql_attr_str2ordinal = mission_statement
+sql_attr_uint = user_id
 sql_query_info = SELECT * FROM sellers WHERE sellers.id = (($id - 1) / 5)
 }
 
@@ -82,10 +81,9 @@ sql_query_info = SELECT * FROM sellers WHERE sellers.id = (($id - 1) / 5)
 
 source geo__addresses
 {
-  strip_html = 0
-  sql_range_step = 20000
-  index_html_attrs = 
+  sql_range_step = 5000
   sql_query_post = 
+  sql_ranged_throttle = 0
 
 type = mysql
 sql_query_pre = SET SESSION group_concat_max_len = 65535
@@ -96,15 +94,15 @@ sql_host = localhost
 sql_pass = 
 sql_user = root
 sql_query_range = SELECT MIN(id) ,  MAX(id) FROM addresses
-sql_query = SELECT (addresses.id * 5 + 2) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Address' AS class, 2 AS class_id, '' AS company, '' AS company_name, 0 AS company_name_facet, '' AS company_two, CONCAT_WS(' ', addresses.line_1, addresses.line_2, addresses.city, addresses.province_region, addresses.zip_postal_code) AS content, 18000 AS created_at, 0 AS deleted, '' AS email, '' AS login, '' AS mission_statement, addresses.name AS name, states.name AS state, 0 AS user_id FROM addresses LEFT OUTER JOIN states AS states ON states.id = addresses.state_id WHERE addresses.id >= $start AND addresses.id <= $end GROUP BY addresses.id
-
-sql_group_column = capitalization
-sql_group_column = class_id
-sql_group_column = company_name_facet
-sql_date_column = created_at
-sql_group_column = deleted
-sql_str2ordinal_column = mission_statement
-sql_group_column = user_id
+sql_query = SELECT (addresses.id * 5 + 2) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Address' AS class, 2 AS class_id, '' AS company, '' AS company_name, 0 AS company_name_facet, '' AS company_two, CONCAT_WS(' ', addresses.line_1, addresses.line_2, addresses.city, addresses.province_region, addresses.zip_postal_code) AS content, 18000 AS created_at, 0 AS deleted, '' AS email, '' AS login, '' AS mission_statement, addresses.name AS name, state.name AS state, 0 AS user_id FROM addresses LEFT OUTER JOIN states AS state ON state.id = addresses.state_id WHERE addresses.id >= $start AND addresses.id <= $end GROUP BY addresses.id
+
+sql_attr_float = capitalization
+sql_attr_uint = class_id
+sql_attr_uint = company_name_facet
+sql_attr_timestamp = created_at
+sql_attr_bool = deleted
+sql_attr_str2ordinal = mission_statement
+sql_attr_uint = user_id
 sql_query_info = SELECT * FROM addresses WHERE addresses.id = (($id - 2) / 5)
 }
 
@@ -113,10 +111,9 @@ sql_query_info = SELECT * FROM addresses WHERE addresses.id = (($id - 2) / 5)
 
 source users
 {
-  strip_html = 0
-  sql_range_step = 20000
-  index_html_attrs = 
+  sql_range_step = 5000
   sql_query_post = 
+  sql_ranged_throttle = 0
 
 type = mysql
 sql_query_pre = SET SESSION group_concat_max_len = 65535
@@ -127,15 +124,15 @@ sql_host = localhost
 sql_pass = 
 sql_user = root
 sql_query_range = SELECT MIN(id) ,  MAX(id) FROM users
-sql_query = SELECT (users.id * 5 + 3) AS id, '' AS address_name, 0 AS capitalization, 'User' AS class, 3 AS class_id, sellers.company_name AS company, '' AS company_name, 0 AS company_name_facet, REPLACE(sellers_two.company_name, '6', ' replacement ') AS company_two, '' AS content, 18000 AS created_at, users.deleted AS deleted, users.email AS email, users.login AS login, '' AS mission_statement, '' AS name, '' AS state, 0 AS user_id FROM users LEFT OUTER JOIN sellers AS sellers ON users.id = sellers.user_id LEFT OUTER JOIN sellers AS sellers_two ON users.id = sellers_two.user_id WHERE users.id >= $start AND users.id <= $end AND (deleted = '0') GROUP BY users.id
-
-sql_group_column = capitalization
-sql_group_column = class_id
-sql_group_column = company_name_facet
-sql_date_column = created_at
-sql_group_column = deleted
-sql_str2ordinal_column = mission_statement
-sql_group_column = user_id
+sql_query = SELECT (users.id * 5 + 3) AS id, '' AS address_name, 0 AS capitalization, 'User' AS class, 3 AS class_id, specific_seller.company_name AS company, '' AS company_name, 0 AS company_name_facet, REPLACE(sellers_two.company_name, '6', ' replacement ') AS company_two, '' AS content, 18000 AS created_at, users.deleted AS deleted, users.email AS email, users.login AS login, '' AS mission_statement, '' AS name, '' AS state, 0 AS user_id FROM users LEFT OUTER JOIN sellers AS specific_seller ON users.id = specific_seller.user_id LEFT OUTER JOIN sellers AS sellers_two ON users.id = sellers_two.user_id WHERE users.id >= $start AND users.id <= $end AND (deleted = '0') GROUP BY users.id
+
+sql_attr_float = capitalization
+sql_attr_uint = class_id
+sql_attr_uint = company_name_facet
+sql_attr_timestamp = created_at
+sql_attr_bool = deleted
+sql_attr_str2ordinal = mission_statement
+sql_attr_uint = user_id
 sql_query_info = SELECT * FROM users WHERE users.id = (($id - 3) / 5)
 }
 
@@ -144,10 +141,9 @@ sql_query_info = SELECT * FROM users WHERE users.id = (($id - 3) / 5)
 
 source geo__countries
 {
-  strip_html = 0
-  sql_range_step = 20000
-  index_html_attrs = 
+  sql_range_step = 5000
   sql_query_post = 
+  sql_ranged_throttle = 0
 
 type = mysql
 sql_query_pre = SET SESSION group_concat_max_len = 65535
@@ -160,13 +156,13 @@ sql_user = root
 sql_query_range = SELECT MIN(id) ,  MAX(id) FROM countries
 sql_query = SELECT (countries.id * 5 + 4) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Country' AS class, 4 AS class_id, '' AS company, '' AS company_name, 0 AS company_name_facet, '' AS company_two, '' AS content, 18000 AS created_at, 0 AS deleted, '' AS email, '' AS login, '' AS mission_statement, countries.name AS name, '' AS state, 0 AS user_id FROM countries WHERE countries.id >= $start AND countries.id <= $end GROUP BY countries.id
 
-sql_group_column = capitalization
-sql_group_column = class_id
-sql_group_column = company_name_facet
-sql_date_column = created_at
-sql_group_column = deleted
-sql_str2ordinal_column = mission_statement
-sql_group_column = user_id
+sql_attr_float = capitalization
+sql_attr_uint = class_id
+sql_attr_uint = company_name_facet
+sql_attr_timestamp = created_at
+sql_attr_bool = deleted
+sql_attr_str2ordinal = mission_statement
+sql_attr_uint = user_id
 sql_query_info = SELECT * FROM countries WHERE countries.id = (($id - 4) / 5)
 }
 
@@ -181,11 +177,15 @@ index complete
   source = sellers
   source = users
   charset_type = utf-8
+  html_index_attrs = 
   charset_table = 0..9, A..Z->a..z, -, _, ., &, a..z, U+410..U+42F->U+430..U+44F, U+430..U+44F,U+C5->U+E5, U+E5, U+C4->U+E4, U+E4, U+D6->U+F6, U+F6, U+16B, U+0c1->a, U+0c4->a, U+0c9->e, U+0cd->i, U+0d3->o, U+0d4->o, U+0da->u, U+0dd->y, U+0e1->a, U+0e4->a, U+0e9->e, U+0ed->i, U+0f3->o, U+0f4->o, U+0fa->u, U+0fd->y, U+104->U+105, U+105, U+106->U+107, U+10c->c, U+10d->c, U+10e->d, U+10f->d, U+116->U+117, U+117, U+118->U+119, U+11a->e, U+11b->e, U+12E->U+12F, U+12F, U+139->l, U+13a->l, U+13d->l, U+13e->l, U+141->U+142, U+142, U+143->U+144, U+144,U+147->n, U+148->n, U+154->r, U+155->r, U+158->r, U+159->r, U+15A->U+15B, U+15B, U+160->s, U+160->U+161, U+161->s, U+164->t, U+165->t, U+16A->U+16B, U+16B, U+16e->u, U+16f->u, U+172->U+173, U+173, U+179->U+17A, U+17A, U+17B->U+17C, U+17C, U+17d->z, U+17e->z,
   min_word_len = 1
+  #   enable_star = 1
   stopwords = 
+  html_strip = 0
   path = /tmp/sphinx//sphinx_index_complete
   docinfo = extern
   morphology = stem_en
+  #   min_infix_len = 1
 }
 

data/test/integration/search_test.rb

@@ -205,9 +205,11 @@ class SearchTest < Test::Unit::TestCase
   end
   
   def test_text_facet
-    # XXX Still broken on Postgres
     @s = Ultrasphinx::Search.new(:facets => ['company_name']).run
-    assert_equal 21, @s.facets['company_name'].size
+    assert_equal(
+      (Seller.count + 1), 
+      @s.facets['company_name'].size
+    )
   end
   
   def test_numeric_facet

data/test/integration/server_test.rb

@@ -13,7 +13,7 @@ class ServerTest < Test::Unit::TestCase
     @pid = Process.fork do
        Dir.chdir RAILS_ROOT do
          # print "S"
-         exec("script/server -p #{PORT} &> /dev/null")
+         exec("script/server -p #{PORT} &> #{LOG}")
        end
      end
      sleep(5)

data/test/test_helper.rb

@@ -1,11 +1,18 @@
 
 require 'rubygems'
 require 'test/unit'
-require 'ruby-debug'
+require 'echoe'
 require 'multi_rails_init'
 
-HERE = File.dirname(__FILE__)
-$LOAD_PATH << HERE
+if defined? ENV['MULTIRAILS_RAILS_VERSION']
+  ENV['RAILS_GEM_VERSION'] = ENV['MULTIRAILS_RAILS_VERSION']
+end
+
+Echoe.silence do
+  HERE = File.expand_path(File.dirname(__FILE__))
+  $LOAD_PATH << HERE
+  LOG = "#{HERE}/integration/app/log/development.log"     
+end
 
 require 'integration/app/config/environment'
 

data/ultrasphinx.gemspec

@@ -1,16 +1,16 @@
 
-# Gem::Specification for Ultrasphinx-1.7
+# Gem::Specification for Ultrasphinx-1.8
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{ultrasphinx}
-  s.version = "1.7"
+  s.version = "1.8"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [""]
-  s.date = %q{2008-01-12}
+  s.date = %q{2008-02-05}
   s.description = %q{Ruby on Rails configurator and client to the Sphinx fulltext search engine.}
   s.email = %q{}
   s.files = ["CHANGELOG", "DEPLOYMENT_NOTES", "examples/ap.multi", "examples/default.base", "init.rb", "lib/ultrasphinx/associations.rb", "lib/ultrasphinx/autoload.rb", "lib/ultrasphinx/configure.rb", "lib/ultrasphinx/core_extensions.rb", "lib/ultrasphinx/fields.rb", "lib/ultrasphinx/is_indexed.rb", "lib/ultrasphinx/postgresql/concat_ws.sql", "lib/ultrasphinx/postgresql/crc32.sql", "lib/ultrasphinx/postgresql/group_concat.sql", "lib/ultrasphinx/postgresql/hex_to_int.sql", "lib/ultrasphinx/postgresql/language.sql", "lib/ultrasphinx/postgresql/unix_timestamp.sql", "lib/ultrasphinx/search/internals.rb", "lib/ultrasphinx/search/parser.rb", "lib/ultrasphinx/search.rb", "lib/ultrasphinx/spell.rb", "lib/ultrasphinx/ultrasphinx.rb", "lib/ultrasphinx.rb", "LICENSE", "Manifest", "RAKE_TASKS", "README", "tasks/ultrasphinx.rake", "test/config/ultrasphinx/test.base", "test/integration/app/app/controllers/addresses_controller.rb", "test/integration/app/app/controllers/application.rb", "test/integration/app/app/controllers/sellers_controller.rb", "test/integration/app/app/controllers/states_controller.rb", "test/integration/app/app/controllers/users_controller.rb", "test/integration/app/app/helpers/addresses_helper.rb", "test/integration/app/app/helpers/application_helper.rb", "test/integration/app/app/helpers/sellers_helper.rb", "test/integration/app/app/helpers/states_helper.rb", "test/integration/app/app/helpers/users_helper.rb", "test/integration/app/app/models/geo/address.rb", "test/integration/app/app/models/geo/country.rb", "test/integration/app/app/models/geo/state.rb", "test/integration/app/app/models/person/user.rb", "test/integration/app/app/models/seller.rb", "test/integration/app/app/views/addresses/edit.html.erb", "test/integration/app/app/views/addresses/index.html.erb", "test/integration/app/app/views/addresses/new.html.erb", "test/integration/app/app/views/addresses/show.html.erb", "test/integration/app/app/views/layouts/addresses.html.erb", "test/integration/app/app/views/layouts/sellers.html.erb", "test/integration/app/app/views/layouts/states.html.erb", "test/integration/app/app/views/layouts/users.html.erb", "test/integration/app/app/views/sellers/edit.html.erb", "test/integration/app/app/views/sellers/index.html.erb", "test/integration/app/app/views/sellers/new.html.erb", "test/integration/app/app/views/sellers/show.html.erb", "test/integration/app/app/views/states/edit.html.erb", "test/integration/app/app/views/states/index.html.erb", "test/integration/app/app/views/states/new.html.erb", "test/integration/app/app/views/states/show.html.erb", "test/integration/app/app/views/users/edit.html.erb", "test/integration/app/app/views/users/index.html.erb", "test/integration/app/app/views/users/new.html.erb", "test/integration/app/app/views/users/show.html.erb", "test/integration/app/config/boot.rb", "test/integration/app/config/database.yml", "test/integration/app/config/environment.rb", "test/integration/app/config/environments/development.rb", "test/integration/app/config/environments/production.rb", "test/integration/app/config/environments/test.rb", "test/integration/app/config/locomotive.yml", "test/integration/app/config/routes.rb", "test/integration/app/config/ultrasphinx/default.base", "test/integration/app/config/ultrasphinx/development.conf.canonical", "test/integration/app/db/migrate/001_create_users.rb", "test/integration/app/db/migrate/002_create_sellers.rb", "test/integration/app/db/migrate/003_create_addresses.rb", "test/integration/app/db/migrate/004_create_states.rb", "test/integration/app/db/migrate/005_add_capitalization_to_seller.rb", "test/integration/app/db/migrate/006_add_deleted_to_user.rb", "test/integration/app/db/migrate/007_add_lat_and_long_to_address.rb", "test/integration/app/db/migrate/008_add_mission_statement_to_seller.rb", "test/integration/app/db/migrate/009_create_countries.rb", "test/integration/app/doc/README_FOR_APP", "test/integration/app/public/404.html", "test/integration/app/public/500.html", "test/integration/app/public/dispatch.cgi", "test/integration/app/public/dispatch.fcgi", "test/integration/app/public/dispatch.rb", "test/integration/app/public/favicon.ico", "test/integration/app/public/images/rails.png", "test/integration/app/public/index.html", "test/integration/app/public/javascripts/application.js", "test/integration/app/public/javascripts/controls.js", "test/integration/app/public/javascripts/dragdrop.js", "test/integration/app/public/javascripts/effects.js", "test/integration/app/public/javascripts/prototype.js", "test/integration/app/public/robots.txt", "test/integration/app/public/stylesheets/scaffold.css", "test/integration/app/Rakefile", "test/integration/app/README", "test/integration/app/script/about", "test/integration/app/script/breakpointer", "test/integration/app/script/console", "test/integration/app/script/destroy", "test/integration/app/script/generate", "test/integration/app/script/performance/benchmarker", "test/integration/app/script/performance/profiler", "test/integration/app/script/plugin", "test/integration/app/script/process/inspector", "test/integration/app/script/process/reaper", "test/integration/app/script/process/spawner", "test/integration/app/script/runner", "test/integration/app/script/server", "test/integration/app/test/fixtures/addresses.yml", "test/integration/app/test/fixtures/countries.yml", "test/integration/app/test/fixtures/sellers.yml", "test/integration/app/test/fixtures/states.yml", "test/integration/app/test/fixtures/users.yml", "test/integration/app/test/functional/addresses_controller_test.rb", "test/integration/app/test/functional/sellers_controller_test.rb", "test/integration/app/test/functional/states_controller_test.rb", "test/integration/app/test/functional/users_controller_test.rb", "test/integration/app/test/test_helper.rb", "test/integration/app/test/unit/address_test.rb", "test/integration/app/test/unit/seller_test.rb", "test/integration/app/test/unit/state_test.rb", "test/integration/app/test/unit/user_test.rb", "test/integration/configure_test.rb", "test/integration/search_test.rb", "test/integration/server_test.rb", "test/integration/spell_test.rb", "test/setup.rb", "test/teardown.rb", "test/test_all.rb", "test/test_helper.rb", "test/ts.multi", "test/unit/parser_test.rb", "TODO", "vendor/riddle/lib/riddle/client/filter.rb", "vendor/riddle/lib/riddle/client/message.rb", "vendor/riddle/lib/riddle/client/response.rb", "vendor/riddle/lib/riddle/client.rb", "vendor/riddle/lib/riddle.rb", "vendor/riddle/MIT-LICENCE", "vendor/riddle/Rakefile", "vendor/riddle/README", "vendor/riddle/spec/fixtures/data/anchor.bin", "vendor/riddle/spec/fixtures/data/any.bin", "vendor/riddle/spec/fixtures/data/boolean.bin", "vendor/riddle/spec/fixtures/data/distinct.bin", "vendor/riddle/spec/fixtures/data/filter.bin", "vendor/riddle/spec/fixtures/data/filter_array.bin", "vendor/riddle/spec/fixtures/data/filter_array_exclude.bin", "vendor/riddle/spec/fixtures/data/filter_floats.bin", "vendor/riddle/spec/fixtures/data/filter_floats_exclude.bin", "vendor/riddle/spec/fixtures/data/filter_floats_range.bin", "vendor/riddle/spec/fixtures/data/filter_range.bin", "vendor/riddle/spec/fixtures/data/filter_range_exclude.bin", "vendor/riddle/spec/fixtures/data/group.bin", "vendor/riddle/spec/fixtures/data/index.bin", "vendor/riddle/spec/fixtures/data/phrase.bin", "vendor/riddle/spec/fixtures/data/simple.bin", "vendor/riddle/spec/fixtures/data/sort.bin", "vendor/riddle/spec/fixtures/data/update_simple.bin", "vendor/riddle/spec/fixtures/data/weights.bin", "vendor/riddle/spec/fixtures/sphinx/configuration.erb", "vendor/riddle/spec/fixtures/sql/conf.example.yml", "vendor/riddle/spec/fixtures/sql/data.sql", "vendor/riddle/spec/fixtures/sql/structure.sql", "vendor/riddle/spec/functional/excerpt_spec.rb", "vendor/riddle/spec/functional/search_spec.rb", "vendor/riddle/spec/functional/update_spec.rb", "vendor/riddle/spec/spec_helper.rb", "vendor/riddle/spec/sphinx_helper.rb", "vendor/riddle/spec/unit/client_spec.rb", "vendor/riddle/spec/unit/filter_spec.rb", "vendor/riddle/spec/unit/message_spec.rb", "vendor/riddle/spec/unit/response_spec.rb", "vendor/will_paginate/LICENSE", "ultrasphinx.gemspec"]

data/vendor/riddle/README

@@ -8,13 +8,13 @@ opting for a more Ruby-like structure.
 While it doesn't (yet) exist as a gem, you can obtain the sourcecode via subversion. If you
 are after a specific release, use the tag as follows:
 
-  svn co http://rails-oceania.googlecode.com/svn/patallan/riddle/tags/0.9.8-r985 riddle
+  svn co http://rails-oceania.googlecode.com/svn/patallan/riddle/tags/0.9.8-r1065 riddle
 
 Or for the most current, just use trunk:
 
   svn co http://rails-oceania.googlecode.com/svn/patallan/riddle/trunk riddle
 
-Please note that at the time of writing, only 0.9.8r871, 0.9.8r909 and 0.9.8r985 are supported.
+Please note that at the time of writing, only 0.9.8r871, 0.9.8r909, 0.9.8r985 and 0.9.8r1065 are supported.
 
 To get started, just instantiate a Client object:
 

data/vendor/riddle/Rakefile

@@ -66,14 +66,11 @@ module RDoc
     <div id="validator-badges">
       <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
     </div>
-    <script type="text/javascript">
-    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-    document.write("\\<script src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'>\\<\\/script>" );
+    <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
     </script>
     <script type="text/javascript">
-    var pageTracker = _gat._getTracker("%analytics%");
-    pageTracker._initData();
-    pageTracker._trackPageview();
+      _uacct = "%analytics%";
+      urchinTracker();
     </script>
     
     </body>

data/vendor/riddle/lib/riddle.rb

@@ -1,3 +1,4 @@
+require 'socket'
 require 'riddle/client'
 require 'riddle/client/filter'
 require 'riddle/client/message'
@@ -11,7 +12,7 @@ module Riddle #:nodoc:
     Major = 0
     Minor = 9
     Tiny  = 8
-    Rev   = 985
+    Rev   = 1065
     
     String = [Major, Minor, Tiny].join('.') + "r#{Rev}"
   end

data/vendor/riddle/lib/riddle/client.rb

@@ -32,9 +32,9 @@ module Riddle
     }
     
     Versions = {
-      :search  => 0x10F, # VER_COMMAND_SEARCH
+      :search  => 0x112, # VER_COMMAND_SEARCH
       :excerpt => 0x100, # VER_COMMAND_EXCERPT
-      :update  => 0x100  # VER_COMMAND_UPDATE
+      :update  => 0x101  # VER_COMMAND_UPDATE
     }
     
     Statuses = {
@@ -54,6 +54,12 @@ module Riddle
       :extended2  => 6  # SPH_MATCH_EXTENDED2
     }
     
+    RankModes = {
+      :proximity_bm25 => 0, # SPH_RANK_PROXIMITY_BM25
+      :bm25           => 1, # SPH_RANK_BM25
+      :none           => 2  # SPH_RANK_NONE
+    }
+    
     SortModes = {
       :relevance     => 0, # SPH_SORT_RELEVANCE
       :attr_desc     => 1, # SPH_SORT_ATTR_DESC
@@ -89,7 +95,8 @@ module Riddle
     attr_accessor :server, :port, :offset, :limit, :max_matches,
       :match_mode, :sort_mode, :sort_by, :weights, :id_range, :filters,
       :group_by, :group_function, :group_clause, :group_distinct, :cut_off,
-      :retry_count, :retry_delay, :anchor
+      :retry_count, :retry_delay, :anchor, :index_weights, :rank_mode,
+      :max_query_time, :field_weights
     attr_reader :queue
     
     # Can instantiate with a specific server and port - otherwise it assumes
@@ -119,6 +126,10 @@ module Riddle
       @anchor         = {}
       # string keys are index names, integer values are weightings
       @index_weights  = {}
+      @rank_mode      = :proximity_bm25
+      @max_query_time = 0
+      # string keys are field names, integer values are weightings
+      @field_weights  = {}
       
       @queue = []
     end
@@ -181,7 +192,7 @@ module Riddle
         matches   = response.next_int
         is_64_bit = response.next_int
         for i in 0...matches
-          doc = is_64_bit > 0 ? (response.next_int() << 32) + response.next_int : response.next_int
+          doc = is_64_bit > 0 ? response.next_64bit_int : response.next_int
           weight = response.next_int
 
           result[:matches] << {:doc => doc, :weight => weight, :index => i, :attributes => {}}
@@ -344,7 +355,7 @@ module Riddle
       version  = 0
       length   = 0
       message  = Array(messages).join("")
-      
+          
       connect do |socket|
         case command
         when :search
@@ -397,7 +408,8 @@ module Riddle
       message = Message.new
       
       # Mode, Limits, Sort Mode
-      message.append_ints @offset, @limit, MatchModes[@match_mode], SortModes[@sort_mode]
+      message.append_ints @offset, @limit, MatchModes[@match_mode],
+        RankModes[@rank_mode], SortModes[@sort_mode]
       message.append_string @sort_by
       
       # Query
@@ -411,7 +423,8 @@ module Riddle
       message.append_string index
       
       # ID Range
-      message.append_ints 0, @id_range.first, @id_range.last
+      message.append_int 1
+      message.append_64bit_ints @id_range.first, @id_range.last
       
       # Filters
       message.append_int @filters.length
@@ -442,6 +455,16 @@ module Riddle
         message.append_int val
       end
       
+      # Max Query Time
+      message.append_int @max_query_time
+      
+      # Per Field Weights
+      message.append_int @field_weights.length
+      @field_weights.each do |key,val|
+        message.append_string key
+        message.append_int val
+      end
+      
       message.to_s
     end
     
@@ -480,7 +503,7 @@ module Riddle
       
       message.append_int values_by_doc.length
       values_by_doc.each do |key,values|
-        message.append_int key # document ID
+        message.append_64bit_int key # document ID
         message.append_ints *values # array of new values (integers)
       end
       

data/vendor/riddle/lib/riddle/client/message.rb

@@ -5,6 +5,7 @@ module Riddle
     class Message
       def initialize
         @message = ""
+        @size_method = @message.respond_to?(:bytesize) ? :bytesize : :length
       end
       
       # Append raw data (only use if you know what you're doing)
@@ -16,7 +17,7 @@ module Riddle
       
       # Append a string's length, then the string itself
       def append_string(str)
-        @message << [str.length].pack('N') + str
+        @message << [str.send(@size_method)].pack('N') + str
       end
       
       # Append an integer
@@ -24,6 +25,10 @@ module Riddle
         @message << [int].pack('N')
       end
       
+      def append_64bit_int(int)
+        @message << [int >> 32, int & 0xFFFFFFFF].pack('NN')
+      end
+      
       # Append a float
       def append_float(float)
         @message << [float].pack('f').unpack('L*').pack("N")
@@ -34,6 +39,10 @@ module Riddle
         ints.each { |int| append_int(int) }
       end
       
+      def append_64bit_ints(*ints)
+        ints.each { |int| append_64bit_int(int) }
+      end
+      
       # Append multiple floats
       def append_floats(*floats)
         floats.each { |float| append_float(float) }

data/vendor/riddle/lib/riddle/client/response.rb

@@ -28,6 +28,13 @@ module Riddle
         return int
       end
       
+      def next_64bit_int
+        high, low = @str[@marker, 8].unpack('N*N*')[0..1]
+        @marker += 8
+        
+        return (high << 32) + low
+      end
+      
       # Return the next float value from the stream
       def next_float
         float = @str[@marker, 4].unpack('N*').pack('L').unpack('f*').first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ultrasphinx
 version: !ruby/object:Gem::Version 
-  version: "1.7"
+  version: "1.8"
 platform: ruby
 authors: 
 - ""
@@ -30,7 +30,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2008-01-12 00:00:00 -05:00
+date: 2008-02-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency