thinking-sphinx 2.0.7 → 2.0.8

data/lib/thinking_sphinx/index/builder.rb

@@ -1,3 +1,5 @@
+require 'blankslate'
+
 module ThinkingSphinx
   class Index
     # The Builder class is the core for the index definition block processing.
@@ -11,36 +13,29 @@ module ThinkingSphinx
     # your indexes. #where provides a method to add manual SQL conditions, and
     # set_property allows you to set some settings on a per-index basis. Check
     # out each method's documentation for better ideas of usage.
-    # 
-    class Builder
-      instance_methods.grep(/^[^_]/).each { |method|
-        next if method.to_s == "instance_eval"
-        define_method(method) {
-          caller.grep(/irb.completion/).empty? ? method_missing(method) : super
-        }
-      }
-      
+    #
+    class Builder < BlankSlate
       def self.generate(model, name = nil, &block)
         index  = ThinkingSphinx::Index.new(model)
         index.name = name unless name.nil?
-        
+
         Builder.new(index, &block) if block_given?
-        
+
         index.delta_object = ThinkingSphinx::Deltas.parse index
         index
       end
-      
+
       def initialize(index, &block)
         @index  = index
         @explicit_source = false
-        
+
         self.instance_eval &block
-        
+
         if no_fields?
           raise "At least one field is necessary for an index"
         end
       end
-      
+
       def define_source(&block)
         if @explicit_source
           @source = ThinkingSphinx::Source.new(@index)
@@ -48,10 +43,10 @@ module ThinkingSphinx
         else
           @explicit_source = true
         end
-        
+
         self.instance_eval &block
       end
-      
+
       # This is how you add fields - the strings Sphinx looks at - to your
       # index. Technically, to use this method, you need to pass in some
       # columns and options - but there's some neat method_missing stuff
@@ -63,26 +58,26 @@ module ThinkingSphinx
       # field.
       #
       # Adding Single-Column Fields:
-      # 
+      #
       # You can use symbols or methods - and can chain methods together to
       # get access down the associations tree.
-      # 
+      #
       #   indexes :id, :as => :my_id
       #   indexes :name, :sortable => true
       #   indexes first_name, last_name, :sortable => true
       #   indexes users.posts.content, :as => :post_content
       #   indexes users(:id), :as => :user_ids
       #
-      # Keep in mind that if any keywords for Ruby methods - such as id or 
+      # Keep in mind that if any keywords for Ruby methods - such as id or
       # name - clash with your column names, you need to use the symbol
       # version (see the first, second and last examples above).
       #
       # If you specify multiple columns (example #2), a field will be created
       # for each. Don't use the :as option in this case. If you want to merge
       # those columns together, continue reading.
-      # 
+      #
       # Adding Multi-Column Fields:
-      # 
+      #
       #   indexes [first_name, last_name], :as => :name
       #   indexes [location, parent.location], :as => :location
       #
@@ -90,7 +85,7 @@ module ThinkingSphinx
       # them in an Array, as shown by the above examples. There's no
       # limitations on whether they're symbols or methods or what level of
       # associations they come from.
-      # 
+      #
       # Adding SQL Fragment Fields
       #
       # You can also define a field using an SQL fragment, useful for when
@@ -102,37 +97,37 @@ module ThinkingSphinx
         options = args.extract_options!
         args.each do |columns|
           field = Field.new(source, FauxColumn.coerce(columns), options)
-          
+
           add_sort_attribute  field, options   if field.sortable
           add_facet_attribute field, options   if field.faceted
         end
       end
-      
+
       # This is the method to add attributes to your index (hence why it is
       # aliased as 'attribute'). The syntax is the same as #indexes, so use
       # that as starting point, but keep in mind the following points.
-      # 
+      #
       # An attribute can have an alias (the :as option), but it is always
       # sortable - so you don't need to explicitly request that. You _can_
       # specify the data type of the attribute (the :type option), but the
       # code's pretty good at figuring that out itself from peering into the
       # database.
-      # 
+      #
       # Attributes are limited to the following types: integers, floats,
       # datetimes (converted to timestamps), booleans, strings and MVAs
       # (:multi). Don't forget that Sphinx converts string attributes to
       # integers, which are useful for sorting, but that's about it.
-      # 
+      #
       # Collection of integers are known as multi-value attributes (MVAs).
       # Generally these would be through a has_many relationship, like in this
       # example:
