ts-datetime-delta 1.0.0 → 1.0.1

data/features/support/env.rb

@@ -11,7 +11,9 @@ require 'cucumber/thinking_sphinx/internal_world'
 world = Cucumber::ThinkingSphinx::InternalWorld.new
 world.configure_database
 
-require 'thinking_sphinx'
+SphinxVersion = ENV['VERSION'] || '0.9.8'
+
+require "thinking_sphinx/#{SphinxVersion}"
 require 'thinking_sphinx/deltas/datetime_delta'
 
 world.setup

data/lib/thinking_sphinx/deltas/datetime_delta.rb

@@ -62,8 +62,11 @@ class ThinkingSphinx::Deltas::DatetimeDelta < ThinkingSphinx::Deltas::DefaultDel
     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`
+    output = `#{config.bin_path}#{config.indexer_binary_name} --config #{config.config_file}#{rotate} #{model.delta_index_names.join(' ')}`
+    
+    model.sphinx_indexes.select(&:delta?).each do |index|
+      output += `#{config.bin_path}#{config.indexer_binary_name} --config #{config.config_file}#{rotate} --merge #{index.core_name} #{index.delta_name} --merge-dst-range sphinx_deleted 0 0`
+    end
     puts output unless ThinkingSphinx.suppress_delta_output?
     
     true

data/spec/spec_helper.rb

@@ -4,8 +4,10 @@ require 'rubygems'
 require 'spec'
 require 'spec/autorun'
 
-require 'thinking_sphinx'
-require 'thinking_sphinx/deltas/delayed_delta'
+SphinxVersion = ENV['VERSION'] || '0.9.8'
+
+require "thinking_sphinx/#{SphinxVersion}"
+require 'thinking_sphinx/deltas/datetime_delta'
 
 Spec::Runner.configure do |config|
   #

data/spec/thinking_sphinx/deltas/datetime_delta_spec.rb

@@ -33,9 +33,17 @@ describe ThinkingSphinx::Deltas::DatetimeDelta do
   
   describe '#delayed_index' do
     before :each do
-      @model = stub('foo')
-      @model.stub!(:name => 'foo')
-      @model.stub!(:source_of_sphinx_index => @model)
+      @index = stub('index',
+        :delta?     => true,
+        :core_name  => 'foo_core',
+        :delta_name => 'foo_delta'
+      )
+      @model = stub('foo',
+        :name                   => 'foo',
+        :source_of_sphinx_index => @model,
+        :delta_index_names      => ['foo_delta'],
+        :sphinx_indexes         => [@index]
+      )
       
       ThinkingSphinx.suppress_delta_output = false
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ts-datetime-delta
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 +11:00
+date: 2009-11-26 00:00:00 +11:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: thinking-sphinx
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.6
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   type: :development