riddle 1.5.0 → 1.5.1

data/spec/functional/excerpt_spec.rb

@@ -4,7 +4,7 @@ describe "Sphinx Excepts", :live => true do
   before :each do
     @client = Riddle::Client.new("localhost", 9313)
   end
-  
+
   it "should highlight a single word multiple times in a document" do
     @client.excerpts(
       :index  => "people",
@@ -14,7 +14,7 @@ describe "Sphinx Excepts", :live => true do
       '<span class="match">Mary</span>, <span class="match">Mary</span>, quite contrary.'
     ]
   end
-  
+
   it "should use specified word markers" do
     @client.excerpts(
       :index        => "people",
@@ -26,7 +26,7 @@ describe "Sphinx Excepts", :live => true do
       "<em>Mary</em>, <em>Mary</em>, quite contrary."
     ]
   end
-  
+
   it "should separate matches that are far apart by an ellipsis by default" do
     excerpts = @client.excerpts(
       :index        => "people",
@@ -34,7 +34,7 @@ describe "Sphinx Excepts", :live => true do
       :docs         => [
         <<-SENTENCE
 This is a really long sentence written by Pat. It has to be over 256
-characters long, between keywords. But what is the keyword? Well, I 
+characters long, between keywords. But what is the keyword? Well, I
 can't tell you just yet... wait patiently until we've hit the 256 mark.
 It'll take a bit longer than you think. We're probably just hitting the
 200 mark at this point. But I think we've now arrived - so I can tell
@@ -46,8 +46,8 @@ not. It's just my name: Pat.
       :before_match => "<em>",
       :after_match  => "</em>"
     )
-    
-    
+
+
     case Riddle.loaded_version
     when '0.9.9'
       excerpts.should == [
@@ -60,7 +60,7 @@ not. It's just my name: <em>Pat</em>.
       ]
     when '1.10'
       excerpts.should == [" &#8230;  really long sentence written by <em>Pat</em>. It has to be over &#8230; . This keyword, however, is\nnot. It's just my name: <em>Pat</em> &#8230; "]
-    when '2.0.1'
+    when '2.0.1', '2.1.0'
       excerpts.should == [" &#8230;  really long sentence written by <em>Pat</em>. It has to be over &#8230; . It's just my name: <em>Pat</em>.\n"]
     else
       excerpts.should == [
@@ -73,7 +73,7 @@ not. It's just my name: <em>Pat</em>.
       ]
     end
   end
-  
+
   it "should use the provided separator" do
     excerpts = @client.excerpts(
       :index           => "people",
@@ -81,7 +81,7 @@ not. It's just my name: <em>Pat</em>.
       :docs            => [
         <<-SENTENCE
 This is a really long sentence written by Pat. It has to be over 256
-characters long, between keywords. But what is the keyword? Well, I 
+characters long, between keywords. But what is the keyword? Well, I
 can't tell you just yet... wait patiently until we've hit the 256 mark.
 It'll take a bit longer than you think. We're probably just hitting the
 200 mark at this point. But I think we've now arrived - so I can tell
@@ -94,7 +94,7 @@ not. It's just my name: Pat.
       :after_match     => "</em>",
       :chunk_separator => " --- "
     )
-    
+
     case Riddle.loaded_version
     when '0.9.9'
       excerpts.should == [
@@ -107,7 +107,7 @@ not. It's just my name: <em>Pat</em>.
       ]
     when '1.10'
       excerpts.should == [" ---  really long sentence written by <em>Pat</em>. It has to be over --- . This keyword, however, is\nnot. It's just my name: <em>Pat</em> --- "]
-    when '2.0.1'
+    when '2.0.1', '2.1.0'
       excerpts.should == [" ---  really long sentence written by <em>Pat</em>. It has to be over --- . It's just my name: <em>Pat</em>.\n"]
     else
       excerpts.should == [
@@ -120,7 +120,7 @@ not. It's just my name: <em>Pat</em>.
       ]
     end
   end
-  
+
   it "should return multiple results for multiple documents" do
      @client.excerpts(
         :index        => "people",

data/spec/riddle/auto_version_spec.rb

@@ -49,5 +49,12 @@ describe Riddle::AutoVersion do
       @controller.stub!(:sphinx_version => '2.0.1-beta')
       Riddle::AutoVersion.configure
     end
+
+    it "should require 2.1.0 if that is the known version" do
+      Riddle::AutoVersion.should_receive(:require).with('riddle/2.1.0')
+
+      @controller.stub!(:sphinx_version => '2.1.0-dev')
+      Riddle::AutoVersion.configure
+    end
   end
 end

data/spec/support/binary_fixtures.rb

@@ -1,14 +1,14 @@
 module BinaryFixtures
   def self.build_fixtures(version = nil)
     return if ENV['TRAVIS']
-    
-    version ||= %w(0.9.9 1.10 2.0.1)
+
+    version ||= %w(0.9.9 1.10 2.0.1 2.1.0)
     Array(version).each do |version|
       FileUtils.mkdir_p "spec/fixtures/data/#{version}"
       `php -f spec/fixtures/data_generator.#{version}.php`
     end
   end
-  
+
   def query_contents(key)
     path     = "spec/fixtures/data/#{Riddle.loaded_version}/#{key}.bin"
     contents = open(path) { |f| f.read }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riddle
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-04 00:00:00.000000000 Z
+date: 2012-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70319939317800 !ruby/object:Gem::Requirement
+  requirement: &70316764766880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70319939317800
+  version_requirements: *70316764766880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70319939316860 !ruby/object:Gem::Requirement
+  requirement: &70316764765360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70319939316860
+  version_requirements: *70316764765360
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70319939316300 !ruby/object:Gem::Requirement
+  requirement: &70316764763300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70319939316300
+  version_requirements: *70316764763300
 description: A Ruby API and configuration helper for the Sphinx search service.
 email:
 - pat@freelancing-gods.com
@@ -68,6 +68,7 @@ files:
 - lib/riddle/1.10/client.rb
 - lib/riddle/2.0.1.rb
 - lib/riddle/2.0.1/client.rb
+- lib/riddle/2.1.0.rb
 - lib/riddle/auto_version.rb
 - lib/riddle/client.rb
 - lib/riddle/client/filter.rb
@@ -173,16 +174,45 @@ files:
 - spec/fixtures/data/2.0.1/sort.bin
 - spec/fixtures/data/2.0.1/update_simple.bin
 - spec/fixtures/data/2.0.1/weights.bin
+- spec/fixtures/data/2.1.0/anchor.bin
+- spec/fixtures/data/2.1.0/any.bin
+- spec/fixtures/data/2.1.0/boolean.bin
+- spec/fixtures/data/2.1.0/comment.bin
+- spec/fixtures/data/2.1.0/distinct.bin
+- spec/fixtures/data/2.1.0/field_weights.bin
+- spec/fixtures/data/2.1.0/filter.bin
+- spec/fixtures/data/2.1.0/filter_array.bin
+- spec/fixtures/data/2.1.0/filter_array_exclude.bin
+- spec/fixtures/data/2.1.0/filter_boolean.bin
+- spec/fixtures/data/2.1.0/filter_floats.bin
+- spec/fixtures/data/2.1.0/filter_floats_exclude.bin
+- spec/fixtures/data/2.1.0/filter_range.bin
+- spec/fixtures/data/2.1.0/filter_range_exclude.bin
+- spec/fixtures/data/2.1.0/group.bin
+- spec/fixtures/data/2.1.0/index.bin
+- spec/fixtures/data/2.1.0/index_weights.bin
+- spec/fixtures/data/2.1.0/keywords_with_hits.bin
+- spec/fixtures/data/2.1.0/keywords_without_hits.bin
+- spec/fixtures/data/2.1.0/overrides.bin
+- spec/fixtures/data/2.1.0/phrase.bin
+- spec/fixtures/data/2.1.0/rank_mode.bin
+- spec/fixtures/data/2.1.0/select.bin
+- spec/fixtures/data/2.1.0/simple.bin
+- spec/fixtures/data/2.1.0/sort.bin
+- spec/fixtures/data/2.1.0/update_simple.bin
+- spec/fixtures/data/2.1.0/weights.bin
 - spec/fixtures/data_generator.0.9.8.php
 - spec/fixtures/data_generator.0.9.9.php
 - spec/fixtures/data_generator.1.10.php
 - spec/fixtures/data_generator.2.0.1.php
+- spec/fixtures/data_generator.2.1.0.php
 - spec/fixtures/data_generator.php
 - spec/fixtures/sphinx/configuration.erb
 - spec/fixtures/sphinxapi.0.9.8.php
 - spec/fixtures/sphinxapi.0.9.9.php
 - spec/fixtures/sphinxapi.1.10.php
 - spec/fixtures/sphinxapi.2.0.1.php
+- spec/fixtures/sphinxapi.2.1.0.php
 - spec/fixtures/sql/conf.example.yml
 - spec/fixtures/sql/data.sql
 - spec/fixtures/sql/data.tsv
@@ -234,7 +264,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3403053604125557779
+      hash: -2420399523402402729
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -243,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3403053604125557779
+      hash: -2420399523402402729
 requirements: []
 rubyforge_project: riddle
 rubygems_version: 1.8.10
@@ -333,16 +363,45 @@ test_files:
 - spec/fixtures/data/2.0.1/sort.bin
 - spec/fixtures/data/2.0.1/update_simple.bin
 - spec/fixtures/data/2.0.1/weights.bin
+- spec/fixtures/data/2.1.0/anchor.bin
+- spec/fixtures/data/2.1.0/any.bin
+- spec/fixtures/data/2.1.0/boolean.bin
+- spec/fixtures/data/2.1.0/comment.bin
+- spec/fixtures/data/2.1.0/distinct.bin
+- spec/fixtures/data/2.1.0/field_weights.bin
+- spec/fixtures/data/2.1.0/filter.bin
+- spec/fixtures/data/2.1.0/filter_array.bin
+- spec/fixtures/data/2.1.0/filter_array_exclude.bin
+- spec/fixtures/data/2.1.0/filter_boolean.bin
+- spec/fixtures/data/2.1.0/filter_floats.bin
+- spec/fixtures/data/2.1.0/filter_floats_exclude.bin
+- spec/fixtures/data/2.1.0/filter_range.bin
+- spec/fixtures/data/2.1.0/filter_range_exclude.bin
+- spec/fixtures/data/2.1.0/group.bin
+- spec/fixtures/data/2.1.0/index.bin
+- spec/fixtures/data/2.1.0/index_weights.bin
+- spec/fixtures/data/2.1.0/keywords_with_hits.bin
+- spec/fixtures/data/2.1.0/keywords_without_hits.bin
+- spec/fixtures/data/2.1.0/overrides.bin
+- spec/fixtures/data/2.1.0/phrase.bin
+- spec/fixtures/data/2.1.0/rank_mode.bin
+- spec/fixtures/data/2.1.0/select.bin
+- spec/fixtures/data/2.1.0/simple.bin
+- spec/fixtures/data/2.1.0/sort.bin
+- spec/fixtures/data/2.1.0/update_simple.bin
+- spec/fixtures/data/2.1.0/weights.bin
 - spec/fixtures/data_generator.0.9.8.php
 - spec/fixtures/data_generator.0.9.9.php
 - spec/fixtures/data_generator.1.10.php
 - spec/fixtures/data_generator.2.0.1.php
+- spec/fixtures/data_generator.2.1.0.php
 - spec/fixtures/data_generator.php
 - spec/fixtures/sphinx/configuration.erb
 - spec/fixtures/sphinxapi.0.9.8.php
 - spec/fixtures/sphinxapi.0.9.9.php
 - spec/fixtures/sphinxapi.1.10.php
 - spec/fixtures/sphinxapi.2.0.1.php
+- spec/fixtures/sphinxapi.2.1.0.php
 - spec/fixtures/sql/conf.example.yml
 - spec/fixtures/sql/data.sql
 - spec/fixtures/sql/data.tsv
@@ -380,3 +439,4 @@ test_files:
 - spec/unit/message_spec.rb
 - spec/unit/response_spec.rb
 - spec/unit/riddle_spec.rb
+has_rdoc: