DrMark-thinking-sphinx 0.9.9 → 1.1.6

data/spec/unit/thinking_sphinx/attribute_spec.rb

@@ -15,154 +15,6 @@ describe ThinkingSphinx::Attribute do
     end
   end
   
-  describe "to_select_sql method with MySQL" do
-    before :each do
-      @index = Person.indexes.first
-      @index.link!
-    end
-    
-    it "should concat with spaces if there's more than one non-integer column" do
-      @index.attributes[0].to_select_sql.should match(/CONCAT_WS\(' ', /)
-    end
-    
-    it "should concat with spaces if there's more than one association for a non-integer column" do
-      @index.attributes[1].to_select_sql.should match(/CONCAT_WS\(' ', /)
-    end
-    
-    it "should concat with commas if there's multiple integer columns" do
-      @index.attributes[2].to_select_sql.should match(/CONCAT_WS\(',', /)
-    end
-    
-    it "should concat with commas if there's more than one association for an integer column" do
-      @index.attributes[3].to_select_sql.should match(/CONCAT_WS\(',', /)
-    end
-    
-    it "should group with spaces if there's string columns from a has_many or has_and_belongs_to_many association" do
-      @index.attributes[4].to_select_sql.should match(/GROUP_CONCAT\(.+ SEPARATOR ' '\)/)
-    end
-    
-    it "should group with commas if there's integer columns from a has_many or has_and_belongs_to_many association" do
-      @index.attributes[5].to_select_sql.should match(/GROUP_CONCAT\(.+ SEPARATOR ','\)/)
-    end
-    
-    it "should convert datetime values to timestamps" do
-      @index.attributes[6].to_select_sql.should match(/UNIX_TIMESTAMP/)
-    end
-  end
-  
-  describe "to_select_sql method with PostgreSQL" do
-    before :each do
-      @index = Person.indexes.first
-      Person.connection.class.stub_method(
-        :name => "ActiveRecord::ConnectionAdapters::PostgreSQLAdapter"
-      )
-      @index.link!
-    end
-    
-    it "should concat with spaces if there's more than one non-integer column" do
-      @index.attributes[0].to_select_sql.should match(/|| ' ' ||/)
-    end
-    
-    it "should concat with spaces if there's more than one association for a non-integer column" do
-      @index.attributes[1].to_select_sql.should match(/|| ' ' ||/)
-    end
-    
-    it "should concat with commas if there's multiple integer columns" do
-      @index.attributes[2].to_select_sql.should match(/|| ',' ||/)
-    end
-    
-    it "should concat with commas if there's more than one association for an integer column" do
-      @index.attributes[3].to_select_sql.should match(/|| ',' ||/)
-    end
-    
-    it "should group with spaces if there's string columns from a has_many or has_and_belongs_to_many association" do
-      @index.attributes[4].to_select_sql.should match(/array_to_string\(array_accum\(.+, ' '\)/)
-    end
-    
-    it "should group with commas if there's integer columns from a has_many or has_and_belongs_to_many association" do
-      @index.attributes[5].to_select_sql.should match(/array_to_string\(array_accum\(.+, ','\)/)
-    end
-  end
-  
-  describe "to_group_sql method" do
-    before :each do
-      @attribute = ThinkingSphinx::Attribute.new([Object.stub_instance(:__stack => [])])
-      @attribute.stub_method(:is_many? => false, :is_string? => false)
-      
-      ThinkingSphinx.stub_method(:use_group_by_shortcut? => false)
-    end
-    
-    it "should return nil if is_many?" do
-      @attribute.stub_method(:is_many? => true)
-      
-      @attribute.to_group_sql.should be_nil
-    end
-    
-    it "should return nil if is_string?" do
-      @attribute.stub_method(:is_string? => true)
-      
-      @attribute.to_group_sql.should be_nil
-    end
-    
-    it "should return nil if group_by shortcut is allowed" do
-      ThinkingSphinx.stub_method(:use_group_by_shortcut? => true)
-      
-      @attribute.to_group_sql.should be_nil
-    end
-    
-    it "should return an array if neither is_many? or shortcut allowed" do
-      @attribute.stub_method(:column_with_prefix => 'hello')
-      @attribute.to_group_sql.should be_a_kind_of(Array)
-    end
-    
-    after :each do
-      ThinkingSphinx.unstub_method(:use_group_by_shortcut?)
-    end
-  end
-  
-  describe "to_sphinx_clause method" do
-    before :each do
-      @attribute = ThinkingSphinx::Attribute.new [Object.stub_instance(:__stack => [])]
-      @attribute.stub_method(:unique_name => "unique name")
-    end
-    
-    it "should use sql_attr_multi syntax for MVA attributes" do
-      @attribute.stub_method(:type => :multi)
-      @attribute.to_sphinx_clause.should match(/^sql_attr_multi\s+= uint unique name from field$/)
-    end
-    
-    it "should use sql_attr_timestamp syntax for datetime values" do
-      @attribute.stub_method(:type => :datetime)
-      @attribute.to_sphinx_clause.should match(/^sql_attr_timestamp\s+= unique name$/)
-    end
-    
-    it "should use sql_attr_str2ordinal for string values" do
-      @attribute.stub_method(:type => :string)
-      @attribute.to_sphinx_clause.should match(/^sql_attr_str2ordinal\s+= unique name$/)
-    end
-    
-    it "should use sql_attr_float for float values" do
-      @attribute.stub_method(:type => :float)
-      @attribute.to_sphinx_clause.should match(/^sql_attr_float\s+= unique name$/)
-    end
-    
-    it "should use sql_attr_bool for boolean values" do
-      @attribute.stub_method(:type => :boolean)
-      @attribute.to_sphinx_clause.should match(/^sql_attr_bool\s+= unique name$/)
-    end
-    
-    it "should use sql_attr_uint for integer values" do
-      @attribute.stub_method(:type => :integer)
-      @attribute.to_sphinx_clause.should match(/^sql_attr_uint\s+= unique name$/)
-    end
-    
-    it "should assume integer for any other types" do
-      @attribute.stub_method(:type => :unknown)
-      @attribute.to_sphinx_clause.should match(/^sql_attr_uint\s+= unique name$/)
-    end
-    
-  end
-  
   describe "unique_name method" do
     before :each do
       @attribute = ThinkingSphinx::Attribute.new [
@@ -305,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
     
@@ -357,4 +209,19 @@ describe ThinkingSphinx::Attribute do
       attribute.send(:all_ints?).should be_false
     end
   end
+  
+  describe "with custom queries" do
+    before :each do
+      index = CricketTeam.sphinx_indexes.first
+      @statement = index.to_riddle_for_core(0, 0).sql_attr_multi.first
+    end
+    
+    it "should track the query type accordingly" do
+      @statement.should match(/uint tags from query/)
+    end
+    
+    it "should include the SQL statement" do
+      @statement.should match(/SELECT cricket_team_id, id FROM tags/)
+    end
+  end
 end

data/spec/unit/thinking_sphinx/collection_spec.rb

@@ -0,0 +1,14 @@
+require 'spec/spec_helper'
+
+describe ThinkingSphinx::Collection do
+  it "should behave like WillPaginate::Collection" do
+    ThinkingSphinx::Collection.instance_methods.should include("previous_page")
+    ThinkingSphinx::Collection.instance_methods.should include("next_page")
+    ThinkingSphinx::Collection.instance_methods.should include("current_page")
+    ThinkingSphinx::Collection.instance_methods.should include("total_pages")
+    ThinkingSphinx::Collection.instance_methods.should include("total_entries")
+    ThinkingSphinx::Collection.instance_methods.should include("offset")
+    
+    ThinkingSphinx::Collection.ancestors.should include(Array)
+  end
+end

data/spec/unit/thinking_sphinx/configuration_spec.rb

@@ -5,17 +5,16 @@ describe ThinkingSphinx::Configuration do
     before :each do
       ThinkingSphinx::Configuration.send(:class_variable_set, :@@environment, nil)
       
-      ENV["RAILS_ENV"]  = nil
-      ENV["MERB_ENV"]   = nil
+      ENV["RAILS_ENV"] = nil
     end
     
     it "should use the Merb environment value if set" do
       unless defined?(Merb)
         module Merb; end
       end
-      
+            
       ThinkingSphinx::Configuration.stub_method(:defined? => true)
-      ENV["MERB_ENV"] = "merb_production"
+      Merb.stub_method(:environment => "merb_production")
       ThinkingSphinx::Configuration.environment.should == "merb_production"
       
       Object.send(:remove_const, :Merb)
@@ -31,178 +30,6 @@ describe ThinkingSphinx::Configuration do
     end
   end
   
-  describe "environment instance method" do
-    it "should return the class method" do
-      ThinkingSphinx::Configuration.stub_method(:environment => "spec")
-      ThinkingSphinx::Configuration.new.environment.should == "spec"
-      ThinkingSphinx::Configuration.should have_received(:environment)
-    end    
-  end
-  
-  describe "build method" do
-    before :each do
-      @config = ThinkingSphinx::Configuration.new
-      
-      @config.stub_methods(
-        :load_models                  => "",
-        :core_index_for_model         => "",
-        :delta_index_for_model        => "",
-        :distributed_index_for_model  => "",
-        :create_array_accum           => true
-      )
-      
-      ThinkingSphinx.stub_method :indexed_models => ["Person", "Friendship"]
-      YAML.stub_method(:load => {
-        :development => {
-          "option" => "value"
-        }
-      })
-      
-      @person_index_a = ThinkingSphinx::Index.stub_instance(
-        :to_config => "",   :adapter => :mysql, :delta? => false,
-        :name => "person",  :model => Person
-      )
-      @person_index_b = ThinkingSphinx::Index.stub_instance(
-        :to_config => "",   :adapter => :mysql, :delta? => false,
-        :name => "person",  :model => Person
-      )
-      @friendship_index_a = ThinkingSphinx::Index.stub_instance(
-        :to_config => "",       :adapter => :mysql, :delta? => false,
-        :name => "friendship",  :model => Friendship
-      )
-      
-      Person.stub_method(:indexes => [@person_index_a, @person_index_b])
-      Friendship.stub_method(:indexes => [@friendship_index_a])
-      
-      FileUtils.mkdir_p "#{@config.app_root}/config"
-      FileUtils.touch   "#{@config.app_root}/config/database.yml"
-    end
-    
-    after :each do
-      ThinkingSphinx.unstub_method :indexed_models
-      YAML.unstub_method :load
-      
-      Person.unstub_method      :indexes
-      Friendship.unstub_method  :indexes
-      # 
-      # FileUtils.rm_rf "#{@config.app_root}/config"
-    end
-    
-    it "should load the models" do
-      @config.build
-      
-      @config.should have_received(:load_models)
-    end
-    
-    it "should load in the database YAML configuration" do
-      @config.build
-      
-      YAML.should have_received(:load)
-    end
-    
-    it "should set the mem limit based on the configuration" do
-      @config.build
-      
-      file = open(@config.config_file) { |f| f.read }
-      file.should match(/mem_limit\s+= #{@config.mem_limit}/)
-    end
-    
-    it "should use the configuration port" do
-      @config.build
-      
-      file = open(@config.config_file) { |f| f.read }
-      file.should match(/port\s+= #{@config.port}/)
-    end
-    
-    it "should use the configuration's log file locations" do
-      @config.build
-      
-      file = open(@config.config_file) { |f| f.read }
-      file.should match(/log\s+= #{@config.searchd_log_file}/)
-      file.should match(/query_log\s+= #{@config.query_log_file}/)
-    end
-    
-    it "should use the configuration's pid file location" do
-      @config.build
-      
-      file = open(@config.config_file) { |f| f.read }
-      file.should match(/pid_file\s+= #{@config.pid_file}/)
-    end
-    
-    it "should set max matches from configuration" do
-      @config.build
-      
-      file = open(@config.config_file) { |f| f.read }
-      file.should match(/max_matches\s+= #{@config.max_matches}/)
-    end
-    
-    it "should request configuration for each index for each model" do
-      @config.build
-      
-      @person_index_a.should have_received(:to_config).with(
-        Person, 0, {:option => "value"}, @config.charset_type, 0
-      )
-      @person_index_b.should have_received(:to_config).with(
-        Person, 1, {:option => "value"}, @config.charset_type, 0
-      )
-      @friendship_index_a.should have_received(:to_config).with(
-        Friendship, 0, {:option => "value"}, @config.charset_type, 1
-      )
-    end
-    
-    it "should call create_array_accum if any index uses postgres" do
-      @person_index_a.stub_method(:adapter => :postgres)
-      
-      @config.build
-      
-      @config.should have_received(:create_array_accum)
-    end
-    
-    it "should not call create_array_accum if no index uses postgres" do
-      @config.build
-      
-      @config.should_not have_received(:create_array_accum)
-    end
-    
-    it "should call core_index_for_model for each model" do
-      @config.build
-      
-      @config.should have_received(:core_index_for_model).with(
-        Person, "source = person_0_core\nsource = person_1_core"
-      )
-      @config.should have_received(:core_index_for_model).with(
-        Friendship, "source = friendship_0_core"
-      )
-    end
-    
-    it "should call delta_index_for_model for each model if any index has a delta" do
-      @person_index_b.stub_method(:delta? => true)
-      
-      @config.build
-      
-      @config.should have_received(:delta_index_for_model).with(
-        Person, "source = person_1_delta"
-      )
-    end
-    
-    it "should not call delta_index_for_model for each model if no indexes have deltas" do
-      @config.build
-      
-      @config.should_not have_received(:delta_index_for_model)
-    end
-    
-    it "should call distributed_index_for_model for each model" do
-      @config.build
-      
-      @config.should have_received(:distributed_index_for_model).with(Person)
-      @config.should have_received(:distributed_index_for_model).with(Friendship)
-    end
-  end
-  
-  describe "load_models method" do
-    it "should have some specs"
-  end
-  
   describe "parse_config method" do
     before :each do
       @settings = {
@@ -214,7 +41,6 @@ describe ThinkingSphinx::Configuration do
           "searchd_file_path" => "searchd/file/path",
           "address"           => "127.0.0.1",
           "port"              => 3333,
-          "allow_star"        => true,
           "min_prefix_len"    => 2,
           "min_infix_len"     => 3,
           "mem_limit"         => "128M",
@@ -232,9 +58,12 @@ describe ThinkingSphinx::Configuration do
     end
     
     it "should use the accessors to set the configuration values" do
-      config = ThinkingSphinx::Configuration.new
-      @settings["development"].each do |key, value|
-        config.send(key).should == value
+      config = ThinkingSphinx::Configuration.instance
+      config.send(:parse_config)
+      
+      %w(config_file searchd_log_file query_log_file pid_file searchd_file_path
+        address port).each do |key|
+        config.send(key).should == @settings["development"][key]
       end
     end
     
@@ -242,253 +71,66 @@ describe ThinkingSphinx::Configuration do
       FileUtils.rm "#{RAILS_ROOT}/config/sphinx.yml"
     end
   end
-  
-  describe "core_index_for_model method" do
-    before :each do
-      @config = ThinkingSphinx::Configuration.new
-      @model  = Person
-    end
-    
-    it "should take its name from the model, with _core appended" do
-      @config.send(:core_index_for_model, @model, "my sources").should match(
-        /index person_core/
-      )
-    end
-    
-    it "should set the path to follow the name" do
-      @config.searchd_file_path = "/my/file/path"
-      @config.send(:core_index_for_model, @model, "my sources").should match(
-        /path = \/my\/file\/path\/person_core/
-      )
-    end
-    
-    it "should include the charset type setting" do
-      @config.charset_type = "specchars"
-      @config.send(:core_index_for_model, @model, "my sources").should match(
-        /charset_type = specchars/
-      )
-    end
-    
-    it "should include the morphology setting if it isn't blank" do
-      @config.morphology = "morph"
-      @config.send(:core_index_for_model, @model, "my sources").should match(
-        /morphology\s+= morph/
-      )
-    end
-    
-    it "should not include the morphology setting if it is blank" do
-      @config.morphology = nil
-      @config.send(:core_index_for_model, @model, "my sources").should_not match(
-        /morphology\s+=/
-      )
-      
-      @config.morphology = ""
-      @config.send(:core_index_for_model, @model, "my sources").should_not match(
-        /morphology\s+=/
-      )
-    end
-    
-    it "should include the charset_table value if it isn't nil" do
-      @config.charset_table = "table_chars"
-      @config.send(:core_index_for_model, @model, "my sources").should match(
-        /charset_table\s+= table_chars/
-      )
-    end
-    
-    it "should not set the charset_table value if it is nil" do
-      @config.charset_table = nil
-      @config.send(:core_index_for_model, @model, "my sources").should_not match(
-        /charset_table\s+=/
-      )      
-    end
-    
-    it "should set the ignore_chars value if it isn't nil" do
-      @config.ignore_chars = "ignorable"
-      @config.send(:core_index_for_model, @model, "my sources").should match(
-        /ignore_chars\s+= ignorable/
-      )
-    end
-    
-    it "should not set the ignore_chars value if it is nil" do
-      @config.ignore_chars = nil
-      @config.send(:core_index_for_model, @model, "my sources").should_not match(
-        /ignore_chars\s+=/
-      )
-    end
     
-    it "should include the star-related settings when allow_star is true" do
-      @config.allow_star      = true
-      @config.min_prefix_len  = 1
-      text =  @config.send(:core_index_for_model, @model, "my sources")
-      
-      text.should match(/enable_star\s+= 1/)
-      text.should match(/min_prefix_len\s+= 1/)
-      # text.should match(/min_infix_len\s+= 1/)
-    end
-    
-    it "should use the configuration's infix and prefix length values if set" do
-      @config.allow_star     = true
-      @config.min_prefix_len = 3
-      @config.min_infix_len  = 2
-      text =  @config.send(:core_index_for_model, @model, "my sources")
-      
-      text.should match(/min_prefix_len\s+= 3/)
-      # text.should match(/min_infix_len\s+= 2/)
+  describe "initialisation" do
+    it "should have a default bin_path of nothing" do
+      ThinkingSphinx::Configuration.instance.bin_path.should == ""
     end
     
-    it "should not include the star-related settings when allow_star is false" do
-      @config.allow_star = false
-      text =  @config.send(:core_index_for_model, @model, "my sources")
-      
-      text.should_not match(/enable_star\s+=/)
-      text.should_not match(/min_prefix_len\s+=/)
-      text.should_not match(/min_infix_len\s+=/)
-    end
-    
-    it "should set prefix_fields if any fields are flagged explicitly" do
-      @model.indexes.first.stub_methods(
-        :prefix_fields => [
-          ThinkingSphinx::Field.stub_instance(:unique_name => "a"),
-          ThinkingSphinx::Field.stub_instance(:unique_name => "b"),
-          ThinkingSphinx::Field.stub_instance(:unique_name => "c")
-        ],
-        :infix_fields  => [
-          ThinkingSphinx::Field.stub_instance(:unique_name => "d"),
-          ThinkingSphinx::Field.stub_instance(:unique_name => "e"),
-          ThinkingSphinx::Field.stub_instance(:unique_name => "f")
-        ]
-      )
+    it "should append a / to bin_path if one is supplied" do
+      @settings = {
+        "development" => {
+          "bin_path" => "path/to/somewhere"
+        }
+      }
       
-      @config.send(:core_index_for_model, @model, "my sources").should match(
-        /prefix_fields\s+= a, b, c/
-      )
-    end
-    
-    it "shouldn't set prefix_fields if none are flagged explicitly" do
-      @config.send(:core_index_for_model, @model, "my sources").should_not match(
-        /prefix_fields\s+=/
-      )
-    end
-    
-    it "should set infix_fields if any fields are flagged explicitly" do
-      @model.indexes.first.stub_methods(
-        :prefix_fields => [
-          ThinkingSphinx::Field.stub_instance(:unique_name => "a"),
-          ThinkingSphinx::Field.stub_instance(:unique_name => "b"),
-          ThinkingSphinx::Field.stub_instance(:unique_name => "c")
-        ],
-        :infix_fields  => [
-          ThinkingSphinx::Field.stub_instance(:unique_name => "d"),
-          ThinkingSphinx::Field.stub_instance(:unique_name => "e"),
-          ThinkingSphinx::Field.stub_instance(:unique_name => "f")
-        ]
-      )
+      open("#{RAILS_ROOT}/config/sphinx.yml", "w") do |f|
+        f.write  YAML.dump(@settings)
+      end
       
-      @config.send(:core_index_for_model, @model, "my sources").should match(
-        /infix_fields\s+= d, e, f/
-      )
-    end
-    
-    it "shouldn't set infix_fields if none are flagged explicitly" do
-      @config.send(:core_index_for_model, @model, "my sources").should_not match(
-        /infix_fields\s+=/
-      )
-    end
-
-    it "should include html_strip if value is set" do
-      @config.html_strip = 1
-      text = @config.send(:core_index_for_model, @model, "my sources")
-      text.should match(/html_strip\s+= 1/)
-    end
-
-    it "shouldn't include html_strip if value is not set" do
-      text = @config.send(:core_index_for_model, @model, "my sources")
-      text.should_not match(/html_strip/)
-    end
-
-    it "should include html_remove_elements if values are set" do
-      @config.html_remove_elements = 'script'
-      text = @config.send(:core_index_for_model, @model, "my sources")
-      text.should match(/html_remove_elements\s+= script/)
-    end
-
-    it "shouldn't include html_remove_elements if no values are set" do
-      text = @config.send(:core_index_for_model, @model, "my sources")
-      text.should_not match(/html_remove_elements/)
+      ThinkingSphinx::Configuration.instance.send(:parse_config)
+      ThinkingSphinx::Configuration.instance.bin_path.should match(/\/$/)
     end
   end
   
-  describe "delta_index_for_model method" do
-    before :each do
-      @config = ThinkingSphinx::Configuration.new
-      @model  = Person
-    end
-    
-    it "should take its name from the model, with _delta appended" do
-      @config.send(:delta_index_for_model, @model, "delta_sources").should match(
-        /index person_delta/
-      )
-    end
-    
-    it "should inherit from the equivalent core index" do
-      @config.send(:delta_index_for_model, @model, "delta_sources").should match(
-        /index person_delta : person_core/
-      )
-    end
-    
-    it "should set the path to follow the name" do
-      @config.searchd_file_path = "/my/file/path"
-      @config.send(:delta_index_for_model, @model, "delta_sources").should match(
-        /path = \/my\/file\/path\/person_delta/
-      )
+  it "should insert set index options into the configuration file" do
+    config = ThinkingSphinx::Configuration.instance
+    ThinkingSphinx::Configuration::IndexOptions.each do |option|
+      config.index_options[option.to_sym] = "something"
+      config.build
+      
+      file = open(config.config_file) { |f| f.read }
+      file.should match(/#{option}\s+= something/)
+      
+      config.index_options[option.to_sym] = nil
     end
   end
   
-  describe "distributed_index_for_model method" do
-    before :each do
-      @config = ThinkingSphinx::Configuration.new
-      @model  = Person
-    end
-    
-    it "should take its name from the model" do
-      @config.send(:distributed_index_for_model, @model).should match(
-        /index person/
-      )
-    end
-    
-    it "should have a type of distributed" do
-      @config.send(:distributed_index_for_model, @model).should match(
-        /type = distributed/
-      )
-    end
-    
-    it "should include the core as a local source" do
-      @config.send(:distributed_index_for_model, @model).should match(
-        /local = person_core/
-      )
-    end
-    
-    it "should only include the delta as a local source if an index is flagged to be delta" do
-      @config.send(:distributed_index_for_model, @model).should_not match(
-        /local = person_delta/
-      )
+  it "should insert set source options into the configuration file" do
+    config = ThinkingSphinx::Configuration.instance
+    ThinkingSphinx::Configuration::SourceOptions.each do |option|
+      config.source_options[option.to_sym] = "something"
+      config.build
       
-      @model.indexes.first.stub_method(:delta? => true)
-      @config.send(:distributed_index_for_model, @model).should match(
-        /local = person_delta/
-      )
-    end
-    
-    it "should handle namespaced models correctly" do
-      Person.stub_method(:name => "Namespaced::Model")
+      file = open(config.config_file) { |f| f.read }
+      file.should match(/#{option}\s+= something/)
       
-      @config.send(:distributed_index_for_model, @model).should match(
-        /index namespaced_model/
-      )
+      config.source_options[option.to_sym] = nil
     end
   end
   
-  describe "create_array_accum method" do
-    it "should create the array_accum method on PostgreSQL"
+  it "should set any explicit prefixed or infixed fields" do
+    file = open(ThinkingSphinx::Configuration.instance.config_file) { |f|
+      f.read
+    }
+    file.should match(/prefix_fields\s+= city/)
+    file.should match(/infix_fields\s+= state/)    
+  end
+  
+  it "should not have prefix fields in indexes where nothing is set" do
+    file = open(ThinkingSphinx::Configuration.instance.config_file) { |f|
+      f.read
+    }
+    file.should_not match(/index alpha_core\s+\{\s+[^\}]*prefix_fields\s+=[^\}]*\}/m)
   end
 end