riddle 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e8107a5880b8a9bf181bd6f395dddef5cd887b0
-  data.tar.gz: daf50f55994fe6b909cceeae4aeb2a8c8568a8ba
+  metadata.gz: c8a66c7b7cd5135ff4cd51a4d22fb0221bf811cf
+  data.tar.gz: b972aa2c33a99d6ac336e70ce8fd79977ee02953
 SHA512:
-  metadata.gz: 25262a9682bdc924d5219fe696064ec6a3c773dcca7228465f132735ea7887cb2ff68662399b22c4a81e5b806821b8f3e0893d90a314ae864a2511eea74df628
-  data.tar.gz: b1b0ccf8b7609ae714c488caebe693427dee20b26ba4ea4e5b9c925f0007f8713319b39a425a75eed52cfc7759ad8037d66abfb5aee40d4f424ce233a93f5130
+  metadata.gz: e7fcc99152ccaaaa7f0b16428b818c18b6d2dfa74bc5bd588c4c348d2360b342768e45b7090b47b686f62c691800f62dd64afd993f6d563e3377fbbedb451644
+  data.tar.gz: 63435a5f30519f6acdeed8b8ef5f1b3baa57a25fc49e76e63074cc69db2f05037e0bc211dda0e13b2e1570e81dab1dad9c07ba9fe1dce2f728998bf74598ac27

data/.travis.yml

@@ -1,16 +1,22 @@
 language: ruby
 rvm:
-  - 2.2
-  - 2.3.4
-  - 2.4.1
-  - jruby-9.1.10.0
+- 2.2.8
+- 2.3.5
+- 2.4.2
+- jruby-9.1.14.0
 env:
-  - SPHINX_BIN=/usr/local/sphinx-2.0.10/bin SPHINX_VERSION=2.0.10
-  - SPHINX_BIN=/usr/local/sphinx-2.1.9/bin SPHINX_VERSION=2.1.9
-  - SPHINX_BIN=/usr/local/sphinx-2.2.6/bin SPHINX_VERSION=2.2.6
+  global:
+  - SPHINX_BIN=ext/sphinx/bin/
+  - secure: aP3wCZnnqim/yBWbO8+N2DAJIDVuqewUayK3nBphR/Jt1POIMbqCIuHwk/SG/JfMc6pJIlH0QOX8wI3fF3y5GO6aIrN8xKAX0DoDm+Gkvk/YEk3cK/2fJUwvocR89M99EoV8ctLPaR03B3dm3h2Dh2oe8NQRBfcrL3WtiHHq3d0=
+  matrix:
+  - SPHINX_VERSION=2.0.10
+  - SPHINX_VERSION=2.1.9
+  - SPHINX_VERSION=2.2.6
 before_script:
 - killall searchd; echo ''
-- if (ruby -e "exit RUBY_VERSION.to_f >= 2.4"); then export RUBYOPT="--enable-frozen-string-literal"; fi; echo $RUBYOPT
+- if (ruby -e "exit RUBY_VERSION.to_f >= 2.4"); then export RUBYOPT="--enable-frozen-string-literal";
+  fi; echo $RUBYOPT
+- "./bin/loadsphinx $SPHINX_VERSION"
 after_script:
 - killall searchd; echo ''
 sudo: false

data/Gemfile

@@ -1,16 +1,8 @@
+# frozen_string_literal: true
+
 source 'http://rubygems.org'
 
 gemspec
 
 gem 'mysql2',     '0.3.20', :platform => :ruby
 gem 'jdbc-mysql', '5.1.35', :platform => :jruby
-
-%w[
-  rspec
-  rspec-core
-  rspec-expectations
-  rspec-mocks
-  rspec-support
-].each do |library|
-  gem library, :git => "https://github.com/rspec/#{library}.git"
-end

data/HISTORY

