scim-query-filter-parser 0.0.3 → 0.0.4

data/.gemspec

@@ -2,7 +2,7 @@
 
 GemSpec ||= Gem::Specification.new do |gem|
   gem.name = 'scim-query-filter-parser'
-  gem.version = '0.0.3'
+  gem.version = '0.0.4'
   gem.license = 'MIT'
   gem.required_ruby_version = '>= 1.9.1'
 

data/lib/scim/query/filter/parser.rb

@@ -42,11 +42,19 @@ class SCIM::Query::Filter::Parser
 
   def parse_expr
     ast = []
-    expect_op = false
-    while not eos and peek != ')'
-      expect_op && assert_op || assert_not_op
-      ast.push(start_group ? parse_group : pop)
-      expect_op ^= true unless Unary[ast.last]
+    until eos or peek == ')'
+      assert_not_op
+      ast.push(start_group ? parse_group : pop.downcase)
+      break if (eos or peek == ')')
+      assert_op
+      ast.push pop.downcase
+      if !Unary[ast.last]
+        assert_not_op
+        ast.push(start_group ? parse_group : pop)
+      end
+      break if eos or peek == ')'
+      assert_op
+      ast.push pop.downcase
     end
     to_rpn ast
   end
@@ -77,10 +85,10 @@ class SCIM::Query::Filter::Parser
     out.push ast.shift if not ast.empty?
     while not ast.empty? do
       op = ast.shift
-      p = Ops[op] \
+      precedence = Ops[op] \
         or fail "Unknown operator '#{op}'"
       while not ops.empty? do
-        break if p > Ops[ops.first]
+        break if precedence > Ops[ops.first]
         out.push ops.shift
       end
       ops.unshift op
@@ -114,7 +122,7 @@ class SCIM::Query::Filter::Parser
   def eos;  @tokens.empty? end
   def start_group; peek == '(' end
   def peek_operator
-    not(eos) and peek.match IsOperator
+    not(eos) and peek.downcase.match IsOperator
   end
 
 

data/test/case.rb

@@ -0,0 +1,32 @@
+require 'scim/query/filter/parser'
+require 'test/unit'
+require 'yaml'
+require 'json'
+
+class TestCase < Test::Unit::TestCase
+  def test_case
+    data = YAML.load $test_case_data
+    parser = SCIM::Query::Filter::Parser.new
+    data.each do |test_case|
+      query = test_case['query']
+      parser.parse query
+
+      got_rpn_json = parser.rpn.to_json
+      want_rpn_json = test_case['rpn'].to_json
+      assert_equal want_rpn_json, got_rpn_json,
+        "Test parse to RPN: '#{query}'"
+
+      got_tree_json = parser.tree.to_json
+      want_tree_json = test_case['tree'].to_json
+      assert_equal want_tree_json, got_tree_json,
+        "Test parse to tree: '#{query}'"
+    end
+  end
+end
+
+# See http://www.simplecloud.info/specs/draft-scim-api-01.html#query-resources
+$test_case_data = <<'...'
+- query: USERName eQ "Ingy döt Net"
+  rpn:   [username,'"Ingy döt Net"',eq]
+  tree:  [eq, username,'"Ingy döt Net"']
+...

data/test/spec.rb

@@ -0,0 +1,76 @@
+require 'scim/query/filter/parser'
+require 'test/unit'
+require 'yaml'
+require 'json'
+
+class TestSpec < Test::Unit::TestCase
+  def test_spec
+    data = YAML.load $test_spec_data
+    parser = SCIM::Query::Filter::Parser.new
+    data.each do |test_case|
+      query = test_case['query']
+      parser.parse query
+
+      got_rpn_json = parser.rpn.to_json
+      want_rpn_json = test_case['rpn'].to_json
+      assert_equal want_rpn_json, got_rpn_json,
+        "Test parse to RPN: '#{query}'"
+
+      got_tree_json = parser.tree.to_json
+      want_tree_json = test_case['tree'].to_json
+      assert_equal want_tree_json, got_tree_json,
+        "Test parse to tree: '#{query}'"
+    end
+  end
+end
+
+# See http://www.simplecloud.info/specs/draft-scim-api-01.html#query-resources
+$test_spec_data = <<'...'
+- query: ''
+  rpn:   []
+  tree:  []
+
+- query: userName eq "bjensen"
+  rpn:   [username,'"bjensen"',eq]
+  tree:  [eq, username,'"bjensen"']
+
+- query: name.familyName co "O'Malley"
+  rpn:   [name.familyname, '"O''Malley"', co]
+  tree:  [co, name.familyname, '"O''Malley"']
+
+- query: userName sw "J"
+  rpn:   [username, '"J"', sw]
+  tree:  [sw, username, '"J"']
+
+- query: title pr
+  rpn:   [title, pr]
+  tree:  [pr, title]
+
+- query: meta.lastModified gt "2011-05-13T04:42:34Z"
+  rpn:   [meta.lastmodified, '"2011-05-13T04:42:34Z"', gt]
+  tree:  [gt, meta.lastmodified, '"2011-05-13T04:42:34Z"']
+
+- query: meta.lastModified ge "2011-05-13T04:42:34Z"
+  rpn:   [meta.lastmodified, '"2011-05-13T04:42:34Z"', ge]
+  tree:  [ge, meta.lastmodified, '"2011-05-13T04:42:34Z"']
+
+- query: meta.lastModified lt "2011-05-13T04:42:34Z"
+  rpn:   [meta.lastmodified, '"2011-05-13T04:42:34Z"', lt]
+  tree:  [lt, meta.lastmodified, '"2011-05-13T04:42:34Z"']
+
+- query: meta.lastModified le "2011-05-13T04:42:34Z"
+  rpn:   [meta.lastmodified, '"2011-05-13T04:42:34Z"', le]
+  tree:  [le, meta.lastmodified, '"2011-05-13T04:42:34Z"']
+
+- query: title pr and userType eq "Employee"
+  rpn:   [title, pr, usertype, '"Employee"', eq, and]
+  tree:  [and, [pr, title], [eq, usertype, '"Employee"']]
+
+- query: title pr or userType eq "Intern"
+  rpn:   [title, pr, usertype, '"Intern"', eq, or]
+  tree:  [or, [pr, title], [eq, usertype, '"Intern"']]
+
+- query: userType eq "Employee" and (emails co "example.com" or emails co "example.org")
+  rpn:   [usertype, '"Employee"', eq, emails, '"example.com"', co, emails, '"example.org"', co, or ,and]
+  tree:  [and, [eq, usertype, '"Employee"'], [or, [co, emails, '"example.com"'], [co, emails, '"example.org"']]]
+...

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scim-query-filter-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -45,7 +45,8 @@ files:
 - README.rdoc
 - Rakefile
 - lib/scim/query/filter/parser.rb
