thinking-sphinx 1.5.0 → 2.0.0.rc1

data/tasks/distribution.rb

@@ -0,0 +1,46 @@
+require 'yard'
+require 'jeweler'
+
+desc 'Generate documentation'
+YARD::Rake::YardocTask.new
+
+Jeweler::Tasks.new do |gem|
+  gem.name        = "thinking-sphinx"
+  gem.summary     = "ActiveRecord/Rails Sphinx library"
+  gem.description = "A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching."
+  gem.author      = "Pat Allan"
+  gem.email       = "pat@freelancing-gods.com"
+  gem.homepage    = "http://ts.freelancing-gods.com"
+    
+  # s.rubyforge_project = "thinking-sphinx"
+  gem.files     = FileList[
+    "rails/*.rb",
+    "lib/**/*.rb",
+    "LICENCE",
+    "README.textile",
+    "tasks/**/*.rb",
+    "VERSION"
+  ]
+  gem.test_files = FileList[
+    "features/**/*.rb",
+    "features/**/*.feature",
+    "features/**/*.example.yml",
+    "spec/**/*_spec.rb"
+  ]
+  
+  gem.add_dependency 'activerecord', '>= 3.0.0.beta3'
+  gem.add_dependency 'riddle',       '>= 1.0.10'
+  
+  gem.add_development_dependency "yard",          ">= 0"
+  gem.add_development_dependency "rspec",         ">= 1.2.9"
+  gem.add_development_dependency "cucumber",      ">= 0"
+  gem.add_development_dependency "will_paginate", "3.0.pre"
+  gem.add_development_dependency "ginger",        "1.2.0"
+  gem.add_development_dependency "faker",         "0.3.1"
+  
+  gem.post_install_message = <<-MESSAGE
+If you're upgrading, you should read this:
+http://freelancing-god.github.com/ts/en/upgrading.html
+
+MESSAGE
+end

data/tasks/testing.rb

@@ -0,0 +1,74 @@
+require 'rubygems'
+require 'rspec/core/rake_task'
+require 'cucumber/rake/task'
+
+desc "Run the specs under spec"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = 'spec/**/*_spec.rb'
+end
+task :spec => :check_dependencies
+
+desc "Run all feature-set configurations"
+task :features do |t|
+  databases = ENV['DATABASES'] || 'mysql,postgresql'
+  databases.split(',').each do |database|
+    puts   "rake features:#{database}"
+    system "rake features:#{database}"
+  end
+end
+
+namespace :features do
+  def add_task(name, description)
+    Cucumber::Rake::Task.new(name, description) do |t|
+      t.cucumber_opts = "--format pretty features/*.feature DATABASE=#{name} --exclude features/thinking_sphinx"
+    end
+  end
+  
+  add_task :mysql,      "Run feature-set against MySQL"
+  add_task :postgresql, "Run feature-set against PostgreSQL"
+  
+  task :mysql      => :check_dependencies
+  task :postgresql => :check_dependencies
+end
+
+desc "Generate RCov reports"
+RSpec::Core::RakeTask.new(:rcov) do |t|
+  t.pattern = 'spec/**/*_spec.rb'
+  t.rcov = true
+  t.rcov_opts = [
+    '--exclude', 'spec',
+    '--exclude', 'gems',
+    '--exclude', 'riddle',
+    '--exclude', 'ruby'
+  ]
+end
+
+namespace :rcov do
+  def add_task(name, description)
+    Cucumber::Rake::Task.new(name, description) do |t|
+      t.cucumber_opts = "--format pretty"
+      t.profile = name
+      t.rcov = true
+      t.rcov_opts = [
+        '--exclude', 'spec',
+        '--exclude', 'gems',
+        '--exclude', 'riddle',
+        '--exclude', 'features'
+      ]
+    end
+  end
+  
+  add_task :mysql,      "Run feature-set against MySQL with rcov"
+  add_task :postgresql, "Run feature-set against PostgreSQL with rcov"
+end
+
+desc "Build cucumber.yml file"
+task :cucumber_defaults do
+  steps = FileList["features/step_definitions/**.rb"].collect { |path|
+    "--require #{path}"
+  }.join(" ")
+  
+  File.open('cucumber.yml', 'w') { |f|
+    f.write "default: \"--require features/support/env.rb #{steps}\"\n"
+  }
+end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
+  hash: 977940590
+  prerelease: true
   segments: 
-  - 1
-  - 5
+  - 2
   - 0
-  version: 1.5.0
+  - 0
+  - rc1
+  version: 2.0.0.rc1
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,204 +16,154 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-07 00:00:00 -07:00
+date: 2010-07-02 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: -1848230021
         segments: 
-        - 2
-        - 1
-        version: "2.1"
-  version_requirements: *id001
-  name: activerecord
-  prerelease: false
+        - 3
+        - 0
+        - 0
+        - beta3
+        version: 3.0.0.beta3
   type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: riddle
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 3
         segments: 
         - 1
         - 0
-        - 7
-        version: 1.0.7
-  version_requirements: *id002
-  name: after_commit
-  prerelease: false
+        - 10
+        version: 1.0.10
   type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 1
-        - 5
-        - 6
-        version: 1.5.6
+        - 0
+        version: "0"
+  type: :development
   version_requirements: *id003
-  name: riddle
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 13
         segments: 
         - 1
-        - 0
         - 2
-        version: 1.0.2
+        - 9
+        version: 1.2.9
+  type: :development
   version_requirements: *id004
-  name: innertube
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
         - 0
-        - 4
-        - 0
-        version: 0.4.0
-  version_requirements: *id005
-  name: appraisal
-  prerelease: false
+        version: "0"
   type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  name: will_paginate
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 961915916
         segments: 
-        - 1
+        - 3
         - 0
-        - 2
-        version: 1.0.2
-  version_requirements: *id006
-  name: cucumber
-  prerelease: false
+        - pre
+        version: 3.0.pre
   type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  name: ginger
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 31
         segments: 
-        - 0
-        - 3
         - 1
-        version: 0.3.1
+        - 2
+        - 0
+        version: 1.2.0
+  type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: faker
   prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency 
   requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
-        version: 0.9.2
-  version_requirements: *id008
-  name: rake
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 17
         segments: 
-        - 2
-        - 6
         - 0
-        version: 2.6.0
-  version_requirements: *id009
-  name: rspec
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 2
         - 3
-        - 15
-        version: 2.3.15
-  version_requirements: *id010
-  name: will_paginate
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 7
-        - 2
-        version: 0.7.2
-  version_requirements: *id011
-  name: yard
-  prerelease: false
+        - 1
+        version: 0.3.1
   type: :development
+  version_requirements: *id008
 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
+email: pat@freelancing-gods.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.textile
 files: 
+- LICENCE
+- README.textile
+- VERSION
 - lib/cucumber/thinking_sphinx/external_world.rb
 - lib/cucumber/thinking_sphinx/internal_world.rb
 - lib/cucumber/thinking_sphinx/sql_logger.rb
-- lib/thinking-sphinx.rb
 - lib/thinking_sphinx.rb
 - lib/thinking_sphinx/active_record.rb
 - 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/has_many_association_with_scopes.rb
 - lib/thinking_sphinx/active_record/scopes.rb
 - lib/thinking_sphinx/adapters/abstract_adapter.rb
 - lib/thinking_sphinx/adapters/mysql_adapter.rb
@@ -220,16 +171,13 @@ files:
 - lib/thinking_sphinx/association.rb
 - lib/thinking_sphinx/attribute.rb
 - lib/thinking_sphinx/auto_version.rb
-- lib/thinking_sphinx/bundled_search.rb
 - lib/thinking_sphinx/class_facet.rb
 - lib/thinking_sphinx/configuration.rb
-- lib/thinking_sphinx/connection.rb
 - lib/thinking_sphinx/context.rb
+- lib/thinking_sphinx/core/array.rb
 - lib/thinking_sphinx/core/string.rb
 - lib/thinking_sphinx/deltas.rb
 - lib/thinking_sphinx/deltas/default_delta.rb
-- lib/thinking_sphinx/deltas/delete_job.rb
-- lib/thinking_sphinx/deltas/index_job.rb
 - lib/thinking_sphinx/deploy/capistrano.rb
 - lib/thinking_sphinx/excerpter.rb
 - lib/thinking_sphinx/facet.rb
@@ -240,7 +188,7 @@ files:
 - lib/thinking_sphinx/index/faux_column.rb
 - lib/thinking_sphinx/join.rb
 - lib/thinking_sphinx/property.rb
-- lib/thinking_sphinx/rails_additions.rb
+- lib/thinking_sphinx/railtie.rb
 - lib/thinking_sphinx/search.rb
 - lib/thinking_sphinx/search_methods.rb
 - lib/thinking_sphinx/source.rb
@@ -248,27 +196,8 @@ files:
 - lib/thinking_sphinx/source/sql.rb
 - lib/thinking_sphinx/tasks.rb
 - lib/thinking_sphinx/test.rb
-- LICENCE
-- README.textile
-- features/abstract_inheritance.feature
-- features/alternate_primary_key.feature
-- features/attribute_transformation.feature
-- features/attribute_updates.feature
-- features/deleting_instances.feature
-- features/direct_attributes.feature
-- features/excerpts.feature
-- features/extensible_delta_indexing.feature
-- features/facets.feature
-- features/facets_across_model.feature
-- features/field_sorting.feature
-- features/handling_edits.feature
-- features/retry_stale_indexes.feature
-- features/searching_across_models.feature
-- features/searching_by_index.feature
-- features/searching_by_model.feature
-- features/searching_with_find_arguments.feature
-- features/sphinx_detection.feature
-- features/sphinx_scopes.feature
+- tasks/distribution.rb
+- tasks/testing.rb
 - features/step_definitions/alpha_steps.rb
 - features/step_definitions/beta_steps.rb
 - features/step_definitions/common_steps.rb
@@ -279,11 +208,8 @@ files:
 - features/step_definitions/scope_steps.rb
 - features/step_definitions/search_steps.rb
 - features/step_definitions/sphinx_steps.rb
-- features/sti_searching.feature
 - features/support/env.rb
 - features/support/lib/generic_delta_handler.rb
-- features/thinking_sphinx/database.example.yml
-- features/thinking_sphinx/db/.gitignore
 - features/thinking_sphinx/db/fixtures/alphas.rb
 - features/thinking_sphinx/db/fixtures/authors.rb
 - features/thinking_sphinx/db/fixtures/betas.rb
@@ -298,7 +224,6 @@ files:
 - features/thinking_sphinx/db/fixtures/gammas.rb
 - features/thinking_sphinx/db/fixtures/music.rb
 - features/thinking_sphinx/db/fixtures/people.rb
-- features/thinking_sphinx/db/fixtures/post_keywords.txt
 - features/thinking_sphinx/db/fixtures/posts.rb
 - features/thinking_sphinx/db/fixtures/robots.rb
 - features/thinking_sphinx/db/fixtures/tags.rb
@@ -321,7 +246,6 @@ files:
 - features/thinking_sphinx/db/migrations/create_taggings.rb
 - features/thinking_sphinx/db/migrations/create_tags.rb
 - features/thinking_sphinx/models/alpha.rb
-- features/thinking_sphinx/models/andrew.rb
 - features/thinking_sphinx/models/animal.rb
 - features/thinking_sphinx/models/author.rb
 - features/thinking_sphinx/models/beta.rb
@@ -342,22 +266,34 @@ files:
 - features/thinking_sphinx/models/robot.rb
 - features/thinking_sphinx/models/tag.rb
 - features/thinking_sphinx/models/tagging.rb
