riddle 1.5.11 → 1.5.12

data/.travis.yml

@@ -4,7 +4,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
   - jruby-18mode
 env:
   - SPHINX_BIN=/usr/local/sphinx-2.0.9/bin SPHINX_VERSION=2.0.9

data/HISTORY

@@ -1,3 +1,9 @@
+1.5.12 - June 1st 2015
+- Adding ? as an escaped character (Alexey Nikitin).
+- Adding contributor code of conduct.
+- Spec fixes, and updating escape_column to not escape JSON expressions that make use of dot or bracket notation (Daniel Vandersluis).
+- Fix stop action to allow exception propagation (Dejan Simic).
+
 1.5.11 - April 19th 2014
 - Riddle::Query.escape covers = and & characters.
 - Hold onto address and port settings when crafting the equivalent listen setting, but don't render them.

data/README.textile

@@ -57,6 +57,8 @@ If you've installed the gem and wondering why there's no tests - check out the g
 
 h2. Contributing
 
+Please note that this project now has a "Contributor Code of Conduct":http://contributor-covenant.org/version/1/0/0/. By participating in this project you agree to abide by its terms.
+
 Riddle uses the "git-flow":http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/ process for development. The "master" branch is the latest released code (in a gem). The "develop" branch is what's coming in the next release. (There may be occasional feature and hotfix branches, although these are generally not pushed to GitHub.)
 
 When submitting a patch to riddle, please submit your pull request against the "develop" branch.

data/lib/riddle.rb

@@ -4,7 +4,7 @@ require 'timeout'
 
 module Riddle #:nodoc:
   @@mutex          = Mutex.new
-  @@escape_pattern = /[\(\)\|\-!@~"&\/]/
+  @@escape_pattern = /[\(\)\|\-!@~"&\/\?]/
   @@use_encoding   = defined?(::Encoding) &&
                      ::Encoding.respond_to?(:default_external)
 

data/lib/riddle/controller.rb

@@ -63,8 +63,8 @@ module Riddle
       else
         `#{cmd}`
       end
-    ensure
-      return !running?
+
+      !running?
     end
 
     def pid

data/lib/riddle/query.rb

@@ -99,7 +99,7 @@ module Riddle::Query
   end
 
   def self.escape(string)
-    string.gsub(/[\(\)\|\-!@~\/"\/\^\$\\><&=]/) { |match| "\\#{match}" }
+    string.gsub(/[\(\)\|\-!@~\/"\/\^\$\\><&=\?]/) { |match| "\\#{match}" }
   end
 
   def self.quote(string)

data/lib/riddle/query/select.rb

@@ -224,7 +224,7 @@ class Riddle::Query::Select
   end
 
   def escape_column(column)
-    if column.to_s[/\A[`@]/] || column.to_s[/\A\w+\(/]
+    if column.to_s[/\A[`@]/] || column.to_s[/\A\w+\(/] || column.to_s[/\A\w+[.\[]/]
       column
     else
       column_name, *extra = column.to_s.split(' ')

data/riddle.gemspec

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

data/spec/functional/escaping_spec.rb

@@ -10,11 +10,11 @@ describe 'SphinxQL escaping', :live => true do
     select.to_sql
   end
 
-  ['@', "'", '"', '\\"', "\\'"].each do |string|
+  ['@', "'", '"', '\\"', "\\'", "?"].each do |string|
     it "escapes #{string}" do
       lambda {
         connection.query sphinxql_matching(Riddle::Query.escape(string))
-      }.should_not raise_error(Mysql2::Error)
+      }.should_not raise_error
     end
   end
 

data/spec/riddle/auto_version_spec.rb

@@ -4,7 +4,7 @@ describe Riddle::AutoVersion do
   describe '.configure' do
     before :each do
       @controller = Riddle::Controller.new stub('configuration'), 'sphinx.conf'
-      Riddle::Controller.stub!(:new => @controller)
+      Riddle::Controller.stub(:new => @controller)
 
       unless ENV['SPHINX_VERSION'].nil?
         @env_version, ENV['SPHINX_VERSION'] = ENV['SPHINX_VERSION'].dup, nil
@@ -18,77 +18,77 @@ describe Riddle::AutoVersion do
     it "should require 0.9.8 if that is the known version" do
       Riddle::AutoVersion.should_receive(:require).with('riddle/0.9.8')
 
-      @controller.stub!(:sphinx_version => '0.9.8')
+      @controller.stub(:sphinx_version => '0.9.8')
       Riddle::AutoVersion.configure
     end
 
     it "should require 0.9.9 if that is the known version" do
       Riddle::AutoVersion.should_receive(:require).with('riddle/0.9.9')
 
-      @controller.stub!(:sphinx_version => '0.9.9')
+      @controller.stub(:sphinx_version => '0.9.9')
       Riddle::AutoVersion.configure
     end
 
     it "should require 1.10 if that is the known version" do
       Riddle::AutoVersion.should_receive(:require).with('riddle/1.10')
 
-      @controller.stub!(:sphinx_version => '1.10-beta')
+      @controller.stub(:sphinx_version => '1.10-beta')
       Riddle::AutoVersion.configure
     end
 
     it "should require 1.10 if using 1.10 with 64 bit IDs" do
       Riddle::AutoVersion.should_receive(:require).with('riddle/1.10')
 
-      @controller.stub!(:sphinx_version => '1.10-id64-beta')
+      @controller.stub(:sphinx_version => '1.10-id64-beta')
       Riddle::AutoVersion.configure
     end
 
     it "should require 2.0.1 if that is the known version" do
       Riddle::AutoVersion.should_receive(:require).with('riddle/2.0.1')
 
-      @controller.stub!(:sphinx_version => '2.0.1-beta')
+      @controller.stub(:sphinx_version => '2.0.1-beta')
       Riddle::AutoVersion.configure
     end
 
     it "should require 2.0.1 if 2.0.2-dev is being used" do
       Riddle::AutoVersion.should_receive(:require).with('riddle/2.0.1')
 
-      @controller.stub!(:sphinx_version => '2.0.2-dev')
+      @controller.stub(:sphinx_version => '2.0.2-dev')
       Riddle::AutoVersion.configure
     end
 
     it "should require 2.1.0 if 2.0.3 is being used" do
       Riddle::AutoVersion.should_receive(:require).with('riddle/2.1.0')
 
-      @controller.stub!(:sphinx_version => '2.0.3-release')
+      @controller.stub(:sphinx_version => '2.0.3-release')
       Riddle::AutoVersion.configure
     end
 
     it "should require 2.1.0 if 2.0.4 is being used" do
       Riddle::AutoVersion.should_receive(:require).with('riddle/2.1.0')
 
-      @controller.stub!(:sphinx_version => '2.0.4-release')
+      @controller.stub(:sphinx_version => '2.0.4-release')
       Riddle::AutoVersion.configure
     end
 
     it "should require 2.1.0 if 2.0.5 is being used" do
       Riddle::AutoVersion.should_receive(:require).with('riddle/2.1.0')
 
-      @controller.stub!(:sphinx_version => '2.0.5-release')
+      @controller.stub(:sphinx_version => '2.0.5-release')
       Riddle::AutoVersion.configure
     end
 
     it "should require 2.1.0 if 2.2.1 is being used" do
       Riddle::AutoVersion.should_receive(:require).with('riddle/2.1.0')
 
-      @controller.stub!(:sphinx_version => '2.2.1-beta')
+      @controller.stub(:sphinx_version => '2.2.1-beta')
       Riddle::AutoVersion.configure
     end
 
     it "should require 2.1.0 if that is the known version" do
       Riddle::AutoVersion.should_receive(:require).with('riddle/2.1.0')
 
-      @controller.stub!(:sphinx_version => '2.1.0-dev')
+      @controller.stub(:sphinx_version => '2.1.0-dev')
       Riddle::AutoVersion.configure
     end
   end

data/spec/riddle/controller_spec.rb

@@ -7,32 +7,32 @@ describe Riddle::Controller do
     end
     
     it "should return 1.10 if using 1.10-beta" do
-      @controller.stub!(:` => 'Sphinx 1.10-beta (r2420)')
+      @controller.stub(:` => 'Sphinx 1.10-beta (r2420)')
       @controller.sphinx_version.should == '1.10-beta'
     end
     
     it "should return 0.9.9 if using 0.9.9" do
-      @controller.stub!(:` => 'Sphinx 0.9.9-release (r2117)')
+      @controller.stub(:` => 'Sphinx 0.9.9-release (r2117)')
       @controller.sphinx_version.should == '0.9.9'
     end
     
     it "should return 0.9.9 if using 0.9.9 rc2" do
-      @controller.stub!(:` => 'Sphinx 0.9.9-rc2 (r1785)')
+      @controller.stub(:` => 'Sphinx 0.9.9-rc2 (r1785)')
       @controller.sphinx_version.should == '0.9.9'
     end
     
     it "should return 0.9.9 if using 0.9.9 rc1" do
-      @controller.stub!(:` => 'Sphinx 0.9.9-rc1 (r1566)')
+      @controller.stub(:` => 'Sphinx 0.9.9-rc1 (r1566)')
       @controller.sphinx_version.should == '0.9.9'
     end
     
     it "should return 0.9.8 if using 0.9.8.1" do
-      @controller.stub!(:` => 'Sphinx 0.9.8.1-release (r1533)')
+      @controller.stub(:` => 'Sphinx 0.9.8.1-release (r1533)')
       @controller.sphinx_version.should == '0.9.8'
     end
     
     it "should return 0.9.8 if using 0.9.8" do
-      @controller.stub!(:` => 'Sphinx 0.9.8-release (r1371)')
+      @controller.stub(:` => 'Sphinx 0.9.8-release (r1371)')
       @controller.sphinx_version.should == '0.9.8'
     end
   end

data/spec/riddle/query/select_spec.rb

@@ -24,6 +24,16 @@ describe Riddle::Query::Select do
       should == 'SELECT @weight FROM foo_core'
   end
 
+  it 'handles JSON as a select value using dot notation' do
+    query.values('key1.key2.key3').from('foo_core').to_sql.
+      should == 'SELECT key1.key2.key3 FROM foo_core'
+  end
+
+  it 'handles JSON as a select value using bracket notation 2' do
+    query.values("key1['key2']['key3']").from('foo_core').to_sql.
+        should == "SELECT key1['key2']['key3'] FROM foo_core"
+  end
+
   it "can prepend select values" do
     query.values('@weight').prepend_values('foo').from('foo_core').to_sql.
       should == 'SELECT foo, @weight FROM foo_core'
@@ -127,6 +137,16 @@ describe Riddle::Query::Select do
       should == "SELECT * FROM foo_core WHERE (`bars` <> 1 OR `bars` <> 2)"
   end
 
+  it 'handles filters on JSON with dot syntax' do
+    query.from('foo_core').where('key1.key2.key3' => 10).to_sql.
+      should == "SELECT * FROM foo_core WHERE key1.key2.key3 = 10"
+  end
+
+  it 'handles filters on JSON with bracket syntax' do
+    query.from('foo_core').where("key1['key2']['key3']" => 10).to_sql.
+        should == "SELECT * FROM foo_core WHERE key1['key2']['key3'] = 10"
+  end
+
   it 'handles grouping' do
     query.from('foo_core').group_by('bar_id').to_sql.
       should == "SELECT * FROM foo_core GROUP BY `bar_id`"

data/spec/riddle/query_spec.rb

@@ -78,7 +78,7 @@ describe Riddle::Query do
   end
 
   describe '.escape' do
-    %w(( ) | - ! @ ~ / ^ $ " > <).each do |reserved|
+    %w(( ) | - ! @ ~ / ^ $ " > < ?).each do |reserved|
       it "escapes #{reserved}" do
         Riddle::Query.escape(reserved).should == "\\#{reserved}"
       end

metadata

@@ -1,66 +1,82 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: riddle
-version: !ruby/object:Gem::Version
-  version: 1.5.11
+version: !ruby/object:Gem::Version 
+  hash: 27
+  prerelease: 
+  segments: 
+  - 1
+  - 5
+  - 12
+  version: 1.5.12
 platform: ruby
-authors:
+authors: 
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2015-06-01 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-- !ruby/object:Gem::Dependency
+  type: :development
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-- !ruby/object:Gem::Dependency
+  type: :development
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 7
+        - 2
         version: 0.7.2
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.2
+  type: :development
+  requirement: *id003
 description: A Ruby API and configuration helper for the Sphinx search service.
-email:
+email: 
 - pat@freelancing-gods.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- ".gitignore"
-- ".travis.yml"
+
+files: 
+- .gitignore
+- .travis.yml
 - Gemfile
 - HISTORY
 - LICENCE
@@ -267,30 +283,39 @@ files:
 - spec/unit/response_spec.rb
 - spec/unit/riddle_spec.rb
 homepage: http://pat.github.io/riddle/
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: riddle
-rubygems_version: 2.2.2
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: An API for Sphinx, written in and for Ruby.
-test_files:
+test_files: 
 - spec/fixtures/.gitignore
 - spec/fixtures/data/0.9.9/anchor.bin
 - spec/fixtures/data/0.9.9/any.bin

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 55868c085e98a4ee1485e4b2b571cac9e712d7f6
-  data.tar.gz: e9c77b9c6d818662404f86951a839df4e0358cd4
-SHA512:
-  metadata.gz: 48cdfd60502df6763b278b0f64f7750554c2075ea9c66cebbf86f4a886891d1b0beb33924f04cd09f17367b8992cbef47571237396157118bee2852a7acb7815
-  data.tar.gz: f7751e152943f0ba712132cce958ff5688524e204628e1975727cc4c978fb3ff5ded9f78d64e6f69a52ca1567b5a02048aec93749b1dffdbc89518e85a9c2e17