flying-sphinx 1.1.0 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWNhMDhjYWNhNjY1MWExY2UyZjQxYjE4YjQ2MTQ3NTljNWY2ODUzZA==
+    MmFjZTkzNjBhNTJjNTBlYzI1ZmE4ODNlNDZmNTViMTk5MWM4ZmExNw==
   data.tar.gz: !binary |-
-    MDE3OTE1NTcyZjhlMzRkMmRlMGNmMzYxNjk5NmYyNzdmMGU5Mjk2ZA==
+    Zjg1ZTkzYTM0MDE0ODcyYTg0ODBlMDZlMjQwNmI0ZGIyM2E2ODg3ZA==
 SHA512:
   metadata.gz: !binary |-
-    ZTJhMjJjODU2YTI5MTdiZWYyYjc1MDAxNjBhNGY0NTExY2Q5YWFhMmExZjdk
-    NTQ0Zjk1Nzg5MmU3MWY2NWViOWMyMzYyMzljODYwODFjMmI0MzdiNDdjYTEz
-    MThkZWUwOGIxODhiNTNiMDAxOGVkZDUyM2ExMTMzNmFmYTdjMDA=
+    M2MxZWNkYzYzOTE4ZDVhNDc1YTIyMDcwNzA3M2Q4OTIwMjlmMTViMTU1M2Vj
+    OWQ5MjdlNWQ1M2MxNTM4YzUyYWJlNDNhOWE3MzE4ZTJhMGFhM2QyOTU3ZGJm
+    YjFkZjg2MzkxYjBkZTY2YWM4YTAxOGQ3ODVjMzkyZTE5OTRiOTE=
   data.tar.gz: !binary |-
-    OTE3NDdjNDNkMTVkMTg1YjkzMTI3NTU2YTIxNTUxYjA4ZmYxYWU1OWEzMjA2
-    YzlhOGE1NjVkNzE1ZjllNGMzNjQ1YjFhODM3ZDJmNmI2MDZjNzU3MjQ0MmIy
-    ODgxNzBlMGM0NjVjNWY5NmY4MzJjOGZiY2E2NDY4MzZhMGE0NTc=
+    ZDUzYTA3ZjVmZTQwZmNiMDk4NjVhNTE5ZTExMjE4NmE5ZGRiYjA5ODUyNWRi
+    MGEyOGM1ZjUzYmYxYjY2YzJlMTdhMWI5ZDIzMjc0MzUwNDBlZjlkOGIxYzUw
+    Mzk0N2Q2YzY2MGJmZTA3OGNlYzMwMDk0NzZmOTQwNTNlYWJhNzk=

data/HISTORY

@@ -1,3 +1,6 @@
+1.2.0 - 30th March 2014
+* All configuration files (Sphinx, wordforms, exceptions, etc) are now gzipped when sent to the API.
+
 1.1.0 - 15th March 2014
 * Updated Faraday dependency to require 0.9 or newer (and removed faraday_middleware dependency).
 * Added remote rotate support via custom controller.

data/README.textile

@@ -9,7 +9,7 @@ This is all covered pretty well on "the Flying Sphinx site":http://flying-sphinx
 <pre><code>gem 'flying-sphinx',
   :git    => 'git://github.com/flying-sphinx/flying-sphinx.git',
   :branch => 'master',
-  :ref    => '216f589d1f'</code></pre>
+  :ref    => '6b691c2b43'</code></pre>
 
 h2. Compatibility and Limitations
 

data/lib/flying_sphinx.rb

@@ -41,7 +41,9 @@ require 'flying_sphinx/api'
 require 'flying_sphinx/binary'
 require 'flying_sphinx/cli'
 require 'flying_sphinx/configuration'
+require 'flying_sphinx/configuration_options'
 require 'flying_sphinx/controller'
+require 'flying_sphinx/gzipped_hash'
 require 'flying_sphinx/setting_files'
 require 'flying_sphinx/sphinxql'
 require 'flying_sphinx/version'

data/lib/flying_sphinx/api.rb

@@ -63,8 +63,9 @@ class FlyingSphinx::API
     }
 
     Faraday.new(options) do |builder|
-      builder.use Faraday::Request::UrlEncoded
-      builder.adapter(adapter)
+      builder.request :multipart
+      builder.request :url_encoded
+      builder.adapter adapter
     end
   end
 

data/lib/flying_sphinx/configuration_options.rb

@@ -0,0 +1,29 @@
+class FlyingSphinx::ConfigurationOptions
+  def to_hash
+    {:sphinx_version => version, :configuration => gzipped_files_hash}
+  end
+
+  private
+
+  def configuration
+    @configuration ||= ThinkingSphinx::Configuration.instance
+  end
+
+  def files_hash
+    FlyingSphinx::SettingFiles.new.to_hash.merge(
+      'sphinx' => FlyingSphinx.translator.sphinx_configuration
+    )
+  end
+
+  def gzipped_files_hash
+    FlyingSphinx::GzippedHash.new(files_hash).to_gzipped_hash
+  end
+
+  def version
+    version_defined? ? configuration.version : '2.0.4'
+  end
+
+  def version_defined?
+    configuration.respond_to?(:version) && configuration.version.present?
+  end
+end

data/lib/flying_sphinx/controller.rb

@@ -17,7 +17,7 @@ class FlyingSphinx::Controller
   end
 
   def configure(file = nil)
-    options = file.nil? ? configuration_options :
+    options = file.nil? ? FlyingSphinx::ConfigurationOptions.new.to_hash :
       {:configuration => {'sphinx' => file}, :sphinx_version => '2.0.6'}
 
     FlyingSphinx::Action.perform api.identifier do
@@ -47,7 +47,7 @@ class FlyingSphinx::Controller
 
   def rebuild
     FlyingSphinx::Action.perform api.identifier, self.class.index_timeout do
-      api.put 'rebuild', configuration_options
+      api.put 'rebuild', FlyingSphinx::ConfigurationOptions.new.to_hash
     end
   end
 
@@ -58,7 +58,7 @@ class FlyingSphinx::Controller
   end
 
   def reset(file = nil)
-    options = file.nil? ? configuration_options :
+    options = file.nil? ? FlyingSphinx::ConfigurationOptions.new.to_hash :
       {:configuration => {'sphinx' => file}, :sphinx_version => '2.0.6'}
 
     FlyingSphinx::Action.perform api.identifier do
@@ -93,20 +93,4 @@ class FlyingSphinx::Controller
   private
 
   attr_reader :api
-
-  def configuration_options
-    version       = '2.0.4'
-    configuration = ThinkingSphinx::Configuration.instance
-
-    if configuration.respond_to?(:version) && configuration.version.present?
-      version = configuration.version
-    end
-
-    {
-      :sphinx_version => version,
-      :configuration  => FlyingSphinx::SettingFiles.new.to_hash.merge(
-        'sphinx' => FlyingSphinx.translator.sphinx_configuration
-      )
-    }
-  end
 end

data/lib/flying_sphinx/gzipped_hash.rb

@@ -0,0 +1,33 @@
+require 'zlib'
+
+class FlyingSphinx::GzippedHash
+  def initialize(hash)
+    @hash = hash
+  end
+
+  def to_gzipped_hash
+    hash['gzip'] = 'true'
+
+    keys.each { |key| hash[key] = gzip hash[key] }
+
+    hash
+  end
+
+  private
+
+  attr_reader :hash
+
+  def keys
+    keys = (hash['extra'] || '').split(';')
+    keys << 'sphinx' if hash['sphinx']
+    keys
+  end
+
+  def gzip(string)
+    io     = StringIO.new 'w'
+    writer = Zlib::GzipWriter.new io
+    writer.write string
+    writer.close
+    Faraday::UploadIO.new StringIO.new(io.string, 'rb'), 'application/gzip'
+  end
+end

data/lib/flying_sphinx/version.rb

@@ -1,3 +1,3 @@
 module FlyingSphinx
-  Version = '1.1.0'
+  Version = '1.2.0'
 end

data/spec/specs/controller_spec.rb

@@ -0,0 +1,61 @@
+require 'light_spec_helper'
+require 'faraday'
+require 'flying_sphinx/controller'
+require 'flying_sphinx/configuration_options'
+require 'flying_sphinx/gzipped_hash'
+
+describe FlyingSphinx::Controller do
+  let(:controller)    { FlyingSphinx::Controller.new api }
+  let(:api)           { double 'API', :identifier => 'foo', :put => true }
+  let(:action_class)  { double }
+  let(:configuration) { double 'TS Configuration' }
+  let(:setting_files) { double :to_hash => {'extra' => 'wordforms:txt.txt',
+    'wordforms:txt.txt' => 'something'} }
+  let(:translator)    { double :sphinx_configuration => 'indexer ...' }
+
+  before :each do
+    stub_const 'FlyingSphinx::Action', action_class
+    action_class.stub(:perform) do |identifier, &block|
+      block.call
+    end
+
+    stub_const 'ThinkingSphinx::Configuration',
+      double(:instance => configuration)
+
+    stub_const 'FlyingSphinx::SettingFiles', double(:new => setting_files)
+    FlyingSphinx.stub :translator => translator
+  end
+
+  def ungzip(contents)
+    io     = StringIO.new contents, 'rb'
+    reader = Zlib::GzipReader.new io
+    reader.read
+  end
+
+  describe 'configure' do
+    it 'sends data to the server' do
+      api.should_receive(:put)
+
+      controller.configure
+    end
+
+    it 'sends through gzipped configuration files' do
+      api.should_receive(:put) do |path, options|
+        path.should == 'configure'
+        options[:configuration]['gzip'].should == 'true'
+        ungzip(options[:configuration]['sphinx'].read).should == 'indexer ...'
+        ungzip(options[:configuration]['wordforms:txt.txt'].read).should == 'something'
+      end
+
+      controller.configure
+    end
+
+    it 'sends through file if provided' do
+      api.should_receive(:put).with 'configure',
+        :configuration  => {'sphinx' => 'searchd ...'},
+        :sphinx_version => '2.0.6'
+
+      controller.configure 'searchd ...'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flying-sphinx
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
@@ -190,7 +190,9 @@ files:
 - lib/flying_sphinx/binary/translator.rb
 - lib/flying_sphinx/cli.rb
 - lib/flying_sphinx/configuration.rb
+- lib/flying_sphinx/configuration_options.rb
 - lib/flying_sphinx/controller.rb
+- lib/flying_sphinx/gzipped_hash.rb
 - lib/flying_sphinx/rails.rb
 - lib/flying_sphinx/railtie.rb
 - lib/flying_sphinx/setting_files.rb
@@ -204,6 +206,7 @@ files:
 - spec/specs/action_spec.rb
 - spec/specs/api_spec.rb
 - spec/specs/configuration_spec.rb
+- spec/specs/controller_spec.rb
 - spec/specs/setting_files_spec.rb
 homepage: https://flying-sphinx.com
 licenses: []
@@ -235,4 +238,5 @@ test_files:
 - spec/specs/action_spec.rb
 - spec/specs/api_spec.rb
 - spec/specs/configuration_spec.rb
+- spec/specs/controller_spec.rb
 - spec/specs/setting_files_spec.rb