@@ -1,3 +1,6 @@
+2.2.1 - December 2nd 2017
+- Check if Mysql2::Client is defined before using it (not just Mysql2).
+
 2.2.0 - June 20th 2017
 - Add compatibility for MRI's frozen string literals setting.
 - Stop packaging test files with gem releases (@dimko).

data/README.markdown

@@ -14,7 +14,7 @@ Riddle is available as a gem, so you can install it directly:
 
 Or include it in a Gemfile:
 
-    gem 'riddle', '~> 2.2.0'
+    gem 'riddle', '~> 2.2.1'
 
 ## Usage
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'bundler'
 

data/bin/loadsphinx

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+version=$1
+name="sphinx-$version"
+url="http://sphinxsearch.com/files/$name-release.tar.gz"
+bucket="thinking-sphinx"
+directory="ext/sphinx"
+prefix="`pwd`/$directory"
+file="ext/$name.tar.gz"
+
+download_and_compile_source () {
+  curl -O $url
+  tar -zxf $name-release.tar.gz
+  cd $name-release
+  ./configure --with-mysql --with-pgsql --enable-id64 --prefix=$prefix
+  make
+  make install
+  cd ..
+  rm -rf $name-release.tar.gz $name-release
+}
+
+load_cache () {
+  mkdir ext
+  curl -o $file http://$bucket.s3.amazonaws.com/bincaches/$name.tar.gz
+  tar -zxf $file
+}
+
+push_cache () {
+  tar -czf $file $directory
+  aws s3 cp $file s3://$bucket/bincaches/$name.tar.gz --acl public-read
+}
+
+if curl -i --head --fail http://$bucket.s3.amazonaws.com/bincaches/$name.tar.gz
+then
+  load_cache
+else
+  download_and_compile_source
+  push_cache
+fi

data/lib/riddle.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thread'
 require 'socket'
 require 'stringio'

data/lib/riddle/0.9.8.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 Riddle.loaded_version = '0.9.8'

data/lib/riddle/0.9.9.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Riddle.loaded_version = '0.9.9'
 
 require 'riddle/0.9.9/client'

data/lib/riddle/0.9.9/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Riddle::Client::Versions[:search] = 0x116
 Riddle::Client::Versions[:update] = 0x102
 

data/lib/riddle/0.9.9/client/filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Riddle::Client::Filter
   #
   

data/lib/riddle/0.9.9/configuration/searchd.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Riddle
   class Configuration
     class Searchd

data/lib/riddle/1.10.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'riddle/0.9.9'
 
 Riddle.loaded_version = '1.10'

data/lib/riddle/1.10/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Riddle::Client::Versions[:search]  = 0x117
 Riddle::Client::Versions[:excerpt] = 0x102
 

data/lib/riddle/2.0.1.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'riddle/0.9.9'
 require 'riddle/1.10'
 

data/lib/riddle/2.0.1/client.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 Riddle::Client::Versions[:search]  = 0x118
 Riddle::Client::Versions[:excerpt] = 0x103

data/lib/riddle/2.1.0.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'riddle/0.9.9'
 require 'riddle/1.10'
 require 'riddle/2.0.1'

data/lib/riddle/auto_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Riddle::AutoVersion
   def self.configure
     controller = Riddle::Controller.new nil, ''

data/lib/riddle/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'riddle/client/filter'
 require 'riddle/client/message'
 require 'riddle/client/response'

data/lib/riddle/client/filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Riddle
   class Client
     class Filter

data/lib/riddle/client/message.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Riddle
   class Client
     # This class takes care of the translation of ints, strings and arrays to

data/lib/riddle/client/response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Riddle
   class Client
     # Used to interrogate responses from the Sphinx daemon. Keep in mind none

data/lib/riddle/command_failed_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Riddle::CommandFailedError < StandardError
   attr_accessor :command_result
 end

data/lib/riddle/command_result.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Riddle::CommandResult
   attr_reader   :command, :status, :output
   attr_accessor :successful

