thinking-sphinx-099 1.2.13 → 1.3.0

data/VERSION.yml

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

data/features/searching_across_models.feature

@@ -17,4 +17,4 @@ Feature: Searching across multiple model
   Scenario: Retrieving results from multiple models
     Given Sphinx is running
     When I search for ten
-    Then I should get 6 results
+    Then I should get 4 results

data/features/step_definitions/common_steps.rb

@@ -1,6 +1,5 @@
 Before do
   $queries_executed = []
-  ThinkingSphinx::Deltas::Job.cancel_thinking_sphinx_jobs
   
   @model      = nil
   @method     = :search

data/lib/thinking_sphinx/deltas.rb

@@ -1,6 +1,4 @@
 require 'thinking_sphinx/deltas/default_delta'
-require 'thinking_sphinx/deltas/delayed_delta'
-require 'thinking_sphinx/deltas/datetime_delta'
 
 module ThinkingSphinx
   module Deltas

data/lib/thinking_sphinx/tasks.rb

@@ -65,14 +65,12 @@ namespace :thinking_sphinx do
   
   desc "Index data for Sphinx using Thinking Sphinx's settings"
   task :index => :app_env do
-    ThinkingSphinx::Deltas::Job.cancel_thinking_sphinx_jobs
-    
     config = ThinkingSphinx::Configuration.instance
     unless ENV["INDEX_ONLY"] == "true"
       puts "Generating Configuration to #{config.config_file}"
       config.build
     end
-        
+    
     FileUtils.mkdir_p config.searchd_file_path
     cmd = "#{config.bin_path}#{config.indexer_binary_name} --config \"#{config.config_file}\" --all"
     cmd << " --rotate" if sphinx_running?
@@ -86,30 +84,6 @@ namespace :thinking_sphinx do
     Rake::Task["thinking_sphinx:index"].invoke
     Rake::Task["thinking_sphinx:start"].invoke
   end
-  
-  namespace :index do
-    task :delta => :app_env do
-      ThinkingSphinx.indexed_models.select { |model|
-        model.constantize.sphinx_indexes.any? { |index| index.delta? }
-      }.each do |model|
-        model.constantize.sphinx_indexes.select { |index|
-          index.delta? && index.delta_object.respond_to?(:delayed_index)
-        }.each { |index|
-          index.delta_object.delayed_index(index.model)
-        }
-      end
-    end
-  end
-  
-  desc "Process stored delta index requests"
-  task :delayed_delta => :app_env do
-    require 'delayed/worker'
-    
-    Delayed::Worker.new(
-      :min_priority => ENV['MIN_PRIORITY'],
-      :max_priority => ENV['MAX_PRIORITY']
-    ).start
-  end
 end
 
 namespace :ts do
@@ -123,10 +97,6 @@ namespace :ts do
   task :stop    => "thinking_sphinx:stop"
   desc "Index data for Sphinx using Thinking Sphinx's settings"
   task :in      => "thinking_sphinx:index"
-  namespace :in do
-    desc "Index Thinking Sphinx datetime delta indexes"
-    task :delta => "thinking_sphinx:index:delta"
-  end
   task :index   => "thinking_sphinx:index"
   desc "Restart Sphinx"
   task :restart => "thinking_sphinx:restart"
@@ -136,8 +106,6 @@ namespace :ts do
   task :config  => "thinking_sphinx:configure"
   desc "Stop Sphinx (if it's running), rebuild the indexes, and start Sphinx"
   task :rebuild => "thinking_sphinx:rebuild"
-  desc "Process stored delta index requests"
-  task :dd      => "thinking_sphinx:delayed_delta"
 end
 
 def sphinx_pid

data/spec/lib/thinking_sphinx_spec.rb

@@ -93,6 +93,10 @@ describe ThinkingSphinx do
       ::ActiveRecord::Base.stub!(
         :connection => @connection
       )
+      
+      ThinkingSphinx.module_eval do
+        class_variable_set :@@use_group_by_shortcut, nil
+      end
     end
     
     it "should return true if no ONLY_FULL_GROUP_BY" do

data/tasks/distribution.rb

@@ -33,21 +33,8 @@ Jeweler::Tasks.new do |gem|
   gem.add_dependency 'activerecord', '>= 1.15.6'
   
   gem.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
+If you're upgrading, you should read this:
+http://freelancing-god.github.com/ts/en/upgrading.html
 
 MESSAGE
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx-099
 version: !ruby/object:Gem::Version 
-  version: 1.2.13
+  version: 1.3.0
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-01 00:00:00 +11:00
+date: 2009-11-04 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,12 +52,7 @@ files:
 - lib/thinking_sphinx/core/array.rb
 - lib/thinking_sphinx/core/string.rb
 - lib/thinking_sphinx/deltas.rb
-- lib/thinking_sphinx/deltas/datetime_delta.rb
 - lib/thinking_sphinx/deltas/default_delta.rb
-- lib/thinking_sphinx/deltas/delayed_delta.rb
-- lib/thinking_sphinx/deltas/delayed_delta/delta_job.rb
-- lib/thinking_sphinx/deltas/delayed_delta/flag_as_deleted_job.rb
-- lib/thinking_sphinx/deltas/delayed_delta/job.rb
 - lib/thinking_sphinx/deploy/capistrano.rb
 - lib/thinking_sphinx/excerpter.rb
 - lib/thinking_sphinx/facet.rb
@@ -86,10 +81,6 @@ files:
 - vendor/after_commit/lib/after_commit/active_record.rb
 - vendor/after_commit/lib/after_commit/connection_adapters.rb
 - vendor/after_commit/test/after_commit_test.rb
-- vendor/delayed_job/lib/delayed/job.rb
-- vendor/delayed_job/lib/delayed/message_sending.rb
-- vendor/delayed_job/lib/delayed/performable_method.rb
-- vendor/delayed_job/lib/delayed/worker.rb
 - vendor/riddle/lib/riddle.rb
 - vendor/riddle/lib/riddle/client.rb
 - vendor/riddle/lib/riddle/client/filter.rb
@@ -111,21 +102,8 @@ homepage: http://ts.freelancing-gods.com
 licenses: []
 
 post_install_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
+  If you're upgrading, you should read this:
+  http://freelancing-god.github.com/ts/en/upgrading.html
   
 rdoc_options: 
 - --charset=UTF-8
@@ -154,8 +132,6 @@ test_files:
 - features/alternate_primary_key.feature
 - features/attribute_transformation.feature
 - features/attribute_updates.feature
-- features/datetime_deltas.feature
-- features/delayed_delta_indexing.feature
 - features/deleting_instances.feature
 - features/direct_attributes.feature
 - features/excerpts.feature
@@ -172,8 +148,6 @@ test_files:
 - features/step_definitions/alpha_steps.rb
 - features/step_definitions/beta_steps.rb
 - features/step_definitions/common_steps.rb
-- features/step_definitions/datetime_delta_steps.rb
-- features/step_definitions/delayed_delta_indexing_steps.rb
 - features/step_definitions/extensible_delta_indexing_steps.rb
 - features/step_definitions/facet_steps.rb
 - features/step_definitions/find_arguments_steps.rb
@@ -193,7 +167,6 @@ test_files:
 - features/support/db/fixtures/categories.rb
 - features/support/db/fixtures/cats.rb
 - features/support/db/fixtures/comments.rb
-- features/support/db/fixtures/delayed_betas.rb
 - features/support/db/fixtures/developers.rb
 - features/support/db/fixtures/dogs.rb
 - features/support/db/fixtures/extensible_betas.rb
@@ -202,7 +175,6 @@ test_files:
 - features/support/db/fixtures/posts.rb
 - features/support/db/fixtures/robots.rb
 - features/support/db/fixtures/tags.rb