-- test/parse.rb
+- test/case.rb
+- test/spec.rb
 homepage: https://github.com/ingydotnet/scim-query-filter-parser-rb
 licenses:
 - MIT

data/test/parse.rb

@@ -1,82 +0,0 @@
-require 'scim/query/filter/parser'
-require 'test/unit'
-require 'yaml'
-require 'json'
-
-class TestParser < Test::Unit::TestCase
-  def test_spec
-    data = $test_parse_data.lines.to_a
-    parser = SCIM::Query::Filter::Parser.new
-    while true do
-      input = data.shift or break
-      input.chomp!
-      rpn_yaml = data.shift or break
-      next if rpn_yaml == "\n"
-      parser.parse(input)
-      got_rpn_json = parser.rpn.to_json
-      want_rpn_json = YAML.load(rpn_yaml).to_json
-      assert_equal want_rpn_json, got_rpn_json,
-        "Test parse to RPN: '#{input.chomp}'"
-      tree_yaml = data.shift or break
-      next if tree_yaml == "\n"
-      got_tree_json = parser.tree.to_json
-      want_tree_json = YAML.load(tree_yaml).to_json
-      assert_equal want_tree_json, got_tree_json,
-        "Test parse to tree: '#{input.chomp}'"
-      blank_line = data.shift or break
-      fail "Got '#{blank_line.chomp}', expected blank line" \
-        unless blank_line == "\n"
-    end
-  end
-end
-
-# See http://www.simplecloud.info/specs/draft-scim-api-01.html#query-resources
-$test_parse_data = <<'...'
-
-[]
-[]
-
-userName eq "bjensen"
-[userName,'"bjensen"',eq]
-[eq, userName,'"bjensen"']
-
-name.familyName co "O'Malley"
-[name.familyName, '"O''Malley"', co]
-[co, name.familyName, '"O''Malley"']
-
-userName sw "J"
-[userName, '"J"', sw]
-[sw, userName, '"J"']
-
-title pr
-[title, pr]
-[pr, title]
-
-meta.lastModified gt "2011-05-13T04:42:34Z"
-[meta.lastModified, '"2011-05-13T04:42:34Z"', gt]
-[gt, meta.lastModified, '"2011-05-13T04:42:34Z"']
-
-meta.lastModified ge "2011-05-13T04:42:34Z"
-[meta.lastModified, '"2011-05-13T04:42:34Z"', ge]
-[ge, meta.lastModified, '"2011-05-13T04:42:34Z"']
-
-meta.lastModified lt "2011-05-13T04:42:34Z"
-[meta.lastModified, '"2011-05-13T04:42:34Z"', lt]
-[lt, meta.lastModified, '"2011-05-13T04:42:34Z"']
-
-meta.lastModified le "2011-05-13T04:42:34Z"
-[meta.lastModified, '"2011-05-13T04:42:34Z"', le]
-[le, meta.lastModified, '"2011-05-13T04:42:34Z"']
-
-title pr and userType eq "Employee"
-[title, pr, userType, '"Employee"', eq, and]
-[and, [pr, title], [eq, userType, '"Employee"']]
-
-title pr or userType eq "Intern"
-[title, pr, userType, '"Intern"', eq, or]
-[or, [pr, title], [eq, userType, '"Intern"']]
-
-userType eq "Employee" and (emails co "example.com" or emails co "example.org")
-[userType, '"Employee"', eq, emails, '"example.com"', co, emails, '"example.org"', co, or ,and]
-[and, [eq, userType, '"Employee"'], [or, [co, emails, '"example.com"'], [co, emails, '"example.org"']]]
-...