ts-delayed-delta 1.1.3 → 2.0.0

data/lib/ts-delayed-delta.rb

@@ -1,4 +1 @@
-require 'thinking_sphinx'
-require 'delayed_job'
 require 'thinking_sphinx/deltas/delayed_delta'
-require 'thinking_sphinx/deltas/delayed_delta/railtie' if defined?(Rails) && Rails::VERSION::MAJOR == 3

data/spec/acceptance/delayed_job_deltas_spec.rb

@@ -0,0 +1,46 @@
+require 'acceptance/spec_helper'
+
+describe 'SQL delta indexing', :live => true do
+  it "automatically indexes new records" do
+    guards = Book.create(
+      :title => 'Guards! Guards!', :author => 'Terry Pratchett'
+    )
+    index
+
+    Book.search('Terry Pratchett').to_a.should == [guards]
+
+    men = Book.create(
+      :title => 'Men At Arms', :author => 'Terry Pratchett'
+    )
+    work
+    sleep 0.25
+
+    Book.search('Terry Pratchett').to_a.should == [guards, men]
+  end
+
+  it "automatically indexes updated records" do
+    book = Book.create :title => 'Night Watch', :author => 'Harry Pritchett'
+    index
+
+    Book.search('Harry').to_a.should == [book]
+
+    book.reload.update_attributes(:author => 'Terry Pratchett')
+    work
+    sleep 0.25
+
+    Book.search('Terry').to_a.should == [book]
+  end
+
+  it "does not match on old values" do
+    book = Book.create :title => 'Night Watch', :author => 'Harry Pritchett'
+    index
+
+    Book.search('Harry').to_a.should == [book]
+
+    book.reload.update_attributes(:author => 'Terry Pratchett')
+    work
+    sleep 0.25
+
+    Book.search('Harry').should be_empty
+  end
+end

data/spec/acceptance/spec_helper.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+root = File.expand_path File.dirname(__FILE__)
+Dir["#{root}/support/**/*.rb"].each { |file| require file }

data/spec/acceptance/support/database_cleaner.rb

@@ -0,0 +1,11 @@
+RSpec.configure do |config|
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :truncation
+  end
+
+  config.after(:each) do
+    if example.example_group_instance.class.metadata[:live]
+      DatabaseCleaner.clean
+    end
+  end
+end

data/spec/acceptance/support/sphinx_controller.rb

@@ -0,0 +1,61 @@
+class SphinxController
+  def initialize
+    if config.respond_to?(:searchd)
+      config.searchd.mysql41 = 9307
+    else
+      config.port = 9313
+    end
+  end
+
+  def setup
+    if config.respond_to?(:searchd)
+      FileUtils.mkdir_p config.indices_location
+
+      config.render_to_file && index
+
+      ThinkingSphinx::Configuration.reset
+    else
+      FileUtils.mkdir_p config.searchd_file_path
+
+      config.build
+      config.controller.index
+
+      ThinkingSphinx::Configuration.instance.reset
+    end
+
+    ActiveSupport::Dependencies.clear
+
+    if config.respond_to?(:searchd)
+      config.index_paths.each do |path|
+        Dir["#{path}/**/*.rb"].each { |file| $LOADED_FEATURES.delete file }
+      end
+
+      config.searchd.mysql41 = 9307
+      config.settings['quiet_deltas']      = true
+      config.settings['attribute_updates'] = true
+    else
+      config.port = 9313
+      ThinkingSphinx.suppress_delta_output = true
+      ThinkingSphinx.updates_enabled       = true
+      ThinkingSphinx.deltas_enabled        = true
+    end
+  end
+
+  def start
+    config.controller.start
+  end
+
+  def stop
+    config.controller.stop
+  end
+
+  def index(*indices)
+    config.controller.index *indices
+  end
+
+  private
+
+  def config
+    ThinkingSphinx::Configuration.instance
+  end
+end

data/spec/acceptance/support/sphinx_helpers.rb

@@ -0,0 +1,31 @@
+module SphinxHelpers
+  def sphinx
+    @sphinx ||= SphinxController.new
+  end
+
+  def index(*indices)
+    yield if block_given?
+
+    ThinkingSphinx.before_index_hooks.each &:call
+    sphinx.index *indices
+    sleep 0.25
+
+    ThinkingSphinx::Connection.pool.clear
+  end
+
+  def work
+    Delayed::Worker.new.work_off
+  end
+end
+
+RSpec.configure do |config|
+  config.include SphinxHelpers
+
+  config.before :all do |group|
+    sphinx.setup && sphinx.start if group.class.metadata[:live]
+  end
+
+  config.after :all do |group|
+    sphinx.stop if group.class.metadata[:live]
+  end
+end

data/spec/internal/.gitignore

