freelancing-god-thinking-sphinx 1.2.1 → 1.2.2

data/README.textile

@@ -145,3 +145,4 @@ Since I first released this library, there's been quite a few people who have su
 * Ole Riesenberg
 * Josh Kalderimis
 * J.D. Hollis
+* Jeffrey Chupp

data/lib/thinking_sphinx.rb

@@ -38,7 +38,7 @@ module ThinkingSphinx
   module Version #:nodoc:
     Major = 1
     Minor = 2
-    Tiny  = 1
+    Tiny  = 2
     
     String = [Major, Minor, Tiny].join('.')
   end

data/lib/thinking_sphinx/active_record.rb

@@ -13,6 +13,15 @@ module ThinkingSphinx
       base.class_eval do
         class_inheritable_array :sphinx_indexes, :sphinx_facets
         class << self
+          
+          def set_sphinx_primary_key(attribute)
+            @sphinx_primary_key_attribute = attribute
+          end
+          
+          def primary_key_for_sphinx
+            @sphinx_primary_key_attribute || primary_key
+          end
+          
           # Allows creation of indexes for Sphinx. If you don't do this, there
           # isn't much point trying to search (or using this plugin at all,
           # really).
@@ -265,13 +274,18 @@ module ThinkingSphinx
       # nothing
     end
     
+    def primary_key_for_sphinx
+      self.send(self.class.primary_key_for_sphinx)
+    end
+
     def sphinx_document_id
-      (self.id * ThinkingSphinx.indexed_models.size) +
+      key = self.class.primary_key_for_sphinx
+      self.attributes[key] * ThinkingSphinx.indexed_models.size +
         ThinkingSphinx.indexed_models.index(self.class.source_of_sphinx_index.name)
     end
-    
+
     private
-    
+
     def sphinx_index_name(suffix)
       "#{self.class.source_of_sphinx_index.name.underscore.tr(':/\\', '_')}_#{suffix}"
     end

data/lib/thinking_sphinx/deltas/delayed_delta.rb

@@ -8,6 +8,9 @@ module ThinkingSphinx
   module Deltas
     class DelayedDelta < ThinkingSphinx::Deltas::DefaultDelta
       def index(model, instance = nil)
