thinking-sphinx 1.2.13 → 1.4.0

data/VERSION.yml

@@ -1,5 +0,0 @@
---- 
-:patch: 13
-:major: 1
-:build: 
-:minor: 2

data/features/datetime_deltas.feature

@@ -1,66 +0,0 @@
-Feature: Datetime Delta Indexing
-  In order to have delta indexing on frequently-updated sites
-  Developers
-  Should be able to use an existing datetime column to track changes
-  
-  Scenario: Delta Index should not fire automatically
-    Given Sphinx is running
-    And I am searching on thetas
-    When I search for one
-    Then I should get 1 result
-  
-    When I change the name of theta one to eleven
-    And I wait for Sphinx to catch up
-    And I search for one
-    Then I should get 1 result
-    
-    When I search for eleven
-    Then I should get 0 results
-  
-  Scenario: Delta Index should fire when jobs are run
-    Given Sphinx is running
-    And I am searching on thetas
-    When I search for two
-    Then I should get 1 result
-  
-    When I change the name of theta two to twelve
-    And I wait for Sphinx to catch up
-    And I search for twelve
-    Then I should get 0 results
-    
-    When I index the theta datetime delta
-    And I wait for Sphinx to catch up
-    And I search for twelve
-    Then I should get 1 result
-    
-    When I search for two
-    Then I should get 0 results
-  
-  Scenario: New records should be merged into the core index
-    Given Sphinx is running
-    And I am searching on thetas
-    When I search for thirteen
-    Then I should get 0 results
-    
-    When I create a new theta named thirteen
-    And I search for thirteen
-    Then I should get 0 results
-    
-    When I index the theta datetime delta
-    And I wait for Sphinx to catch up
-    And I search for thirteen
-    Then I should get 1 result
-    
-    When I search for the document id of theta thirteen in the theta_core index
-    Then it should exist
-  
-  Scenario: Deleting records
-    Given Sphinx is running
-    And I am searching on thetas
-    When I search for three
-    Then I should get 1 result
-    
-    When I delete the theta named three
-    And I wait for Sphinx to catch up
-    And I search for three
-    Then I should get 0 results

data/features/delayed_delta_indexing.feature

@@ -1,37 +0,0 @@
-Feature: Delayed Delta Indexing
-  In order to have delta indexing on frequently-updated sites
-  Developers
-  Should be able to use delayed_job to handle delta indexes to lower system load
-  
-  Scenario: Delta Index should not fire automatically
-    Given Sphinx is running
-    And I am searching on delayed betas
-    When I search for one
-    Then I should get 1 result
-  
-    When I change the name of delayed beta one to eleven
-    And I wait for Sphinx to catch up
-    And I search for one
-    Then I should get 1 result
-    
-    When I search for eleven
-    Then I should get 0 results
-  
-  Scenario: Delta Index should fire when jobs are run
-    Given Sphinx is running
-    And I am searching on delayed betas
-    When I search for one
-    Then I should get 1 result
-  
-    When I change the name of delayed beta two to twelve
-    And I wait for Sphinx to catch up
-    And I search for twelve
-    Then I should get 0 results
-    
-    When I run the delayed jobs
-    And I wait for Sphinx to catch up
-    And I search for twelve
-    Then I should get 1 result
-    
-    When I search for two
-    Then I should get 0 results

data/features/step_definitions/datetime_delta_steps.rb

@@ -1,15 +0,0 @@
-When /^I index the theta datetime delta$/ do
-  Theta.sphinx_indexes.first.delta_object.delayed_index(Theta)
-end
-
-When /^I change the name of theta (\w+) to (\w+)$/ do |current, replacement|
-  Theta.find_by_name(current).update_attributes(:name => replacement)
-end
-
-When /^I create a new theta named (\w+)$/ do |name|
-  Theta.create(:name => name)
-end
-
-When /^I delete the theta named (\w+)$/ do |name|
-  Theta.find_by_name(name).destroy
-end

data/features/step_definitions/delayed_delta_indexing_steps.rb