@@ -0,0 +1,2 @@
+config/*.sphinx.conf
+db/sphinx/*

data/spec/internal/app/indices/book_index.rb

@@ -0,0 +1,3 @@
+ThinkingSphinx::Index.define :book, :with => :active_record, :delta => ThinkingSphinx::Deltas::DelayedDelta do
+  indexes title, author
+end if ThinkingSphinx::Index.respond_to?(:define)

data/spec/internal/app/models/book.rb

@@ -0,0 +1,7 @@
+class Book < ActiveRecord::Base
+  define_index do
+    indexes title, author
+
+    set_property :delta => ThinkingSphinx::Deltas::DelayedDelta
+  end if respond_to?(:define_index)
+end

data/spec/internal/config/database.yml

@@ -0,0 +1,5 @@
+test:
+  adapter:      <%= ENV['DATABASE'] || 'mysql2' %>
+  database:     thinking_sphinx
+  username:     <%= ENV['DATABASE'] == 'postgresql' ? ENV['USER'] : 'root' %>
+  min_messages: warning

data/spec/internal/db/schema.rb

@@ -0,0 +1,24 @@
+ActiveRecord::Schema.define do
+  create_table(:books, :force => true) do |t|
+    t.string  :title
+    t.string  :author
+    t.integer :year
+    t.string  :blurb_file
+    t.boolean :delta, :default => true, :null => false
+    t.timestamps
+  end
+
+  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, :text
+    t.column :run_at, :datetime
+    t.column :locked_at, :datetime
+    t.column :failed_at, :datetime
+    t.column :locked_by, :string
+    t.column :queue, :string
+    t.column :created_at, :datetime
+    t.column :updated_at, :datetime
+  end
+end

data/spec/internal/log/.gitignore

@@ -0,0 +1 @@
+*.log

data/spec/spec_helper.rb

@@ -1,15 +1,17 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-
 require 'rubygems'
 require 'bundler'
- 
+
 Bundler.require :default, :development
 
-require 'thinking_sphinx'
-require 'thinking_sphinx/deltas/delayed_delta'
+require 'thinking_sphinx/railtie'
+
+Combustion.initialize! :active_record
 
-Delayed::Worker.backend = :active_record
+root = File.expand_path File.dirname(__FILE__)
+Dir["#{root}/support/**/*.rb"].each { |file| require file }
 
 RSpec.configure do |config|
-  #
+  # enable filtering for examples
+  config.filter_run :wip => nil
+  config.run_all_when_everything_filtered = true
 end

data/ts-delayed-delta.gemspec

@@ -1,14 +1,13 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path('../lib', __FILE__)
-require 'thinking_sphinx/deltas/delayed_delta/version'
 
 Gem::Specification.new do |s|
   s.name        = 'ts-delayed-delta'
-  s.version     = ThinkingSphinx::DelayedDelta::Version
+  s.version     = '2.0.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']
-  s.homepage    = 'http://github.com/freelancing-god/ts-delayed-delta'
+  s.homepage    = 'http://github.com/pat/ts-delayed-delta'
   s.summary     = %q{Thinking Sphinx - Delayed Deltas}
   s.description = %q{Manage delta indexes via Delayed Job for Thinking Sphinx}
 
@@ -16,15 +15,20 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f|
+    File.basename(f)
+  }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'thinking-sphinx', '>= 1.3.6'
-  s.add_runtime_dependency 'delayed_job',     '>= 2.0.4'
+  s.add_runtime_dependency 'thinking-sphinx'
+  s.add_runtime_dependency 'delayed_job'
 
-  s.add_development_dependency 'mysql2',   '0.3.7'
-  s.add_development_dependency 'yard',     '>= 0.7.2'
-  s.add_development_dependency 'rake',     '>= 0.9.2'
-  s.add_development_dependency 'rspec',    '2.6.0'
-  s.add_development_dependency 'cucumber', '1.0.2'
+  s.add_development_dependency 'appraisal',                 '~> 0.5.2'
+  s.add_development_dependency 'combustion',                '~> 0.4.0'
+  s.add_development_dependency 'database_cleaner',          '~> 0.7.1'
+  s.add_development_dependency 'delayed_job_active_record', '~> 0.4.4'
+  s.add_development_dependency 'mysql2',                    '~> 0.3.12b4'
+  s.add_development_dependency 'pg',                        '~> 0.11.0'
+  s.add_development_dependency 'rake',                      '>= 0.9.2'
+  s.add_development_dependency 'rspec',                     '~> 2.11.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ts-delayed-delta
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 15
   prerelease: 
   segments: 
-  - 1
-  - 1
-  - 3
-  version: 1.1.3
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,120 +15,167 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-02 00:00:00 Z
+date: 2013-05-07 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
-        - 1
-        - 3
-        - 6
-        version: 1.3.6
+        - 0
+        version: "0"
   version_requirements: *id001
