pixeltrix-thinking-sphinx 1.1.5 → 1.2.1

data/spec/lib/thinking_sphinx/source_spec.rb

@@ -0,0 +1,217 @@
+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
+      )
+      ThinkingSphinx::Attribute.new(
+        @source, ThinkingSphinx::Index::FauxColumn.new(:contacts, :id),
+        :as => :contact_ids, :source => :query
+      )
+      
+      @source.conditions << "`birthday` <= NOW()"
+      @source.groupings  << "`first_name`"
+      
+      @index.local_options[:group_concat_max_len] = 1024
+      
+      @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 not match the sourced MVA attribute" do
+        @query.should_not match(/contact_ids/)
+      end
+      
+      it "should include joins for required associations" do
+        @query.should match(/LEFT OUTER JOIN `tags`/)
+      end
+      
+      it "should not include joins for the sourced MVA attribute" do
+        @query.should_not match(/LEFT OUTER JOIN `contacts`/)
+      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.detect { |query|
+          query == "SET NAMES utf8"
+        }.should_not be_nil
+      end
+      
+      it "should set the group_concat_max_len session value for MySQL if requested" do
+        @queries.detect { |query|
+          query == "SET SESSION group_concat_max_len = 1024"
+        }.should_not be_nil
+      end
+    end
+  end
+  
+  describe "#to_riddle_for_core with range disabled" do
+    before :each do
+      ThinkingSphinx::Field.new(
+        @source, ThinkingSphinx::Index::FauxColumn.new(:first_name)
+      )
+    end
+    
+    describe "set per-index" do
+      before :each do
+        @index.local_options[:disable_range] = true
+        @riddle = @source.to_riddle_for_core(1, 0)
+      end
+      
+      it "should not have the range in the sql_query" do
+        @riddle.sql_query.should_not match(/`people`.`id` >= \$start/)
+        @riddle.sql_query.should_not match(/`people`.`id` <= \$end/)
+      end
+    
+      it "should not have a sql_query_range" do
+        @riddle.sql_query_range.should be_nil
+      end
+    end
+    
+    describe "set globally" do
+      before :each do
+        ThinkingSphinx::Configuration.instance.index_options[:disable_range] = true
+        @riddle = @source.to_riddle_for_core(1, 0)
+      end
+      
+      it "should not have the range in the sql_query" do
+        @riddle.sql_query.should_not match(/`people`.`id` >= \$start/)
+        @riddle.sql_query.should_not match(/`people`.`id` <= \$end/)
+      end
+    
+      it "should not have a sql_query_range" do
+        @riddle.sql_query_range.should be_nil
+      end
+    end
+  end
+end

data/spec/{unit → lib}/thinking_sphinx_spec.rb

@@ -51,15 +51,33 @@ describe ThinkingSphinx do
     ThinkingSphinx.updates_enabled?.should be_true
   end
   
+  it "should always say Sphinx is running if flagged as being on a remote machine" do
+    ThinkingSphinx.remote_sphinx = true
+    ThinkingSphinx.stub_method(:sphinx_running_by_pid? => false)
+    
+    ThinkingSphinx.sphinx_running?.should be_true
+  end
+  
+  it "should actually pay attention to Sphinx if not on a remote machine" do
+    ThinkingSphinx.remote_sphinx = false
+    ThinkingSphinx.stub_method(:sphinx_running_by_pid? => false)
+    ThinkingSphinx.sphinx_running?.should be_false
+    
+    ThinkingSphinx.stub_method(:sphinx_running_by_pid? => true)
+    ThinkingSphinx.sphinx_running?.should be_true
+  end
+  
   describe "use_group_by_shortcut? method" do
     before :each do
-      unless ::ActiveRecord::ConnectionAdapters.const_defined?(:MysqlAdapter)
+      adapter = defined?(JRUBY_VERSION) ? :JdbcAdapter : :MysqlAdapter
+      unless ::ActiveRecord::ConnectionAdapters.const_defined?(adapter)
         pending "No MySQL"
         return
       end
       
-      @connection = ::ActiveRecord::ConnectionAdapters::MysqlAdapter.stub_instance(
-        :select_all => true
+      @connection = ::ActiveRecord::ConnectionAdapters.const_get(adapter).stub_instance(
+        :select_all => true,
+        :config => {:adapter => defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql'}
       )
       ::ActiveRecord::Base.stub_method(
         :connection => @connection
@@ -103,12 +121,16 @@ describe ThinkingSphinx do
     
     describe "if not using MySQL" do
       before :each do
-        unless ::ActiveRecord::ConnectionAdapters.const_defined?(:PostgreSQLAdapter)
+        adapter = defined?(JRUBY_VERSION) ? 'JdbcAdapter' : 'PostgreSQLAdapter'
+        unless ::ActiveRecord::ConnectionAdapters.const_defined?(adapter)
           pending "No PostgreSQL"
           return
         end
-        @connection = ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.stub_instance(
-          :select_all => true
+        
+        @connection = stub(adapter).as_null_object
+        @connection.stub!(
+          :select_all => true,
+          :config => {:adapter => defined?(JRUBY_VERSION) ? 'jdbcpostgresql' : 'postgresql'}
         )
         ::ActiveRecord::Base.stub_method(
           :connection => @connection
@@ -120,9 +142,9 @@ describe ThinkingSphinx do
       end
     
       it "should not call select_all" do
-        ThinkingSphinx.use_group_by_shortcut?
+        @connection.should_not_receive(:select_all)
         
-        @connection.should_not have_received(:select_all)
+        ThinkingSphinx.use_group_by_shortcut?
       end
     end
   end

data/tasks/distribution.rb

@@ -27,13 +27,32 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "thinking-sphinx"
   s.test_files        = FileList["spec/**/*_spec.rb"]
   s.files             = FileList[
+    "rails/*.rb",
     "lib/**/*.rb",
     "LICENCE",
-    "README",
+    "README.textile",
     "tasks/**/*.rb",
     "tasks/**/*.rake",
     "vendor/**/*"
   ]
+  s.post_install_message = <<-MESSAGE
+With the release of Thinking Sphinx 1.1.18, there is one important change to
+note: previously, the default morphology for indexing was 'stem_en'. The new
+default is nil, to avoid any unexpected behavior. If you wish to keep the old
+value though, you will need to add the following settings to your
+config/sphinx.yml file:
+
+development:
+  morphology: stem_en
+test:
+  morphology: stem_en
+production:
+  morphology: stem_en
+
+To understand morphologies/stemmers better, visit the following link:
+http://www.sphinxsearch.com/docs/manual-0.9.8.html#conf-morphology
+
+MESSAGE
 end
 
 Rake::GemPackageTask.new(spec) do |p|

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

data/vendor/after_commit/init.rb

@@ -3,3 +3,6 @@ ActiveRecord::Base.send(:include, AfterCommit::ActiveRecord)
 Object.subclasses_of(ActiveRecord::ConnectionAdapters::AbstractAdapter).each do |klass|
   klass.send(:include, AfterCommit::ConnectionAdapters)
 end
+if defined?(JRUBY_VERSION) and defined?(JdbcSpec::MySQL)
+  JdbcSpec::MySQL.send :include, AfterCommit::ConnectionAdapters
+end

data/vendor/after_commit/lib/after_commit/active_record.rb

@@ -71,19 +71,42 @@ module AfterCommit
         # after_commit callback can be made from the ConnectionAdapters when
         # the commit for the transaction has finally succeeded. 
         def after_commit_callback
-          callback(:after_commit)
+          call_after_commit_callback :after_commit
         end
         
         def after_commit_on_create_callback
-          callback(:after_commit_on_create)
+          call_after_commit_callback :after_commit_on_create
         end
         
         def after_commit_on_update_callback
-          callback(:after_commit_on_update)
+          call_after_commit_callback :after_commit_on_update
         end
         
         def after_commit_on_destroy_callback
-          callback(:after_commit_on_destroy)
+          call_after_commit_callback :after_commit_on_destroy
+        end
+        
+        private
+        
+        def call_after_commit_callback(call)
+          if can_call_after_commit call
+            callback call
+            clear_after_commit_call call
+          end
+        end
+        
+        def can_call_after_commit(call)
+          @calls ||= {}
+          @calls[call] ||= false
+          if @calls[call]
+            return false
+          else
+            @calls[call] = true
+          end
+        end
+        
+        def clear_after_commit_call(call)
+          @calls[call] = false
         end
       end
     end

data/vendor/after_commit/lib/after_commit/connection_adapters.rb

@@ -7,7 +7,7 @@ module AfterCommit
         # override it so that after this happens, any records that were saved
         # or destroyed within this transaction now get their after_commit
         # callback fired.
-        def commit_db_transaction_with_callback          
+        def commit_db_transaction_with_callback
           commit_db_transaction_without_callback
           trigger_after_commit_callbacks
           trigger_after_commit_on_create_callbacks

data/vendor/after_commit/lib/after_commit.rb

@@ -39,4 +39,7 @@ ActiveRecord::Base.send(:include, AfterCommit::ActiveRecord)
 
 Object.subclasses_of(ActiveRecord::ConnectionAdapters::AbstractAdapter).each do |klass|
   klass.send(:include, AfterCommit::ConnectionAdapters)
-end
+end
+if defined?(JRUBY_VERSION) and defined?(JdbcSpec::MySQL)
+  JdbcSpec::MySQL.send :include, AfterCommit::ConnectionAdapters
+end

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

@@ -10,14 +10,15 @@ module Riddle
       
       # Append raw data (only use if you know what you're doing)
       def append(*args)
-        return if args.length == 0
-        
         args.each { |arg| @message << arg }
       end
       
       # Append a string's length, then the string itself
       def append_string(str)
-        @message << [str.send(@size_method)].pack('N') + str
+        string = string.respond_to?(:force_encoding) ?
+          str.force_encoding('ASCII-8BIT') : str
+        
+        @message << [string.send(@size_method)].pack('N') + string
       end
       
       # Append an integer

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

@@ -437,6 +437,9 @@ module Riddle
       version  = 0
       length   = 0
       message  = Array(messages).join("")
+      if message.respond_to?(:force_encoding)
+        message = message.force_encoding('ASCII-8BIT')
+      end
           
       connect do |socket|
         case command

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

@@ -21,7 +21,7 @@ module Riddle
             conf = "  #{setting} = "
           else
             conf = setting_to_array(setting).collect { |set|
-              "  #{setting} = #{set}"  
+              "  #{setting} = #{set}"
             }
           end
           conf.length == 0 ? nil : conf
@@ -30,7 +30,13 @@ module Riddle
       
       def setting_to_array(setting)
         value = send(setting)
-        value.is_a?(Array) ? value : [value]
+        case value
+        when Array      then value
+        when TrueClass  then [1]
+        when FalseClass then [0]
+        else
+          [value]
+        end
       end
     end
   end

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

@@ -10,7 +10,7 @@ module Riddle
       cmd << " --rotate" if running?
       `#{cmd}`
     end
-    
+
     def start
       return if running?
 

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