riddle 1.0.3 → 1.0.4

data/README.textile

@@ -79,3 +79,4 @@ Thanks to the following people who have contributed to Riddle in some shape or f
 * Dylan Egan
 * Jerry Vos
 * Piotr Sarnacki
+* Tim Preston

data/lib/riddle.rb

@@ -1,10 +1,6 @@
 require 'socket'
 require 'timeout'
 
-require 'riddle/client'
-require 'riddle/configuration'
-require 'riddle/controller'
-
 module Riddle #:nodoc:
   class ConnectionError < StandardError #:nodoc:
     #
@@ -21,4 +17,34 @@ module Riddle #:nodoc:
   def self.escape(string)
     string.gsub(escape_pattern) { |char| "\\#{char}" }
   end
+  
+  def self.loaded_version
+    Thread.current[:riddle_sphinx_version]
+  end
+  
+  def self.loaded_version=(version)
+    Thread.current[:riddle_sphinx_version] = version
+  end
+  
+  def self.version_warning
+    return if loaded_version
+    
+    STDERR.puts %Q{
+Riddle cannot detect Sphinx on your machine, and so can't determine which
+version of Sphinx you are planning on using. Please use one of the following
+lines after "require 'riddle'" to avoid this warning.
+
+  require 'riddle/0.9.8'
+  # or
+  require 'riddle/0.9.9'
+
+    }
+  end
 end
+
+require 'riddle/auto_version'
+require 'riddle/client'
+require 'riddle/configuration'
+require 'riddle/controller'
+
+Riddle::AutoVersion.configure

data/lib/riddle/0.9.8.rb

@@ -0,0 +1 @@
+Riddle.loaded_version = '0.9.8'

data/lib/riddle/0.9.9.rb

@@ -1,3 +1,5 @@
+Riddle.loaded_version = '0.9.9'
+
 require 'riddle/0.9.9/client'
 require 'riddle/0.9.9/client/filter'
 require 'riddle/0.9.9/configuration/searchd'

data/lib/riddle/auto_version.rb

@@ -0,0 +1,11 @@
+class Riddle::AutoVersion
+  def self.configure
+    controller = Riddle::Controller.new nil, ''
+    version    = controller.sphinx_version
+    
+    case version
+    when '0.9.8', '0.9.9'
+      require "riddle/#{version}"
+    end
+  end
+end

data/lib/riddle/client.rb

@@ -129,6 +129,8 @@ module Riddle
     # defaults of localhost and 3312 respectively. All other settings can be
     # accessed and changed via the attribute accessors.
     def initialize(server=nil, port=nil)
+      Riddle.version_warning
+      
       @server = server || "localhost"
       @port   = port   || 3312
       @socket = nil

data/lib/riddle/configuration.rb

@@ -18,6 +18,8 @@ module Riddle
     attr_accessor :indexer
     
     def initialize
+      Riddle.version_warning
+      
       @indexer = Riddle::Configuration::Indexer.new
       @searchd = Riddle::Configuration::Searchd.new
       @indexes = []
@@ -30,4 +32,4 @@ module Riddle
       ).join("\n")
     end
   end
-end
+end

data/lib/riddle/configuration/sql_source.rb

@@ -30,6 +30,19 @@ module Riddle
         @unpack_zlib          = []
         @unpack_mysqlcompress = []
       end
