riddle 2.1.0 → 2.2.0

data/spec/fixtures/sql/structure.sql

@@ -1,16 +0,0 @@
-DROP TABLE IF EXISTS `people`;
-
-CREATE TABLE `people` (
-  `id` int(11) NOT NULL auto_increment,
-  `first_name` varchar(50) NOT NULL,
-  `middle_initial` varchar(10) NOT NULL,
-  `last_name` varchar(50) NOT NULL,
-  `gender` varchar(10) NOT NULL,
-  `street_address` varchar(200) NOT NULL,
-  `city` varchar(100) NOT NULL,
-  `state` varchar(100) NOT NULL,
-  `postcode` varchar(10) NOT NULL,
-  `email` varchar(100) NOT NULL,
-  `birthday` datetime NOT NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8

data/spec/functional/connection_spec.rb

@@ -1,64 +0,0 @@
-require 'spec_helper'
-
-class RiddleSpecConnectionProcError < StandardError; end
-
-describe 'Sphinx Client', :live => true do
-  let(:client) { Riddle::Client.new 'localhost', 9313 }
-
-  after :each do
-    Riddle::Client.connection = nil
-  end
-
-  describe '.connection' do
-    it "should use the given block" do
-      Riddle::Client.connection = lambda { |client|
-        TCPSocket.new(client.server, client.port)
-      }
-      client.query('smith').should be_kind_of(Hash)
-    end
-
-    it "should fail with errors from the given block" do
-      Riddle::Client.connection = lambda { |client|
-        raise RiddleSpecConnectionProcError
-      }
-      lambda { client.query('smith') }.
-        should raise_error(Riddle::ResponseError)
-    end
-  end
-
-  describe '#connection' do
-    it "use the given block" do
-      client.connection = lambda { |client|
-        TCPSocket.new(client.server, client.port)
-      }
-      client.query('smith').should be_kind_of(Hash)
-    end
-
-    it "should fail with errors from the given block" do
-      client.connection = lambda { |client|
-        raise RiddleSpecConnectionProcError
-      }
-      lambda { client.query('smith') }.
-        should raise_error(Riddle::ResponseError)
-    end
-
-    it "should not override OutOfBoundsError instances" do
-      client.connection = lambda { |client|
-        raise Riddle::OutOfBoundsError
-      }
-      lambda { client.query('smith') }.
-        should raise_error(Riddle::OutOfBoundsError)
-    end
-
-    it "should prioritise instance over class connection" do
-      Riddle::Client.connection = lambda { |client|
-        raise RiddleSpecConnectionProcError
-      }
-      client.connection = lambda { |client|
-        TCPSocket.new(client.server, client.port)
-      }
-
-      lambda { client.query('smith') }.should_not raise_error
-    end
-  end
-end

data/spec/functional/escaping_spec.rb

@@ -1,49 +0,0 @@
-require 'spec_helper'
-
-describe 'SphinxQL escaping', :live => true do
-  let(:connection) { Mysql2::Client.new :host => '127.0.0.1', :port => 9306 }
-
-  def sphinxql_matching(string)
-    select = Riddle::Query::Select.new
-    select.from 'people'
-    select.matching string
-    select.to_sql
-  end
-
-  ['@', "'", '"', '\\"', "\\'", "?"].each do |string|
-    it "escapes #{string}" do
-      lambda {
-        connection.query sphinxql_matching(Riddle::Query.escape(string))
-      }.should_not raise_error
-    end
-  end
-
-  context 'on snippets' do
-    def snippets_for(text, words = '', options = nil)
-      snippets_query = Riddle::Query.snippets(text, 'people', words, options)
-      connection.query(snippets_query).first['snippet']
-    end
-
-    it 'preserves original text with special SphinxQL escape characters' do
-      text = 'email: john@example.com (yay!)'
-      snippets_for(text).should == text
-    end
-
-    it 'preserves original text with special MySQL escape characters' do
-      text = "'Dear' Susie\nAlways use {\\LaTeX}"
-      snippets_for(text).should == text
-    end
-
-    it 'escapes match delimiters with special SphinxQL escape characters' do
-      snippets = snippets_for('hello world', 'world',
-        :before_match => '()|-!', :after_match => '@~"/^$')
-      snippets.should == 'hello ()|-!world@~"/^$'
-    end
-
-    it 'escapes match delimiters with special MySQL escape characters' do
-      snippets = snippets_for('hello world', 'world',
-        :before_match => "'\"", :after_match => "\n\t\\")
-      snippets.should == "hello '\"world\n\t\\"
-    end
-  end
-end unless RUBY_PLATFORM == 'java' || Riddle.loaded_version.to_i < 2

data/spec/functional/excerpt_spec.rb

@@ -1,139 +0,0 @@
-require 'spec_helper'
-
-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",
-      :words  => "Mary",
-      :docs   => ["Mary, Mary, quite contrary."]
-    ).should == [
-      '<span class="match">Mary</span>, <span class="match">Mary</span>, quite contrary.'
-    ]
-  end
-
-  it "should use specified word markers" do
-    @client.excerpts(
-      :index        => "people",
-      :words        => "Mary",
-      :docs         => ["Mary, Mary, quite contrary."],
-      :before_match => "<em>",
-      :after_match  => "</em>"
-    ).should == [
-      "<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",
-      :words        => "Pat",
-      :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
-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
-you what the keyword is. I bet you're really interested in finding out,
-yeah? Excerpts are particularly riveting. This keyword, however, is
-not. It's just my name: Pat.
-        SENTENCE
-        ],
-      :before_match => "<em>",
-      :after_match  => "</em>"
-    )
-
-
-    case Riddle.loaded_version
-    when '0.9.9'
-      excerpts.should == [
-        <<-SENTENCE
-This is a really long sentence written by <em>Pat</em>. It has to be over 256
-characters long, between keywords. But what is the  &#8230; 're really interested in finding out,
-yeah? Excerpts are particularly riveting. This keyword, however, is
-not. It's just my name: <em>Pat</em>.
-        SENTENCE
-      ]
-    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', '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 == [
-        <<-SENTENCE
-This is a really long sentence written by <em>Pat</em>. It has to be over 256
-characters long, between keywords. But what is the keyword?  &#8230;  interested in finding out,
-yeah? Excerpts are particularly riveting. This keyword, however, is
-not. It's just my name: <em>Pat</em>.
-        SENTENCE
-      ]
-    end
-  end
-
-  it "should use the provided separator" do
-    excerpts = @client.excerpts(
-      :index           => "people",
-      :words           => "Pat",
-      :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
-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
-you what the keyword is. I bet you're really interested in finding out,
-yeah? Excerpts are particularly riveting. This keyword, however, is
-not. It's just my name: Pat.
-        SENTENCE
-        ],
-      :before_match    => "<em>",
-      :after_match     => "</em>",
-      :chunk_separator => " --- "
-    )
-
-    case Riddle.loaded_version
-    when '0.9.9'
-      excerpts.should == [
-        <<-SENTENCE
-This is a really long sentence written by <em>Pat</em>. It has to be over 256
-characters long, between keywords. But what is the  --- 're really interested in finding out,
-yeah? Excerpts are particularly riveting. This keyword, however, is
-not. It's just my name: <em>Pat</em>.
-        SENTENCE
-      ]
-    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', '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 == [
-        <<-SENTENCE
-This is a really long sentence written by <em>Pat</em>. It has to be over 256
-characters long, between keywords. But what is the keyword?  ---  interested in finding out,
-yeah? Excerpts are particularly riveting. This keyword, however, is
-not. It's just my name: <em>Pat</em>.
-        SENTENCE
-      ]
-    end
-  end
-
-  it "should return multiple results for multiple documents" do
-     @client.excerpts(
-        :index        => "people",
-        :words        => "Mary",
-        :docs         => [
-          "Mary, Mary, quite contrary.",
-          "The epithet \"Bloody Mary\" is associated with a number of historical and fictional women, most notably Queen Mary I of England"
-        ],
-        :before_match => "<em>",
-        :after_match  => "</em>"
-      ).should == [
-        "<em>Mary</em>, <em>Mary</em>, quite contrary.",
-        "The epithet \"Bloody <em>Mary</em>\" is associated with a number of historical and fictional women, most notably Queen <em>Mary</em> I of England"
-      ]
-  end
-end

data/spec/functional/keywords_spec.rb

@@ -1,40 +0,0 @@
-require 'spec_helper'
-
-describe "Sphinx Keywords", :live => true do
-  before :each do
-    @client = Riddle::Client.new("localhost", 9313)
-  end
-  
-  it "should return an array of hashes" do
-    results = @client.keywords("pat", "people")
-    results.should be_kind_of(Array)
-    
-    results.each do |result|
-      result.should be_kind_of(Hash)
-    end
-  end
-  
-  it "should have keys for normalised and tokenised versions of the keywords" do
-    results = @client.keywords("pat", "people")
-    results.each do |result|
-      result.keys.should include(:normalised)
-      result.keys.should include(:tokenised)
-    end
-  end
-  
-  it "shouldn't have docs or hits keys if not requested" do
-    results = @client.keywords("pat", "people")
-    results.each do |result|
-      result.keys.should_not include(:docs)
-      result.keys.should_not include(:hits)
-    end
-  end
-  
-  it "should have docs and hits keys if requested" do
-    results = @client.keywords("pat", "people", true)
-    results.each do |result|
-      result.keys.should include(:docs)
-      result.keys.should include(:hits)
-    end
-  end
-end

data/spec/functional/persistance_spec.rb

@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe "Sphinx Persistance Connection", :live => true do
-  before :each do
-    @client = Riddle::Client.new("localhost", 9313)
-  end
-  
-  it "should raise errors once already opened" do
-    @client.open
-    lambda { @client.open }.should raise_error
-    @client.close
-  end
-  
-  it "should raise errors if closing when already closed" do
-    lambda { @client.close }.should raise_error
-  end
-end

