flying-sphinx 2.1.4 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: becb4d73c43a31cfec2fd25215d08bf1739a3e65992abb8dfdc986f23858ef7d
-  data.tar.gz: 7bc358f2990194925946c2c28ad7cbd49b88dc46d16d0485ebadcb82a794f830
+  metadata.gz: 9f6ae3a86fa09f28adfe144f1e33ebc0cbd16e612146f77dd14634616a9de420
+  data.tar.gz: b7945e84452327eac48a975da634cb196d619c602a16233d7fe9f58f0aeb31a6
 SHA512:
-  metadata.gz: 2962c39d42f25d92382887b0400027b16536e33ca8ce24cbbf739fcc61429ff4e34367dcb4a674d0459f5b4c44e0374de582fcf4aa904357040f734a4627ba82
-  data.tar.gz: fc33d8ecd8144d30e2fdccfcee9304bdb0723f701eb40130d0366762c58d06bb64127b4d37d35a4ef556f98a0ead0a7fa36c5a74aad58781eee2d31dd15c980e
+  metadata.gz: 4aa2d490c2d47ba961ad9c8cc5eb6b98c88df1ebbe12f20fcec691cfa02ebb2b87bdccfdee1121c2956b19c97239c3e1f228b1d90e6480db8d7ccdc5b09af18b
+  data.tar.gz: 91e86268a161e4d3fb1505132f982b09fa5114e567bfdfabed01f2a3f2b25b6364e975a601e8eb588e772ead7cdc3b9b29e398964a3f0ab211e446020121e995

data/.travis.yml

@@ -1,12 +1,13 @@
 language: ruby
 rvm:
-- 2.2.10
-- 2.3.7
-- 2.4.4
-- 2.5.1
+- 2.3.8
+- 2.4.5
+- 2.5.3
+- 2.6.1
 before_install:
-- gem install bundler
 - gem update --system
+- gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+- gem install bundler -v '< 2'
 before_script:
 - bundle exec appraisal install
 cache: bundler

data/Appraisals

@@ -27,3 +27,7 @@ end
 appraise 'rails-5.2' do
   gem 'rails', '~> 5.2.0'
 end
+
+appraise 'rails_6_0' do
+  gem 'rails',  '~> 6.0.0.beta2'
+end if RUBY_VERSION.to_f >= 2.5

data/CHANGELOG.markdown

@@ -2,6 +2,16 @@
 
 All notable changes to this project (at least, from v0.4.0 onwards) are documented in this file.
 
+## 2.2.0 - 2020-04-04
+
+### Added
+
+* The `lemmatizer_base` option is now respected and files in that specified directory are copied to the Flying Sphinx servers as part of the configure command.
+
+### Changed
+
+* Official support for Ruby 2.2 has ended. The gem may continue to work, but there is no guarantee of ongoing compatibility.
+
 ## 2.1.4 - 2019-03-10
 
 ### Fixed

data/README.textile

@@ -12,7 +12,7 @@ This is all covered pretty well on "the Flying Sphinx site":http://flying-sphinx
 
 h2. Compatibility and Limitations
 
-The current (2.x) releases support Thinking Sphinx v4+, ActiveRecord/Rails 3.2+, and Ruby 2.2+.
+The current (2.x) releases support Thinking Sphinx v4+, ActiveRecord/Rails 3.2+, and Ruby 2.3+. Ruby 2.2.x will probably work well too, but is not tested against, and thus not officially supported.
 
 If you are using older versions of any of these, please use v1.3.1 (which supports Thinking Sphinx v1.5+, ActiveRecord/Rails 2.3.6+, and Ruby 1.9.3+).
 

data/flying-sphinx.gemspec

@@ -27,9 +27,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'appraisal',    '~> 2.2'
   s.add_development_dependency 'dotenv',       '~> 0.11.1'
   s.add_development_dependency 'em-websocket', '~> 0.5.1'
-  s.add_development_dependency 'mysql2',       '~> 0.3.15'
+  s.add_development_dependency 'mysql2',       '>= 0.3.15'
   s.add_development_dependency 'rack'
   s.add_development_dependency 'rspec',        '~> 2.14'
   s.add_development_dependency 'rspec-retry',  '~> 0.4'
-  s.add_development_dependency 'webmock',      '~> 1.17.4'
+  s.add_development_dependency 'webmock',      '~> 3.8'
 end

data/lib/flying_sphinx/configuration_options.rb

@@ -8,7 +8,10 @@ class FlyingSphinx::ConfigurationOptions
   end
 
   def settings
-    @settings ||= FlyingSphinx::SettingFiles.new(indices).to_hash
+    @settings ||= begin
+      configuration.render
+      FlyingSphinx::SettingFiles.new(configuration).to_hash
+    end
   end
 
   def version
@@ -21,11 +24,6 @@ class FlyingSphinx::ConfigurationOptions
     @configuration ||= ThinkingSphinx::Configuration.instance
   end
 
-  def indices
-    configuration.render
-    configuration.indices
-  end
-
   def version_defined?
     configuration.version.present?
   end

data/lib/flying_sphinx/setting_files.rb

@@ -1,9 +1,10 @@
 class FlyingSphinx::SettingFiles
   INDEX_SETTINGS  = [:stopwords, :wordforms, :exceptions]
   SOURCE_SETTINGS = [:mysql_ssl_cert, :mysql_ssl_key, :mysql_ssl_ca]
+  COMMON_SETTINGS = [:lemmatizer_base]
 
-  def initialize(indices)
-    @indices = indices
+  def initialize(configuration)
+    @configuration = configuration
   end
 
   def to_hash
@@ -19,11 +20,27 @@ class FlyingSphinx::SettingFiles
 
   private
 
-  attr_reader :indices
+  attr_reader :configuration
+
+  delegate :indices, :to => :configuration
+
+  def common_settings(&block)
+    return unless configuration.respond_to?(:common)
+
+    COMMON_SETTINGS.each do |setting|
+      path = configuration.common.public_send(setting)
+      next if path.nil?
+
+      Dir["#{path}/**/*"].each do |file|
+        block.call setting, file
+      end
+    end
+  end
 
   def each_file_for_setting(&block)
     index_settings  &block
     source_settings &block
+    common_settings &block
   end
 
   def index_settings(&block)

data/lib/flying_sphinx/version.rb

@@ -1,3 +1,3 @@
 module FlyingSphinx
-  Version = '2.1.4'
+  Version = '2.2.0'
 end

data/spec/acceptance/configuring_spec.rb

@@ -4,7 +4,7 @@ require 'cgi'
 describe 'Configuring Sphinx' do
   let(:interface)     { ThinkingSphinx.rake_interface.new }
   let(:configuration) { configuration_double :indices => [double('Index')],
-    :render => 'searchd { }', :version => '2.2.11' }
+    :render => 'searchd { }', :version => '2.2.11', :common => double('common', lemmatizer_base: nil) }
 
   before :each do
     allow(ThinkingSphinx::Configuration).to receive(:instance).

data/spec/flying_sphinx/setting_files_spec.rb

@@ -1,8 +1,12 @@
 require 'spec_helper'
 
 describe FlyingSphinx::SettingFiles do
-  let(:files)   { FlyingSphinx::SettingFiles.new indices }
+  let(:files)   { FlyingSphinx::SettingFiles.new configuration }
+  let(:configuration) do
+    double(:configuration, :indices => indices, :common => common)
+  end
   let(:indices) { [] }
+  let(:common)  { double(:common, :lemmatizer_base => nil) }
 
   def index_double(methods)
     double 'Riddle::Configuration::Index', methods
@@ -14,38 +18,38 @@ describe FlyingSphinx::SettingFiles do
 
   describe '#to_hash' do
     before :each do
-      File.stub :read => 'blah'
+      allow(File).to receive(:read).and_return('blah')
     end
 
     [:stopwords, :wordforms, :exceptions].each do |setting|
       it "collects #{setting} files from indices" do
         indices << index_double(setting => '/my/file/foo.txt')
 
-        files.to_hash.should == {
+        expect(files.to_hash).to eq(
           "#{setting}/foo.txt" => 'blah',
           'extra'              => "#{setting}/foo.txt"
-        }
+        )
       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')
 
-        files.to_hash.should == {
+        expect(files.to_hash).to eq(
           "#{setting}/foo.txt" => 'blah',
           'extra'              => "#{setting}/foo.txt"
-        }
+        )
       end
 
       it "accepts multiples files for #{setting}" do
         indices << index_double(
           setting => '/my/file/foo.txt /my/file/bar.txt')
 
-        files.to_hash["#{setting}/foo.txt"].should == 'blah'
-        files.to_hash["#{setting}/bar.txt"].should == 'blah'
-        files.to_hash['extra'].split(';').should =~ [
+        expect(files.to_hash["#{setting}/foo.txt"]).to eq('blah')
+        expect(files.to_hash["#{setting}/bar.txt"]).to eq('blah')
+        expect(files.to_hash['extra'].split(';')).to match_array([
           "#{setting}/foo.txt", "#{setting}/bar.txt"
-        ]
+        ])
       end
     end
 
@@ -54,10 +58,10 @@ describe FlyingSphinx::SettingFiles do
         indices << index_double(:sources => [
           source_double(setting => '/my/file/foo.txt')])
 
-        files.to_hash.should == {
+        expect(files.to_hash).to eq(
           "#{setting}/foo.txt" => 'blah',
           'extra'              => "#{setting}/foo.txt"
-        }
+        )
       end
 
       it "does not repeat same files for #{setting}" do
@@ -66,21 +70,35 @@ describe FlyingSphinx::SettingFiles do
         indices << index_double(:sources => [
           source_double(setting => '/my/file/foo.txt')])
 
-        files.to_hash.should == {
+        expect(files.to_hash).to eq(
           "#{setting}/foo.txt" => 'blah',
           'extra'              => "#{setting}/foo.txt"
-        }
+        )
       end
 
       it "accepts multiples files for #{setting}" do
         indices << index_double(:sources => [
           source_double(setting => '/my/file/foo.txt /my/file/bar.txt')])
 
-        files.to_hash["#{setting}/foo.txt"].should == 'blah'
-        files.to_hash["#{setting}/bar.txt"].should == 'blah'
-        files.to_hash['extra'].split(';').should =~ [
+        expect(files.to_hash["#{setting}/foo.txt"]).to eq('blah')
+        expect(files.to_hash["#{setting}/bar.txt"]).to eq('blah')
+        expect(files.to_hash['extra'].split(';')).to match_array([
           "#{setting}/foo.txt", "#{setting}/bar.txt"
-        ]
+        ])
+      end
+    end
+
+    [:lemmatizer_base].each do |setting|
+      it "collects #{setting} files from sources" do
+        allow(common).to receive(setting).and_return("/my/path")
+
+        allow(Dir).to receive(:[]).with("/my/path/**/*").
+          and_return(["/my/path/foo.txt"])
+
+        expect(files.to_hash).to eq(
+          "#{setting}/foo.txt" => 'blah',
+          'extra'              => "#{setting}/foo.txt"
+        )
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flying-sphinx
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.2.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-10 00:00:00.000000000 Z
+date: 2020-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ey-hmac
@@ -140,14 +140,14 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.15
 - !ruby/object:Gem::Dependency
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.4
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.4
+        version: '3.8'
 description: Hooks Thinking Sphinx into the Flying Sphinx service
 email: pat@freelancing-gods.com
 executables: