flying-sphinx 0.6.0 → 0.6.1

data/HISTORY

@@ -1,3 +1,8 @@
+0.6.1 - 4th November 2011
+* Adding Riddle dependency requirement.
+* Updating indexes (index plural) references to indices.
+* Updating faraday_middleware version requirement, to play nicely with OmniAuth (Paolo Perrotta)
+
 0.6.0 - 31st July 2011
 * Version in a separate file.
 * Support for all file-based Sphinx settings: stopwords, wordforms, exceptions, and mysql ssl settings for SQL sources.

data/README.textile

@@ -32,6 +32,7 @@ In the meantime, please keep in mind the following:
 h2. Contributors
 
 * "Josh Kalderimis":http://blog.cookiestack.com/ for switching the API calls to Faraday, improving the specs, a ton of debugging, and encouraging a versioned API.
+* "Paolo Perrotta":http://ducktypo.blogspot.com/ for updating dependencies for faraday_middleware.
 
 h2. Licence
 

data/flying-sphinx.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
 
   s.add_runtime_dependency 'thinking-sphinx',    ['>= 0']
+  s.add_runtime_dependency 'riddle',             ['>= 1.5.0']
   s.add_runtime_dependency 'net-ssh',            ['>= 2.0.23']
   s.add_runtime_dependency 'multi_json',         ['~> 1.0.1']
-  s.add_runtime_dependency 'faraday',            ['~> 0.6.1']
-  s.add_runtime_dependency 'faraday_middleware', ['~> 0.6.3']
+  s.add_runtime_dependency 'faraday_middleware', ['~> 0.7.0']
   s.add_runtime_dependency 'rash',               ['~> 0.3.0']
-  
+
   s.add_development_dependency 'rake',            ['0.8.7']
   s.add_development_dependency 'yajl-ruby',       ['~> 0.8.2']
   s.add_development_dependency 'rspec',           ['~> 2.5.0']
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'fakeweb',         ['~> 1.3.0']
   s.add_development_dependency 'fakeweb-matcher', ['~> 1.2.2']
   s.add_development_dependency 'delayed_job',     ['~> 2.1.4']
-  
+
   s.post_install_message = <<-MESSAGE
 If you're upgrading, you should rebuild your Sphinx setup when deploying:
 

data/lib/flying_sphinx/configuration.rb

@@ -1,6 +1,6 @@
 class FlyingSphinx::Configuration
   attr_reader :identifier, :api_key, :host, :port, :database_port, :mem_limit
-  
+
   FileIndexSettings  = [:stopwords, :wordforms, :exceptions]
   FileSourceSettings = [:mysql_ssl_cert, :mysql_ssl_key, :mysql_ssl_ca]
   FileSettings       = FileIndexSettings + FileSourceSettings
@@ -24,7 +24,7 @@ class FlyingSphinx::Configuration
 
     riddle.render
   end
-  
+
   def file_setting_pairs(setting)
     @file_setting_pairs ||= {}
     @file_setting_pairs[setting] ||= begin
@@ -43,7 +43,7 @@ class FlyingSphinx::Configuration
   def stop_sphinx
     api.post('stop')
   end
-  
+
   def client_key
     "#{identifier}:#{api_key}"
   end
@@ -53,7 +53,7 @@ class FlyingSphinx::Configuration
       puts "#{action.created_at}  #{action.name}"
     end
   end
-  
+
   private
 
   def set_from_server
@@ -106,7 +106,7 @@ class FlyingSphinx::Configuration
   def set_searchd_settings
     thinking_sphinx.port    = port
     thinking_sphinx.address = host
-    
+
     if riddle.searchd.respond_to?(:client_key)
       riddle.searchd.client_key = client_key
     end
@@ -118,8 +118,8 @@ class FlyingSphinx::Configuration
 
   def set_database_settings
     return unless FlyingSphinx::Tunnel.required?
