flying-sphinx 0.6.6 → 0.7.0

data/spec/specs/setting_files_spec.rb

@@ -0,0 +1,92 @@
+require 'light_spec_helper'
+require 'flying_sphinx/setting_files'
+
+describe FlyingSphinx::SettingFiles do
+  let(:files)   { FlyingSphinx::SettingFiles.new indices }
+  let(:indices) { [] }
+
+  def index_double(methods)
+    fire_double 'Riddle::Configuration::Index', methods
+  end
+
+  def source_double(methods)
+    fire_double 'Riddle::Configuration::SQLSource', methods
+  end
+
+  describe '#upload_to' do
+    let(:api) { fire_double('FlyingSphinx::API') }
+
+    before :each do
+      File.stub :read => 'blah'
+    end
+
+    [:stopwords, :wordforms, :exceptions].each do |setting|
+      it "uploads #{setting} files from indices" do
+        indices << index_double(setting => '/my/file/foo.txt')
+
+        api.should_receive(:post).with('/add_file', :setting => setting.to_s,
+          :file_name => 'foo.txt', :content => 'blah')
+
+        files.upload_to(api)
+      end
+
+      it "does not repeat same files for #{setting}" do
+        indices << index_double(setting => '/my/file/foo.txt')
+        indices << index_double(setting => '/my/file/foo.txt')
+
+        api.should_receive(:post).with('/add_file', :setting => setting.to_s,
+          :file_name => 'foo.txt', :content => 'blah').once
+
+        files.upload_to(api)
+      end
+
+      it "accepts multiples files for #{setting}" do
+        indices << index_double(
+          setting => '/my/file/foo.txt /my/file/bar.txt')
+
+        api.should_receive(:post).with('/add_file', :setting => setting.to_s,
+          :file_name => 'foo.txt', :content => 'blah').once
+        api.should_receive(:post).with('/add_file', :setting => setting.to_s,
+          :file_name => 'bar.txt', :content => 'blah').once
+
+        files.upload_to(api)
+      end
+    end
+
+    [:mysql_ssl_cert, :mysql_ssl_key, :mysql_ssl_ca].each do |setting|
+      it "uploads #{setting} files from indices" do
+        indices << index_double(:sources => [
+          source_double(setting => '/my/file/foo.txt')])
+
+        api.should_receive(:post).with('/add_file', :setting => setting.to_s,
+          :file_name => 'foo.txt', :content => 'blah')
+
+        files.upload_to(api)
+      end
+
+      it "does not repeat same files for #{setting}" do
+        indices << index_double(:sources => [
+          source_double(setting => '/my/file/foo.txt')])
+        indices << index_double(:sources => [
+          source_double(setting => '/my/file/foo.txt')])
+
+        api.should_receive(:post).with('/add_file', :setting => setting.to_s,
+          :file_name => 'foo.txt', :content => 'blah').once
+
+        files.upload_to(api)
+      end
+
+      it "accepts multiples files for #{setting}" do
+        indices << index_double(:sources => [
+          source_double(setting => '/my/file/foo.txt /my/file/bar.txt')])
+
+        api.should_receive(:post).with('/add_file', :setting => setting.to_s,
+          :file_name => 'foo.txt', :content => 'blah').once
+        api.should_receive(:post).with('/add_file', :setting => setting.to_s,
+          :file_name => 'bar.txt', :content => 'blah').once
+
+        files.upload_to(api)
+      end
+    end
+  end
+end

data/spec/specs/sphinx_configuration_spec.rb

@@ -0,0 +1,35 @@
+require 'light_spec_helper'
+require 'flying_sphinx/sphinx_configuration'
+
+describe FlyingSphinx::SphinxConfiguration do
+  let(:configuration) { FlyingSphinx::SphinxConfiguration.new ts_config }
+  let(:ts_config)     { fire_double('ThinkingSphinx::Configuration',
+    :configuration => riddle_config, :version => '2.1.0-dev',
+    :generate => true) }
+  let(:riddle_config) { fire_double('Riddle::Configuration',
+    :render => 'foo {}') }
+
+  describe '#upload_to' do
+    let(:api) { fire_double('FlyingSphinx::API', :put => true) }
+
+    it "generates the Sphinx configuration" do
+      ts_config.should_receive(:generate)
+
+      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', :tunnel => 'false')
+
+      configuration.upload_to api
+    end
+
+    it "informs the API when tunnelling will be required" do
+      api.should_receive(:put).with('/', :configuration => 'foo {}',
+        :sphinx_version => '2.1.0-dev', :tunnel => 'true')
+
+      configuration.upload_to api, true
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flying-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
-  - 6
-  version: 0.6.6
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-14 00:00:00 Z
+date: 2012-07-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thinking-sphinx
@@ -116,62 +116,61 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 63
         segments: 
         - 0
-        - 8
-        - 7
-        version: 0.8.7
+        - 9
+        - 2
+        version: 0.9.2
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+  name: rspec
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 21
         segments: 
-        - 0
-        - 8
         - 2
-        version: 0.8.2
+        - 11
+        version: "2.11"
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rspec-fire
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 19
         segments: 
-        - 2
-        - 5
+        - 1
+        - 1
         - 0
-        version: 2.5.0
+        version: 1.1.0
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: yajl-ruby
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 41
+        hash: 59
         segments: 
         - 0
-        - 9
-        - 9
-        version: 0.9.9
+        - 8
+        - 2
+        version: 0.8.2
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
@@ -250,15 +249,21 @@ files:
 - lib/flying_sphinx/index_request.rb
 - lib/flying_sphinx/rails.rb
 - lib/flying_sphinx/railtie.rb
+- lib/flying_sphinx/setting_files.rb
 - lib/flying_sphinx/sinatra.rb
+- lib/flying_sphinx/sphinx_configuration.rb
 - lib/flying_sphinx/tasks.rb
 - lib/flying_sphinx/tunnel.rb
 - lib/flying_sphinx/version.rb
+- spec/light_spec_helper.rb
 - spec/spec_helper.rb
+- spec/specs/api_spec.rb
 - spec/specs/configuration_spec.rb
 - spec/specs/delayed_delta_spec.rb
 - spec/specs/flag_as_deleted_job_spec.rb
 - spec/specs/index_request_spec.rb
+- spec/specs/setting_files_spec.rb
+- spec/specs/sphinx_configuration_spec.rb
 homepage: https://flying-sphinx.com
 licenses: []
 
@@ -297,9 +302,13 @@ signing_key:
 specification_version: 3
 summary: Sphinx in the Cloud
 test_files: 
+- spec/light_spec_helper.rb
 - spec/spec_helper.rb
+- spec/specs/api_spec.rb
 - spec/specs/configuration_spec.rb
 - spec/specs/delayed_delta_spec.rb
 - spec/specs/flag_as_deleted_job_spec.rb
 - spec/specs/index_request_spec.rb
+- spec/specs/setting_files_spec.rb
+- spec/specs/sphinx_configuration_spec.rb
 has_rdoc: