cql-ruby 0.8.1 → 0.8.2

data/lib/cql_ruby/cql_lexer.rb

@@ -47,6 +47,7 @@ class CqlLexer
   end
   
   def find_quoted_string_end( s, position )
+  
     is_backslashed = false
     for i in position+1..s.length
       if s[i..i] == '\\'
@@ -134,7 +135,7 @@ class CqlLexer
       return
     end
     @value = @simple_tokens[ @index ]
-    if /[0-9]+/ =~ @value
+    if /^[0-9]+$/ =~ @value
       @token_type = CqlLexer::TT_NUMBER
     elsif @value.length > 1
       if @value.slice(0..0) == '"'

data/test/test_cql_parser.rb

@@ -27,6 +27,18 @@ class TestCqlParser < Test::Unit::TestCase
     # and round-trip it comes back. 
     assert_equal('field relation "there is \\"phrase here\\""', node.to_cql)    
   end
+
+  def test_tokens_ending_in_numbers
+    # Not sure why tokens ending in numbers were a bug, first test then
+    # fix.
+    parser = CqlRuby::CqlParser.new
+    parser.debug = false
+
+    cql = 'number_field = "one_1 two_2"'
+    tree = parser.parse(cql)
+    
+    assert_equal(cql, tree.to_cql )    
+  end
   
   def test_parser
     parser = CqlRuby::CqlParser.new

data/test/test_cql_to_solr.rb

@@ -33,13 +33,20 @@ class CqlToSolrTest < Test::Unit::TestCase
   end
 
   def test_rel_any
-    assert_to_solr_eq('column cql.any "one two three"', 'column:(one OR two OR three)')
+    assert_to_solr_eq('column cql.any "one_term two_term three_term"', 'column:(one_term OR two_term OR three_term)')
   end
 
+  # For some reason these particular tokens caaused a bug
+  def test_any_number_tokens
+    assert_to_solr_eq('number_field cql.any "bib_1 bib_2"', 'number_field:(bib_1 OR bib_2)')
+  end
+
+
   def test_rel_all
     assert_to_solr_eq('column cql.all "one two three"', 'column:(+one +two +three)')
   end
 
+  
   def test_rel_not
     # Depending on solr schema, this will really map to "does not include phrase", not "does not exactly equal", best we can do. 
     assert_to_solr_eq('column <> "one two three"', '-column:"one two three"')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cql-ruby
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Jonathan Rochkind
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-28 00:00:00 -04:00
+date: 2010-07-07 00:00:00 -04:00
 default_executable: 
 dependencies: []