thinking-sphinx 1.3.2 → 1.3.3

data/VERSION.yml

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

data/features/support/env.rb

@@ -13,6 +13,7 @@ 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}"
 
 world.setup

data/lib/thinking_sphinx.rb

@@ -3,7 +3,6 @@ Dir[File.join(File.dirname(__FILE__), '../vendor/*/lib')].each do |path|
 end
 
 require 'active_record'
-require 'riddle'
 require 'after_commit'
 require 'yaml'
 require 'cgi'

data/lib/thinking_sphinx/0.9.8.rb

@@ -0,0 +1,3 @@
+require 'riddle'
+require 'riddle/0.9.8'
+require 'thinking_sphinx'

data/lib/thinking_sphinx/0.9.9.rb

@@ -0,0 +1,3 @@
+require 'riddle'
+require 'riddle/0.9.9'
+require 'thinking_sphinx'

data/rails/init.rb

@@ -1,4 +1,4 @@
-require 'thinking_sphinx'
+require 'thinking_sphinx/0.9.8'
 require 'action_controller/dispatcher'
 
 ActionController::Dispatcher.to_prepare :thinking_sphinx do

data/tasks/distribution.rb

@@ -2,9 +2,7 @@ require 'yard'
 require 'jeweler'
 
 desc 'Generate documentation'
-YARD::Rake::YardocTask.new do |t|
-  # t.title = 'Thinking Sphinx - ActiveRecord Sphinx Plugin'
-end
+YARD::Rake::YardocTask.new
 
 Jeweler::Tasks.new do |gem|
   gem.name        = "thinking-sphinx"
@@ -22,7 +20,6 @@ Jeweler::Tasks.new do |gem|
     "README.textile",
     "tasks/**/*.rb",
     "tasks/**/*.rake",
-    "vendor/**/*",
     "VERSION.yml"
   ]
   gem.test_files = FileList[
@@ -31,6 +28,8 @@ Jeweler::Tasks.new do |gem|
   ]
   
   gem.add_dependency 'activerecord', '>= 1.15.6'
+  gem.add_dependency 'riddle',       '>= 1.0.0'
+  gem.add_dependency 'after_commit', '>= 1.0.2'
   
   gem.post_install_message = <<-MESSAGE
 If you're upgrading, you should read this:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-05 00:00:00 +11:00
+date: 2009-11-11 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.15.6
     version: 
+- !ruby/object:Gem::Dependency 
+  name: riddle
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: after_commit
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.2
+    version: 
 description: A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching.
 email: pat@freelancing-gods.com
 executables: []
@@ -38,6 +58,8 @@ files:
 - lib/cucumber/thinking_sphinx/internal_world.rb
 - lib/cucumber/thinking_sphinx/sql_logger.rb
 - lib/thinking_sphinx.rb
+- lib/thinking_sphinx/0.9.8.rb
+- lib/thinking_sphinx/0.9.9.rb
 - lib/thinking_sphinx/active_record.rb
 - lib/thinking_sphinx/active_record/attribute_updates.rb
 - lib/thinking_sphinx/active_record/delta.rb
@@ -75,30 +97,6 @@ files:
 - tasks/distribution.rb
 - tasks/rails.rake
 - tasks/testing.rb
-- vendor/after_commit/LICENSE
-- vendor/after_commit/README
-- vendor/after_commit/Rakefile
-- vendor/after_commit/init.rb
-- vendor/after_commit/lib/after_commit.rb
-- 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/riddle/lib/riddle.rb
-- vendor/riddle/lib/riddle/client.rb
-- vendor/riddle/lib/riddle/client/filter.rb
-- vendor/riddle/lib/riddle/client/message.rb
-- vendor/riddle/lib/riddle/client/response.rb
-- vendor/riddle/lib/riddle/configuration.rb
-- vendor/riddle/lib/riddle/configuration/distributed_index.rb
-- vendor/riddle/lib/riddle/configuration/index.rb
-- vendor/riddle/lib/riddle/configuration/indexer.rb
-- vendor/riddle/lib/riddle/configuration/remote_index.rb
-- vendor/riddle/lib/riddle/configuration/searchd.rb
-- vendor/riddle/lib/riddle/configuration/section.rb
-- vendor/riddle/lib/riddle/configuration/source.rb
-- vendor/riddle/lib/riddle/configuration/sql_source.rb
-- vendor/riddle/lib/riddle/configuration/xml_source.rb
-- vendor/riddle/lib/riddle/controller.rb
 has_rdoc: true
 homepage: http://ts.freelancing-gods.com
 licenses: []

data/vendor/after_commit/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2008 Nick Muerdter
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/vendor/after_commit/README

@@ -1,16 +0,0 @@
-after_commit
-===========
-
-A Ruby on Rails plugin to add after_commit callbacks. The callbacks that are provided can be used
-to trigger events that run only after the entire transaction is complete. This is beneficial
-in situations where you are doing asynchronous processing and need committed objects.
-
-The following callbacks are provided:
-  
-   * (1) after_commit
-   * (2) after_commit_on_create
-   * (3) after_commit_on_update
-   * (4) after_commit_on_destroy
-   
-The after_commit callback is run for any object that has just been committed. You can obtain finer
-callback control by using the additional <tt>after_commit_on_*</tt> callbacks.

data/vendor/after_commit/Rakefile

@@ -1,22 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the after_commit plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for the after_commit plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'AfterCommit'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/vendor/after_commit/init.rb

@@ -1,8 +0,0 @@
-ActiveRecord::Base.send(:include, AfterCommit::ActiveRecord)
-
-Object.subclasses_of(ActiveRecord::ConnectionAdapters::AbstractAdapter).each do |klass|
-  klass.send(:include, AfterCommit::ConnectionAdapters)
-end
-if defined?(JRUBY_VERSION) and defined?(JdbcSpec::MySQL)
-  JdbcSpec::MySQL.send :include, AfterCommit::ConnectionAdapters
-end

data/vendor/after_commit/lib/after_commit.rb

@@ -1,45 +0,0 @@
-require 'after_commit/active_record'
-require 'after_commit/connection_adapters'
-
-module AfterCommit
-  def self.committed_records
-    @@committed_records ||= []
-  end
-
-  def self.committed_records=(committed_records)
-    @@committed_records = committed_records
-  end
-  
-  def self.committed_records_on_create
-    @@committed_records_on_create ||= []
-  end
-  
-  def self.committed_records_on_create=(committed_records)
-    @@committed_records_on_create = committed_records
-  end
-  
-  def self.committed_records_on_update
-    @@committed_records_on_update ||= []
-  end
-  
-  def self.committed_records_on_update=(committed_records)
-    @@committed_records_on_update = committed_records
-  end
-  
-  def self.committed_records_on_destroy
-    @@committed_records_on_destroy ||= []
-  end
-  
-  def self.committed_records_on_destroy=(committed_records)
-    @@committed_records_on_destroy = committed_records
-  end
-end
-
-ActiveRecord::Base.send(:include, AfterCommit::ActiveRecord)
-
-Object.subclasses_of(ActiveRecord::ConnectionAdapters::AbstractAdapter).each do |klass|
-  klass.send(:include, AfterCommit::ConnectionAdapters)
-end
-if defined?(JRUBY_VERSION) and defined?(JdbcSpec::MySQL)
-  JdbcSpec::MySQL.send :include, AfterCommit::ConnectionAdapters
-end

data/vendor/after_commit/lib/after_commit/active_record.rb

@@ -1,114 +0,0 @@
-module AfterCommit
-  module ActiveRecord
-    # Based on the code found in Thinking Sphinx:
-    # http://ts.freelancing-gods.com/ which was based on code written by Eli
-    # Miller:
-    # http://elimiller.blogspot.com/2007/06/proper-cache-expiry-with-aftercommit.html
-    # with slight modification from Joost Hietbrink. And now me! Whew.
-    def self.included(base)
-      base.class_eval do
-        # The define_callbacks method was added post Rails 2.0.2 - if it
-        # doesn't exist, we define the callback manually
-        if respond_to?(:define_callbacks)
-          define_callbacks  :after_commit,
-                            :after_commit_on_create,
-                            :after_commit_on_update,
-                            :after_commit_on_destroy
-        else
-          class << self
-            # Handle after_commit callbacks - call all the registered callbacks.
-            def after_commit(*callbacks, &block)
-              callbacks << block if block_given?
-              write_inheritable_array(:after_commit, callbacks)
-            end
-            
-            def after_commit_on_create(*callbacks, &block)
-              callbacks << block if block_given?
-              write_inheritable_array(:after_commit_on_create, callbacks)
-            end
-            
-            def after_commit_on_update(*callbacks, &block)
-              callbacks << block if block_given?
-              write_inheritable_array(:after_commit_on_update, callbacks)
-            end
-            
-            def after_commit_on_destroy(*callbacks, &block)
-              callbacks << block if block_given?
-              write_inheritable_array(:after_commit_on_destroy, callbacks)
-            end
-          end
-        end
-
-        after_save    :add_committed_record
-        after_create  :add_committed_record_on_create
-        after_update  :add_committed_record_on_update
-        after_destroy :add_committed_record_on_destroy
-
-        # We need to keep track of records that have been saved or destroyed
-        # within this transaction.
-        def add_committed_record
-          AfterCommit.committed_records << self
-        end
-        
-        def add_committed_record_on_create
-          AfterCommit.committed_records_on_create << self
-        end
-        
-        def add_committed_record_on_update
-          AfterCommit.committed_records_on_update << self
-        end
-        
-        def add_committed_record_on_destroy
-          AfterCommit.committed_records << self
-          AfterCommit.committed_records_on_destroy << self
-        end
-        
-        def after_commit
-          # Deliberately blank.
-        end
-
-        # Wraps a call to the private callback method so that the the
-        # after_commit callback can be made from the ConnectionAdapters when
-        # the commit for the transaction has finally succeeded. 
-        def after_commit_callback
-          call_after_commit_callback :after_commit
-        end
-        
-        def after_commit_on_create_callback
-          call_after_commit_callback :after_commit_on_create
-        end
-        
-        def after_commit_on_update_callback
-          call_after_commit_callback :after_commit_on_update
-        end
-        
-        def after_commit_on_destroy_callback
-          call_after_commit_callback :after_commit_on_destroy
-        end
-        
-        private
-        
-        def call_after_commit_callback(call)
-          if can_call_after_commit call
-            callback call
-            clear_after_commit_call call
-          end
-        end
-        
-        def can_call_after_commit(call)
-          @calls ||= {}
-          @calls[call] ||= false
-          if @calls[call]
-            return false
-          else
-            @calls[call] = true
-          end
-        end
-        
-        def clear_after_commit_call(call)
-          @calls[call] = false
-        end
-      end
-    end
-  end
-end

