freelancing-god-thinking-sphinx 1.1.12 → 1.1.14

data/lib/thinking_sphinx/facet_collection.rb

@@ -3,28 +3,25 @@ module ThinkingSphinx
     attr_accessor :arguments
     
     def initialize(arguments)
-      @arguments        = arguments.clone
-      @attribute_values = {}
-      @facet_names           = []
+      @arguments    = arguments.clone
+      @facet_names  = []
     end
     
     def add_from_results(facet, results)
       name = ThinkingSphinx::Facet.name_for(facet)
-
-      self[name]              ||= {}
-      @attribute_values[name] ||= {}
+      
+      self[name]  ||= {}
       @facet_names << name
-
+      
       return if results.empty?
-
+      
       facet = facet_from_object(results.first, facet) if facet.is_a?(String)
       
       results.each_with_groupby_and_count { |result, group, count|
         facet_value = facet.value(result, group)
         
-        self[name][facet_value]              ||= 0
-        self[name][facet_value]              += count
-        @attribute_values[name][facet_value]  = group
+        self[name][facet_value] ||= 0
+        self[name][facet_value]  += count
       }
     end
     
@@ -34,7 +31,7 @@ module ThinkingSphinx
       options[:with] ||= {}
       
       hash.each do |key, value|
-        attrib = ThinkingSphinx::Facet.attribute_name_for(key)
+        attrib = ThinkingSphinx::Facet.attribute_name_from_value(key, value)
         options[:with][attrib] = underlying_value key, value
       end
       
@@ -48,8 +45,10 @@ module ThinkingSphinx
       case value
       when Array
         value.collect { |item| underlying_value(key, item) }
+      when String
+        value.to_crc32
       else
-        @attribute_values[key][value]
+        value
       end
     end
     

data/lib/thinking_sphinx/field.rb

@@ -52,12 +52,14 @@ module ThinkingSphinx
     #     :as => :posts, :prefixes => true
     #   )
     # 
-    def initialize(columns, options = {})
+    def initialize(source, columns, options = {})
       super
       
       @sortable = options[:sortable] || false
       @infixes  = options[:infixes]  || false
       @prefixes = options[:prefixes] || false
+      
+      source.fields << self
     end
     
     # Get the part of the SELECT clause related to this field. Don't forget

data/lib/thinking_sphinx/index.rb

@@ -9,8 +9,7 @@ module ThinkingSphinx
   # Enjoy.
   # 
   class Index
-    attr_accessor :model, :fields, :attributes, :conditions, :groupings,
-      :delta_object, :options
+    attr_accessor :model, :sources, :delta_object
     
     # Create a new index instance by passing in the model it is tied to, and
     # a block to build it with (optional but recommended). For documentation
@@ -28,153 +27,11 @@ module ThinkingSphinx
     #
     def initialize(model, &block)
       @model        = model
-      @associations = {}
-      @fields       = []
-      @attributes   = []
-      @conditions   = []
-      @groupings    = []
+      @sources      = []
       @options      = {}
       @delta_object = nil
       