-- features/support/db/fixtures/thetas.rb
 - features/support/db/migrations/create_alphas.rb
 - features/support/db/migrations/create_animals.rb
 - features/support/db/migrations/create_authors.rb
@@ -211,7 +183,6 @@ test_files:
 - features/support/db/migrations/create_boxes.rb
 - features/support/db/migrations/create_categories.rb
 - features/support/db/migrations/create_comments.rb
-- features/support/db/migrations/create_delayed_betas.rb
 - features/support/db/migrations/create_developers.rb
 - features/support/db/migrations/create_extensible_betas.rb
 - features/support/db/migrations/create_gammas.rb
@@ -220,7 +191,6 @@ test_files:
 - features/support/db/migrations/create_robots.rb
 - features/support/db/migrations/create_taggings.rb
 - features/support/db/migrations/create_tags.rb
-- features/support/db/migrations/create_thetas.rb
 - features/support/db/mysql.rb
 - features/support/db/postgresql.rb
 - features/support/env.rb
@@ -233,7 +203,6 @@ test_files:
 - features/support/models/cat.rb
 - features/support/models/category.rb
 - features/support/models/comment.rb
-- features/support/models/delayed_beta.rb
 - features/support/models/developer.rb
 - features/support/models/dog.rb
 - features/support/models/extensible_beta.rb
@@ -243,7 +212,6 @@ test_files:
 - features/support/models/robot.rb
 - features/support/models/tag.rb
 - features/support/models/tagging.rb
-- features/support/models/theta.rb
 - features/support/post_database.rb
 - spec/lib/thinking_sphinx/active_record/delta_spec.rb
 - spec/lib/thinking_sphinx/active_record/has_many_association_spec.rb
@@ -254,7 +222,6 @@ test_files:
 - spec/lib/thinking_sphinx/configuration_spec.rb
 - spec/lib/thinking_sphinx/core/array_spec.rb
 - spec/lib/thinking_sphinx/core/string_spec.rb
-- spec/lib/thinking_sphinx/deltas/job_spec.rb
 - spec/lib/thinking_sphinx/excerpter_spec.rb
 - spec/lib/thinking_sphinx/facet_search_spec.rb
 - spec/lib/thinking_sphinx/facet_spec.rb

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/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/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/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.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/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/spec/lib/thinking_sphinx/deltas/job_spec.rb

@@ -1,32 +0,0 @@
-require 'spec/spec_helper'
-
-describe ThinkingSphinx::Deltas::Job do
-  describe '.cancel_thinking_sphinx_jobs' do
-    before :each do
-      ThinkingSphinx::Deltas::Job.stub!(:delete_all => true)
-    end
-    
-    it "should not delete any rows if the delayed_jobs table does not exist" do
-      ThinkingSphinx::Deltas::Job.connection.stub!(:tables => [])
-      ThinkingSphinx::Deltas::Job.should_not_receive(:delete_all)
-      
-      ThinkingSphinx::Deltas::Job.cancel_thinking_sphinx_jobs
-    end
-    
-    it "should delete rows if the delayed_jobs table does exist" do
-      ThinkingSphinx::Deltas::Job.connection.stub!(:tables => ['delayed_jobs'])
-      ThinkingSphinx::Deltas::Job.should_receive(:delete_all)
-      
-      ThinkingSphinx::Deltas::Job.cancel_thinking_sphinx_jobs
-    end
-    
-    it "should delete only Thinking Sphinx jobs" do
-      ThinkingSphinx::Deltas::Job.connection.stub!(:tables => ['delayed_jobs'])
-      ThinkingSphinx::Deltas::Job.should_receive(:delete_all) do |sql|
-        sql.should match(/handler LIKE '--- !ruby\/object:ThinkingSphinx::Deltas::\%'/)
-      end
-      
-      ThinkingSphinx::Deltas::Job.cancel_thinking_sphinx_jobs
-    end
-  end
-end