data/lib/riddle/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'riddle/configuration/section'
 require 'riddle/configuration/index_settings'
 

data/lib/riddle/configuration/common.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Riddle
   class Configuration
     class Common < Riddle::Configuration::Section

data/lib/riddle/configuration/distributed_index.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Riddle
   class Configuration
     class DistributedIndex < Riddle::Configuration::Section

data/lib/riddle/configuration/index.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Riddle
   class Configuration
     class Index < Riddle::Configuration::Section

data/lib/riddle/configuration/index_settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Riddle
   class Configuration
     module IndexSettings

data/lib/riddle/configuration/indexer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Riddle
   class Configuration
     class Indexer < Riddle::Configuration::Section

data/lib/riddle/configuration/parser.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 require 'stringio'
 

data/lib/riddle/configuration/realtime_index.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Riddle
   class Configuration
     class RealtimeIndex < Riddle::Configuration::Section

data/lib/riddle/configuration/remote_index.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Riddle
   class Configuration
     class RemoteIndex

data/lib/riddle/configuration/searchd.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Riddle
   class Configuration
     class Searchd < Riddle::Configuration::Section

data/lib/riddle/configuration/section.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Riddle
   class Configuration
     class Section

data/lib/riddle/configuration/source.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Riddle
   class Configuration
     class Source < Riddle::Configuration::Section

data/lib/riddle/configuration/sql_source.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Riddle
   class Configuration
     class SQLSource < Riddle::Configuration::Source

data/lib/riddle/configuration/template_index.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Riddle
   class Configuration
     class TemplateIndex < Riddle::Configuration::Section

data/lib/riddle/configuration/tsv_source.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Riddle
   class Configuration
     class TSVSource < Riddle::Configuration::Source

data/lib/riddle/configuration/xml_source.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Riddle
   class Configuration
     class XMLSource < Riddle::Configuration::Source

data/lib/riddle/controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Riddle
   NoConfigurationFileError = Class.new StandardError
 

data/lib/riddle/execute_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Riddle::ExecuteCommand
   WINDOWS = (RUBY_PLATFORM =~ /mswin|mingw/)
 

data/lib/riddle/query.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module Riddle::Query
   ESCAPE_CHARACTERS = /[\(\)\|\-!@~\/"\/\^\$\\><&=\?]/
   # http://sphinxsearch.com/docs/current/extended-syntax.html
   ESCAPE_WORDS = /\b(?:MAYBE|NEAR|PARAGRAPH|SENTENCE|ZONE|ZONESPAN)\b/
+  MYSQL2_ESCAPE = defined?(Mysql2) && defined?(Mysql::Client)
 
   def self.connection(address = '127.0.0.1', port = 9312)
     require 'mysql2'
@@ -112,7 +115,7 @@ module Riddle::Query
   end
 
   def self.sql_escape(string)
-    return Mysql2::Client.escape(string) if defined?(Mysql2)
+    return Mysql2::Client.escape(string) if MYSQL2_ESCAPE
 
     string.gsub(/['"\\]/) { |character| "\\#{character}" }
   end

data/lib/riddle/query/delete.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Riddle::Query::Delete
   def initialize(index, *ids)
     @index = index

data/lib/riddle/query/insert.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Riddle::Query::Insert
   attr_reader :columns, :values
 

data/lib/riddle/query/select.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Riddle::Query::Select
   def initialize
     @values                = []

data/riddle.gemspec

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'riddle'
-  s.version     = '2.2.0'
+  s.version     = '2.2.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riddle
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,6 +66,7 @@ files:
 - LICENCE
 - README.markdown
 - Rakefile
+- bin/loadsphinx
 - lib/riddle.rb
 - lib/riddle/0.9.8.rb
 - lib/riddle/0.9.9.rb
@@ -127,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: riddle
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: An API for Sphinx, written in and for Ruby.