riddle 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0743ec72ebf70708fe0cbdbfb63d44c307e7c798
-  data.tar.gz: a46b1a68d1104d21d7d63b52d712e313e6b48c6a
+  metadata.gz: 9703ab2715784c618307e9081ebf69b2bea0ed08
+  data.tar.gz: 9570d8929bbb278985a468570c34ddc6cf702502
 SHA512:
-  metadata.gz: 6df640330c4c08a437e831de9c2a78c0d0fe55618bdad21ad36e80ef0b908f0f8f6445533c2a395122a0121cdc298dacb723ca98712d277f86ab2e72df8af9ea
-  data.tar.gz: 097f533203b245d59c2cdaccc52cca61bfefacb551e0c58e974e9a777d97b01e45c4ed843095d7119dc9889d6d83591926d0f5437ad330229d74fbeb6a81416e
+  metadata.gz: 0d097ac478f457a842116c00ba098ebc0d70b19e5fad881b53aa7721ac2058d75e3c63a05647185e9c58931bfa06adce4e5c8405018197f0bf6cdce11794dfe2
+  data.tar.gz: 2375a83b6ff035108262bc185483ecbe7a13a7abedf676fb2df20ab293b52eefa4fee4df1b9d003b642600b0109461e9d75e6bf715718d1bbc0d2a8b30bda69b

data/.travis.yml

@@ -2,6 +2,8 @@ language: ruby
 rvm:
   - 2.1
   - 2.2
+  - 2.3.3
+  - 2.4.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

data/HISTORY

@@ -1,3 +1,9 @@
+2.1.0 - January 5th 2017
+- Wrap string attribute filter values in single quotes.
+- Remove direct references to FixNum to avoid MRI 2.4 warnings.
+- Remove escaped line-endings while parsing.
+- Escape word-operators like MAYBE, NEAR etc (Jonathan del Strother)
+
 2.0.0 - September 25th 2016
 - Start and stop commands now accept a verbose option.
 - Failed commands (as determined by a non-zero status code) raise a Riddle::CommandFailedError exception.

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', '~> 1.5.12'
+    gem 'riddle', '~> 2.1.0'
 
 ## Usage
 

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

@@ -1,6 +1,8 @@
 module Riddle
   class Configuration
     class Searchd
+      NUMBER = 1.class
+
       def valid?
         set_listen
 
@@ -10,14 +12,14 @@ module Riddle
       private
 
       def set_listen
-        @listen = @listen.to_s if @listen.is_a?(Fixnum)
+        @listen = @listen.to_s if @listen.is_a?(NUMBER)
 
         return unless @listen.nil? || @listen.empty?
 
         @listen = []
         @listen << @port.to_s if @port
         @listen << "9306:mysql41" if @mysql41.is_a?(TrueClass)
-        @listen << "#{@mysql41}:mysql41" if @mysql41.is_a?(Fixnum)
+        @listen << "#{@mysql41}:mysql41" if @mysql41.is_a?(NUMBER)
 
         @listen.each { |l| l.insert(0, "#{@address}:") } if @address
       end

data/lib/riddle/configuration/parser.rb

@@ -132,7 +132,7 @@ class Riddle::Configuration::Parser
     SETTING_PATTERN = /^(\w+)\s*=\s*(.*)$/
 
     def initialize(input)
-      @stream   = StringIO.new(input)
+      @stream   = StringIO.new(input.gsub("\\\n", ''))
       @sections = {}
     end
 

data/lib/riddle/query.rb

@@ -1,4 +1,8 @@
 module Riddle::Query
+  ESCAPE_CHARACTERS = /[\(\)\|\-!@~\/"\/\^\$\\><&=\?]/
+  # http://sphinxsearch.com/docs/current/extended-syntax.html
+  ESCAPE_WORDS = /\b(?:MAYBE|NEAR|PARAGRAPH|SENTENCE|ZONE|ZONESPAN)\b/
+
   def self.connection(address = '127.0.0.1', port = 9312)
     require 'mysql2'
 
@@ -99,7 +103,8 @@ module Riddle::Query
   end
 
   def self.escape(string)
-    string.gsub(/[\(\)\|\-!@~\/"\/\^\$\\><&=\?]/) { |match| "\\#{match}" }
+    string.gsub(ESCAPE_CHARACTERS) { |match| "\\#{match}" }
+      .gsub(ESCAPE_WORDS) { |word| "\\#{word}" }
   end
 
   def self.quote(string)

data/lib/riddle/query/select.rb

@@ -195,6 +195,8 @@ class Riddle::Query::Select
       value.to_i
     when Date
       Time.utc(value.year, value.month, value.day).to_i
+    when String
+      "'#{value.gsub("'", "\\'")}'"
     else
       value
     end

data/riddle.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'riddle'
-  s.version     = '2.0.0'
+  s.version     = '2.1.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']

data/spec/riddle/query/select_spec.rb

@@ -122,6 +122,11 @@ describe Riddle::Query::Select do
       should == "SELECT * FROM foo_core WHERE MATCH('foo') AND `bar` BETWEEN 1 AND 5"
   end
 
+  it "handles filters with strings" do
+    query.from('foo_core').where(:bar => 'baz').to_sql.
+      should == "SELECT * FROM foo_core WHERE `bar` = 'baz'"
+  end
+
   it "handles filters expecting matches on all values" do
     query.from('foo_core').where_all(:bars => [1, 2]).to_sql.
       should == "SELECT * FROM foo_core WHERE `bars` = 1 AND `bars` = 2"

data/spec/riddle/query_spec.rb

@@ -83,5 +83,15 @@ describe Riddle::Query do
         Riddle::Query.escape(reserved).should == "\\#{reserved}"
       end
     end
+
+    it "escapes word-operators correctly" do
+      operators = ['MAYBE', 'NEAR', 'PARAGRAPH', 'SENTENCE', 'ZONE', 'ZONESPAN']
+      operators.each do |operator|
+        base = "string with #{operator} operator"
+        Riddle::Query.escape(base).should == base.gsub(operator, "\\#{operator}")
+      end
+
+      Riddle::Query.escape("FIND THE ZONES").should == "FIND THE ZONES"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riddle
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-25 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -289,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: riddle
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: An API for Sphinx, written in and for Ruby.