freelancing-god-thinking-sphinx 1.1.3 → 1.1.4

data/README

@@ -48,7 +48,7 @@ database, causing the next run to have failures. Let that run complete and then
 Since I first released this library, there's been quite a few people who have submitted patches, to my immense gratitude. Others have suggested syntax changes and general improvements. So my thanks to the following people:
 
 - Joost Hietbrink
-- Jonathon Conway
+- Jonathan Conway
 - Gregory Mirzayantz
 - Tung Nguyen
 - Sean Cribbs
@@ -103,3 +103,5 @@ Since I first released this library, there's been quite a few people who have su
 - Lachie Cox
 - Lourens Naude
 - Tom Davies
+- Dan Pickett
+- Alex Caudill

data/lib/thinking_sphinx.rb

@@ -13,6 +13,7 @@ require 'thinking_sphinx/attribute'
 require 'thinking_sphinx/collection'
 require 'thinking_sphinx/configuration'
 require 'thinking_sphinx/facet'
+require 'thinking_sphinx/facet_collection'
 require 'thinking_sphinx/field'
 require 'thinking_sphinx/index'
 require 'thinking_sphinx/rails_additions'
@@ -33,7 +34,7 @@ module ThinkingSphinx
   module Version #:nodoc:
     Major = 1
     Minor = 1
-    Tiny  = 3
+    Tiny  = 4
     
     String = [Major, Minor, Tiny].join('.')
   end

data/lib/thinking_sphinx/adapters/abstract_adapter.rb

@@ -11,7 +11,8 @@ module ThinkingSphinx
       
     def self.detect(model)
       case model.connection.class.name
-      when "ActiveRecord::ConnectionAdapters::MysqlAdapter"
+      when "ActiveRecord::ConnectionAdapters::MysqlAdapter",
+           "ActiveRecord::ConnectionAdapters::MysqlplusAdapter"
         ThinkingSphinx::MysqlAdapter.new model
       when "ActiveRecord::ConnectionAdapters::PostgreSQLAdapter"
         ThinkingSphinx::PostgreSQLAdapter.new model
@@ -30,4 +31,4 @@ module ThinkingSphinx
       @connection ||= @model.connection
     end
   end
-end
+end

data/lib/thinking_sphinx/adapters/postgresql_adapter.rb

@@ -11,7 +11,7 @@ module ThinkingSphinx
     
     def concatenate(clause, separator = ' ')
       clause.split(', ').collect { |field|
-        "COALESCE(#{field}, '')"
+        "COALESCE(CAST(#{field} as varchar), '')"
       }.join(" || '#{separator}' || ")
     end
     

data/lib/thinking_sphinx/attribute.rb

@@ -140,7 +140,7 @@ module ThinkingSphinx
     # actual column's datatype is and returns that.
     def type
       @type ||= case
-      when is_many?
+      when is_many?, is_many_ints?
         :multi
       when @associations.values.flatten.length > 1
         :string
@@ -152,7 +152,7 @@ module ThinkingSphinx
     def to_facet
       return nil unless @faceted
       
-      ThinkingSphinx::Facet.new(unique_name, @columns, self)
+      ThinkingSphinx::Facet.new(self)
     end
     
     private
@@ -206,6 +206,10 @@ module ThinkingSphinx
       associations.values.flatten.any? { |assoc| assoc.is_many? }
     end
     
+    def is_many_ints?
+      concat_ws? && all_ints?
+    end
+    
     # Returns true if any of the columns are string values, instead of database
     # column references.
     def is_string?

data/lib/thinking_sphinx/collection.rb

@@ -130,5 +130,13 @@ module ThinkingSphinx
         yield self[index], match[:weight]
       end
     end
+    
+    def inject_with_groupby_and_count(initial = nil, &block)
+      index = -1
+      results[:matches].inject(initial) do |memo, match|
+        index += 1
+        yield memo, self[index], match[:attributes]["@groupby"], match[:attributes]["@count"]
+      end
+    end
   end
-end
+end

data/lib/thinking_sphinx/facet.rb

@@ -0,0 +1,58 @@
+module ThinkingSphinx
+  class Facet
+    attr_reader :reference
+    
+    def initialize(reference)
+      @reference = reference
+      
+      if reference.columns.length != 1
+        raise "Can't translate Facets on multiple-column field or attribute"
+      end
+    end
+    
+    def name
+      reference.unique_name
+    end
+    
+    def attribute_name
+      @attribute_name ||= case @reference
+      when Attribute
+        @reference.unique_name.to_s
+      when Field
+        @reference.unique_name.to_s + "_sort"
+      end
+    end
+    
+    def value(object, attribute_value)
+      return translate(object, attribute_value) if @reference.is_a?(Field)
+      
+      case @reference.type
+      when :string, :multi
+        translate(object, attribute_value)
+      when :datetime
+        Time.at(attribute_value)
+      when :boolean
+        attribute_value > 0
+      else
+        attribute_value
+      end
+    end
+    
+    def to_s
+      name
+    end
+    
+    private
+    
+    def translate(object, attribute_value)
+      column.__stack.each { |method|
+        object = object.send(method)
+      }
+      object.send(column.__name)
+    end
+    
+    def column
+      @reference.columns.first
+    end
+  end
+end

data/lib/thinking_sphinx/facet_collection.rb

@@ -0,0 +1,44 @@
+module ThinkingSphinx
+  class FacetCollection < Hash
+    attr_accessor :arguments
+    
+    def initialize(arguments)
+      @arguments        = arguments.clone
+      @attribute_values = {}
+      @facets           = []
+    end
+    
+    def add_from_results(facet, results)
+      self[facet.name]              = {}
+      @attribute_values[facet.name] = {}
+      @facets << facet
+      
+      results.each_with_groupby_and_count { |result, group, count|
+        facet_value = facet.value(result, group)
+        
+        self[facet.name][facet_value]               = count
+        @attribute_values[facet.name][facet_value]  = group
+      }
+    end
+    
+    def for(hash = {})
+      arguments        = @arguments.clone
+      options          = arguments.extract_options!
+      options[:with] ||= {}
+      
+      hash.each do |key, value|
+        attrib = facet_for_key(key).attribute_name
+        options[:with][attrib] = @attribute_values[key][value]
+      end
+      
+      arguments << options
+      ThinkingSphinx::Search.search *arguments
+    end
+    
+    private
+    
+    def facet_for_key(key)
+      @facets.detect { |facet| facet.name == key }
+    end
+  end
+end

data/lib/thinking_sphinx/field.rb

@@ -115,7 +115,7 @@ module ThinkingSphinx
     def to_facet
       return nil unless @faceted
       
-      ThinkingSphinx::Facet.new(unique_name, @columns, self)
+      ThinkingSphinx::Facet.new(self)
     end
     
     private

data/lib/thinking_sphinx/index.rb

@@ -159,21 +159,22 @@ module ThinkingSphinx
         stored_class = @model.store_full_sti_class ? @model.name : @model.name.demodulize
         builder.where("#{@model.quoted_table_name}.#{quote_column(@model.inheritance_column)} = '#{stored_class}'")
       end
-
-      @fields       = builder.fields
-      @attributes   = builder.attributes
+      
+      set_model = Proc.new { |item| item.model = @model }
+      
+      @fields       = builder.fields &set_model
+      @attributes   = builder.attributes.each &set_model
       @conditions   = builder.conditions
       @groupings    = builder.groupings
       @delta_object = ThinkingSphinx::Deltas.parse self, builder.properties
       @options      = builder.properties
       
+      is_faceted = Proc.new { |item| item.faceted }
+      add_facet  = Proc.new { |item| @model.sphinx_facets << item.to_facet }
+      
       @model.sphinx_facets ||= []
-      @fields.select { |field| field.faceted }.each { |field|
-        @model.sphinx_facets << field.to_facet
-      }
-      @attributes.select { |attrib| attrib.faceted }.each { |attrib|
-        @model.sphinx_facets << attrib.to_facet
-      }
+      @fields.select(    &is_faceted).each &add_facet
+      @attributes.select(&is_faceted).each &add_facet
       
       # We want to make sure that if the database doesn't exist, then Thinking
       # Sphinx doesn't mind when running non-TS tasks (like db:create, db:drop
@@ -277,7 +278,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] || ""
       source.sql_pass = (config[:password].to_s || "").gsub('#', '\#')
       source.sql_db   = config[:database]
       source.sql_port = config[:port]

data/lib/thinking_sphinx/index/builder.rb

@@ -147,6 +147,15 @@ module ThinkingSphinx
         end
         alias_method :attribute, :has
         
+        def facet(*args)
+          options = args.extract_options!
+          options[:facet] = true
+          
+          args.each do |columns|
+            attributes << Attribute.new(FauxColumn.coerce(columns), options)
+          end
+        end
+        
         # Use this method to add some manual SQL conditions for your index
         # request. You can pass in as many strings as you like, they'll get
         # joined together with ANDs later on.

data/lib/thinking_sphinx/search.rb

@@ -21,7 +21,7 @@ module ThinkingSphinx
         
         options = args.extract_options!
         page    = options[:page] ? options[:page].to_i : 1
-
+        
         ThinkingSphinx::Collection.ids_from_results(results, page, client.limit, options)
       end
 
@@ -353,18 +353,13 @@ module ThinkingSphinx
       end
       
       def facets(*args)
-        options = args.extract_options!.merge! :group_function => :attr
+        hash    = ThinkingSphinx::FacetCollection.new args
+        options = args.extract_options!.clone.merge! :group_function => :attr
         
-        options[:class].sphinx_facets.inject({}) do |hash, facet|
-          facet_result = {}
+        options[:class].sphinx_facets.inject(hash) do |hash, facet|
           options[:group_by] = facet.attribute_name
           
-          results = search *(args + [options])
-          results.each_with_groupby_and_count do |result, group, count|
-            facet_result[facet.value(result, group)] = count
-          end
-          hash[facet.name] = facet_result
-          
+          hash.add_from_results facet, search(*(args + [options]))
           hash
         end
       end
@@ -474,6 +469,13 @@ module ThinkingSphinx
           Riddle::Client::Filter.new attr.to_s, filter_value(val), true
         } if options[:without]
         
+        # every-match attribute filters
+        client.filters += options[:with_all].collect { |attr,vals|
+          Array(vals).collect { |val|
+            Riddle::Client::Filter.new attr.to_s, filter_value(val)
+          }
+        }.flatten if options[:with_all]
+        
         # exclusive attribute filter on primary key
         client.filters += Array(options[:without_ids]).collect { |id|
           Riddle::Client::Filter.new 'sphinx_internal_id', filter_value(id), true

data/lib/thinking_sphinx/tasks.rb

@@ -0,0 +1,128 @@
+require 'fileutils'
+
+namespace :thinking_sphinx do
+  task :app_env do
+    Rake::Task[:environment].invoke if defined?(RAILS_ROOT)
+    Rake::Task[:merb_env].invoke    if defined?(Merb)
+  end
+  
+  desc "Stop if running, then start a Sphinx searchd daemon using Thinking Sphinx's settings"
+  task :running_start => :app_env do
+   Rake::Task["thinking_sphinx:stop"].invoke if sphinx_running?
+   Rake::Task["thinking_sphinx:start"].invoke
+  end
+  
+  desc "Start a Sphinx searchd daemon using Thinking Sphinx's settings"
+  task :start => :app_env do
+    config = ThinkingSphinx::Configuration.instance
+    
+    FileUtils.mkdir_p config.searchd_file_path
+    raise RuntimeError, "searchd is already running." if sphinx_running?
+    
+    Dir["#{config.searchd_file_path}/*.spl"].each { |file| File.delete(file) }
+
+    cmd = "#{config.bin_path}searchd --pidfile --config #{config.config_file}"
+    puts cmd
+    system cmd
+    
+    sleep(2)
+    
+    if sphinx_running?
+      puts "Started successfully (pid #{sphinx_pid})."
+    else
+      puts "Failed to start searchd daemon. Check #{config.searchd_log_file}."
+    end
+  end
+  
+  desc "Stop Sphinx using Thinking Sphinx's settings"
+  task :stop => :app_env do
+    raise RuntimeError, "searchd is not running." unless sphinx_running?
+    config = ThinkingSphinx::Configuration.instance
+    pid    = sphinx_pid
+    system "searchd --stop --config #{config.config_file}"
+    puts "Stopped search daemon (pid #{pid})."
+  end
+  
+  desc "Restart Sphinx"
+  task :restart => [:app_env, :stop, :start]
+  
+  desc "Generate the Sphinx configuration file using Thinking Sphinx's settings"
+  task :configure => :app_env do
+    config = ThinkingSphinx::Configuration.instance
+    puts "Generating Configuration to #{config.config_file}"
+    config.build
+  end
+  
+  desc "Index data for Sphinx using Thinking Sphinx's settings"
+  task :index => :app_env do
+    ThinkingSphinx::Deltas::Job.cancel_thinking_sphinx_jobs
+    
+    config = ThinkingSphinx::Configuration.instance
+    unless ENV["INDEX_ONLY"] == "true"
+      puts "Generating Configuration to #{config.config_file}"
+      config.build
+    end
+        
+    FileUtils.mkdir_p config.searchd_file_path
+    cmd = "#{config.bin_path}indexer --config #{config.config_file} --all"
+    cmd << " --rotate" if sphinx_running?
+    puts cmd
+    system cmd
+  end
+  
+  namespace :index do
+    task :delta => :app_env do
+      ThinkingSphinx.indexed_models.select { |model|
+        model.constantize.sphinx_indexes.any? { |index| index.delta? }
+      }.each do |model|
+        model.constantize.sphinx_indexes.select { |index|
+          index.delta? && index.delta_object.respond_to?(:delayed_index)
+        }.each { |index|
+          index.delta_object.delayed_index(index.model)
+        }
+      end
+    end
+  end
+  
+  desc "Process stored delta index requests"
+  task :delayed_delta => :app_env do
+    require 'delayed/worker'
+    
+    Delayed::Worker.new(
+      :min_priority => ENV['MIN_PRIORITY'],
+      :max_priority => ENV['MAX_PRIORITY']
+    ).start
+  end
+end
+
+namespace :ts do
+  desc "Stop if running, then start a Sphinx searchd daemon using Thinking Sphinx's settings"
+  task :run     => "thinking_sphinx:running_start"
+  desc "Start a Sphinx searchd daemon using Thinking Sphinx's settings"
+  task :start   => "thinking_sphinx:start"
+  desc "Stop Sphinx using Thinking Sphinx's settings"
+  task :stop    => "thinking_sphinx:stop"
+  desc "Index data for Sphinx using Thinking Sphinx's settings"
+  task :in      => "thinking_sphinx:index"
+  namespace :in do
+    desc "Index Thinking Sphinx datetime delta indexes"
+    task :delta => "thinking_sphinx:index:delta"
+  end
+  task :index   => "thinking_sphinx:index"
+  desc "Restart Sphinx"
+  task :restart => "thinking_sphinx:restart"
+  desc "Generate the Sphinx configuration file using Thinking Sphinx's settings"
+  task :conf    => "thinking_sphinx:configure"
+  desc "Generate the Sphinx configuration file using Thinking Sphinx's settings"
+  task :config  => "thinking_sphinx:configure"
+  desc "Process stored delta index requests"
+  task :dd      => "thinking_sphinx:delayed_delta"
+end
+
+def sphinx_pid
+  ThinkingSphinx.sphinx_pid
+end
+
+def sphinx_running?
+  ThinkingSphinx.sphinx_running?
+end

data/spec/unit/thinking_sphinx/attribute_spec.rb

@@ -157,7 +157,7 @@ describe ThinkingSphinx::Attribute do
     end
     
     it "should return :string if there's more than one association" do
-      @attribute.associations = {:a => :assoc, :b => :assoc}
+      @attribute.associations = {:a => [:assoc], :b => [:assoc]}
       @attribute.send(:type).should == :string
     end
     

data/tasks/rails.rake

@@ -0,0 +1 @@
+require File.join(File.dirname(__FILE__), '/../lib/thinking_sphinx/tasks')

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 = 3
+    Release = 4
     
     String      = [Major, Minor, Tiny].join('.')
     GemVersion  = [Major, Minor, Tiny, Rev, Release].join('.')

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

@@ -456,7 +456,7 @@ module Riddle
         header = socket.recv(8)
         status, version, length = header.unpack('n2N')
         
-        while response.length < length
+        while response.length < (length || 0)
           part = socket.recv(length - response.length)
           response << part if part
         end

data/vendor/riddle/lib/riddle/configuration/section.rb

@@ -20,13 +20,18 @@ module Riddle
           if send(setting) == ""
             conf = "  #{setting} = "
           else
-            conf = Array(send(setting)).collect { |set|
+            conf = setting_to_array(setting).collect { |set|
               "  #{setting} = #{set}"  
             }
           end
           conf.length == 0 ? nil : conf
         }.flatten.compact
       end
+      
+      def setting_to_array(setting)
+        value = send(setting)
+        value.is_a?(Array) ? value : [value]
+      end
     end
   end
-end
+end

data/vendor/riddle/lib/riddle/controller.rb

@@ -14,7 +14,7 @@ module Riddle
     def start
       return if running?
 
-      cmd = "searchd --config #{@path}"
+      cmd = "searchd --pidfile --config #{@path}"
       `#{cmd}`    
 
       sleep(1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-17 00:00:00 -08:00
+date: 2009-02-04 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -41,19 +41,21 @@ files:
 - lib/thinking_sphinx/deltas/delayed_delta/job.rb
 - lib/thinking_sphinx/deltas/delayed_delta.rb
 - lib/thinking_sphinx/deltas.rb
+- lib/thinking_sphinx/facet.rb
+- lib/thinking_sphinx/facet_collection.rb
 - lib/thinking_sphinx/field.rb
 - lib/thinking_sphinx/index/builder.rb
 - lib/thinking_sphinx/index/faux_column.rb
 - lib/thinking_sphinx/index.rb
 - lib/thinking_sphinx/rails_additions.rb
 - lib/thinking_sphinx/search.rb
+- lib/thinking_sphinx/tasks.rb
 - lib/thinking_sphinx.rb
 - LICENCE
 - README
 - tasks/distribution.rb
 - tasks/testing.rb
-- tasks/thinking_sphinx_tasks.rb
-- tasks/thinking_sphinx_tasks.rake
+- tasks/rails.rake
 - vendor/after_commit
 - vendor/after_commit/init.rb
 - vendor/after_commit/lib