-- spec/fixtures/data.sql
-- spec/fixtures/database.yml.default
-- spec/fixtures/models.rb
-- spec/fixtures/structure.sql
-- spec/spec_helper.rb
-- spec/sphinx_helper.rb
+- features/abstract_inheritance.feature
+- features/alternate_primary_key.feature
+- features/attribute_transformation.feature
+- features/attribute_updates.feature
+- features/deleting_instances.feature
+- features/direct_attributes.feature
+- features/excerpts.feature
+- features/extensible_delta_indexing.feature
+- features/facets.feature
+- features/facets_across_model.feature
+- features/handling_edits.feature
+- features/retry_stale_indexes.feature
+- features/searching_across_models.feature
+- features/searching_by_index.feature
+- features/searching_by_model.feature
+- features/searching_with_find_arguments.feature
+- features/sphinx_detection.feature
+- features/sphinx_scopes.feature
+- features/sti_searching.feature
+- features/thinking_sphinx/database.example.yml
 - spec/thinking_sphinx/active_record/delta_spec.rb
 - spec/thinking_sphinx/active_record/has_many_association_spec.rb
 - spec/thinking_sphinx/active_record/scopes_spec.rb
 - spec/thinking_sphinx/active_record_spec.rb
-- spec/thinking_sphinx/adapters/abstract_adapter_spec.rb
 - spec/thinking_sphinx/association_spec.rb
 - spec/thinking_sphinx/attribute_spec.rb
 - spec/thinking_sphinx/auto_version_spec.rb
 - spec/thinking_sphinx/configuration_spec.rb
-- spec/thinking_sphinx/connection_spec.rb
 - spec/thinking_sphinx/context_spec.rb
 - spec/thinking_sphinx/core/array_spec.rb
 - spec/thinking_sphinx/core/string_spec.rb
@@ -368,22 +304,21 @@ files:
 - spec/thinking_sphinx/index/builder_spec.rb
 - spec/thinking_sphinx/index/faux_column_spec.rb
 - spec/thinking_sphinx/index_spec.rb
-- spec/thinking_sphinx/rails_additions_spec.rb
 - spec/thinking_sphinx/search_methods_spec.rb
 - spec/thinking_sphinx/search_spec.rb
 - spec/thinking_sphinx/source_spec.rb
 - spec/thinking_sphinx/test_spec.rb
 - spec/thinking_sphinx_spec.rb
 has_rdoc: true
-homepage: http://pat.github.io/thinking-sphinx/
+homepage: http://ts.freelancing-gods.com
 licenses: []
 
 post_install_message: |+
   If you're upgrading, you should read this:
-  http://pat.github.io/thinking-sphinx/upgrading.html
+  http://freelancing-god.github.com/ts/en/upgrading.html
   
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -398,39 +333,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
-rubyforge_project: thinking-sphinx
-rubygems_version: 1.6.2
+rubyforge_project: 
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ActiveRecord/Rails Sphinx library
 test_files: 
-- features/abstract_inheritance.feature
-- features/alternate_primary_key.feature
-- features/attribute_transformation.feature
-- features/attribute_updates.feature
-- features/deleting_instances.feature
-- features/direct_attributes.feature
-- features/excerpts.feature
-- features/extensible_delta_indexing.feature
-- features/facets.feature
-- features/facets_across_model.feature
-- features/field_sorting.feature
-- features/handling_edits.feature
-- features/retry_stale_indexes.feature
-- features/searching_across_models.feature
-- features/searching_by_index.feature
-- features/searching_by_model.feature
-- features/searching_with_find_arguments.feature
-- features/sphinx_detection.feature
-- features/sphinx_scopes.feature
 - features/step_definitions/alpha_steps.rb
 - features/step_definitions/beta_steps.rb
 - features/step_definitions/common_steps.rb
@@ -441,11 +359,8 @@ test_files:
 - features/step_definitions/scope_steps.rb
 - features/step_definitions/search_steps.rb
 - features/step_definitions/sphinx_steps.rb
