cql-ruby 0.9.0 → 0.9.1

data/lib/cql_ruby/cql_to_solr.rb

@@ -116,19 +116,19 @@ class CqlTermNode
       # match/exclude on partial matches too, not only complete matches. 
       when "<>"
         negate = true
-        maybe_quote(@term)
-      when "cql.adj", "==" then   maybe_quote(@term)                                
+        solr_maybe_quote(@term)
+      when "cql.adj", "==" then   solr_maybe_quote(@term)                                
       when "cql.all" then '(' + @term.split(/\s/).collect{|a| '+'+a}.join(" ") + ')'          
       when "cql.any" then         '(' + @term.split(/\s/).join(" OR ") + ')'          
-      when ">=" then              "[" + maybe_quote(@term) + " TO *]"          
-      when ">" then               "{" + maybe_quote(@term) + " TO *}"          
-      when "<=" then              "[* TO " + maybe_quote(@term) + "]"          
-      when "<" then               "{* TO " + maybe_quote(@term) + "}"
+      when ">=" then              "[" + solr_maybe_quote(@term) + " TO *]"          
+      when ">" then               "{" + solr_maybe_quote(@term) + " TO *}"          
+      when "<=" then              "[* TO " + solr_maybe_quote(@term) + "]"          
+      when "<" then               "{* TO " + solr_maybe_quote(@term) + "}"
       when "cql.within"
         bounds = @term.gsub('"', "").split(/\s/)
         raise CqlException.new("can not extract two bounding values from within relation term: #{@term}") unless bounds.length == 2
 
-        "[" + maybe_quote(bounds[0]) + " TO " + maybe_quote(bounds[1]) + "]"                  
+        "[" + solr_maybe_quote(bounds[0]) + " TO " + solr_maybe_quote(bounds[1]) + "]"                  
       else
         raise CqlException.new("relation not supported: #{relation}")
     end
@@ -140,6 +140,17 @@ class CqlTermNode
     
     return ret     
   end
+  
+  # utility method, quotes/escapes value, if needed, for inclusion
+  # in solr lucene query parser term. 
+  # wraps in double quotes if needed, backslash-escapes internal double
+  # quotes. 
+  def solr_maybe_quote(term)
+    return term unless term =~ /[^a-zA-Z0-9_]/
+    
+    return '"' + term.gsub('"', '\\"') + '"'
+  end
+  
 end
 
 class CqlBooleanNode

data/test/test_cql_to_solr.rb

@@ -89,6 +89,12 @@ class CqlToSolrTest < Test::Unit::TestCase
       assert_to_solr_eq("cql.allindexes = val", @@parser.parse("my_all_index = val").to_solr)
     end        
   end
+  
+  def test_escapes_terms
+    assert_to_solr_eq('text = ab[]cd', 'text:"ab[]cd"')
+    
+    assert_to_solr_eq('text = "one\'s \" two"', 'text:"one\'s \" two"')
+  end
 
 #############
 # Helpers

metadata

@@ -1,32 +1,39 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: cql-ruby
-version: !ruby/object:Gem::Version
-  version: 0.9.0
+version: !ruby/object:Gem::Version 
+  hash: 57
   prerelease: 
+  segments: 
+  - 0
+  - 9
+  - 1
+  version: 0.9.1
 platform: ruby
-authors:
+authors: 
 - Jonathan Rochkind
 - Chick Markley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000 Z
+
+date: 2012-04-17 00:00:00 Z
 dependencies: []
-description: ! ' CQL Parser, with serialization from cql node tree to cql, xcql, and
-  solr query'
+
+description: " CQL Parser, with serialization from cql node tree to cql, xcql, and solr query"
 email: cql_ruby@googlegroups.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.md
-files:
+files: 
 - lib/cql_ruby.rb
 - lib/cql_ruby/cql_generator.rb
 - lib/cql_ruby/cql_lexer.rb
 - lib/cql_ruby/cql_nodes.rb
 - lib/cql_ruby/cql_parser.rb
 - lib/cql_ruby/cql_to_solr.rb
-- lib/cql_ruby/version.rb
 - README.md
 - test/test_cql_parser.rb
 - test/test_cql_nodes.rb
@@ -38,30 +45,38 @@ files:
 - test/test_cql_to_solr.rb
 homepage: https://github.com/jrochkind/cql-ruby
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+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'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: cql-ruby
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: CQL Parser
-test_files:
+test_files: 
 - test/test_cql_parser.rb
 - test/test_cql_nodes.rb
 - test/test_cql_generator.rb

data/lib/cql_ruby/version.rb

@@ -1,9 +0,0 @@
-module CqlRuby #:nodoc:
-  module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 7
-    TINY  = 1
-
-    STRING = [MAJOR, MINOR, TINY].join('.')
-  end
-end