@@ -1,7 +0,0 @@
-When /^I run the delayed jobs$/ do
-  Delayed::Job.work_off.inspect
-end
-
-When /^I change the name of delayed beta (\w+) to (\w+)$/ do |current, replacement|
-  DelayedBeta.find_by_name(current).update_attributes(:name => replacement)
-end

data/features/support/database.yml

@@ -1,5 +0,0 @@
-username: thinking_sphinx
-host: localhost
-password: thinking_sphinx
-pool: 1
-min_messages: warning

data/features/support/db/active_record.rb

@@ -1,40 +0,0 @@
-require 'yaml'
-require 'active_record'
-
-# Database Defaults
-host     = "localhost"
-username = "thinking_sphinx"
-password = nil
-
-# Read in YAML file
-if File.exist?("features/support/db/database.yml")
-  config    = YAML.load open("features/support/db/database.yml")
-  host      = config["host"]     || host
-  username  = config["username"] || username
-  password  = config["password"] || password
-end
-
-# Set up Connection
-ActiveRecord::Base.establish_connection(
-  :adapter  => Database,
-  :database => 'thinking_sphinx',
-  :username => username,
-  :password => password,
-  :host     => host
-)
-
-# Copied from ActiveRecord's test suite
-ActiveRecord::Base.connection.class.class_eval do
-  IGNORED_SQL = [
-    /^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/,
-    /^SELECT @@ROWCOUNT/, /^SHOW FIELDS/
-  ]
-
-  def execute_with_query_record(sql, name = nil, &block)
-    $queries_executed ||= []
-    $queries_executed << sql unless IGNORED_SQL.any? { |r| sql =~ r }
-    execute_without_query_record(sql, name, &block)
-  end
-
-  alias_method_chain :execute, :query_record
-end

data/features/support/db/database.yml

@@ -1,5 +0,0 @@
-adapter: mysql
-username: thinking_sphinx
-host: localhost
-password: thinking_sphinx
-pool: 1

data/features/support/db/fixtures/delayed_betas.rb

@@ -1,10 +0,0 @@
-DelayedBeta.create :name => "one"
-DelayedBeta.create :name => "two"
-DelayedBeta.create :name => "three"
-DelayedBeta.create :name => "four"
-DelayedBeta.create :name => "five"
-DelayedBeta.create :name => "six"
-DelayedBeta.create :name => "seven"
-DelayedBeta.create :name => "eight"
-DelayedBeta.create :name => "nine"
-DelayedBeta.create :name => "ten"

data/features/support/db/fixtures/thetas.rb

@@ -1,10 +0,0 @@
-Theta.create :name => "one"
-Theta.create :name => "two"
-Theta.create :name => "three"
-Theta.create :name => "four"
-Theta.create :name => "five"
-Theta.create :name => "six"
-Theta.create :name => "seven"
-Theta.create :name => "eight"
-Theta.create :name => "nine"
-Theta.create :name => "ten"

data/features/support/db/migrations/create_delayed_betas.rb

@@ -1,17 +0,0 @@
-ActiveRecord::Base.connection.create_table :delayed_betas, :force => true do |t|
-  t.column  :name, :string,  :null => false
-  t.column :delta, :boolean, :null => false, :default => false
-end
-
-ActiveRecord::Base.connection.create_table :delayed_jobs, :force => true do |t|
-  t.column :priority, :integer, :default => 0
-  t.column :attempts, :integer, :default => 0
-  t.column :handler, :text
-  t.column :last_error, :string
-  t.column :run_at, :datetime
-  t.column :locked_at, :datetime
-  t.column :failed_at, :datetime
-  t.column :locked_by, :string
-  t.column :created_at, :datetime
-  t.column :updated_at, :datetime
-end

data/features/support/db/migrations/create_thetas.rb

@@ -1,5 +0,0 @@
-ActiveRecord::Base.connection.create_table :thetas, :force => true do |t|
-  t.column :name,       :string,    :null => false
-  t.column :created_at, :datetime,  :null => false
-  t.column :updated_at, :datetime,  :null => false
-end

data/features/support/db/mysql.rb

@@ -1,3 +0,0 @@
-require 'active_record'
-Database = defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql'
-require "active_record/connection_adapters/#{Database}_adapter"

data/features/support/db/postgresql.rb

@@ -1,3 +0,0 @@
-require 'active_record'
-Database = defined?(JRUBY_VERSION) ? 'jdbcpostgresql' : 'postgresql'
-require "active_record/connection_adapters/#{Database}_adapter"

data/features/support/models/alpha.rb

@@ -1,10 +0,0 @@
-class Alpha < ActiveRecord::Base
-  define_index do
-    indexes :name, :sortable => true
-    
-    has value, created_at, created_on
-    has cost, :facet => true
-    
-    set_property :field_weights => {"name" => 10}
-  end
-end

data/features/support/models/delayed_beta.rb

@@ -1,7 +0,0 @@
-class DelayedBeta < ActiveRecord::Base
-  define_index do
-    indexes :name, :sortable => true
-    
-    set_property :delta => :delayed
-  end
-end

data/features/support/models/theta.rb

@@ -1,7 +0,0 @@
-class Theta < ActiveRecord::Base
-  define_index do
-    indexes :name, :sortable => true
-    
-    set_property :delta => :datetime, :threshold => 1.hour
-  end
-end

data/features/support/post_database.rb

@@ -1,43 +0,0 @@
-$:.unshift File.dirname(__FILE__) + '/../../lib'
-
-require 'lib/thinking_sphinx'
-
-%w( tmp/config tmp/log tmp/db/sphinx/development ).each do |path|
-  FileUtils.mkdir_p "#{Dir.pwd}/#{path}"
-end
-
-Kernel.const_set :RAILS_ROOT, "#{Dir.pwd}/tmp" unless defined?(RAILS_ROOT)
-
-at_exit do
-  ThinkingSphinx::Configuration.instance.controller.stop
-  sleep(1) # Ensure Sphinx has shut down completely
-  ActiveRecord::Base.logger.close
-  FileUtils.rm_r "#{Dir.pwd}/tmp"
-end
-
-# Add log file
-ActiveRecord::Base.logger = Logger.new open("tmp/active_record.log", "a")
-
-# Set up database tables
-Dir["features/support/db/migrations/*.rb"].each do |file|
-  require file.gsub(/\.rb$/, '')
-end
-
-# Load Models
-Dir["features/support/models/*.rb"].sort.each do |file|
-  require file.gsub(/\.rb$/, '')
-end
-
-ThinkingSphinx.deltas_enabled = false
-
-# Load Fixtures
-Dir["features/support/db/fixtures/*.rb"].each do |file|
-  require file.gsub(/\.rb$/, '')
-end
-
-ThinkingSphinx.deltas_enabled = true
-ThinkingSphinx.suppress_delta_output = true
-
-ThinkingSphinx::Configuration.instance.build
-ThinkingSphinx::Configuration.instance.controller.index
-ThinkingSphinx::Configuration.instance.controller.start

data/lib/thinking_sphinx/deltas/datetime_delta.rb

@@ -1,50 +0,0 @@
-module ThinkingSphinx
-  module Deltas
-    class DatetimeDelta < ThinkingSphinx::Deltas::DefaultDelta
-      attr_accessor :column, :threshold
-      
-      def initialize(index, options)
-        @index      = index
-        @column     = options.delete(:delta_column) || :updated_at
-        @threshold  = options.delete(:threshold)    || 1.day
-      end
-      
-      def index(model, instance = nil)
-        # do nothing
-        true
-      end
-      
-      def delayed_index(model)
-        config = ThinkingSphinx::Configuration.instance
-        rotate = ThinkingSphinx.sphinx_running? ? "--rotate" : ""
-        
-        output = `#{config.bin_path}#{config.indexer_binary_name} --config #{config.config_file} #{rotate} #{delta_index_name model}`
-        output += `#{config.bin_path}#{config.indexer_binary_name} --config #{config.config_file} #{rotate} --merge #{core_index_name model} #{delta_index_name model} --merge-dst-range sphinx_deleted 0 0`
-        puts output unless ThinkingSphinx.suppress_delta_output?
-        
-        true
-      end
-            
-      def toggle(instance)
-        # do nothing
-      end
-      
-      def toggled(instance)
-        instance.send(@column) > @threshold.ago
-      end
-      
-      def reset_query(model)
-        nil
-      end
-      
-      def clause(model, toggled)
-        if toggled
-          "#{model.quoted_table_name}.#{model.connection.quote_column_name(@column.to_s)}" +
-          " > #{adapter.time_difference(@threshold)}"
-        else
-          nil
-        end
-      end
-    end
-  end
-end

data/lib/thinking_sphinx/deltas/delayed_delta/delta_job.rb

@@ -1,24 +0,0 @@
-module ThinkingSphinx
-  module Deltas
-    class DeltaJob
-      attr_accessor :index
-      
-      def initialize(index)
-        @index = index
-      end
-      
-      def perform
-        return true unless ThinkingSphinx.updates_enabled? &&
-          ThinkingSphinx.deltas_enabled?
-        
-        config = ThinkingSphinx::Configuration.instance
-        client = Riddle::Client.new config.address, config.port
-        
-        output = `#{config.bin_path}#{config.indexer_binary_name} --config #{config.config_file} --rotate #{index}`
-        puts output unless ThinkingSphinx.suppress_delta_output?
-        
-        true
-      end
-    end
-  end
-end

data/lib/thinking_sphinx/deltas/delayed_delta/flag_as_deleted_job.rb

@@ -1,27 +0,0 @@
-module ThinkingSphinx
-  module Deltas
-    class FlagAsDeletedJob
-      attr_accessor :index, :document_id
-      
-      def initialize(index, document_id)
-        @index, @document_id = index, document_id
-      end
-      
-      def perform
-        return true unless ThinkingSphinx.updates_enabled?
-        
-        config = ThinkingSphinx::Configuration.instance
-        client = Riddle::Client.new config.address, config.port
-        
-        client.update(
-          @index,
-          ['sphinx_deleted'],
-          {@document_id => [1]}
-        ) if ThinkingSphinx.sphinx_running? &&
-          ThinkingSphinx::Search.search_for_id(@document_id, @index)
-        
-        true
-      end
-    end
-  end
-end

data/lib/thinking_sphinx/deltas/delayed_delta/job.rb

@@ -1,26 +0,0 @@
-module ThinkingSphinx
-  module Deltas
-    class Job < Delayed::Job
-      def self.enqueue(object, priority = 0)
-        super unless duplicates_exist(object)
-      end
-      
-      def self.cancel_thinking_sphinx_jobs
-        if connection.tables.include?("delayed_jobs")
-          delete_all("handler LIKE '--- !ruby/object:ThinkingSphinx::Deltas::%'")
-        end
-      end
-
-      private
-
-      def self.duplicates_exist(object)
-        count(
-          :conditions => {
-            :handler    => object.to_yaml,
-            :locked_at  => nil
-          }
-        ) > 0
-      end
-    end
-  end
-end

data/lib/thinking_sphinx/deltas/delayed_delta.rb

@@ -1,30 +0,0 @@
-require 'delayed/job'
-
-require 'thinking_sphinx/deltas/delayed_delta/delta_job'
-require 'thinking_sphinx/deltas/delayed_delta/flag_as_deleted_job'
-require 'thinking_sphinx/deltas/delayed_delta/job'
-
-module ThinkingSphinx
-  module Deltas
-    class DelayedDelta < ThinkingSphinx::Deltas::DefaultDelta
-      def index(model, instance = nil)
-        return true unless ThinkingSphinx.updates_enabled? && ThinkingSphinx.deltas_enabled?
-        return true if instance && !toggled(instance)
-      
-        ThinkingSphinx::Deltas::Job.enqueue(
-          ThinkingSphinx::Deltas::DeltaJob.new(delta_index_name(model)),
-          ThinkingSphinx::Configuration.instance.delayed_job_priority
-        )
-        
-        Delayed::Job.enqueue(
-          ThinkingSphinx::Deltas::FlagAsDeletedJob.new(
-            core_index_name(model), instance.sphinx_document_id
-          ),
-          ThinkingSphinx::Configuration.instance.delayed_job_priority
-        ) if instance
-        
-        true
-      end
-    end
-  end
-end

data/spec/lib/thinking_sphinx/active_record/scopes_spec.rb

@@ -1,96 +0,0 @@
-require 'spec/spec_helper'
-
-describe ThinkingSphinx::ActiveRecord::Scopes do
-  after :each do
-    Alpha.remove_sphinx_scopes
-  end
-  
-  it "should be included into models with indexes" do
-    Alpha.included_modules.should include(ThinkingSphinx::ActiveRecord::Scopes)
-  end
-  
-  it "should not be included into models without indexes" do
-    Gamma.included_modules.should_not include(
-      ThinkingSphinx::ActiveRecord::Scopes
-    )
-  end
-  
-  describe '.sphinx_scope' do
-    before :each do
-      Alpha.sphinx_scope(:by_name) { |name| {:conditions => {:name => name}} }
-    end
-    
-    it "should define a method on the model" do
-      Alpha.should respond_to(:by_name)
-    end
-  end
-  
-  describe '.sphinx_scopes' do
-    before :each do
-      Alpha.sphinx_scope(:by_name) { |name| {:conditions => {:name => name}} }
-    end
-    
-    it "should return an array of defined scope names as symbols" do
-      Alpha.sphinx_scopes.should == [:by_name]
-    end
-  end
-  
-  describe '.remove_sphinx_scopes' do
-    before :each do
-      Alpha.sphinx_scope(:by_name) { |name| {:conditions => {:name => name}} }
-      Alpha.remove_sphinx_scopes
-    end
-    
-    it "should remove sphinx scope methods" do
-      Alpha.should_not respond_to(:by_name)
-    end
-    
-    it "should empty the list of sphinx scopes" do
-      Alpha.sphinx_scopes.should be_empty
-    end
-  end
-  
-  describe '.example_scope' do
-    before :each do
-      Alpha.sphinx_scope(:by_name) { |name| {:conditions => {:name => name}} }
-      Alpha.sphinx_scope(:by_foo)  { |foo|  {:conditions => {:foo  => foo}}  }
-      Alpha.sphinx_scope(:with_betas) { {:classes => [Beta]} }
-    end
-    
-    it "should return a ThinkingSphinx::Search object" do
-      Alpha.by_name('foo').should be_a(ThinkingSphinx::Search)
-    end
-    
-    it "should set the classes option" do
-      Alpha.by_name('foo').options[:classes].should == [Alpha]
-    end
-    
-    it "should be able to be called on a ThinkingSphinx::Search object" do
-      search = ThinkingSphinx::Search.new(:classes => [Alpha])
-      lambda {
-        search.by_name('foo')
-      }.should_not raise_error
-    end
-    
-    it "should return the search object it gets called upon" do
-      search = ThinkingSphinx::Search.new(:classes => [Alpha])
-      search.by_name('foo').should == search
-    end
-    
-    it "should apply the scope options to the underlying search object" do
-      search = ThinkingSphinx::Search.new(:classes => [Alpha])
-      search.by_name('foo').options[:conditions].should == {:name => 'foo'}
-    end
-    
-    it "should combine hash option scopes such as :conditions" do
-      search = ThinkingSphinx::Search.new(:classes => [Alpha])
-      search.by_name('foo').by_foo('bar').options[:conditions].
-        should == {:name => 'foo', :foo => 'bar'}
-    end
-    
-    it "should combine array option scopes such as :classes" do
-      search = ThinkingSphinx::Search.new(:classes => [Alpha])
-      search.with_betas.options[:classes].should == [Alpha, Beta]
-    end
-  end
-end