@@ -246,16 +246,19 @@ module Siren module Equal def value(expr1, expr2) return expr1 == expr2 unless expr2.respond_to?(:gsub) - expr2 = expr2.gsub('*', '.*').gsub('?', '.') - expr1 =~ %r{^#{expr2}$} + expr1 =~ %r{^#{Match.convert(expr2)}$} end end module Match def value(expr1, expr2) return expr1 == expr2 unless expr2.respond_to?(:gsub) - expr2 = expr2.gsub('*', '.*').gsub('?', '.') - expr1 =~ %r{^#{expr2}$}i + expr1 =~ %r{^#{Match.convert(expr2)}$}i + end + + def self.convert(string) + string.gsub(/([\.\+\[\]\{\}\(\)\^\$])/) { "\\#{$1}" }. + gsub('*', '.*').gsub('?', '.') end end lib/siren/json_query_nodes.rb @@ -129,7 +129,7 @@ class SirenTest < Test::Unit::TestCase {:key => [9,5,7], :val => 1..8}) end - def test_wildcards + def test_string_matching assert_equal ["Sayings of the Century", "The Lord of the Rings"], Siren.query("$.store.book[? @.title = '* of the *'][= title]", fixtures(:store)) @@ -144,6 +144,8 @@ class SirenTest < Test::Unit::TestCase assert_equal [], Siren.query("$.store.book[? @.title = '? of the ?'][= title]", fixtures(:store)) + + assert_equal '302 [QSA,L]', Siren.query("$[? @ = '302 [QSA,L]'][0]", ['302 [QSA,L]']) end def test_bookstore test/test_siren.rb d98b2393117ef2c58c635a5e8fe084347782c03e James Coglan jcoglan@googlemail.com http://github.com/jcoglan/siren/commit/515687122c70492bb11085654a4892b304dbdc29 515687122c70492bb11085654a4892b304dbdc29 2009-07-07T05:37:22-07:00 2009-07-07T05:37:22-07:00 Escape regex-related characters in string literals. 7b6a727a05c55839a899b15fb3f9beab22a423eb James Coglan jcoglan@googlemail.com