dpickett-thinking-sphinx 1.1.4 → 1.1.12

data/spec/unit/thinking_sphinx_spec.rb

@@ -53,13 +53,15 @@ describe ThinkingSphinx do
   
   describe "use_group_by_shortcut? method" do
     before :each do
-      unless ::ActiveRecord::ConnectionAdapters.const_defined?(:MysqlAdapter)
+      adapter = defined?(JRUBY_VERSION) ? :JdbcAdapter : :MysqlAdapter
+      unless ::ActiveRecord::ConnectionAdapters.const_defined?(adapter)
         pending "No MySQL"
         return
       end
       
-      @connection = ::ActiveRecord::ConnectionAdapters::MysqlAdapter.stub_instance(
-        :select_all => true
+      @connection = ::ActiveRecord::ConnectionAdapters.const_get(adapter).stub_instance(
+        :select_all => true,
+        :config => {:adapter => defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql'}
       )
       ::ActiveRecord::Base.stub_method(
         :connection => @connection
@@ -103,12 +105,14 @@ describe ThinkingSphinx do
     
     describe "if not using MySQL" do
       before :each do
-        unless ::ActiveRecord::ConnectionAdapters.const_defined?(:PostgreSQLAdapter)
+        adapter = defined?(JRUBY_VERSION) ? :JdbcAdapter : :PostgreSQLAdapter
+        unless ::ActiveRecord::ConnectionAdapters.const_defined?(adapter)
           pending "No PostgreSQL"
           return
         end
-        @connection = ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.stub_instance(
-          :select_all => true
+        @connection = ::ActiveRecord::ConnectionAdapters.const_get(adapter).stub_instance(
+          :select_all => true,
+          :config => {:adapter => defined?(JRUBY_VERSION) ? 'jdbcpostgresql' : 'postgresql'}
         )
         ::ActiveRecord::Base.stub_method(
           :connection => @connection

data/tasks/distribution.rb

@@ -29,7 +29,7 @@ spec = Gem::Specification.new do |s|
   s.files             = FileList[
     "lib/**/*.rb",
     "LICENCE",
-    "README",
+    "README.textile",
     "tasks/**/*.rb",
     "tasks/**/*.rake",
     "vendor/**/*"

data/tasks/testing.rb

@@ -20,13 +20,7 @@ namespace :features do
   def add_task(name, description)
     Cucumber::Rake::Task.new(name, description) do |t|
       t.cucumber_opts = "--format pretty"
-      t.step_pattern  = [
-        "features/support/env",
-        "features/support/db/#{name}",
-        "features/support/db/active_record",
-        "features/support/post_database",
-        "features/step_definitions/**.rb"
-      ]
+      t.profile = name
     end
   end
   
@@ -46,13 +40,7 @@ namespace :rcov do
   def add_task(name, description)
     Cucumber::Rake::Task.new(name, description) do |t|
       t.cucumber_opts = "--format pretty"
-      t.step_pattern  = [
-        "features/support/env",
-        "features/support/db/#{name}",
-        "features/support/db/active_record",
-        "features/support/post_database",
-        "features/step_definitions/**.rb"
-      ]
+      t.profile = name
       t.rcov = true
       t.rcov_opts = [
         '--exclude', 'spec',
@@ -80,7 +68,11 @@ task :cucumber_defaults do
     "--require #{path}"
   }.join(" ")
   
+  features = FileList["features/*.feature"].join(" ")
+  
   File.open('cucumber.yml', 'w') { |f|
-    f.write "default: \"#{default_requires} #{step_definitions}\""
+    f.write "default: \"#{default_requires} #{step_definitions}\"\n\n"
+    f.write "mysql: \"#{default_requires} #{step_definitions} #{features}\"\n\n"
+    f.write "postgresql: \"#{default_requires.gsub(/mysql/, 'postgresql')} #{step_definitions} #{features}\""
   }
 end

data/vendor/after_commit/init.rb

@@ -3,3 +3,6 @@ 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

@@ -71,19 +71,42 @@ module AfterCommit
         # after_commit callback can be made from the ConnectionAdapters when
         # the commit for the transaction has finally succeeded. 
         def after_commit_callback
-          callback(:after_commit)
+          call_after_commit_callback :after_commit
         end
         
         def after_commit_on_create_callback
-          callback(:after_commit_on_create)
+          call_after_commit_callback :after_commit_on_create
         end
         
         def after_commit_on_update_callback
-          callback(:after_commit_on_update)
+          call_after_commit_callback :after_commit_on_update
         end
         
         def after_commit_on_destroy_callback
-          callback(:after_commit_on_destroy)
+          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

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

@@ -7,7 +7,7 @@ module AfterCommit
         # 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          
+        def commit_db_transaction_with_callback
           commit_db_transaction_without_callback
           trigger_after_commit_callbacks
           trigger_after_commit_on_create_callbacks

data/vendor/after_commit/lib/after_commit.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dpickett-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.1.4
+  version: 1.1.12
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-19 00:00:00 -08:00
+date: 2009-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -22,6 +22,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/thinking_sphinx/active_record/attribute_updates.rb
 - lib/thinking_sphinx/active_record/delta.rb
 - lib/thinking_sphinx/active_record/has_many_association.rb
 - lib/thinking_sphinx/active_record/search.rb
@@ -42,18 +43,20 @@ files:
 - lib/thinking_sphinx/deltas/delayed_delta/job.rb
 - lib/thinking_sphinx/deltas/delayed_delta.rb
 - lib/thinking_sphinx/deltas.rb
+- lib/thinking_sphinx/deploy/capistrano.rb
 - lib/thinking_sphinx/facet.rb
 - lib/thinking_sphinx/facet_collection.rb
 - lib/thinking_sphinx/field.rb
 - lib/thinking_sphinx/index/builder.rb
 - lib/thinking_sphinx/index/faux_column.rb
 - lib/thinking_sphinx/index.rb
+- lib/thinking_sphinx/property.rb
 - lib/thinking_sphinx/rails_additions.rb
 - lib/thinking_sphinx/search.rb
 - lib/thinking_sphinx/tasks.rb
 - lib/thinking_sphinx.rb
 - LICENCE
-- README
+- README.textile
 - tasks/distribution.rb
 - tasks/testing.rb
 - tasks/rails.rake
@@ -106,10 +109,13 @@ files:
 - spec/unit/thinking_sphinx/collection_spec.rb
 - spec/unit/thinking_sphinx/configuration_spec.rb
 - spec/unit/thinking_sphinx/core/string_spec.rb
+- spec/unit/thinking_sphinx/facet_collection_spec.rb
+- spec/unit/thinking_sphinx/facet_spec.rb
 - spec/unit/thinking_sphinx/field_spec.rb
 - spec/unit/thinking_sphinx/index/builder_spec.rb
 - spec/unit/thinking_sphinx/index/faux_column_spec.rb
 - spec/unit/thinking_sphinx/index_spec.rb
+- spec/unit/thinking_sphinx/rails_additions_spec.rb
 - spec/unit/thinking_sphinx/search_spec.rb
 - spec/unit/thinking_sphinx_spec.rb
 has_rdoc: true
@@ -150,9 +156,12 @@ test_files:
 - spec/unit/thinking_sphinx/collection_spec.rb
 - spec/unit/thinking_sphinx/configuration_spec.rb
 - spec/unit/thinking_sphinx/core/string_spec.rb
+- spec/unit/thinking_sphinx/facet_collection_spec.rb
+- spec/unit/thinking_sphinx/facet_spec.rb
 - spec/unit/thinking_sphinx/field_spec.rb
 - spec/unit/thinking_sphinx/index/builder_spec.rb
 - spec/unit/thinking_sphinx/index/faux_column_spec.rb
 - spec/unit/thinking_sphinx/index_spec.rb
+- spec/unit/thinking_sphinx/rails_additions_spec.rb
 - spec/unit/thinking_sphinx/search_spec.rb
 - spec/unit/thinking_sphinx_spec.rb

data/README

@@ -1,107 +0,0 @@
-= Thinking Sphinx
-
-== Usage
-
-First, if you haven't done so already, check out the main usage[http://ts.freelancing-gods.com/usage.html] page. Once you've done that, the next place to look for information is the specific method docs - ThinkingSphinx::Search and ThinkingSphinx::Index::Builder in particular.
-
-Keep in mind that while Thinking Sphinx works for ActiveRecord with Merb, it doesn't yet support DataMapper (although that is planned).
-
-== Contributing
-
-Fork on GitHub and after you've committed tested patches, send a pull request.
-
-To get the spec suite running, you will need to install the not-a-mock gem if you don't already have it:
-
-  git clone git://github.com/freelancing-god/not-a-mock.git
-  cd not-a-mock
-  rake gem
-  gem install pkg/not_a_mock-1.1.0.gem
-  
-Then install the ginger gem. The steps are the same, except that you might need to sudo the gem install:
-
-  git clone git://github.com/freelancing-god/ginger.git
-  cd ginger
-  rake gem
-  sudo gem install pkg/ginger-1.1.0.gem
-
-Then set up your database:
-
-  cp spec/fixtures/database.yml.default spec/fixtures/database.yml
-  mysqladmin -u root create thinking_sphinx
-  
-Make sure you don't have another Sphinx daemon (searchd) running. If you do, quit it with "rake ts:stop"
-in the app root.
-
-You should now have a passing test suite from which to build your patch on.
-
-  rake spec
-  
-If you get the message "Failed to start searchd daemon", run the spec with sudo:
-
-  sudo rake spec
-  
-If you quit the spec suite before it's completed, you may be left with data in the test
-database, causing the next run to have failures. Let that run complete and then try again.
-
-== Contributors
-
-Since I first released this library, there's been quite a few people who have submitted patches, to my immense gratitude. Others have suggested syntax changes and general improvements. So my thanks to the following people:
-
-- Joost Hietbrink
-- Jonathan Conway
-- Gregory Mirzayantz
-- Tung Nguyen
-- Sean Cribbs
-- Benoit Caccinolo
-- John Barton
-- Oliver Beddows
-- Arthur Zapparoli
-- Dusty Doris
-- Marcus Crafter
-- Patrick Lenz
-- Björn Andreasson
-- James Healy
-- Jae-Jun Hwang
-- Xavier Shay
-- Jason Rust
-- Gopal Patel
-- Chris Heald
-- Peter Vandenberk
-- Josh French
-- Andrew Bennett
-- Jordan Fowler
-- Seth Walker
-- Joe Noon
-- Wolfgang Postler
-- Rick Olson
-- Killian Murphy
-- Morten Primdahl
-- Ryan Bates
-- David Eisinger
-- Shay Arnett
-- Minh Tran
-- Jeremy Durham
-- Piotr Sarnacki
-- Matt Johnson
-- Nicolas Blanco
-- Max Lapshin
-- Josh Natanson
-- Philip Hallstrom
-- Christian Rishøj
-- Mike Flester
-- Jim Remsik
-- Kennon Ballou
-- Henrik Nyh
-- Emil Tin
-- Doug Cole
-- Ed Hickey
-- Evan Weaver
-- Thibaut Barrere
-- Kristopher Chambers
-- Dmitrij Smalko
-- Aleksey Yeschenko
-- Lachie Cox
-- Lourens Naude
-- Tom Davies
-- Dan Pickett
-- Alex Caudill