data/spec/functional/search_spec.rb

@@ -1,67 +0,0 @@
-require 'spec_helper'
-
-describe "Sphinx Searches", :live => true do
-  let(:client) { Riddle::Client.new 'localhost', 9313 }
-  
-  it "should return a single hash if a single query" do
-    client.query("smith").should be_kind_of(Hash)
-  end
-  
-  it "should return an array of hashs if multiple queries are run" do
-    client.append_query "smith"
-    client.append_query "jones"
-    results = client.run
-    results.should be_kind_of(Array)
-    results.each { |result| result.should be_kind_of(Hash) }
-  end
-  
-  it "should return an array of matches" do
-    matches = client.query("smith")[:matches]
-    matches.should be_kind_of(Array)
-    matches.each { |match| match.should be_kind_of(Hash) }
-  end
-  
-  it "should return an array of string fields" do
-    fields = client.query("smith")[:fields]
-    fields.should be_kind_of(Array)
-    fields.each { |field| field.should be_kind_of(String) }
-  end
-  
-  it "should return an array of attribute names" do
-    attributes = client.query("smith")[:attribute_names]
-    attributes.should be_kind_of(Array)
-    attributes.each { |a| a.should be_kind_of(String) }
-  end
-  
-  it "should return a hash of attributes" do
-    attributes = client.query("smith")[:attributes]
-    attributes.should be_kind_of(Hash)
-    attributes.each do |key,value|
-      key.should be_kind_of(String)
-      value.should be_kind_of(Integer)
-    end
-  end
-  
-  it "should return the total number of results returned" do
-    client.query("smith")[:total].should be_kind_of(Integer)
-  end
-  
-  it "should return the total number of results available" do
-    client.query("smith")[:total_found].should be_kind_of(Integer)
-  end
-  
-  it "should return the time taken for the query as a float" do
-    client.query("smith")[:time].should be_kind_of(Float)
-  end
-  
-  it "should return a hash of the words from the query, with the number of documents and the number of hits" do
-    words = client.query("smith victoria")[:words]
-    words.should be_kind_of(Hash)
-    words.each do |word,hash|
-      word.should be_kind_of(String)
-      hash.should be_kind_of(Hash)
-      hash[:docs].should be_kind_of(Integer)
-      hash[:hits].should be_kind_of(Integer)
-    end
-  end
-end

data/spec/functional/status_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-if Riddle.loaded_version == '0.9.9' || Riddle.loaded_version == '1.10'
-  describe "Sphinx Status", :live => true do
-    before :each do
-      @client = Riddle::Client.new("localhost", 9313)
-      @status = @client.status
-    end
-  
-    it "should return a hash" do
-      @status.should be_a(Hash)
-    end
-  
-    it "should include the uptime, connections, and command_search keys" do
-      # Not checking all values, but ensuring keys are being set correctly
-      @status[:uptime].should_not be_nil
-      @status[:connections].should_not be_nil
-      @status[:command_search].should_not be_nil
-    end
-  end
-end

data/spec/functional/update_spec.rb

@@ -1,41 +0,0 @@
-require 'spec_helper'
-
-describe "Sphinx Updates", :live => true do
-  before :each do
-    @client = Riddle::Client.new("localhost", 9313)
-  end
-  
-  it "should update a single record appropriately" do
-    # check existing birthday
-    result = @client.query("Ellie K Ford")
-    result[:matches].should_not be_empty
-    result[:matches].length.should == 1
-    ellie = result[:matches].first
-    ellie[:attributes]["birthday"].should == Time.local(1970, 1, 23).to_i
-    
-    # make Ellie younger by 6 years
-    @client.update("people", ["birthday"], {ellie[:doc] => [Time.local(1976, 1, 23).to_i]})
-    
-    # check attribute's value
-    result = @client.query("Ellie K Ford")
-    result[:matches].should_not be_empty
-    result[:matches].length.should == 1
-    ellie = result[:matches].first
-    ellie[:attributes]["birthday"].should == Time.local(1976, 1, 23).to_i
-  end
-  
-  it "should update multiple records appropriately" do
-    result = @client.query("Steele")
-    pairs = {}
-    result[:matches].each do |match|
-      pairs[match[:doc]] = [match[:attributes]["birthday"] + (365*24*60*60)]
-    end
-    
-    @client.update "people", ["birthday"], pairs
-    
-    result = @client.query("Steele")
-    result[:matches].each do |match|
-      match[:attributes]["birthday"].should == pairs[match[:doc]].first
-    end
-  end
-end