data/vendor/delayed_job/lib/delayed/job.rb

@@ -1,251 +0,0 @@
-module Delayed
-
-  class DeserializationError < StandardError
-  end
-
-  class Job < ActiveRecord::Base
-    MAX_ATTEMPTS = 25
-    MAX_RUN_TIME = 4.hours
-    set_table_name :delayed_jobs
-
-    # By default failed jobs are destroyed after too many attempts.
-    # If you want to keep them around (perhaps to inspect the reason
-    # for the failure), set this to false.
-    cattr_accessor :destroy_failed_jobs
-    self.destroy_failed_jobs = true
-
-    # Every worker has a unique name which by default is the pid of the process.
-    # There are some advantages to overriding this with something which survives worker retarts:
-    # Workers can safely resume working on tasks which are locked by themselves. The worker will assume that it crashed before.
-    cattr_accessor :worker_name
-    self.worker_name = "host:#{Socket.gethostname} pid:#{Process.pid}" rescue "pid:#{Process.pid}"
-
-    NextTaskSQL         = '(run_at <= ? AND (locked_at IS NULL OR locked_at < ?) OR (locked_by = ?)) AND failed_at IS NULL'
-    NextTaskOrder       = 'priority DESC, run_at ASC'
-
-    ParseObjectFromYaml = /\!ruby\/\w+\:([^\s]+)/
-
-    cattr_accessor :min_priority, :max_priority
-    self.min_priority = nil
-    self.max_priority = nil
-
-    class LockError < StandardError
-    end
-
-    def self.clear_locks!
-      update_all("locked_by = null, locked_at = null", ["locked_by = ?", worker_name])
-    end
-
-    def failed?
-      failed_at
-    end
-    alias_method :failed, :failed?
-
-    def payload_object
-      @payload_object ||= deserialize(self['handler'])
-    end
-
-    def name
-      @name ||= begin
-        payload = payload_object
-        if payload.respond_to?(:display_name)
-          payload.display_name
-        else
-          payload.class.name
-        end
-      end
-    end
-
-    def payload_object=(object)
-      self['handler'] = object.to_yaml
-    end
-
-    def reschedule(message, backtrace = [], time = nil)
-      if self.attempts < MAX_ATTEMPTS
-        time ||= Job.db_time_now + (attempts ** 4) + 5
-
-        self.attempts    += 1
-        self.run_at       = time
-        self.last_error   = message + "\n" + backtrace.join("\n")
-        self.unlock
-        save!
-      else
-        logger.info "* [JOB] PERMANENTLY removing #{self.name} because of #{attempts} consequetive failures."
-        destroy_failed_jobs ? destroy : update_attribute(:failed_at, Time.now)
-      end
-    end
-
-    def self.enqueue(*args, &block)
-      object = block_given? ? EvaledJob.new(&block) : args.shift
-
-      unless object.respond_to?(:perform) || block_given?
-        raise ArgumentError, 'Cannot enqueue items which do not respond to perform'
-      end
-    
-      priority = args[0] || 0
-      run_at   = args[1]
-
-      Job.create(:payload_object => object, :priority => priority.to_i, :run_at => run_at)
-    end
-
-    def self.find_available(limit = 5, max_run_time = MAX_RUN_TIME)
-
-      time_now = db_time_now
-
-      sql = NextTaskSQL.dup
-
-      conditions = [time_now, time_now - max_run_time, worker_name]
-
-      if self.min_priority
-        sql << ' AND (priority >= ?)'
-        conditions << min_priority
-      end
-
-      if self.max_priority
-        sql << ' AND (priority <= ?)'
-        conditions << max_priority
-      end
-
-      conditions.unshift(sql)
-
-      records = ActiveRecord::Base.silence do
-        find(:all, :conditions => conditions, :order => NextTaskOrder, :limit => limit)
-      end
-
-      records.sort_by { rand() }
-    end
-
-    # Get the payload of the next job we can get an exclusive lock on.
-    # If no jobs are left we return nil
-    def self.reserve(max_run_time = MAX_RUN_TIME, &block)
-
-      # We get up to 5 jobs from the db. In face we cannot get exclusive access to a job we try the next.
-      # this leads to a more even distribution of jobs across the worker processes
-      find_available(5, max_run_time).each do |job|
-        begin
-          logger.info "* [JOB] aquiring lock on #{job.name}"
-          job.lock_exclusively!(max_run_time, worker_name)
-          runtime =  Benchmark.realtime do
-            invoke_job(job.payload_object, &block)
-            job.destroy
-          end
-          logger.info "* [JOB] #{job.name} completed after %.4f" % runtime
-
-          return job
-        rescue LockError
-          # We did not get the lock, some other worker process must have
-          logger.warn "* [JOB] failed to aquire exclusive lock for #{job.name}"
-        rescue StandardError => e
-          job.reschedule e.message, e.backtrace
-          log_exception(job, e)
-          return job
-        end
-      end
-
-      nil
-    end
-
-    # This method is used internally by reserve method to ensure exclusive access
-    # to the given job. It will rise a LockError if it cannot get this lock.
-    def lock_exclusively!(max_run_time, worker = worker_name)
-      now = self.class.db_time_now
-      affected_rows = if locked_by != worker
-        # We don't own this job so we will update the locked_by name and the locked_at
-        self.class.update_all(["locked_at = ?, locked_by = ?", now, worker], ["id = ? and (locked_at is null or locked_at < ?)", id, (now - max_run_time.to_i)])
-      else
-        # We already own this job, this may happen if the job queue crashes.
-        # Simply resume and update the locked_at
-        self.class.update_all(["locked_at = ?", now], ["id = ? and locked_by = ?", id, worker])
-      end
-      raise LockError.new("Attempted to aquire exclusive lock failed") unless affected_rows == 1
-
-      self.locked_at    = now
-      self.locked_by    = worker
-    end
-
-    def unlock
-      self.locked_at    = nil
-      self.locked_by    = nil
-    end
-
-    # This is a good hook if you need to report job processing errors in additional or different ways
-    def self.log_exception(job, error)
-      logger.error "* [JOB] #{job.name} failed with #{error.class.name}: #{error.message} - #{job.attempts} failed attempts"
-      logger.error(error)
-    end
-
-    def self.work_off(num = 100)
-      success, failure = 0, 0
-
-      num.times do
-        job = self.reserve do |j|
-          begin
-            j.perform
-            success += 1
-          rescue
-            failure += 1
-            raise
-          end
-        end
-
-        break if job.nil?
-      end
-
-      return [success, failure]
-    end
-
-    # Moved into its own method so that new_relic can trace it.
-    def self.invoke_job(job, &block)
-      block.call(job)
-    end
-
-  private
-
-    def deserialize(source)
-      handler = YAML.load(source) rescue nil
-
-      unless handler.respond_to?(:perform)
-        if handler.nil? && source =~ ParseObjectFromYaml
-          handler_class = $1
-        end
-        attempt_to_load(handler_class || handler.class)
-        handler = YAML.load(source)
-      end
-
-      return handler if handler.respond_to?(:perform)
-
-      raise DeserializationError,
-        'Job failed to load: Unknown handler. Try to manually require the appropiate file.'
-    rescue TypeError, LoadError, NameError => e
-      raise DeserializationError,
-        "Job failed to load: #{e.message}. Try to manually require the required file."
-    end
-
-    # Constantize the object so that ActiveSupport can attempt
-    # its auto loading magic. Will raise LoadError if not successful.
-    def attempt_to_load(klass)
-       klass.constantize
-    end
-
-    def self.db_time_now
-      (ActiveRecord::Base.default_timezone == :utc) ? Time.now.utc : Time.now
-    end
-
-  protected
-
-    def before_save
-      self.run_at ||= self.class.db_time_now
-    end
-
-  end
-
-  class EvaledJob
-    def initialize
-      @job = yield
-    end
-
-    def perform
-      eval(@job)
-    end
-  end
-end

data/vendor/delayed_job/lib/delayed/message_sending.rb

@@ -1,7 +0,0 @@
-module Delayed
-  module MessageSending
-    def send_later(method, *args)
-      Delayed::Job.enqueue Delayed::PerformableMethod.new(self, method.to_sym, args)
-    end
-  end
-end

data/vendor/delayed_job/lib/delayed/performable_method.rb

@@ -1,55 +0,0 @@
-module Delayed
-  class PerformableMethod < Struct.new(:object, :method, :args)
-    CLASS_STRING_FORMAT = /^CLASS\:([A-Z][\w\:]+)$/
-    AR_STRING_FORMAT    = /^AR\:([A-Z][\w\:]+)\:(\d+)$/
-
-    def initialize(object, method, args)
-      raise NoMethodError, "undefined method `#{method}' for #{self.inspect}" unless object.respond_to?(method)
-
-      self.object = dump(object)
-      self.args   = args.map { |a| dump(a) }
-      self.method = method.to_sym
-    end
-    
-    def display_name  
-      case self.object
-      when CLASS_STRING_FORMAT then "#{$1}.#{method}"
-      when AR_STRING_FORMAT    then "#{$1}##{method}"
-      else "Unknown##{method}"
-      end      
-    end    
-
-    def perform
-      load(object).send(method, *args.map{|a| load(a)})
-    rescue ActiveRecord::RecordNotFound
-      # We cannot do anything about objects which were deleted in the meantime
-      true
-    end
-
-    private
-
-    def load(arg)
-      case arg
-      when CLASS_STRING_FORMAT then $1.constantize
-      when AR_STRING_FORMAT    then $1.constantize.find($2)
-      else arg
-      end
-    end
-
-    def dump(arg)
-      case arg
-      when Class              then class_to_string(arg)
-      when ActiveRecord::Base then ar_to_string(arg)
-      else arg
-      end
-    end
-
-    def ar_to_string(obj)
-      "AR:#{obj.class}:#{obj.id}"
-    end
-
-    def class_to_string(obj)
-      "CLASS:#{obj.name}"
-    end
-  end
-end

data/vendor/delayed_job/lib/delayed/worker.rb

@@ -1,54 +0,0 @@
-module Delayed
-  class Worker
-    SLEEP = 5
-
-    cattr_accessor :logger
-    self.logger = if defined?(Merb::Logger)
-                    Merb.logger
-                  elsif defined?(RAILS_DEFAULT_LOGGER)
-                    RAILS_DEFAULT_LOGGER
-                  end
-
-    def initialize(options={})
-      @quiet = options[:quiet]
-      Delayed::Job.min_priority = options[:min_priority] if options.has_key?(:min_priority)
-      Delayed::Job.max_priority = options[:max_priority] if options.has_key?(:max_priority)
-    end
-
-    def start
-      say "*** Starting job worker #{Delayed::Job.worker_name}"
-
-      trap('TERM') { say 'Exiting...'; $exit = true }
-      trap('INT')  { say 'Exiting...'; $exit = true }
-
-      loop do
-        result = nil
-
-        realtime = Benchmark.realtime do
-          result = Delayed::Job.work_off
-        end
-
-        count = result.sum
-
-        break if $exit
-
-        if count.zero?
-          sleep(SLEEP)
-        else
-          say "#{count} jobs processed at %.4f j/s, %d failed ..." % [count / realtime, result.last]
-        end
-
-        break if $exit
-      end
-
-    ensure
-      Delayed::Job.clear_locks!
-    end
-
-    def say(text)
-      puts text unless @quiet
-      logger.info text if logger
-    end
-
-  end
-end