-      initialize_from_builder(&block) if block_given?
-      
-      add_internal_attributes_and_facets
-    end
-    
-    def name
-      self.class.name(@model)
-    end
-    
-    def self.name(model)
-      model.name.underscore.tr(':/\\', '_')
-    end
-    
-    def to_riddle_for_core(offset, index)
-      link!
-      
-      source = Riddle::Configuration::SQLSource.new(
-        "#{name}_core_#{index}", adapter.sphinx_identifier
-      )
-      
-      set_source_database_settings  source
-      set_source_attributes         source, offset
-      set_source_sql                source, offset
-      set_source_settings           source
-      
-      source
-    end
-    
-    def to_riddle_for_delta(offset, index)
-      link!
-      
-      source = Riddle::Configuration::SQLSource.new(
-        "#{name}_delta_#{index}", adapter.sphinx_identifier
-      )
-      source.parent = "#{name}_core_#{index}"
-      
-      set_source_database_settings  source
-      set_source_attributes         source, offset
-      set_source_sql                source, offset, true
-      
-      source
-    end
-    
-    # Link all the fields and associations to their corresponding
-    # associations and joins. This _must_ be called before interrogating
-    # the index's fields and associations for anything that may reference
-    # their SQL structure.
-    # 
-    def link!
-      base = ::ActiveRecord::Associations::ClassMethods::JoinDependency.new(
-        @model, [], nil
-      )
-      
-      @fields.each { |field|
-        field.model ||= @model
-        field.columns.each { |col|
-          field.associations[col] = associations(col.__stack.clone)
-          field.associations[col].each { |assoc| assoc.join_to(base) }
-        }
-      }
-      
-      @attributes.each { |attribute|
-        attribute.model ||= @model
-        attribute.columns.each { |col|
-          attribute.associations[col] = associations(col.__stack.clone)
-          attribute.associations[col].each { |assoc| assoc.join_to(base) }
-        }
-      }
-    end
-    
-    # Flag to indicate whether this index has a corresponding delta index.
-    #
-    def delta?
-      !@delta_object.nil?
-    end
-    
-    def adapter
-      @adapter ||= @model.sphinx_database_adapter
-    end
-        
-    def prefix_fields
-      @fields.select { |field| field.prefixes }
-    end
-    
-    def infix_fields
-      @fields.select { |field| field.infixes }
-    end
-        
-    def index_options
-      all_index_options = ThinkingSphinx::Configuration.instance.index_options.clone
-      @options.keys.select { |key|
-        ThinkingSphinx::Configuration::IndexOptions.include?(key.to_s)
-      }.each { |key| all_index_options[key.to_sym] = @options[key] }
-      all_index_options
-    end
-        
-    def quote_column(column)
-      @model.connection.quote_column_name(column)
-    end
-    
-    private
-    
-    def utf8?
-      self.index_options[:charset_type] == "utf-8"
-    end
-    
-    # Does all the magic with the block provided to the base #initialize.
-    # Creates a new class subclassed from Builder, and evaluates the block
-    # on it, then pulls all relevant settings - fields, attributes, conditions,
-    # properties - into the new index.
-    # 
-    # Also creates a CRC attribute for the model.
-    # 
-    def initialize_from_builder(&block)
-      builder = Class.new(Builder)
-      builder.setup
-      
-      builder.instance_eval &block
-      
-      unless @model.descends_from_active_record?
-        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
-      
-      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(    &is_faceted).each &add_facet
-      @attributes.select(&is_faceted).each &add_facet
+      # add_internal_attributes_and_facets
       
       # 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
@@ -188,237 +45,67 @@ module ThinkingSphinx
       end
     end
     
-    # Returns all associations used amongst all the fields and attributes.
-    # This includes all associations between the model and what the actual
-    # columns are from.
-    # 
-    def all_associations
-      @all_associations ||= (
-        # field associations
-        @fields.collect { |field|
-          field.associations.values
-        }.flatten +
-        # attribute associations
-        @attributes.collect { |attrib|
-          attrib.associations.values if attrib.include_as_association?
-        }.compact.flatten
-      ).uniq.collect { |assoc|
-        # get ancestors as well as column-level associations
-        assoc.ancestors
-      }.flatten.uniq
+    def fields
+      @sources.collect { |source| source.fields }.flatten
     end
     
-    # Gets a stack of associations for a specific path.
-    # 
-    def associations(path, parent = nil)
-      assocs = []
-      
-      if parent.nil?
-        assocs = association(path.shift)
-      else
-        assocs = parent.children(path.shift)
-      end
-      
-      until path.empty?
-        point = path.shift
-        assocs = assocs.collect { |assoc|
-          assoc.children(point)
-        }.flatten
-      end
-      
-      assocs
+    def attributes
+      @sources.collect { |source| source.attributes }.flatten
     end
     