data/vendor/after_commit/lib/after_commit/connection_adapters.rb

@@ -1,103 +0,0 @@
-module AfterCommit
-  module ConnectionAdapters
-    def self.included(base)
-      base.class_eval do
-        # The commit_db_transaction method gets called when the outermost
-        # transaction finishes and everything inside commits. We want to
-        # override it so that after this happens, any records that were saved
-        # or destroyed within this transaction now get their after_commit
-        # callback fired.
-        def commit_db_transaction_with_callback
-          commit_db_transaction_without_callback
-          trigger_after_commit_callbacks
-          trigger_after_commit_on_create_callbacks
-          trigger_after_commit_on_update_callbacks
-          trigger_after_commit_on_destroy_callbacks
-        end 
-        alias_method_chain :commit_db_transaction, :callback
-
-        # In the event the transaction fails and rolls back, nothing inside
-        # should recieve the after_commit callback.
-        def rollback_db_transaction_with_callback
-          rollback_db_transaction_without_callback
-
-          AfterCommit.committed_records = []
-          AfterCommit.committed_records_on_create = []
-          AfterCommit.committed_records_on_update = []
-          AfterCommit.committed_records_on_destroy = []
-        end
-        alias_method_chain :rollback_db_transaction, :callback
-        
-        protected        
-          def trigger_after_commit_callbacks
-            # Trigger the after_commit callback for each of the committed
-            # records.
-            if AfterCommit.committed_records.any?
-              AfterCommit.committed_records.each do |record|
-                begin
-                  record.after_commit_callback
-                rescue
-                end
-              end 
-            end 
-
-            # Make sure we clear out our list of committed records now that we've
-            # triggered the callbacks for each one. 
-            AfterCommit.committed_records = []
-          end
-        
-          def trigger_after_commit_on_create_callbacks
-            # Trigger the after_commit_on_create callback for each of the committed
-            # records.
-            if AfterCommit.committed_records_on_create.any?
-              AfterCommit.committed_records_on_create.each do |record|
-                begin
-                  record.after_commit_on_create_callback
-                rescue
-                end
-              end 
-            end 
-
-            # Make sure we clear out our list of committed records now that we've
-            # triggered the callbacks for each one. 
-            AfterCommit.committed_records_on_create = []
-          end
-        
-          def trigger_after_commit_on_update_callbacks
-            # Trigger the after_commit_on_update callback for each of the committed
-            # records.
-            if AfterCommit.committed_records_on_update.any?
-              AfterCommit.committed_records_on_update.each do |record|
-                begin
-                  record.after_commit_on_update_callback
-                rescue
-                end
-              end 
-            end 
-
-            # Make sure we clear out our list of committed records now that we've
-            # triggered the callbacks for each one. 
-            AfterCommit.committed_records_on_update = []
-          end
-        
-          def trigger_after_commit_on_destroy_callbacks
-            # Trigger the after_commit_on_destroy callback for each of the committed
-            # records.
-            if AfterCommit.committed_records_on_destroy.any?
-              AfterCommit.committed_records_on_destroy.each do |record|
-                begin
-                  record.after_commit_on_destroy_callback
-                rescue
-                end
-              end 
-            end 
-
-            # Make sure we clear out our list of committed records now that we've
-            # triggered the callbacks for each one. 
-            AfterCommit.committed_records_on_destroy = []
-          end
-        #end protected
-      end 
-    end 
-  end
-end