thinking-sphinx 1.2.12 → 1.2.13

data/spec/lib/thinking_sphinx/excerpter_spec.rb

@@ -40,6 +40,14 @@ describe ThinkingSphinx::Excerpter do
       @excerpter.big_name
     end
     
+    it "should escape the text in the excerpt" do
+      @search.should_receive(:excerpt_for) do |string, model|
+        string.should == 'test "escaping" <characters>'
+      end
+      
+      @excerpter.string_to_escape
+    end
+    
     it "should still raise an exception if no column or method exists" do
       lambda {
         @excerpter.foo

data/spec/lib/thinking_sphinx/search_spec.rb

@@ -919,6 +919,15 @@ describe ThinkingSphinx::Search do
         count.should  == 5
       end
     end
+    
+    it "should be aliased to each_with_group_and_count" do
+      search = ThinkingSphinx::Search.new
+      search.each_with_group_and_count do |obj, group, count|
+        obj.should    == @alpha
+        group.should  == 101
+        count.should  == 5
+      end
+    end
   end
   
   describe '.each_with_weighting' do

data/tasks/distribution.rb

@@ -25,7 +25,10 @@ Jeweler::Tasks.new do |gem|
     "vendor/**/*",
     "VERSION.yml"
   ]
-  gem.test_files = FileList["spec/**/*_spec.rb"]
+  gem.test_files = FileList[
+    "features/**/*",
+    "spec/**/*_spec.rb"
+  ]
   
   gem.add_dependency 'activerecord', '>= 1.15.6'
   

data/tasks/testing.rb

@@ -10,17 +10,17 @@ end
 
 desc "Run all feature-set configurations"
 task :features do |t|
-  puts   "rake features:mysql"
-  system "rake features:mysql"
-  puts   "rake features:postgresql"
-  system "rake features:postgresql"
+  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"
-      t.profile = name
+      t.cucumber_opts = "--format pretty features/*.feature DATABASE=#{name}"
     end
   end
   
@@ -62,22 +62,11 @@ end
 
 desc "Build cucumber.yml file"
 task :cucumber_defaults do
-  default_requires = %w(
-    --require features/support/env.rb
-    --require features/support/db/mysql.rb
-    --require features/support/db/active_record.rb
-    --require features/support/post_database.rb
-  ).join(" ")
-  
-  step_definitions = FileList["features/step_definitions/**.rb"].collect { |path|
+  steps = FileList["features/step_definitions/**.rb"].collect { |path|
     "--require #{path}"
   }.join(" ")
   
-  features = FileList["features/*.feature"].join(" ")
-  
   File.open('cucumber.yml', 'w') { |f|
-    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}\""
+    f.write "default: \"--require features/support/env.rb #{steps}\"\n"
   }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.2.12
+  version: 1.2.13
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-05 00:00:00 +02:00
+date: 2009-11-01 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +34,8 @@ files:
 - LICENCE
 - README.textile
 - VERSION.yml
+- lib/cucumber/thinking_sphinx/internal_world.rb
+- lib/cucumber/thinking_sphinx/sql_logger.rb
 - lib/thinking_sphinx.rb
 - lib/thinking_sphinx/active_record.rb
 - lib/thinking_sphinx/active_record/attribute_updates.rb
@@ -149,6 +151,100 @@ signing_key:
 specification_version: 3
 summary: ActiveRecord/Rails Sphinx library
 test_files: 
+- features/alternate_primary_key.feature
+- features/attribute_transformation.feature
+- features/attribute_updates.feature
+- features/datetime_deltas.feature
+- features/delayed_delta_indexing.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_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
+- features/step_definitions/datetime_delta_steps.rb
+- features/step_definitions/delayed_delta_indexing_steps.rb
+- features/step_definitions/extensible_delta_indexing_steps.rb
+- features/step_definitions/facet_steps.rb
+- features/step_definitions/find_arguments_steps.rb
+- features/step_definitions/gamma_steps.rb
+- features/step_definitions/scope_steps.rb
+- features/step_definitions/search_steps.rb
+- features/step_definitions/sphinx_steps.rb
+- features/sti_searching.feature
+- features/support/database.example.yml
+- features/support/database.yml
+- features/support/db/active_record.rb
+- features/support/db/database.yml
+- features/support/db/fixtures/alphas.rb
+- features/support/db/fixtures/authors.rb
+- features/support/db/fixtures/betas.rb
+- features/support/db/fixtures/boxes.rb
+- features/support/db/fixtures/categories.rb
+- features/support/db/fixtures/cats.rb
+- features/support/db/fixtures/comments.rb
+- features/support/db/fixtures/delayed_betas.rb
+- features/support/db/fixtures/developers.rb
+- features/support/db/fixtures/dogs.rb
+- features/support/db/fixtures/extensible_betas.rb
+- features/support/db/fixtures/gammas.rb
+- features/support/db/fixtures/people.rb
+- features/support/db/fixtures/posts.rb
+- features/support/db/fixtures/robots.rb
+- features/support/db/fixtures/tags.rb
+- features/support/db/fixtures/thetas.rb
+- features/support/db/migrations/create_alphas.rb
+- features/support/db/migrations/create_animals.rb
+- features/support/db/migrations/create_authors.rb
+- features/support/db/migrations/create_authors_posts.rb
+- features/support/db/migrations/create_betas.rb
+- features/support/db/migrations/create_boxes.rb
+- features/support/db/migrations/create_categories.rb
+- features/support/db/migrations/create_comments.rb
+- features/support/db/migrations/create_delayed_betas.rb
+- features/support/db/migrations/create_developers.rb
+- features/support/db/migrations/create_extensible_betas.rb
+- features/support/db/migrations/create_gammas.rb
+- features/support/db/migrations/create_people.rb
+- features/support/db/migrations/create_posts.rb
+- features/support/db/migrations/create_robots.rb
+- features/support/db/migrations/create_taggings.rb
+- features/support/db/migrations/create_tags.rb
+- features/support/db/migrations/create_thetas.rb
+- features/support/db/mysql.rb
+- features/support/db/postgresql.rb
+- features/support/env.rb
+- features/support/lib/generic_delta_handler.rb
+- features/support/models/alpha.rb
+- features/support/models/animal.rb
+- features/support/models/author.rb
+- features/support/models/beta.rb
+- features/support/models/box.rb
+- features/support/models/cat.rb
+- features/support/models/category.rb
+- features/support/models/comment.rb
+- features/support/models/delayed_beta.rb
+- features/support/models/developer.rb
+- features/support/models/dog.rb
+- features/support/models/extensible_beta.rb
+- features/support/models/gamma.rb
+- features/support/models/person.rb
+- features/support/models/post.rb
+- features/support/models/robot.rb
+- features/support/models/tag.rb
+- features/support/models/tagging.rb
+- features/support/models/theta.rb
+- features/support/post_database.rb
 - spec/lib/thinking_sphinx/active_record/delta_spec.rb
 - spec/lib/thinking_sphinx/active_record/has_many_association_spec.rb
 - spec/lib/thinking_sphinx/active_record/scopes_spec.rb
@@ -158,6 +254,7 @@ test_files:
 - spec/lib/thinking_sphinx/configuration_spec.rb
 - spec/lib/thinking_sphinx/core/array_spec.rb
 - spec/lib/thinking_sphinx/core/string_spec.rb
+- spec/lib/thinking_sphinx/deltas/job_spec.rb
 - spec/lib/thinking_sphinx/excerpter_spec.rb
 - spec/lib/thinking_sphinx/facet_search_spec.rb
 - spec/lib/thinking_sphinx/facet_spec.rb