-    # Gets the association stack for a specific key.
-    # 
-    def association(key)
-      @associations[key] ||= Association.children(@model, key)
-    end
-
-    def crc_column
-      if @model.column_names.include?(@model.inheritance_column)
-        adapter.cast_to_unsigned(adapter.convert_nulls(
-          adapter.crc(adapter.quote_with_table(@model.inheritance_column), true),
-          @model.to_crc32
-        ))
-      else
-        @model.to_crc32.to_s
-      end
+    def name
+      self.class.name(@model)
     end
     
-    def add_internal_attributes_and_facets
-      add_internal_attribute :sphinx_internal_id, :integer, @model.primary_key.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"
-      
-      add_internal_facet :class_crc
+    def self.name(model)
+      model.name.underscore.tr(':/\\', '_')
     end
     
-    def add_internal_attribute(name, type, contents, facet = false)
-      return unless attribute_by_alias(name).nil?
-      
-      @attributes << Attribute.new(
-        FauxColumn.new(contents),
-        :type   => type,
-        :as     => name,
-        :facet  => facet,
-        :admin  => true
-      )
+    def prefix_fields
+      fields.select { |field| field.prefixes }
     end
     
-    def add_internal_facet(name)
-      return unless facet_by_alias(name).nil?
-      
-      @model.sphinx_facets << ClassFacet.new(attribute_by_alias(name))
+    def infix_fields
+      fields.select { |field| field.infixes }
     end
     
-    def attribute_by_alias(attr_alias)
-      @attributes.detect { |attrib| attrib.alias == attr_alias }
+    def local_options
+      @options
     end
     
-    def facet_by_alias(name)
-      @model.sphinx_facets.detect { |facet| facet.name == name }
+    def options
+      all_index_options = ThinkingSphinx::Configuration.instance.index_options.clone
+      @options.keys.select { |key|
+        ThinkingSphinx::Configuration::IndexOptions.include?(key.to_s)
+      }.each { |key| all_index_options[key.to_sym] = @options[key] }
+      all_index_options
     end
     
-    def subclasses_to_s
-      "'" + (@model.send(:subclasses).collect { |klass|
-        klass.to_crc32.to_s
-      } << @model.to_crc32.to_s).join(",") + "'"
-    end
-        
-    def set_source_database_settings(source)
-      config = @model.connection.instance_variable_get(:@config)
-      
-      source.sql_host = config[:host]           || "localhost"
-      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]
-      source.sql_sock = config[:socket]
+    def delta?
+      !@delta_object.nil?
     end
     
-    def set_source_attributes(source, offset = nil)
-      attributes.each do |attrib|
-        source.send(attrib.type_to_config) << attrib.config_value(offset)
-      end
-    end
+    private
     
-    def set_source_sql(source, offset, delta = false)
-      source.sql_query        = to_sql(:offset => offset, :delta => delta).gsub(/\n/, ' ')
-      source.sql_query_range  = to_sql_query_range(:delta => delta)
-      source.sql_query_info   = to_sql_query_info(offset)
-      
-      source.sql_query_pre += send(!delta ? :sql_query_pre_for_core : :sql_query_pre_for_delta)
-      
-      if @options[:group_concat_max_len]
-        source.sql_query_pre << "SET SESSION group_concat_max_len = #{@options[:group_concat_max_len]}"
-      end
-      
-      source.sql_query_pre += [adapter.utf8_query_pre].compact if utf8?
+    def adapter
+      @adapter ||= @model.sphinx_database_adapter
     end
     
-    def set_source_settings(source)
-      ThinkingSphinx::Configuration.instance.source_options.each do |key, value|
-        source.send("#{key}=".to_sym, value)
-      end
-      
-      @options.each do |key, value|
-        source.send("#{key}=".to_sym, value) if ThinkingSphinx::Configuration::SourceOptions.include?(key.to_s) && !value.nil?
-      end
+    def utf8?
+      options[:charset_type] == "utf-8"
     end
     