+        return true unless ThinkingSphinx.updates_enabled? && ThinkingSphinx.deltas_enabled?
+        return true if instance && !toggled(instance)
+      
         ThinkingSphinx::Deltas::Job.enqueue(
           ThinkingSphinx::Deltas::DeltaJob.new(delta_index_name(model)),
           ThinkingSphinx::Configuration.instance.delayed_job_priority

data/lib/thinking_sphinx/deploy/capistrano.rb

@@ -90,8 +90,9 @@ DESC
     end
 
     def rake(*tasks)
+      rails_env = fetch(:rails_env, "production")
       tasks.each do |t|
-        run "cd #{current_path} && rake #{t} RAILS_ENV=production"
+        run "cd #{current_path} && rake #{t} RAILS_ENV=#{rails_env}"
       end
     end
   end

data/lib/thinking_sphinx/search.rb

@@ -554,7 +554,7 @@ module ThinkingSphinx
       instances = ids.length > 0 ? klass.find(
         :all,
         :joins      => options[:joins],
-        :conditions => {klass.primary_key.to_sym => ids},
+        :conditions => {klass.primary_key_for_sphinx.to_sym => ids},
         :include    => (options[:include] || index_options[:include]),
         :select     => (options[:select]  || index_options[:select]),
         :order      => (options[:sql_order] || index_options[:sql_order])
@@ -564,7 +564,7 @@ module ThinkingSphinx
       # the search method can retry without them. See 
       # ThinkingSphinx::Search.retry_search_on_stale_index.
       if options[:raise_on_stale] && instances.length < ids.length
-        stale_ids = ids - instances.map {|i| i.id }
+        stale_ids = ids - instances.map { |i| i.id }
         raise StaleIdsException, stale_ids
       end
 
@@ -573,7 +573,9 @@ module ThinkingSphinx
       return instances if options[:sql_order]
 
       ids.collect { |obj_id|
-        instances.detect { |obj| obj.id == obj_id }
+        instances.detect do |obj|
+          obj.primary_key_for_sphinx == obj_id
+        end
       }
     end
     
@@ -593,8 +595,8 @@ module ThinkingSphinx
       results[:matches].collect do |match|
         groups.detect { |crc, group|
           crc == match[:attributes]["class_crc"]
-        }[1].detect { |obj|
-          obj && obj.id == match[:attributes]["sphinx_internal_id"]
+        }[1].compact.detect { |obj|
+          obj.primary_key_for_sphinx == match[:attributes]["sphinx_internal_id"]
         }
       end
     end

data/lib/thinking_sphinx/source/internal_properties.rb

@@ -2,7 +2,7 @@ module ThinkingSphinx
   class Source
     module InternalProperties
       def add_internal_attributes_and_facets
-        add_internal_attribute :sphinx_internal_id, :integer, @model.primary_key.to_sym
+        add_internal_attribute :sphinx_internal_id, :integer, @model.primary_key_for_sphinx.to_sym
         add_internal_attribute :class_crc,          :integer, crc_column, true
         add_internal_attribute :subclass_crcs,      :multi,   subclasses_to_s
         add_internal_attribute :sphinx_deleted,     :integer, "0"

data/lib/thinking_sphinx/source/sql.rb

@@ -33,10 +33,10 @@ GROUP BY #{ sql_group_clause }
         return nil if @index.options[:disable_range]
         
         min_statement = adapter.convert_nulls(
-          "MIN(#{quote_column(@model.primary_key)})", 1
+          "MIN(#{quote_column(@model.primary_key_for_sphinx)})", 1
         )
         max_statement = adapter.convert_nulls(
-          "MAX(#{quote_column(@model.primary_key)})", 1
+          "MAX(#{quote_column(@model.primary_key_for_sphinx)})", 1
         )
 
         sql = "SELECT #{min_statement}, #{max_statement} " +
@@ -53,14 +53,14 @@ GROUP BY #{ sql_group_clause }
       # 
       def to_sql_query_info(offset)
         "SELECT * FROM #{@model.quoted_table_name} WHERE " +
-        "#{quote_column(@model.primary_key)} = (($id - #{offset}) / #{ThinkingSphinx.indexed_models.size})"
+        "#{quote_column(@model.primary_key_for_sphinx)} = (($id - #{offset}) / #{ThinkingSphinx.indexed_models.size})"
       end
 
       def sql_select_clause(offset)
         unique_id_expr = ThinkingSphinx.unique_id_expression(offset)
 
         (
-          ["#{@model.quoted_table_name}.#{quote_column(@model.primary_key)} #{unique_id_expr} AS #{quote_column(@model.primary_key)} "] + 
+          ["#{@model.quoted_table_name}.#{quote_column(@model.primary_key_for_sphinx)} #{unique_id_expr} AS #{quote_column(@model.primary_key_for_sphinx)} "] + 
           @fields.collect     { |field|     field.to_select_sql     } +
           @attributes.collect { |attribute| attribute.to_select_sql }
         ).compact.join(", ")
@@ -69,8 +69,8 @@ GROUP BY #{ sql_group_clause }
       def sql_where_clause(options)
         logic = []
         logic += [
-          "#{@model.quoted_table_name}.#{quote_column(@model.primary_key)} >= $start",
-          "#{@model.quoted_table_name}.#{quote_column(@model.primary_key)} <= $end"
+          "#{@model.quoted_table_name}.#{quote_column(@model.primary_key_for_sphinx)} >= $start",
+          "#{@model.quoted_table_name}.#{quote_column(@model.primary_key_for_sphinx)} <= $end"
         ] unless @index.options[:disable_range]
 
         if self.delta? && !@index.delta_object.clause(@model, options[:delta]).blank?
@@ -88,7 +88,7 @@ GROUP BY #{ sql_group_clause }
         end
 
         (
-          ["#{@model.quoted_table_name}.#{quote_column(@model.primary_key)}"] + 
+          ["#{@model.quoted_table_name}.#{quote_column(@model.primary_key_for_sphinx)}"] + 
           @fields.collect     { |field|     field.to_group_sql     }.compact +
           @attributes.collect { |attribute| attribute.to_group_sql }.compact +
           @groupings + internal_groupings

data/vendor/riddle/lib/riddle.rb

@@ -18,7 +18,7 @@ module Riddle #:nodoc:
     Rev     = 1533
     # Release number to mark my own fixes, beyond feature parity with
     # Sphinx itself.
-    Release = 5
+    Release = 7
     
     String      = [Major, Minor, Tiny].join('.')
     GemVersion  = [Major, Minor, Tiny, Rev, Release].join('.')

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

@@ -10,14 +10,15 @@ module Riddle
       
       # Append raw data (only use if you know what you're doing)
       def append(*args)
-        return if args.length == 0
-        
         args.each { |arg| @message << arg }
       end
       
       # Append a string's length, then the string itself
       def append_string(str)
-        @message << [str.send(@size_method)].pack('N') + str
+        string = str.respond_to?(:force_encoding) ?
+          str.dup.force_encoding('ASCII-8BIT') : str
+        
+        @message << [string.send(@size_method)].pack('N') + string
       end
       
       # Append an integer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-27 00:00:00 -07:00
+date: 2009-07-30 00:00:00 -07:00
 default_executable: 
 dependencies: []