flying-sphinx 0.8.1 → 0.8.2

data/HISTORY

@@ -1,3 +1,7 @@
+0.8.2 - 28th August 2012
+* Don't presume there is a Time.zone method (for Rails 2.3).
+* Set client key as part of the configuration generation process (for Rails 2.3).
+
 0.8.1 - 28th August 2012
 * Load Thinking Sphinx when sending a generated configuration (as opposed to a hand-written file).
 * Rebuild command now sends the new configuration up, as before.

data/lib/flying_sphinx/api.rb

@@ -72,7 +72,7 @@ class FlyingSphinx::API
   end
 
   def log_message(message)
-    time = Time.zone ? Time.zone.now : Time.now.utc
+    time = (Time.respond_to?(:zone) && Time.zone) ? Time.zone.now : Time.now.utc
     puts "[#{time.to_s}] #{message}"
   end
 

data/lib/flying_sphinx/sphinx_configuration.rb

@@ -22,6 +22,8 @@ class FlyingSphinx::SphinxConfiguration
   def content
     @content ||= begin
       thinking_sphinx.generate
+      thinking_sphinx.configuration.searchd.client_key =
+        FlyingSphinx::Configuration.new.client_key
       thinking_sphinx.configuration.render
     end
   end

data/lib/flying_sphinx/version.rb

@@ -1,3 +1,3 @@
 module FlyingSphinx
-  Version = '0.8.1'
+  Version = '0.8.2'
 end

data/spec/specs/sphinx_configuration_spec.rb

@@ -6,10 +6,18 @@ describe FlyingSphinx::SphinxConfiguration do
   let(:ts_config)     { fire_double('ThinkingSphinx::Configuration',
     :configuration => riddle_config, :version => '2.1.0-dev',
     :generate => true) }
+  let(:searchd)       { fire_double('Riddle::Configuration::Searchd',
+    :client_key= => true) }
   let(:riddle_config) { fire_double('Riddle::Configuration',
-    :render => 'foo {}') }
+    :render => 'foo {}', :searchd => searchd) }
+  let(:fs_config)     { fire_double('FlyingSphinx::Configuration',
+    :client_key => 'foo:bar') }
 
   describe '#upload_to' do
+    before :each do
+      stub_const 'FlyingSphinx::Configuration', double(:new => fs_config)
+    end
+
     let(:api) { fire_double('FlyingSphinx::API', :put => true) }
 
     it "generates the Sphinx configuration" do
@@ -18,6 +26,12 @@ describe FlyingSphinx::SphinxConfiguration do
       configuration.upload_to api
     end
 
+    it "sets the client key" do
+      searchd.should_receive(:client_key=).with('foo:bar')
+
+      configuration.upload_to api
+    end
+
     it "sends the configuration to the API" do
       api.should_receive(:put).with('/', :configuration => 'foo {}',
         :sphinx_version => '2.1.0-dev')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flying-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Pat Allan