-    def sql_query_pre_for_core
-      if self.delta? && !@delta_object.reset_query(@model).blank?
-        [@delta_object.reset_query(@model)]
-      else
-        []
-      end
+    # Does all the magic with the block provided to the base #initialize.
+    # Creates a new class subclassed from Builder, and evaluates the block
+    # on it, then pulls all relevant settings - fields, attributes, conditions,
+    # properties - into the new index.
+    # 
+    def initialize_from_builder(&block)
+      #
     end
     
     def sql_query_pre_for_delta
       [""]
     end
-    
-    # Generates the big SQL statement to get the data back for all the fields
-    # and attributes, using all the relevant association joins. If you want
-    # the version filtered for delta values, send through :delta => true in the
-    # options. Won't do much though if the index isn't set up to support a
-    # delta sibling.
-    # 
-    # Examples:
-    # 
-    #   index.to_sql
-    #   index.to_sql(:delta => true)
-    #
-    def to_sql(options={})
-      assocs = all_associations
-      
-      where_clause = ""
-      if self.delta? && !@delta_object.clause(@model, options[:delta]).blank?
-        where_clause << " AND #{@delta_object.clause(@model, options[:delta])}"
-      end
-      unless @conditions.empty?
-        where_clause << " AND " << @conditions.join(" AND ")
-      end
-      
-      internal_groupings = []
-      if @model.column_names.include?(@model.inheritance_column)
-         internal_groupings << "#{@model.quoted_table_name}.#{quote_column(@model.inheritance_column)}"
-      end
-      
-      unique_id_expr = ThinkingSphinx.unique_id_expression(options[:offset])
-      
-      sql = <<-SQL
-SELECT #{ (
-  ["#{@model.quoted_table_name}.#{quote_column(@model.primary_key)} #{unique_id_expr} AS #{quote_column(@model.primary_key)} "] + 
-  @fields.collect { |field| field.to_select_sql } +
-  @attributes.collect { |attribute| attribute.to_select_sql }
-).compact.join(", ") }
-FROM #{ @model.table_name }
-  #{ assocs.collect { |assoc| assoc.to_sql }.join(' ') }
-WHERE #{@model.quoted_table_name}.#{quote_column(@model.primary_key)} >= $start
-  AND #{@model.quoted_table_name}.#{quote_column(@model.primary_key)} <= $end
-  #{ where_clause }
-GROUP BY #{ (
-  ["#{@model.quoted_table_name}.#{quote_column(@model.primary_key)}"] + 
-  @fields.collect { |field| field.to_group_sql }.compact +
-  @attributes.collect { |attribute| attribute.to_group_sql }.compact +
-  @groupings + internal_groupings
-).join(", ") }
-      SQL
-      
-      sql += " ORDER BY NULL" if adapter.sphinx_identifier == "mysql"
-      sql
-    end
-    
-    # Simple helper method for the query info SQL - which is a statement that
-    # returns the single row for a corresponding id.
-    # 
-    def to_sql_query_info(offset)
-      "SELECT * FROM #{@model.quoted_table_name} WHERE " +
-      " #{quote_column(@model.primary_key)} = (($id - #{offset}) / #{ThinkingSphinx.indexed_models.size})"
-    end
-    
-    # Simple helper method for the query range SQL - which is a statement that
-    # returns minimum and maximum id values. These can be filtered by delta -
-    # so pass in :delta => true to get the delta version of the SQL.
-    # 
-    def to_sql_query_range(options={})
-      min_statement = adapter.convert_nulls(
-        "MIN(#{quote_column(@model.primary_key)})", 1
-      )
-      max_statement = adapter.convert_nulls(
-        "MAX(#{quote_column(@model.primary_key)})", 1
-      )
-      
-      sql = "SELECT #{min_statement}, #{max_statement} " +
-            "FROM #{@model.quoted_table_name} "
-      if self.delta? && !@delta_object.clause(@model, options[:delta]).blank?
-        sql << "WHERE #{@delta_object.clause(@model, options[:delta])}"
-      end
-      
-      sql
-    end
   end
 end