freelancing-god-thinking-sphinx 1.2.8 → 1.2.9

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 2
-:patch: 8
+:patch: 9

data/lib/thinking_sphinx.rb

@@ -7,6 +7,7 @@ require 'riddle'
 require 'after_commit'
 require 'yaml'
 
+require 'thinking_sphinx/core/array'
 require 'thinking_sphinx/core/string'
 require 'thinking_sphinx/property'
 require 'thinking_sphinx/active_record'

data/lib/thinking_sphinx/active_record.rb

@@ -281,7 +281,7 @@ module ThinkingSphinx
     # @return [Integer] Unique record id for the purposes of Sphinx.
     # 
     def primary_key_for_sphinx
-      read_attribute(self.class.primary_key_for_sphinx)
+      @primary_key_for_sphinx ||= read_attribute(self.class.primary_key_for_sphinx)
     end
     
     def sphinx_document_id

data/lib/thinking_sphinx/core/array.rb

@@ -0,0 +1,7 @@
+module SearchAsArray
+  def ===(object)
+    object.is_a?(ThinkingSphinx::Search) || super
+  end
+end
+
+Array.extend SearchAsArray

data/lib/thinking_sphinx/facet.rb

@@ -72,7 +72,7 @@ module ThinkingSphinx
     end
     
     def value(object, attribute_value)
-      return translate(object, attribute_value) if translate?
+      return translate(object, attribute_value) if translate? || float?
       
       case @property.type
       when :datetime
@@ -106,5 +106,9 @@ module ThinkingSphinx
     def column
       @property.columns.first
     end
+    
+    def float?
+      @property.type == :float
+    end
   end
 end

data/lib/thinking_sphinx/index.rb

@@ -41,10 +41,10 @@ module ThinkingSphinx
     end
     
     def name
-      self.class.name(@model)
+      self.class.name_for @model
     end
     
-    def self.name(model)
+    def self.name_for(model)
       model.name.underscore.tr(':/\\', '_')
     end
     

data/lib/thinking_sphinx/search.rb

@@ -194,15 +194,15 @@ module ThinkingSphinx
     end
     
     def excerpt_for(string, model = nil)
-      if model.nil? && options[:classes].length == 1
-        model ||= options[:classes].first
+      if model.nil? && classes.length == 1
+        model ||= classes.first
       end
       
       populate
       client.excerpts(
         :docs   => [string],
         :words  => results[:words].keys.join(' '),
-        :index  => "#{model.sphinx_name}_core"
+        :index  => "#{model.source_of_sphinx_index.sphinx_name}_core"
       ).first
     end
     
@@ -266,8 +266,8 @@ module ThinkingSphinx
     def client
       client = config.client
       