-  prerelease: false
   name: thinking-sphinx
-- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 2
         - 0
-        - 4
-        version: 2.0.4
+        version: "0"
   version_requirements: *id002
-  prerelease: false
   name: delayed_job
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 15
         segments: 
         - 0
-        - 3
-        - 7
-        version: 0.3.7
+        - 5
+        - 2
+        version: 0.5.2
   version_requirements: *id003
+  name: appraisal
   prerelease: false
-  name: mysql2
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 15
         segments: 
         - 0
-        - 7
-        - 2
-        version: 0.7.2
+        - 4
+        - 0
+        version: 0.4.0
   version_requirements: *id004
+  name: combustion
   prerelease: false
-  name: yard
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 1
         segments: 
         - 0
-        - 9
-        - 2
-        version: 0.9.2
+        - 7
+        - 1
+        version: 0.7.1
   version_requirements: *id005
+  name: database_cleaner
   prerelease: false
-  name: rake
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 7
         segments: 
-        - 2
-        - 6
         - 0
-        version: 2.6.0
+        - 4
+        - 4
+        version: 0.4.4
   version_requirements: *id006
+  name: delayed_job_active_record
   prerelease: false
-  name: rspec
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 3357009125
         segments: 
-        - 1
         - 0
-        - 2
-        version: 1.0.2
+        - 3
+        - 12
+        - b
+        - 4
+        version: 0.3.12b4
   version_requirements: *id007
+  name: mysql2
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 11
+        - 0
+        version: 0.11.0
+  version_requirements: *id008
+  name: pg
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  version_requirements: *id009
+  name: rake
   prerelease: false
-  name: cucumber
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 2
+        - 11
+        - 0
+        version: 2.11.0
+  version_requirements: *id010
+  name: rspec
+  prerelease: false
+  type: :development
 description: Manage delta indexes via Delayed Job for Thinking Sphinx
 email: 
 - pat@freelancing-gods.com
@@ -141,36 +188,33 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .travis.yml
+- Appraisals
 - Gemfile
 - LICENSE
 - README.textile
 - Rakefile
-- VERSION
-- features/delayed_deltas.feature
-- features/step_definitions/common_steps.rb
-- features/step_definitions/delayed_delta_steps.rb
-- features/support/env.rb
-- features/thinking_sphinx/database.example.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
+- gemfiles/binary.gemfile
+- gemfiles/sphinxql.gemfile
 - 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/deltas/delayed_delta/railtie.rb
-- lib/thinking_sphinx/deltas/delayed_delta/tasks.rb
-- lib/thinking_sphinx/deltas/delayed_delta/version.rb
 - lib/ts-delayed-delta.rb
+- spec/acceptance/delayed_job_deltas_spec.rb
+- spec/acceptance/spec_helper.rb
+- spec/acceptance/support/database_cleaner.rb
+- spec/acceptance/support/sphinx_controller.rb
+- spec/acceptance/support/sphinx_helpers.rb
+- spec/internal/.gitignore
+- spec/internal/app/indices/book_index.rb
+- spec/internal/app/models/book.rb
+- spec/internal/config/database.yml
+- spec/internal/db/schema.rb
+- spec/internal/log/.gitignore
 - 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
-- spec/thinking_sphinx/deltas/delayed_delta/job_spec.rb
-- spec/thinking_sphinx/deltas/delayed_delta_spec.rb
-- tasks/rails.rake
 - ts-delayed-delta.gemspec
-homepage: http://github.com/freelancing-god/ts-delayed-delta
+has_rdoc: true
+homepage: http://github.com/pat/ts-delayed-delta
 licenses: []
 
 post_install_message: 
@@ -199,22 +243,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ts-delayed-delta
-rubygems_version: 1.8.16
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Thinking Sphinx - Delayed Deltas
 test_files: 
-- features/delayed_deltas.feature
-- features/step_definitions/common_steps.rb
-- features/step_definitions/delayed_delta_steps.rb
-- features/support/env.rb
-- features/thinking_sphinx/database.example.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/acceptance/delayed_job_deltas_spec.rb
+- spec/acceptance/spec_helper.rb
+- spec/acceptance/support/database_cleaner.rb
+- spec/acceptance/support/sphinx_controller.rb
+- spec/acceptance/support/sphinx_helpers.rb
+- spec/internal/.gitignore
+- spec/internal/app/indices/book_index.rb
+- spec/internal/app/models/book.rb
+- spec/internal/config/database.yml
+- spec/internal/db/schema.rb
+- spec/internal/log/.gitignore
 - 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
-- spec/thinking_sphinx/deltas/delayed_delta/job_spec.rb
-- spec/thinking_sphinx/deltas/delayed_delta_spec.rb