ts-delayed-delta 1.1.1 → 1.1.2

data/README.textile

@@ -52,7 +52,8 @@ h2. Contributors
 * "Edgars Beigarts":http://github.com/ebeigarts (Adding intelligent description for tasks)
 * "Alexander Simonov":http://simonov.me/ (Explicit table definition)
 * "David Goodlad":http://david.goodlad.ca/ (Delayed Job/ActiveRecord load order fix)
+* "Ben Hutton":http://www.benhutton.com/ (Delayed Job compatibility update)
 
 h2. Copyright
 
-Copyright (c) 2009 Pat Allan, and released under an MIT Licence.
+Copyright (c) 2009-2010 Pat Allan, and released under an MIT Licence.

data/features/support/env.rb

@@ -8,10 +8,10 @@ $:.unshift File.dirname(__FILE__) + '/../../lib'
 
 require 'cucumber/thinking_sphinx/internal_world'
 
-Time.zone_default = Time.__send__(:get_zone, 'Melbourne')
-ActiveRecord::Base.time_zone_aware_attributes = true
-ActiveRecord::Base.default_timezone = :utc
-
+# Time.zone_default = Time.__send__(:get_zone, 'Melbourne')
+# ActiveRecord::Base.time_zone_aware_attributes = true
+# ActiveRecord::Base.default_timezone = :utc
+# 
 world = Cucumber::ThinkingSphinx::InternalWorld.new
 world.configure_database
 

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

@@ -26,7 +26,7 @@ class ThinkingSphinx::Deltas::Job < Delayed::Backend::ActiveRecord::Job
   # @param [Integer] priority (0)
   # 
   def self.enqueue(object, priority = 0)
-    ::Delayed::Job.enqueue(object, priority) unless duplicates_exist(object)
+    ::Delayed::Job.enqueue(object, :priority => priority) unless duplicates_exist(object)
   end
   
   # Remove all Thinking Sphinx/Delayed Delta jobs from the queue. If the

data/lib/thinking_sphinx/deltas/delayed_delta.rb

@@ -43,7 +43,7 @@ class ThinkingSphinx::Deltas::DelayedDelta < ThinkingSphinx::Deltas::DefaultDelt
       ThinkingSphinx::Deltas::FlagAsDeletedJob.new(
         model.core_index_names, instance.sphinx_document_id
       ),
-      ThinkingSphinx::Configuration.instance.delayed_job_priority
+      :priority => ThinkingSphinx::Configuration.instance.delayed_job_priority
     ) if instance
     
     true

data/spec/spec_helper.rb

@@ -7,6 +7,8 @@ require 'spec/autorun'
 require 'thinking_sphinx'
 require 'thinking_sphinx/deltas/delayed_delta'
 
+Delayed::Worker.backend = :active_record
+
 Spec::Runner.configure do |config|
   #
 end

data/spec/thinking_sphinx/deltas/delayed_delta_spec.rb

@@ -96,7 +96,7 @@ describe ThinkingSphinx::Deltas::DelayedDelta do
     end
     
     it "should enqueue a flag-as-deleted job for the appropriate indexes" do
-      Delayed::Job.should_receive(:enqueue) do |job, priority|
+      Delayed::Job.should_receive(:enqueue) do |job, options|
         job.indexes.should == ['foo_core']
       end
       
@@ -104,7 +104,7 @@ describe ThinkingSphinx::Deltas::DelayedDelta do
     end
     
     it "should enqueue a flag-as-deleted job for the appropriate id" do
-      Delayed::Job.should_receive(:enqueue) do |job, priority|
+      Delayed::Job.should_receive(:enqueue) do |job, options|
         job.document_id.should == 42
       end
       
@@ -112,8 +112,8 @@ describe ThinkingSphinx::Deltas::DelayedDelta do
     end
     
     it "should use the defined priority for the flag-as-deleted job" do
-      Delayed::Job.should_receive(:enqueue) do |job, priority|
-        priority.should == 2
+      Delayed::Job.should_receive(:enqueue) do |job, options|
+        options[:priority].should == 2
       end
       
       @delayed_delta.index(@model, @instance)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ts-delayed-delta
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 +11:00
+date: 2011-02-15 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 11
         segments: 
+        - 2
         - 1
-        - 8
-        - 4
-        version: 1.8.4
+        - 0
+        version: 2.1.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -116,11 +116,9 @@ files:
 - features/step_definitions/delayed_delta_steps.rb
 - features/support/env.rb
 - features/thinking_sphinx/database.example.yml
-- features/thinking_sphinx/database.yml
 - features/thinking_sphinx/db/fixtures/delayed_betas.rb
 - features/thinking_sphinx/db/migrations/create_delayed_betas.rb
 - features/thinking_sphinx/models/delayed_beta.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/thinking_sphinx/deltas/delayed_delta/delta_job_spec.rb
 - spec/thinking_sphinx/deltas/delayed_delta/flag_as_deleted_job_spec.rb
@@ -166,11 +164,9 @@ test_files:
 - features/step_definitions/delayed_delta_steps.rb
 - features/support/env.rb
 - features/thinking_sphinx/database.example.yml
-- features/thinking_sphinx/database.yml
 - features/thinking_sphinx/db/fixtures/delayed_betas.rb
 - features/thinking_sphinx/db/migrations/create_delayed_betas.rb
 - features/thinking_sphinx/models/delayed_beta.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/thinking_sphinx/deltas/delayed_delta/delta_job_spec.rb
 - spec/thinking_sphinx/deltas/delayed_delta/flag_as_deleted_job_spec.rb

data/features/thinking_sphinx/database.yml

@@ -1,4 +0,0 @@
-username: root
-host: localhost
-pool: 1
-min_messages: warning

data/spec/spec.opts

@@ -1 +0,0 @@
---color