-    
-    riddle.indexes.each do |index|
+
+    riddle.indices.each do |index|
       next unless index.respond_to?(:sources)
 
       index.sources.each do |source|
@@ -128,19 +128,19 @@ class FlyingSphinx::Configuration
       end
     end
   end
-  
+
   def set_file_settings
-    riddle.indexes.each do |index|
+    riddle.indices.each do |index|
       set_file_settings_for index, FileIndexSettings
-      
+
       next unless index.respond_to?(:sources)
-            
+
       index.sources.each do |source|
         set_file_settings_for source, FileSourceSettings
       end
     end
   end
-  
+
   def set_file_settings_for(object, settings)
     settings.each do |setting|
       next unless object.respond_to?(setting)
@@ -148,14 +148,14 @@ class FlyingSphinx::Configuration
         file_setting_pairs(setting)[object.send(setting)]
     end
   end
-  
+
   def file_setting_sources(setting)
     @file_setting_sources ||= {}
-    @file_setting_sources[setting] ||= riddle.indexes.collect { |index|
+    @file_setting_sources[setting] ||= riddle.indices.collect { |index|
       file_settings_for_index(index, setting)
     }.flatten.compact.uniq
   end
-  
+
   def file_settings_for_index(index, setting)
     settings = Array(file_setting_for(index, setting))
     settings += index.sources.collect { |source|
@@ -163,11 +163,11 @@ class FlyingSphinx::Configuration
     } if index.respond_to?(:sources)
     settings
   end
-  
+
   def file_setting_for(object, setting)
     object.respond_to?(setting) ? object.send(setting) : nil
   end
-  
+
   def identifier_from_env
     ENV['FLYING_SPHINX_IDENTIFIER']
   end
@@ -175,11 +175,11 @@ class FlyingSphinx::Configuration
   def api_key_from_env
     ENV['FLYING_SPHINX_API_KEY']
   end
-  
+
   def host_from_env
     ENV['FLYING_SPHINX_HOST']
   end
-  
+
   def port_from_env
     ENV['FLYING_SPHINX_PORT']
   end

data/lib/flying_sphinx/version.rb

@@ -1,3 +1,3 @@
 module FlyingSphinx
-  Version = '0.6.0'
+  Version = '0.6.1'
 end

data/spec/specs/configuration_spec.rb

@@ -3,7 +3,7 @@ require 'multi_json'
 
 describe FlyingSphinx::Configuration do
   let(:api_server) { 'https://flying-sphinx.com/api/my' }
-  
+
   before :each do
     FakeWeb.register_uri(:get, "#{api_server}/app",
       :body => MultiJson.encode(
@@ -13,67 +13,67 @@ describe FlyingSphinx::Configuration do
       )
     )
   end
-  
+
   describe '#initialize' do
     let(:api_key)    { 'foo-bar-baz' }
     let(:identifier) { 'app@heroku.com' }
     let(:config)     { FlyingSphinx::Configuration.new identifier, api_key }
-    
+
     it "requests details from the server with the given API key" do
       config
       FakeWeb.should have_requested :get, "#{api_server}/app"
     end
-    
+
     it "sets the host from the server information" do
       config.host.should == 'foo.bar.com'
     end
-    
+
     it "sets the port from the server information" do
       config.port.should == 9319
     end
-    
+
     it "sets the port from the server information" do
       config.database_port.should == 10001
     end
   end
-  
+
   describe '#file_setting_pairs' do
     let(:config)    { FlyingSphinx::Configuration.new 'ident' }
     let(:riddle)    { ThinkingSphinx::Configuration.instance.configuration }
     let(:base_path) { '/mnt/sphinx/flying-sphinx/ident' }
-    
+
     context 'index setting' do
       it "pairs each local file path to a server file path" do
-        riddle.stub! :indexes => [
+        riddle.stub! :indices => [
           double('index', :wordforms => '/path/to/wordforms-foo.txt',
             :sources => [double('source'), double('source')]),
           double('index', :wordforms => '/path/to/wordforms-bar.txt',
             :sources => [double('source'), double('source')])
         ]
-        
+
         config.file_setting_pairs(:wordforms).should == {
           '/path/to/wordforms-foo.txt' => "#{base_path}/wordforms/0.txt",
           '/path/to/wordforms-bar.txt' => "#{base_path}/wordforms/1.txt"
         }
       end
-      
+
       it "doesn't duplicate multiple references to the same local file" do
-        riddle.stub! :indexes => [
+        riddle.stub! :indices => [
           double('index', :wordforms => '/path/to/wordforms-foo.txt',
             :sources => [double('source'), double('source')]),
           double('index', :wordforms => '/path/to/wordforms-foo.txt',
             :sources => [double('source'), double('source')])
         ]
-        
+
         config.file_setting_pairs(:wordforms).should == {
           '/path/to/wordforms-foo.txt' => "#{base_path}/wordforms/0.txt"
         }
       end
     end
-    
+
     context 'source setting' do
       it "pairs each local file path to a server file path" do
-        riddle.stub! :indexes => [
+        riddle.stub! :indices => [
           double('index', :sources => [
             double('source', :mysql_ssl_cert => '/path/to/cert-foo.txt'),
             double('source', :mysql_ssl_cert => '/path/to/cert-bar.txt')
@@ -83,16 +83,16 @@ describe FlyingSphinx::Configuration do
             double('source', :mysql_ssl_cert => nil)
           ])
         ]
-        
+
         config.file_setting_pairs(:mysql_ssl_cert).should == {
           '/path/to/cert-foo.txt' => "#{base_path}/mysql_ssl_cert/0.txt",
           '/path/to/cert-bar.txt' => "#{base_path}/mysql_ssl_cert/1.txt",
           '/path/to/cert-baz.txt' => "#{base_path}/mysql_ssl_cert/2.txt"
         }
       end
-      
+
       it "doesn't duplicate multiple references to the same local file" do
-        riddle.stub! :indexes => [
+        riddle.stub! :indices => [
           double('index', :sources => [
             double('source', :mysql_ssl_cert => '/path/to/cert-foo.txt'),
             double('source', :mysql_ssl_cert => '/path/to/cert-bar.txt')
@@ -102,7 +102,7 @@ describe FlyingSphinx::Configuration do
             double('source', :mysql_ssl_cert => nil)
           ])
         ]
-        
+
         config.file_setting_pairs(:mysql_ssl_cert).should == {
           '/path/to/cert-foo.txt' => "#{base_path}/mysql_ssl_cert/0.txt",
           '/path/to/cert-bar.txt' => "#{base_path}/mysql_ssl_cert/1.txt"
@@ -110,13 +110,13 @@ describe FlyingSphinx::Configuration do
       end
     end
   end
-  
+
   describe '#sphinx_configuration' do
     let(:config)    { FlyingSphinx::Configuration.new 'ident' }
     let(:riddle)    { double('riddle configuration').as_null_object }
     let(:base_path) { '/mnt/sphinx/flying-sphinx/ident' }
     let(:source)    { double('source') }
-    
+
     before :each do
       ThinkingSphinx::Configuration.instance.stub!(
         :generate      => nil,
@@ -124,40 +124,40 @@ describe FlyingSphinx::Configuration do
       )
       FlyingSphinx::Tunnel.stub! :required? => false
     end
-    
+
     it "sets database settings to match Flying Sphinx port forward" do
       FlyingSphinx::Tunnel.stub! :required? => true
-      
-      riddle.stub! :indexes => [
+
+      riddle.stub! :indices => [
         double('distributed index'),
         double('index', :sources => [source])
       ]
-      
+
       source.should_receive(:sql_host=).with('127.0.0.1')
       source.should_receive(:sql_port=).with(10001)
-      
+
       config.sphinx_configuration
     end
-    
+
     it "sets file path to match server directories for index settings" do
-      riddle.stub! :indexes => [
+      riddle.stub! :indices => [
         double('index', :wordforms => '/path/to/wordforms-foo.txt',
           :sources => [double('source'), double('source')]),
         double('index', :wordforms => '/path/to/wordforms-bar.txt',
           :sources => [double('source'), double('source')]),
         double('distributed index')
       ]
-      
-      riddle.indexes[0].should_receive(:wordforms=).
+
+      riddle.indices[0].should_receive(:wordforms=).
         with("#{base_path}/wordforms/0.txt")
-      riddle.indexes[1].should_receive(:wordforms=).
+      riddle.indices[1].should_receive(:wordforms=).
         with("#{base_path}/wordforms/1.txt")
-      
+
       config.sphinx_configuration
     end
-    
+
     it "sets file path to match server directories for source settings" do
-      riddle.stub! :indexes => [
+      riddle.stub! :indices => [
         double('index', :sources => [
           double('source', :mysql_ssl_cert => '/path/to/cert-foo.txt'),
           double('source', :mysql_ssl_cert => '/path/to/cert-bar.txt')
@@ -168,16 +168,16 @@ describe FlyingSphinx::Configuration do
         ]),
         double('distributed index')
       ]
-      
-      riddle.indexes[0].sources[0].should_receive(:mysql_ssl_cert=).
+
+      riddle.indices[0].sources[0].should_receive(:mysql_ssl_cert=).
         with("#{base_path}/mysql_ssl_cert/0.txt")
-      riddle.indexes[0].sources[1].should_receive(:mysql_ssl_cert=).
+      riddle.indices[0].sources[1].should_receive(:mysql_ssl_cert=).
         with("#{base_path}/mysql_ssl_cert/1.txt")
-      riddle.indexes[1].sources[0].should_receive(:mysql_ssl_cert=).
+      riddle.indices[1].sources[0].should_receive(:mysql_ssl_cert=).
         with("#{base_path}/mysql_ssl_cert/2.txt")
-      riddle.indexes[1].sources[1].should_receive(:mysql_ssl_cert=).
+      riddle.indices[1].sources[1].should_receive(:mysql_ssl_cert=).
         with(nil)
-      
+
       config.sphinx_configuration
     end
   end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flying-sphinx
 version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: 
-  version: 0.6.0
+  segments: 
+  - 0
+  - 6
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Pat Allan
@@ -10,152 +15,215 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-31 00:00:00 +10:00
+date: 2011-11-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thinking-sphinx
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: net-ssh
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  name: riddle
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.23
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
+        version: 1.5.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  name: net-ssh
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.1
+        hash: 33
+        segments: 
+        - 2
+        - 0
+        - 23
+        version: 2.0.23
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: faraday
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  name: multi_json
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.6.1
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: faraday_middleware
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.6.3
+        hash: 3
+        segments: 
+        - 0
+        - 7
+        - 0
+        version: 0.7.0
   type: :runtime
-  version_requirements: *id005
+  prerelease: false
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   name: rash
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
         version: 0.3.0
   type: :runtime
-  version_requirements: *id006
+  prerelease: false
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: rake
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 8
+        - 2
         version: 0.8.2
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   name: rcov
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 41
+        segments: 
+        - 0
+        - 9
+        - 9
         version: 0.9.9
   type: :development
-  version_requirements: *id010
+  prerelease: false
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   name: fakeweb
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id011
+  prerelease: false
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
   name: fakeweb-matcher
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 2
+        - 2
         version: 1.2.2
   type: :development
-  version_requirements: *id012
+  prerelease: false
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
   name: delayed_job
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 1
+        - 4
         version: 2.1.4
   type: :development
-  version_requirements: *id013
+  prerelease: false
+  requirement: *id013
 description: Hooks Thinking Sphinx into the Flying Sphinx service
 email: pat@freelancing-gods.com
 executables: []
@@ -211,17 +279,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Sphinx in the Cloud