-- features/sti_searching.feature
 - features/support/env.rb
 - features/support/lib/generic_delta_handler.rb
-- features/thinking_sphinx/database.example.yml
-- features/thinking_sphinx/db/.gitignore
 - features/thinking_sphinx/db/fixtures/alphas.rb
 - features/thinking_sphinx/db/fixtures/authors.rb
 - features/thinking_sphinx/db/fixtures/betas.rb
@@ -460,7 +375,6 @@ test_files:
 - features/thinking_sphinx/db/fixtures/gammas.rb
 - features/thinking_sphinx/db/fixtures/music.rb
 - features/thinking_sphinx/db/fixtures/people.rb
-- features/thinking_sphinx/db/fixtures/post_keywords.txt
 - features/thinking_sphinx/db/fixtures/posts.rb
 - features/thinking_sphinx/db/fixtures/robots.rb
 - features/thinking_sphinx/db/fixtures/tags.rb
@@ -483,7 +397,6 @@ test_files:
 - features/thinking_sphinx/db/migrations/create_taggings.rb
 - features/thinking_sphinx/db/migrations/create_tags.rb
 - features/thinking_sphinx/models/alpha.rb
-- features/thinking_sphinx/models/andrew.rb
 - features/thinking_sphinx/models/animal.rb
 - features/thinking_sphinx/models/author.rb
 - features/thinking_sphinx/models/beta.rb
@@ -504,22 +417,34 @@ test_files:
 - features/thinking_sphinx/models/robot.rb
 - features/thinking_sphinx/models/tag.rb
 - features/thinking_sphinx/models/tagging.rb
-- spec/fixtures/data.sql
-- spec/fixtures/database.yml.default
-- spec/fixtures/models.rb
-- spec/fixtures/structure.sql
-- spec/spec_helper.rb
-- spec/sphinx_helper.rb
+- features/abstract_inheritance.feature
+- features/alternate_primary_key.feature
+- features/attribute_transformation.feature
+- features/attribute_updates.feature
+- features/deleting_instances.feature
+- features/direct_attributes.feature
+- features/excerpts.feature
+- features/extensible_delta_indexing.feature
+- features/facets.feature
+- features/facets_across_model.feature
+- features/handling_edits.feature
+- features/retry_stale_indexes.feature
+- features/searching_across_models.feature
+- features/searching_by_index.feature
+- features/searching_by_model.feature
+- features/searching_with_find_arguments.feature
+- features/sphinx_detection.feature
+- features/sphinx_scopes.feature
+- features/sti_searching.feature
+- features/thinking_sphinx/database.example.yml
 - spec/thinking_sphinx/active_record/delta_spec.rb
 - spec/thinking_sphinx/active_record/has_many_association_spec.rb
 - spec/thinking_sphinx/active_record/scopes_spec.rb
 - spec/thinking_sphinx/active_record_spec.rb
-- spec/thinking_sphinx/adapters/abstract_adapter_spec.rb
 - spec/thinking_sphinx/association_spec.rb
 - spec/thinking_sphinx/attribute_spec.rb
 - spec/thinking_sphinx/auto_version_spec.rb
 - spec/thinking_sphinx/configuration_spec.rb
-- spec/thinking_sphinx/connection_spec.rb
 - spec/thinking_sphinx/context_spec.rb
 - spec/thinking_sphinx/core/array_spec.rb
 - spec/thinking_sphinx/core/string_spec.rb
@@ -530,7 +455,6 @@ test_files:
 - spec/thinking_sphinx/index/builder_spec.rb
 - spec/thinking_sphinx/index/faux_column_spec.rb
 - spec/thinking_sphinx/index_spec.rb
-- spec/thinking_sphinx/rails_additions_spec.rb
 - spec/thinking_sphinx/search_methods_spec.rb
 - spec/thinking_sphinx/search_spec.rb
 - spec/thinking_sphinx/source_spec.rb