-      index_options = (options[:classes] || []).length != 1 ?
-        {} : options[:classes].first.sphinx_indexes.first.local_options
+      index_options = classes.length != 1 ?
+        {} : classes.first.sphinx_indexes.first.local_options
       
       [
         :max_matches, :group_by, :group_function, :group_clause,
@@ -321,6 +321,10 @@ module ThinkingSphinx
       end
     end
     
+    def classes
+      @classes ||= options[:classes] || []
+    end
+    
     def query
       @query ||= begin
         q = @args.join(' ') << conditions_as_query
@@ -333,7 +337,7 @@ module ThinkingSphinx
       
       # Soon to be deprecated.
       keys = @options[:conditions].keys.reject { |key|
-        attributes.include?(key)
+        attributes.include?(key.to_sym)
       }
       
       ' ' + keys.collect { |key|
@@ -404,9 +408,9 @@ module ThinkingSphinx
     end
     
     def field_names
-      return [] if (options[:classes] || []).length != 1
+      return [] if classes.length != 1
       
-      options[:classes].first.sphinx_indexes.collect { |index|
+      classes.first.sphinx_indexes.collect { |index|
         index.fields.collect { |field| field.unique_name }
       }.flatten
     end
@@ -428,7 +432,7 @@ module ThinkingSphinx
       weights = options[:index_weights] || {}
       weights.keys.inject({}) do |hash, key|
         if key.is_a?(Class)
-          name = ThinkingSphinx::Index.name(key)
+          name = ThinkingSphinx::Index.name_for(key)
           hash["#{name}_core"]  = weights[key]
           hash["#{name}_delta"] = weights[key]
         else
@@ -450,7 +454,7 @@ module ThinkingSphinx
     def internal_filters
       filters = [Riddle::Client::Filter.new('sphinx_deleted', [0])]
       
-      class_crcs = (options[:classes] || []).collect { |klass|
+      class_crcs = classes.collect { |klass|
         klass.to_crc32s
       }.flatten
       
@@ -467,7 +471,7 @@ module ThinkingSphinx
     
     def condition_filters
       (options[:conditions] || {}).collect { |attrib, value|
-        if attributes.include?(attrib)
+        if attributes.include?(attrib.to_sym)
           puts <<-MSG
 Deprecation Warning: filters on attributes should be done using the :with
 option, not :conditions. For example:
@@ -513,6 +517,8 @@ MSG
         value.collect { |v| filter_value(v) }.flatten
       when Time
         value.respond_to?(:in_time_zone) ? [value.utc.to_i] : [value.to_i]
+      when NilClass
+        0
       else
         Array(value)
       end
@@ -542,15 +548,15 @@ MSG
     end
     
     def index_option(key)
-      return nil if options[:classes].length != 1
+      return nil if classes.length != 1
       
-      options[:classes].first.sphinx_indexes.collect { |index|
+      classes.first.sphinx_indexes.collect { |index|
         index.local_options[key]
       }.compact.first
     end
     
     def attribute(*keys)
-      return nil if options[:classes].length != 1
+      return nil if classes.length != 1
       
       keys.detect { |key|
         attributes.include?(key)
@@ -558,9 +564,9 @@ MSG
     end
     
     def attributes
-      return [] if (options[:classes] || []).length != 1
+      return [] if classes.length != 1
       
-      attributes = options[:classes].first.sphinx_indexes.collect { |index|
+      attributes = classes.first.sphinx_indexes.collect { |index|
         index.attributes.collect { |attrib| attrib.unique_name }
       }.flatten
     end
@@ -599,7 +605,7 @@ MSG
 
       # if the user has specified an SQL order, return the collection
       # without rearranging it into the Sphinx order
-      return instances if options[:sql_order]
+      return instances if (options[:sql_order] || index_options[:sql_order])
 
       ids.collect { |obj_id|
         instances.detect do |obj|
@@ -612,6 +618,8 @@ MSG
     # the number of #find's in multi-model searches.
     # 
     def instances_from_matches
+      return single_class_results if classes.length == 1
+      
       groups = results[:matches].group_by { |match|
         match[:attributes]["class_crc"]
       }
@@ -630,6 +638,10 @@ MSG
       end
     end
     
+    def single_class_results
+      instances_from_class classes.first, results[:matches]
+    end
+    
     def class_from_crc(crc)
       config.models_by_crc[crc].constantize
     end
@@ -643,12 +655,12 @@ MSG
     end
     
     def is_scope?(method)
-      options[:classes] && options[:classes].length == 1 &&
-      options[:classes].first.sphinx_scopes.include?(method)
+      classes && classes.length == 1 &&
+      classes.first.sphinx_scopes.include?(method)
     end
     
     def add_scope(method, *args, &block)
-      merge_search options[:classes].first.send(method, *args, &block)
+      merge_search classes.first.send(method, *args, &block)
     end
     
     def merge_search(search)

data/lib/thinking_sphinx/source.rb

@@ -82,7 +82,7 @@ module ThinkingSphinx
       config = @model.connection.instance_variable_get(:@config)
       
       source.sql_host = config[:host]           || "localhost"
-      source.sql_user = config[:username]       || config[:user] || ""
+      source.sql_user = config[:username]       || config[:user] || 'root'
       source.sql_pass = (config[:password].to_s || "").gsub('#', '\#')
       source.sql_db   = config[:database]
       source.sql_port = config[:port]

data/spec/lib/thinking_sphinx/core/array_spec.rb

@@ -0,0 +1,9 @@
+require 'spec/spec_helper'
+
+describe Array do
+  describe '.===' do
+    it "should return true if an instance of ThinkingSphinx::Search" do
+      Array.should === ThinkingSphinx::Search.new
+    end
+  end
+end

data/spec/lib/thinking_sphinx/facet_spec.rb

@@ -277,26 +277,45 @@ describe ThinkingSphinx::Facet do
   end
   
   describe "#value" do
-    before :each do
-      @index  = ThinkingSphinx::Index.new(Friendship)
-      @source = ThinkingSphinx::Source.new(@index)
-      @field  = ThinkingSphinx::Field.new(
-        @source, ThinkingSphinx::Index::FauxColumn.new(:person, :first_name)
-      )
-      @facet  = ThinkingSphinx::Facet.new(@field)
-    end
+    describe 'for fields from associations' do
+      before :each do
+        @index  = ThinkingSphinx::Index.new(Friendship)
+        @source = ThinkingSphinx::Source.new(@index)
+        @field  = ThinkingSphinx::Field.new(
+          @source, ThinkingSphinx::Index::FauxColumn.new(:person, :first_name)
+        )
+        @facet  = ThinkingSphinx::Facet.new(@field)
+      end
     
-    it "should return association values" do
-      person      = Person.find(:first)
-      friendship  = Friendship.new(:person => person)
+      it "should return association values" do
+        person      = Person.find(:first)
+        friendship  = Friendship.new(:person => person)
       
-      @facet.value(friendship, 1).should == person.first_name
+        @facet.value(friendship, 1).should == person.first_name
+      end
+    
+      it "should return nil if the association is nil" do
+        friendship = Friendship.new(:person => nil)
+      
+        @facet.value(friendship, 1).should be_nil
+      end
     end
     
-    it "should return nil if the association is nil" do
-      friendship = Friendship.new(:person => nil)
+    describe 'for float attributes' do
+      before :each do
+        @index     = ThinkingSphinx::Index.new(Alpha)
+        @source    = ThinkingSphinx::Source.new(@index)
+        @attribute = ThinkingSphinx::Attribute.new(
+          @source, ThinkingSphinx::Index::FauxColumn.new(:cost)
+        )
+        @facet     = ThinkingSphinx::Facet.new(@attribute)
+      end
+      
+      it "should translate using the given model" do
+        alpha = Alpha.new(:cost => 10.5)
       
-      @facet.value(friendship, 1).should be_nil
+        @facet.value(alpha, 1093140480).should == 10.5
+      end
     end
   end
 end

data/spec/lib/thinking_sphinx/search_spec.rb

@@ -379,6 +379,13 @@ describe ThinkingSphinx::Search do
         filter.exclude?.should be_false
       end
       
+      it "should treat nils in arrays as 0" do
+        ThinkingSphinx::Search.new(:with => {:ints => [nil, 1, 2, 3]}).first
+        
+        filter = @client.filters.last
+        filter.values.should    == [0, 1, 2, 3]
+      end
+      
       it "should append inclusive filters of time ranges" do
         first, last = 1.week.ago, Time.now
         ThinkingSphinx::Search.new(:with => {
@@ -688,6 +695,35 @@ describe ThinkingSphinx::Search do
       end
     end
     
+    describe 'sql ordering' do
+      before :each do
+        @client.stub! :query => {
+          :matches => minimal_result_hashes(@alpha_b, @alpha_a)
+        }
+        Alpha.stub! :find => [@alpha_a, @alpha_b]
+      end
+      
+      it "shouldn't re-sort SQL results based on Sphinx information" do
+        search = ThinkingSphinx::Search.new(
+          :classes    => [Alpha],
+          :sql_order  => 'id'
+        )
+        search.first.should == @alpha_a
+        search.last.should  == @alpha_b
+      end
+      
+      it "should use the option for the ActiveRecord::Base#find calls" do
+        Alpha.should_receive(:find) do |mode, options|
+          options[:order].should == 'id'
+        end
+        
+        ThinkingSphinx::Search.new(
+          :classes    => [Alpha],
+          :sql_order  => 'id'
+        ).first
+      end
+    end
+    
     describe 'excerpts' do
       before :each do
         @search = ThinkingSphinx::Search.new
@@ -942,6 +978,14 @@ describe ThinkingSphinx::Search do
       
       @search.excerpt_for('string', Beta)
     end
+    
+    it "should use the correct index in STI situations" do
+      @client.should_receive(:excerpts) do |options|
+        options[:index].should == 'person_core'
+      end
+      
+      @search.excerpt_for('string', Parent)
+    end
   end
   
   describe '#search' do

data/spec/lib/thinking_sphinx/source_spec.rb

@@ -72,6 +72,16 @@ describe ThinkingSphinx::Source do
       @riddle.sql_sock.should == config[:socket]
     end
     
+    it "should use a default username of root if nothing else is provided" do
+      Person.connection.stub!(:instance_variable_get => {
+        :user     => nil,
+        :username => nil
+      })
+      
+      riddle = @source.to_riddle_for_core(1, 0)
+      riddle.sql_user.should == 'root'
+    end
+    
     it "should assign attributes" do
       # 3 internal attributes plus the one requested
       @riddle.sql_attr_uint.length.should == 4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-23 00:00:00 -07:00
+date: 2009-09-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,7 @@ files:
 - lib/thinking_sphinx/attribute.rb
 - lib/thinking_sphinx/class_facet.rb
 - lib/thinking_sphinx/configuration.rb
+- lib/thinking_sphinx/core/array.rb
 - lib/thinking_sphinx/core/string.rb
 - lib/thinking_sphinx/deltas.rb
 - lib/thinking_sphinx/deltas/datetime_delta.rb
@@ -105,7 +106,6 @@ files:
 - vendor/riddle/lib/riddle/controller.rb
 has_rdoc: true
 homepage: http://ts.freelancing-gods.com
-licenses: 
 post_install_message: |+
   With the release of Thinking Sphinx 1.1.18, there is one important change to
   note: previously, the default morphology for indexing was 'stem_en'. The new
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching.
@@ -154,6 +154,7 @@ test_files:
 - spec/lib/thinking_sphinx/association_spec.rb
 - spec/lib/thinking_sphinx/attribute_spec.rb
 - spec/lib/thinking_sphinx/configuration_spec.rb
+- spec/lib/thinking_sphinx/core/array_spec.rb
 - spec/lib/thinking_sphinx/core/string_spec.rb
 - spec/lib/thinking_sphinx/excerpter_spec.rb
 - spec/lib/thinking_sphinx/facet_search_spec.rb