+      
+      def sql_query=(query)
+        unless query.nil?
+          max_length = 8178  # max is: 8192 - "sql_query = ".length - "\\\n".length
+          i = max_length
+          while i < query.length
+            i = query.rindex(" ", i)
+            query.insert(i, "\\" + "\n")
+            i = i + max_length
+          end
+        end
+        @sql_query = query
+      end
             
       def valid?
         super && (!( @sql_host.nil? || @sql_user.nil? || @sql_db.nil? ||

data/lib/riddle/controller.rb

@@ -1,14 +1,31 @@
 module Riddle
   class Controller
+    attr_accessor :path, :bin_path, :searchd_binary_name, :indexer_binary_name
+    
     def initialize(configuration, path)
       @configuration  = configuration
       @path           = path
+      
+      @bin_path            = ''
+      @searchd_binary_name = 'searchd'
+      @indexer_binary_name = 'indexer'
+    end
+    
+    def sphinx_version
+      stderr      = $stderr.dup
+      read, write = IO.pipe
+      $stderr.reopen(write)
+      `#{indexer}`[/^Sphinx (\d\.\d\.\d)/, 1]
+    rescue
+      nil
+    ensure
+      $stderr.reopen(stderr)
     end
     
     def index(*indexes)
       indexes << '--all' if indexes.empty?
       
-      cmd = "indexer --config #{@path} #{indexes.join(' ')}"
+      cmd = "#{indexer} --config #{@path} #{indexes.join(' ')}"
       cmd << " --rotate" if running?
       `#{cmd}`
     end
@@ -16,7 +33,7 @@ module Riddle
     def start
       return if running?
       
-      cmd = "searchd --pidfile --config #{@path}"
+      cmd = "#{searchd} --pidfile --config #{@path}"
       
       if RUBY_PLATFORM =~ /mswin/
         system("start /B #{cmd} 1> NUL 2>&1")
@@ -51,5 +68,15 @@ module Riddle
     rescue
       false
     end
+    
+    private
+    
+    def indexer
+      "#{bin_path}#{indexer_binary_name}"
+    end
+    
+    def searchd
+      "#{bin_path}#{searchd_binary_name}"
+    end
   end
 end

data/spec/functional/excerpt_spec.rb

@@ -48,7 +48,7 @@ not. It's just my name: Pat.
     )
     
     
-    if SphinxVersion == '0.9.9'
+    if Riddle.loaded_version == '0.9.9'
       excerpts.should == [
         <<-SENTENCE
 This is a really long sentence written by <em>Pat</em>. It has to be over 256
@@ -90,7 +90,7 @@ not. It's just my name: Pat.
       :chunk_separator => " --- "
     )
     
-    if SphinxVersion == '0.9.9'
+    if Riddle.loaded_version == '0.9.9'
       excerpts.should == [
         <<-SENTENCE
 This is a really long sentence written by <em>Pat</em>. It has to be over 256

data/spec/functional/status_spec.rb

@@ -1,6 +1,6 @@
 require 'spec/spec_helper'
 
-if SphinxVersion == '0.9.9'
+if Riddle.loaded_version == '0.9.9'
   describe "Sphinx Status" do
     before :each do
       @client = Riddle::Client.new("localhost", 3313)

data/spec/riddle/auto_version_spec.rb

@@ -0,0 +1,24 @@
+require 'spec/spec_helper'
+
+describe Riddle::AutoVersion do
+  describe '.configure' do
+    before :each do
+      @controller = Riddle::Controller.new stub('configuration'), 'sphinx.conf'
+      Riddle::Controller.stub!(:new => @controller)
+    end
+    
+    it "should require 0.9.8 if that is the known version" do
+      Riddle::AutoVersion.should_receive(:require).with('riddle/0.9.8')
+      
+      @controller.stub!(:sphinx_version => '0.9.8')
+      Riddle::AutoVersion.configure
+    end
+    
+    it "should require 0.9.9 if that is the known version" do
+      Riddle::AutoVersion.should_receive(:require).with('riddle/0.9.9')
+      
+      @controller.stub!(:sphinx_version => '0.9.9')
+      Riddle::AutoVersion.configure
+    end
+  end
+end

data/spec/riddle/client_spec.rb

@@ -0,0 +1,11 @@
+require 'spec/spec_helper'
+
+describe Riddle::Client do
+  describe '#initialize' do
+    it "should check the loaded Sphinx version" do
+      Riddle.should_receive(:version_warning)
+      
+      Riddle::Client.new
+    end
+  end
+end

data/spec/riddle/configuration_spec.rb

@@ -0,0 +1,11 @@
+require 'spec/spec_helper'
+
+describe Riddle::Configuration do
+  describe '#initialize' do
+    it "should check the loaded Sphinx version" do
+      Riddle.should_receive(:version_warning)
+      
+      Riddle::Configuration.new
+    end
+  end
+end

data/spec/riddle/controller_spec.rb

@@ -0,0 +1,29 @@
+require 'spec/spec_helper'
+
+describe Riddle::Controller do
+  describe '#sphinx_version' do
+    before :each do
+      @controller = Riddle::Controller.new stub('controller'), 'sphinx.conf'
+    end
+    
+    it "should return 0.9.9 if using 0.9.9 rc2" do
+      @controller.stub!(:` => 'Sphinx 0.9.9-rc2 (r1785)')
+      @controller.sphinx_version.should == '0.9.9'
+    end
+    
+    it "should return 0.9.9 if using 0.9.9 rc1" do
+      @controller.stub!(:` => 'Sphinx 0.9.9-rc1 (r1566)')
+      @controller.sphinx_version.should == '0.9.9'
+    end
+    
+    it "should return 0.9.8 if using 0.9.8.1" do
+      @controller.stub!(:` => 'Sphinx 0.9.8.1-release (r1533)')
+      @controller.sphinx_version.should == '0.9.8'
+    end
+    
+    it "should return 0.9.8 if using 0.9.8" do
+      @controller.stub!(:` => 'Sphinx 0.9.8-release (r1371)')
+      @controller.sphinx_version.should == '0.9.8'
+    end
+  end
+end

data/spec/riddle_spec.rb

@@ -0,0 +1,27 @@
+require 'spec/spec_helper'
+
+describe Riddle do
+  describe '.version_warning' do
+    before :each do
+      @existing_version = Riddle.loaded_version
+    end
+    
+    after :each do
+      Riddle.loaded_version = @existing_version
+    end
+    
+    it "should do nothing if there is a Sphinx version loaded" do
+      STDERR.should_not_receive(:puts)
+      
+      Riddle.loaded_version = '0.9.8'
+      Riddle.version_warning
+    end
+    
+    it "should output a warning if no version is loaded" do
+      STDERR.should_receive(:puts)
+      
+      Riddle.loaded_version = nil
+      Riddle.version_warning
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,6 @@
 $:.unshift File.dirname(__FILE__) + '/../lib'
 
-SphinxVersion = ENV['VERSION'] || '0.9.8'
-
 require 'riddle'
-require "riddle/#{SphinxVersion}"
 require 'spec'
 require 'spec/sphinx_helper'
 
@@ -14,7 +11,7 @@ Spec::Runner.configure do |config|
   sphinx.index
   
   config.before :all do
-    `php -f spec/fixtures/data_generator.#{SphinxVersion}.php`
+    `php -f spec/fixtures/data_generator.#{Riddle.loaded_version}.php`
     sphinx.start
   end
   

data/spec/unit/client_spec.rb

@@ -130,7 +130,7 @@ describe Riddle::Client do
     client.queue.first.should == query_contents(:comment)
   end
   
-  if SphinxVersion == '0.9.9'
+  if Riddle.loaded_version == '0.9.9'
     it "should build a message with overrides correctly" do
       client = Riddle::Client.new
       client.add_override("rating", :float, {1 => 10.0})

data/spec/unit/configuration/searchd_spec.rb

@@ -1,7 +1,7 @@
 require 'spec/spec_helper'
 
 describe Riddle::Configuration::Searchd do
-  if SphinxVersion == '0.9.9'
+  if Riddle.loaded_version == '0.9.9'
     it "should be invalid without a listen or pid_file" do
       searchd = Riddle::Configuration::Searchd.new
       searchd.should_not be_valid
@@ -60,7 +60,7 @@ describe Riddle::Configuration::Searchd do
     searchd.port      = 3312
     searchd.pid_file  = "file.pid"
     
-    if SphinxVersion == '0.9.9'
+    if Riddle.loaded_version == '0.9.9'
       searchd.render.should == <<-SEARCHD
 searchd
 {

data/spec/unit/configuration/sql_source_spec.rb

@@ -112,4 +112,25 @@ source src1
 }
     SQLSOURCE
   end
+  
+  it "should insert a backslash-newline into an sql_query when greater than 8178 characters" do
+    source = Riddle::Configuration::SQLSource.new("src1", "mysql")
+    source.sql_query = big_query_string[0, 8200]
+    
+    (source.sql_query.index("\\\n") < 8178).should be_true
+  end
+  
+  it "should insert two backslash-newlines into an sql_query when greater than 16,356 characters" do
+    source = Riddle::Configuration::SQLSource.new("src1", "mysql")
+    source.sql_query = big_query_string
+    
+    (source.sql_query.index("\\\n") < 8178).should be_true
+    (source.sql_query.index("\\\n", 8178) < 16356).should be_true
+  end
+  
+  def big_query_string
+    return <<-SQL
+SELECT MARLEY was dead to begin with There is no doubtwhatever about that The register of his burial wassigned by the clergyman the clerk the undertakerand the chief mourner Scrooge signed it andScrooges name was good upon Change for anything hechose to put his hand to Old Marley was as dead as adoornailMind I dont mean to say that I know of myown knowledge what there is particularly dead abouta doornail I might have been inclined myself toregard a coffinnail as the deadest piece of ironmongeryin the trade But the wisdom of our ancestorsis in the simile and my unhallowed handsshall not disturb it or the Countrys done for Youwill therefore permit me to repeat emphatically thatMarley was as dead as a doornailScrooge knew he was dead Of course he didHow could it be otherwise Scrooge and he werepartners for I dont know how many years Scroogewas his sole executor his sole administrator his soleassign his sole residuary legatee his sole friend andsole mourner And even Scrooge was not so dreadfullycut up by the sad event but that he was an excellentman of business on the very day of the funeraland solemnised it with an undoubted bargainThe mention of Marleys funeral brings me back tothe point I started from There is no doubt that Marleywas dead This must be distinctly understood ornothing wonderful can come of the story I am goingto relate If we were not perfectly convinced thatHamlets Father died before the play began therewould be nothing more remarkable in his taking astroll at night in an easterly wind upon his own rampartsthan there would be in any other middleagedgentleman rashly turning out after dark in a breezyspotsay Saint Pauls Churchyard for instanceliterally to astonish his sons weak mindScrooge never painted out Old Marleys nameThere it stood years afterwards above the warehousedoor Scrooge and Marley The firm was known asScrooge and Marley Sometimes people new to thebusiness called Scrooge Scrooge and sometimes Marleybut he answered to both names It was all thesame to himOh But he was a tightfisted hand at the grindstoneScrooge a squeezing wrenching grasping scrapingclutching covetous old sinner Hard and sharp as flintfrom which no steel had ever struck out generous firesecret and selfcontained and solitary as an oyster Thecold within him froze his old features nipped his pointednose shrivelled his cheek stiffened his gait made hiseyes red his thin lips blue and spoke out shrewdly in hisgrating voice A frosty rime was on his head and on hiseyebrows and his wiry chin He carried his own lowtemperature always about with him he iced his office inthe dogdays and didnt thaw it one degree at ChristmasExternal heat and cold had little influence onScrooge No warmth could warm no wintry weatherchill him No wind that blew was bitterer than heno falling snow was more intent upon its purpose nopelting rain less open to entreaty Foul weather didntknow where to have him The heaviest rain andsnow and hail and sleet could boast of the advantageover him in only one respect They often came downhandsomely and Scrooge never didNobody ever stopped him in the street to say withgladsome looks My dear Scrooge how are youWhen will you come to see me No beggars imploredhim to bestow a trifle no children asked himwhat it was oclock no man or woman ever once in allhis life inquired the way to such and such a place ofScrooge Even the blind mens dogs appeared toknow him and when they saw him coming on wouldtug their owners into doorways and up courts andthen would wag their tails as though they said Noeye at all is better than an evil eye dark masterBut what did Scrooge care It was the very thinghe liked To edge his way along the crowded pathsof life warning all human sympathy to keep its distancewas what the knowing ones call nuts to ScroogeOnce upon a timeof all the good days in the yearon Christmas Eveold Scrooge sat busy in hiscountinghouse It was cold bleak biting weather foggywithal and he could hear the people in the court outsidego wheezing up and down beating their handsupon their breasts and stamping their feet upon thepavement stones to warm them The city clocks hadonly just gone three but it was quite dark alreadyit had not been light all dayand candles were flaringin the windows of the neighbouring offices likeruddy smears upon the palpable brown air The fogcame pouring in at every chink and keyhole and wasso dense without that although the court was of thenarrowest the houses opposite were mere phantomsTo see the dingy cloud come drooping down obscuringeverything one might have thought that Naturelived hard by and was brewing on a large scaleThe door of Scrooges countinghouse was openthat he might keep his eye upon his clerk who in adismal little cell beyond a sort of tank was copyingletters Scrooge had a very small fire but the clerksfire was so very much smaller that it looked like onecoal But he couldnt replenish it for Scrooge keptthe coalbox in his own room and so surely as theclerk came in with the shovel the master predictedthat it would be necessary for them to part Whereforethe clerk put on his white comforter and tried towarm himself at the candle in which effort not beinga man of a strong imagination he failedA merry Christmas uncle God save you crieda cheerful voice It was the voice of Scroogesnephew who came upon him so quickly that this wasthe first intimation he had of his approachBah said Scrooge HumbugHe had so heated himself with rapid walking in thefog and frost this nephew of Scrooges that he wasall in a glow his face was ruddy and handsome hiseyes sparkled and his breath smoked againChristmas a humbug uncle said Scroogesnephew You dont mean that I am sureI do said Scrooge Merry Christmas Whatright have you to be merry What reason have youto be merry Youre poor enoughCome then returned the nephew gaily Whatright have you to be dismal What reason have youto be morose Youre rich enoughScrooge having no better answer ready on the spurof the moment said Bah again and followed it upwith HumbugDont be cross uncle said the nephewWhat else can I be returned the uncle when Ilive in such a world of fools as this Merry ChristmasOut upon merry Christmas Whats Christmastime to you but a time for paying bills withoutmoney a time for finding yourself a year older butnot an hour richer a time for balancing your booksand having every item in em through a round dozenof months presented dead against you If I couldwork my will said Scrooge indignantly every idiotwho goes about with Merry Christmas on his lipsshould be boiled with his own pudding and buriedwith a stake of holly through his heart He shouldUncle pleaded the nephewNephew returned the uncle sternly keep Christmasin your own way and let me keep it in mineKeep it repeated Scrooges nephew But youdont keep itLet me leave it alone then said Scrooge Muchgood may it do you Much good it has ever doneyouThere are many things from which I might havederived good by which I have not profited I daresay returned the nephew Christmas among therest But I am sure I have always thought of Christmastime when it has come roundapart from theveneration due to its sacred name and origin if anythingbelonging to it can be apart from thatas agood time a kind forgiving charitable pleasanttime the only time I know of in the long calendarof the year when men and women seem by one consentto open their shutup hearts freely and to thinkof people below them as if they really werefellowpassengers to the grave and not another raceof creatures bound on other journeys And thereforeuncle though it has never put a scrap of gold orsilver in my pocket I believe that it has done megood and will do me good and I say God bless itThe clerk in the Tank involuntarily applaudedBecoming immediately sensible of the improprietyhe poked the fire and extinguished the last frail sparkfor everLet me hear another sound from you saidScrooge and youll keep your Christmas by losingyour situation Youre quite a powerful speakersir he added turning to his nephew I wonder youdont go into ParliamentDont be angry uncle Come Dine with us tomorrowScrooge said that he would see himyes indeed hedid He went the whole length of the expressionand said that he would see him in that extremity firstBut why cried Scrooges nephew WhyWhy did you get married said ScroogeBecause I fell in loveBecause you fell in love growled Scrooge as ifthat were the only one thing in the world more ridiculousthan a merry Christmas Good afternoonNay uncle but you never came to see me beforethat happened Why give it as a reason for notcoming nowGood afternoon said ScroogeI want nothing from you I ask nothing of youwhy cannot we be friendsGood afternoon said ScroogeI am sorry with all my heart to find you soresolute We have never had any quarrel to which Ihave been a party But I have made the trial inhomage to Christmas and Ill keep my Christmashumour to the last So A Merry Christmas uncleGood afternoon said ScroogeAnd A Happy New YearGood afternoon said ScroogeHis nephew left the room without an angry wordnotwithstanding He stopped at the outer door tobestow the greetings of the season on the clerk whocold as he was was warmer than Scrooge for he returnedthem cordiallyTheres another fellow muttered Scrooge whooverheard him my clerk with fifteen shillings aweek and a wife and family talking about a merryChristmas Ill retire to BedlamThis lunatic in letting Scrooges nephew out hadlet two other people in They were portly gentlemenpleasant to behold and now stood with their hats offin Scrooges office They had books and papers intheir hands and bowed to himScrooge and Marleys I believe said one of thegentlemen referring to his list Have I the pleasureof addressing Mr Scrooge or Mr MarleyMr Marley has been dead these seven yearsScrooge replied He died seven years ago this verynightWe have no doubt his liberality is well representedby his surviving partner said the gentleman presentinghis credentialsIt certainly was for they had been two kindredspirits At the ominous word liberality Scroogefrowned and shook his head and handed the credentialsbackAt this festive season of the year Mr Scroogesaid the gentleman taking up a pen it is more thanusually desirable that we should make some slightprovision for the Poor and destitute who suffergreatly at the present time Many thousands are inwant of common necessaries hundreds of thousandsare in want of common comforts sirAre there no prisons asked ScroogePlenty of prisons said the gentleman laying downthe pen againAnd the Union workhouses demanded ScroogeAre they still in operationThey are Still returned the gentleman I wishI could say they were notThe Treadmill and the Poor Law are in full vigourthen said ScroogeBoth very busy sirOh I was afraid from what you said at firstthat something had occurred to stop them in theiruseful course said Scrooge Im very glad tohear itUnder the impression that they scarcely furnishChristian cheer of mind or body to the multitudereturned the gentleman a few of us are endeavouringto raise a fund to buy the Poor some meat and drinkand means of warmth We choose this time becauseit is a time of all others when Want is keenly feltand Abundance rejoices What shall I put you downforNothing Scrooge repliedYou wish to be anonymousI wish to be left alone said Scrooge Since youask me what I wish gentlemen that is my answerI dont make merry myself at Christmas and I cantafford to make idle people merry I help to supportthe establishments I have mentionedthey costenough and those who are badly off must go thereMany cant go there and many would rather dieIf they would rather die said Scrooge they hadbetter do it and decrease the surplus populationBesidesexcuse meI dont know thatBut you might know it observed the gentlemanIts not my business Scrooge returned Itsenough for a man to understand his own business andnot to interfere with other peoples Mine occupiesme constantly Good afternoon gentlemenSeeing clearly that it would be useless to pursuetheir point the gentlemen withdrew Scrooge resumedhis labours with an improved opinion of himselfand in a more facetious temper than was usualwith himMeanwhile the fog and darkness thickened so thatpeople ran about with flaring links proffering theirservices to go before horses in carriages and conductthem on their way The ancient tower of a churchwhose gruff old bell was always peeping slily downat Scrooge out of a Gothic window in the wall becameinvisible and struck the hours and quarters in theclouds with tremulous vibrations afterwards as ifits teeth were chattering in its frozen head up thereThe cold became intense In the main street at thecorner of the court some labourers were repairingthe gaspipes and had lighted a great fire in a brazierround which a party of ragged men and boys weregathered warming their hands and winking theireyes before the blaze in rapture The waterplugbeing left in solitude its overflowings sullenly congealedand turned to misanthropic ice The brightnessof the shops where holly sprigs and berriescrackled in the lamp heat of the windows made palefaces ruddy as they passed Poulterers and grocerstrades became a splendid joke a glorious pageantwith which it was next to impossible to believe thatsuch dull principles as bargain and sale had anythingto do The Lord Mayor in the stronghold of themighty Mansion House gave orders to his fifty cooksand butlers to keep Christmas as a Lord Mayorshousehold should and even the little tailor whom hehad fined five shillings on the previous Monday forbeing drunk and bloodthirsty in the streets stirred uptomorrows pudding in his garret while his leanwife and the baby sallied out to buy the beefFoggier yet and colder Piercing searching bitingcold If the good Saint Dunstan had but nippedthe Evil Spirits nose with a touch of such weatheras that instead of using his familiar weapons thenindeed he would have roared to lusty purpose Theowner of one scant young nose gnawed and mumbledby the hungry cold as bones are gnawed by dogsstooped down at Scrooges keyhole to regale him witha Christmas carol but at the first sound of        God bless you merry gentleman         May nothing you dismayScrooge seized the ruler with such energy of actionthat the singer fled in terror leaving the keyhole tothe fog and even more congenial frostAt length the hour of shutting up the countinghousearrived With an illwill Scrooge dismounted from hisstool and tacitly admitted the fact to the expectantclerk in the Tank who instantly snuffed his candle outand put on his hatYoull want all day tomorrow I suppose saidScroogeIf quite convenient sirIts not convenient said Scrooge and its notfair If I was to stop halfacrown for it youdthink yourself illused Ill be boundThe clerk smiled faintlyAnd yet said Scrooge you dont think me illusedwhen I pay a days wages for no workThe clerk observed that it was only once a yearA poor excuse for picking a mans pocket everytwentyfifth of December said Scrooge buttoninghis greatcoat to the chin But I suppose you musthave the whole day Be here all the earlier nextmorningThe clerk promised that he would and Scroogewalked out with a growl The office was closed in atwinkling and the clerk with the long ends of hiswhite comforter dangling below his waist for heboasted no greatcoat went down a slide on Cornhillat the end of a lane of boys twenty times inhonour of its being Christmas Eve and then ran hometo Camden Town as hard as he could pelt to playat blindmansbuffScrooge took his melancholy dinner in his usualmelancholy tavern and having read all the newspapers andbeguiled the rest of the evening with hisbankersbook went home to bed He lived inchambers which had once belonged to his deceasedpartner They were a gloomy suite of rooms in alowering pile of building up a yard where it had solittle business to be that one could scarcely helpfancying it must have run there when it was a younghouse playing at hideandseek with other housesand forgotten the way out again It was old enoughnow and dreary enough for nobody lived in it butScrooge the other rooms being all let out as officesThe yard was so dark that even Scrooge who knewits every stone was fain to grope with his handsThe fog and frost so hung about the black old gatewayof the house that it seemed as if the Genius ofthe Weather sat in mournful meditation on thethresholdNow it is a fact that there was nothing at allparticular about the knocker on the door except that itwas very large It is also a fact that Scrooge hadseen it night and morning during his whole residencein that place also that Scrooge had as little of whatis called fancy about him as any man in the city ofLondon even includingwhich is a bold wordthecorporation aldermen and livery Let it also beborne in mind that Scrooge had not bestowed onethought on Marley since his last mention of hisseven years dead partner that afternoon And thenlet any man explain to me if he can how it happenedthat Scrooge having his key in the lock of the doorsaw in the knocker without its undergoing any intermediateprocess of changenot a knocker but Marleys faceMarleys face It was not in impenetrable shadowas the other objects in the yard were but had adismal light about it like a bad lobster in a darkcellar It was not angry or ferocious but lookedat Scrooge as Marley used to look with ghostlyspectacles turned up on its ghostly forehead Thehair was curiously stirred as if by breath or hot airand though the eyes were wide open they were perfectlymotionless FROM documents
+    SQL
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: riddle
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-27 00:00:00 +11:00
+date: 2009-12-01 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,7 @@ files:
 - lib/riddle/0.9.9/client.rb
 - lib/riddle/0.9.9/client/filter.rb
 - lib/riddle/0.9.9/configuration/searchd.rb
+- lib/riddle/auto_version.rb
 - lib/riddle/client.rb
 - lib/riddle/client/filter.rb
 - lib/riddle/client/message.rb
@@ -92,52 +93,6 @@ signing_key:
 specification_version: 3
 summary: An API for Sphinx, written in and for Ruby.
 test_files: 
-- spec/fixtures/data/anchor.bin
-- spec/fixtures/data/any.bin
-- spec/fixtures/data/boolean.bin
-- spec/fixtures/data/comment.bin
-- spec/fixtures/data/distinct.bin
-- spec/fixtures/data/field_weights.bin
-- spec/fixtures/data/filter.bin
-- spec/fixtures/data/filter_array.bin
-- spec/fixtures/data/filter_array_exclude.bin
-- spec/fixtures/data/filter_boolean.bin
-- spec/fixtures/data/filter_floats.bin
-- spec/fixtures/data/filter_floats_exclude.bin
-- spec/fixtures/data/filter_range.bin
-- spec/fixtures/data/filter_range_exclude.bin
-- spec/fixtures/data/group.bin
-- spec/fixtures/data/index.bin
-- spec/fixtures/data/index_weights.bin
-- spec/fixtures/data/keywords_with_hits.bin
-- spec/fixtures/data/keywords_without_hits.bin
-- spec/fixtures/data/overrides.bin
-- spec/fixtures/data/phrase.bin
-- spec/fixtures/data/rank_mode.bin
-- spec/fixtures/data/select.bin
-- spec/fixtures/data/simple.bin
-- spec/fixtures/data/sort.bin
-- spec/fixtures/data/update_simple.bin
-- spec/fixtures/data/weights.bin
-- spec/fixtures/data_generator.0.9.8.php
-- spec/fixtures/data_generator.0.9.9.php
-- spec/fixtures/sphinx/configuration.erb
-- spec/fixtures/sphinx/people.spa
-- spec/fixtures/sphinx/people.spd
-- spec/fixtures/sphinx/people.sph
-- spec/fixtures/sphinx/people.spi
-- spec/fixtures/sphinx/people.spk
-- spec/fixtures/sphinx/people.spm
-- spec/fixtures/sphinx/people.spp
-- spec/fixtures/sphinx/searchd.log
-- spec/fixtures/sphinx/searchd.query.log
-- spec/fixtures/sphinx/spec.conf
-- spec/fixtures/sphinxapi.0.9.8.php
-- spec/fixtures/sphinxapi.0.9.9.php
-- spec/fixtures/sql/conf.example.yml
-- spec/fixtures/sql/conf.yml
-- spec/fixtures/sql/data.sql
-- spec/fixtures/sql/structure.sql
 - spec/functional/connection_spec.rb
 - spec/functional/excerpt_spec.rb
 - spec/functional/keywords_spec.rb
@@ -145,6 +100,11 @@ test_files:
 - spec/functional/search_spec.rb
 - spec/functional/status_spec.rb
 - spec/functional/update_spec.rb
+- spec/riddle/auto_version_spec.rb
+- spec/riddle/client_spec.rb
+- spec/riddle/configuration_spec.rb
+- spec/riddle/controller_spec.rb
+- spec/riddle_spec.rb
 - spec/spec_helper.rb
 - spec/sphinx_helper.rb
 - spec/unit/client_spec.rb