freelancing-god-thinking-sphinx 1.1.12 → 1.1.14

data/spec/unit/thinking_sphinx/search_spec.rb

@@ -53,10 +53,17 @@ describe ThinkingSphinx::Search do
   
   describe "facets method" do
     before :each do
-      @results = [Person.find(:first)]
-      @results.stub!(:each_with_groupby_and_count).
-        and_yield(@results.first, @results.first.city.to_crc32, 1)
-      ThinkingSphinx::Search.stub!(:search => @results)
+      @person = Person.find(:first)
+      
+      @city_results = [@person]
+      @city_results.stub!(:each_with_groupby_and_count).
+        and_yield(@person, @person.city.to_crc32, 1)
+      
+      @birthday_results = [@person]
+      @birthday_results.stub!(:each_with_groupby_and_count).
+        and_yield(@person, @person.birthday.to_i, 1)
+      
+      ThinkingSphinx::Search.stub!(:search).and_return(@city_results, @birthday_results)
       
       @config = ThinkingSphinx::Configuration.instance
       @config.configuration.searchd.max_matches = 10_000
@@ -93,6 +100,26 @@ describe ThinkingSphinx::Search do
         :limit          => 200
       )
     end
+    
+    describe "conflicting facets" do
+      before :each do
+        @index = ThinkingSphinx::Index::Builder.generate(Alpha) do
+          indexes :name
+          has :value, :as => :city, :facet => true
+        end
+      end
+      
+      after :each do
+        Alpha.sphinx_facets.delete_at(-1)
+        Alpha.sphinx_indexes.delete_at(-1)
+      end
+      
+      it "should raise an error if searching with facets of same name but different type" do
+        lambda {
+          ThinkingSphinx::Search.facets :all_attributes => true
+        }.should raise_error
+      end
+    end
   end
 end
 

data/spec/unit/thinking_sphinx/source_spec.rb

@@ -0,0 +1,156 @@
+require 'spec/spec_helper'
+
+describe ThinkingSphinx::Source do
+  before :each do
+    @index  = ThinkingSphinx::Index.new(Person)
+    @source = ThinkingSphinx::Source.new(@index, :sql_range_step => 1000)
+  end
+  
+  it "should generate the name from the model" do
+    @source.name.should == "person"
+  end
+  
+  it "should handle namespaced models for name generation" do
+    index  = ThinkingSphinx::Index.new(Admin::Person)
+    source = ThinkingSphinx::Source.new(index)
+    source.name.should == "admin_person"
+  end
+  
+  describe "#to_riddle_for_core" do
+    before :each do
+      config = ThinkingSphinx::Configuration.instance
+      config.source_options[:sql_ranged_throttle] = 100
+      
+      ThinkingSphinx::Field.new(
+        @source, ThinkingSphinx::Index::FauxColumn.new(:first_name)
+      )
+      ThinkingSphinx::Field.new(
+        @source, ThinkingSphinx::Index::FauxColumn.new(:last_name)
+      )
+      
+      ThinkingSphinx::Attribute.new(
+        @source, ThinkingSphinx::Index::FauxColumn.new(:id), :as => :internal_id
+      )
+      ThinkingSphinx::Attribute.new(
+        @source, ThinkingSphinx::Index::FauxColumn.new(:birthday)
+      )
+      ThinkingSphinx::Attribute.new(
+        @source, ThinkingSphinx::Index::FauxColumn.new(:tags, :id), :as => :tag_ids
+      )
+      
+      @source.conditions << "`birthday` <= NOW()"
+      @source.groupings  << "`first_name`"
+      
+      @riddle = @source.to_riddle_for_core(1, 0)
+    end
+    
+    it "should generate a Riddle Source object" do
+      @riddle.should be_a_kind_of(Riddle::Configuration::SQLSource)
+    end
+    
+    it "should use the index and name its own name" do
+      @riddle.name.should == "person_core_0"
+    end
+    
+    it "should use the model's database connection to determine type" do
+      @riddle.type.should == "mysql"
+    end
+    
+    it "should match the model's database settings" do
+      config = Person.connection.instance_variable_get(:@config)
+      @riddle.sql_db.should   == config[:database]
+      @riddle.sql_user.should == config[:username]
+      @riddle.sql_pass.should == config[:password].to_s
+      @riddle.sql_host.should == config[:host]
+      @riddle.sql_port.should == config[:port]
+      @riddle.sql_sock.should == config[:socket]
+    end
+    
+    it "should assign attributes" do
+      # 3 internal attributes plus the one requested
+      @riddle.sql_attr_uint.length.should == 4
+      @riddle.sql_attr_uint.last.should == :internal_id
+      
+      @riddle.sql_attr_timestamp.length.should == 1
+      @riddle.sql_attr_timestamp.first.should == :birthday
+    end
+    
+    it "should set Sphinx Source options" do
+      @riddle.sql_range_step.should      == 1000
+      @riddle.sql_ranged_throttle.should == 100
+    end
+    
+    describe "#sql_query" do
+      before :each do
+        @query = @riddle.sql_query
+      end
+      
+      it "should select data from the model table" do
+        @query.should match(/FROM `people`/)
+      end
+      
+      it "should select each of the fields" do
+        @query.should match(/`first_name`.+FROM/)
+        @query.should match(/`last_name`.+FROM/)
+      end
+      
+      it "should select each of the attributes" do
+        @query.should match(/`id` AS `internal_id`.+FROM/)
+        @query.should match(/`birthday`.+FROM/)
+        @query.should match(/`tags`.`id`.+ AS `tag_ids`.+FROM/)
+      end
+      
+      it "should include joins for required associations" do
+        @query.should match(/LEFT OUTER JOIN `tags`/)
+      end
+      
+      it "should include any defined conditions" do
+        @query.should match(/WHERE.+`birthday` <= NOW()/)
+      end
+      
+      it "should include any defined groupings" do
+        @query.should match(/GROUP BY.+`first_name`/)
+      end
+    end
+    
+    describe "#sql_query_range" do
+      before :each do
+        @query = @riddle.sql_query_range
+      end
+      
+      it "should select data from the model table" do
+        @query.should match(/FROM `people`/)
+      end
+      
+      it "should select the minimum and the maximum ids" do
+        @query.should match(/SELECT.+MIN.+MAX.+FROM/)
+      end
+    end
+    
+    describe "#sql_query_info" do
+      before :each do
+        @query = @riddle.sql_query_info
+      end
+      
+      it "should select all fields from the model table" do
+        @query.should match(/SELECT \* FROM `people`/)
+      end
+      
+      it "should filter the primary key with the offset" do
+        model_count = ThinkingSphinx.indexed_models.size
+        @query.should match(/WHERE `id` = \(\(\$id - 1\) \/ #{model_count}\)/)
+      end
+    end
+    
+    describe "#sql_query_pre" do
+      before :each do
+        @queries = @riddle.sql_query_pre
+      end
+      
+      it "should default to just the UTF8 statement" do
+        @queries.length.should == 1
+        @queries.first.should == "SET NAMES utf8"
+      end
+    end
+  end
+end

data/tasks/testing.rb

@@ -20,13 +20,7 @@ namespace :features do
   def add_task(name, description)
     Cucumber::Rake::Task.new(name, description) do |t|
       t.cucumber_opts = "--format pretty"
-      t.step_pattern  = [
-        "features/support/env",
-        "features/support/db/#{name}",
-        "features/support/db/active_record",
-        "features/support/post_database",
-        "features/step_definitions/**.rb"
-      ]
+      t.profile = name
     end
   end
   
@@ -46,13 +40,7 @@ namespace :rcov do
   def add_task(name, description)
     Cucumber::Rake::Task.new(name, description) do |t|
       t.cucumber_opts = "--format pretty"
-      t.step_pattern  = [
-        "features/support/env",
-        "features/support/db/#{name}",
-        "features/support/db/active_record",
-        "features/support/post_database",
-        "features/step_definitions/**.rb"
-      ]
+      t.profile = name
       t.rcov = true
       t.rcov_opts = [
         '--exclude', 'spec',
@@ -80,7 +68,11 @@ task :cucumber_defaults do
     "--require #{path}"
   }.join(" ")
   
+  features = FileList["features/*.feature"].join(" ")
+  
   File.open('cucumber.yml', 'w') { |f|
-    f.write "default: \"#{default_requires} #{step_definitions}\""
+    f.write "default: \"#{default_requires} #{step_definitions}\"\n\n"
+    f.write "mysql: \"#{default_requires} #{step_definitions} #{features}\"\n\n"
+    f.write "postgresql: \"#{default_requires.gsub(/mysql/, 'postgresql')} #{step_definitions} #{features}\""
   }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.1.12
+  version: 1.1.14
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-11 00:00:00 -07:00
+date: 2009-05-18 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -52,7 +52,11 @@ files:
 - lib/thinking_sphinx/index.rb
 - lib/thinking_sphinx/property.rb
 - lib/thinking_sphinx/rails_additions.rb
+- lib/thinking_sphinx/search/facets.rb
 - lib/thinking_sphinx/search.rb
+- lib/thinking_sphinx/source/internal_properties.rb
+- lib/thinking_sphinx/source/sql.rb
+- lib/thinking_sphinx/source.rb
 - lib/thinking_sphinx/tasks.rb
 - lib/thinking_sphinx.rb
 - LICENCE
@@ -117,6 +121,7 @@ files:
 - spec/unit/thinking_sphinx/index_spec.rb
 - spec/unit/thinking_sphinx/rails_additions_spec.rb
 - spec/unit/thinking_sphinx/search_spec.rb
+- spec/unit/thinking_sphinx/source_spec.rb
 - spec/unit/thinking_sphinx_spec.rb
 has_rdoc: true
 homepage: http://ts.freelancing-gods.com
@@ -164,4 +169,5 @@ test_files:
 - spec/unit/thinking_sphinx/index_spec.rb
 - spec/unit/thinking_sphinx/rails_additions_spec.rb
 - spec/unit/thinking_sphinx/search_spec.rb
+- spec/unit/thinking_sphinx/source_spec.rb
 - spec/unit/thinking_sphinx_spec.rb