-      # 
+      #
       #   has posts(:id), :as => :post_ids
-      # 
+      #
       # This allows you to filter on any of the values tied to a specific
       # record. Might be best to read through the Sphinx documentation to get
       # a better idea of that though.
-      # 
+      #
       # Adding SQL Fragment Attributes
       #
       # You can also define an attribute using an SQL fragment, useful for
@@ -140,68 +135,68 @@ module ThinkingSphinx
       # the type of the attribute though:
       #
       #   has "age < 18", :as => :minor, :type => :boolean
-      # 
+      #
       # If you're creating attributes for latitude and longitude, don't
       # forget that Sphinx expects these values to be in radians.
-      # 
+      #
       def has(*args)
         options = args.extract_options!
         args.each do |columns|
           attribute = Attribute.new(source, FauxColumn.coerce(columns), options)
-          
+
           add_facet_attribute attribute, options if attribute.faceted
         end
       end
-      
+
       def facet(*args)
         options = args.extract_options!
         options[:facet] = true
-        
+
         args.each do |columns|
           attribute = Attribute.new(source, FauxColumn.coerce(columns), options)
-          
+
           add_facet_attribute attribute, options
         end
       end
-      
+
       def join(*args)
         args.each do |association|
           Join.new(source, association)
         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.
-      # 
+      #
       #   where "user_id = 10"
       #   where "parent_type = 'Article'", "created_at < NOW()"
-      # 
+      #
       def where(*args)
         source.conditions += args
       end
-      
+
       # Use this method to add some manual SQL strings to the GROUP BY
       # clause. You can pass in as many strings as you'd like, they'll get
       # joined together with commas later on.
-      # 
+      #
       #   group_by "lat", "lng"
-      # 
+      #
       def group_by(*args)
         source.groupings += args
       end
-      
+
       # This is what to use to set properties on the index. Chief amongst
       # those is the delta property - to allow automatic updates to your
       # indexes as new models are added and edited - but also you can
       # define search-related properties which will be the defaults for all
       # searches on the model.
-      # 
+      #
       #   set_property :delta => true
       #   set_property :field_weights => {"name" => 100}
       #   set_property :order => "name ASC"
       #   set_property :select => 'name'
-      # 
+      #
       # Also, the following two properties are particularly relevant for
       # geo-location searching - latitude_attr and longitude_attr. If your
       # attributes for these two values are named something other than
@@ -210,59 +205,59 @@ module ThinkingSphinx
       # geo-related search.
       #
       #   set_property :latitude_attr => "lt", :longitude_attr => "lg"
-      # 
+      #
       # Please don't forget to add a boolean field named 'delta' to your
       # model's database table if enabling the delta index for it.
       # Valid options for the delta property are:
-      # 
+      #
       # true
       # false
       # :default
       # :delayed
       # :datetime
-      # 
-      # You can also extend ThinkingSphinx::Deltas::DefaultDelta to implement 
+      #
+      # You can also extend ThinkingSphinx::Deltas::DefaultDelta to implement
       # your own handling for delta indexing.
-      # 
+      #
       def set_property(*args)
         options = args.extract_options!
         options.each do |key, value|
           set_single_property key, value
         end
-        
+
         set_single_property args[0], args[1] if args.length == 2
       end
       alias_method :set_properties, :set_property
-      
+
       # Handles the generation of new columns for the field and attribute
       # definitions.
-      # 
+      #
       def method_missing(method, *args)
         FauxColumn.new(method, *args)
       end
-      
+
       # A method to allow adding fields from associations which have names
       # that clash with method names in the Builder class (ie: properties,
       # fields, attributes).
-      # 
+      #
       # Example: indexes assoc(:properties).column
-      # 
+      #
       def assoc(assoc, *args)
         FauxColumn.new(assoc, *args)
       end
-      
+
       # Use this method to generate SQL for your attributes, conditions, etc.
       # You can pass in as whatever ActiveRecord::Base.sanitize_sql accepts.
-      # 
+      #
       #   where sanitize_sql(["active = ?", true])
       #   #=> WHERE active = 1
-      # 
+      #
       def sanitize_sql(*args)
         @index.model.send(:sanitize_sql, *args)
       end
-      
+
       private
-      
+
       def source
         @source ||= begin
           source = ThinkingSphinx::Source.new(@index)
@@ -270,7 +265,7 @@ module ThinkingSphinx
           source
         end
       end
-      
+
       def set_single_property(key, value)
         source_options = ThinkingSphinx::Configuration::SourceOptions
         if source_options.include?(key.to_s)
@@ -279,19 +274,19 @@ module ThinkingSphinx
           @index.local_options.merge!  key => value
         end
       end
-      
+
       def add_sort_attribute(field, options)
         add_internal_attribute field, options, "_sort"
       end
-      
+
       def add_facet_attribute(property, options)
         add_internal_attribute property, options, "_facet", true
         @index.model.sphinx_facets << property.to_facet
       end
-      
+
       def add_internal_attribute(property, options, suffix, crc = false)
         return unless ThinkingSphinx::Facet.translate?(property)
-        
+
         Attribute.new(source,
           property.columns.collect { |col| col.clone },
           options.merge(
@@ -301,7 +296,7 @@ module ThinkingSphinx
           ).except(:facet)
         )
       end
-      
+
       def no_fields?
         @index.sources.empty? || @index.sources.any? { |source|
           source.fields.length == 0

data/lib/thinking_sphinx/railtie.rb

@@ -3,7 +3,7 @@ require 'rails'
 
 module ThinkingSphinx
   class Railtie < Rails::Railtie
-    
+
     initializer 'thinking_sphinx.sphinx' do
       ThinkingSphinx::AutoVersion.detect
     end
@@ -26,16 +26,13 @@ module ThinkingSphinx
     end
 
     config.to_prepare do
-      I18n.backend.reload!
-      I18n.backend.available_locales
-      
       # ActiveRecord::Base.to_crc32s is dependant on the subclasses being loaded
       # consistently. When the environment is reset, subclasses/descendants will
       # be lost but our context will not reload them for us.
       #
       # We reset the context which causes the subclasses/descendants to be
       # reloaded next time the context is called.
-      # 
+      #
       ThinkingSphinx.reset_context!
     end
 

data/lib/thinking_sphinx/search.rb

@@ -224,6 +224,10 @@ module ThinkingSphinx
     def next_page?
       !next_page.nil?
     end
+    
+    def last_page?
+      next_page.nil?
+    end
 
     # The previous page number of the result set. If this is the first page,
     # then nil is returned.
@@ -763,8 +767,8 @@ module ThinkingSphinx
         filter_value(value.first).first..filter_value(value.last).first
       when Array
         value.collect { |v| filter_value(v) }.flatten
-      when Time
-        [value.to_i]
+      when Date, Time
+        [value.to_time.to_i]
       when NilClass
         0
       else

data/lib/thinking_sphinx/tasks.rb

@@ -33,12 +33,22 @@ namespace :thinking_sphinx do
 
     Dir["#{config.searchd_file_path}/*.spl"].each { |file| File.delete(file) }
 
-    config.controller.start
-
-    if sphinx_running?
-      puts "Started successfully (pid #{sphinx_pid})."
+    if ENV["NODETACH"] == "true"
+      unless pid = fork
+        config.controller.start(:nodetach => true)
+      end
+      Signal.trap('TERM') { Process.kill(:QUIT, pid) }
+      Signal.trap('INT')  { Process.kill(:QUIT, pid) }
+      Process.wait(pid)
     else
-      puts "Failed to start searchd daemon. Check #{config.searchd_log_file}"
+      config.controller.start
+
+      if sphinx_running?
+        puts "Started successfully (pid #{sphinx_pid})."
+      else
+        puts "Failed to start searchd daemon. Check #{config.searchd_log_file}"
+        puts "Be sure to run thinking_sphinx:index before thinking_sphinx:start"
+      end
     end
   end
 

data/lib/thinking_sphinx/version.rb

@@ -1,3 +1,3 @@
 module ThinkingSphinx
-  Version = '2.0.7'
+  Version = '2.0.8'
 end

data/spec/sphinx_helper.rb

@@ -1,13 +1,6 @@
 require 'active_record'
-prefix = defined?(JRUBY_VERSION) ? "jdbc" : ""
-require "active_record/connection_adapters/#{prefix}mysql_adapter"
-require "active_record/connection_adapters/mysql2_adapter"
-
-begin
-  require "active_record/connection_adapters/#{prefix}postgresql_adapter"
-rescue LoadError
-  # No postgres?  no prob...
-end
+require 'active_record/connection_adapters/mysql2_adapter'
+require 'active_record/connection_adapters/postgresql_adapter'
 require 'yaml'
 
 class SphinxHelper