mongoid_oslc 0.1.2 → 0.1.3

data/lib/mongoid/oslc/grammar.rb

@@ -3,31 +3,13 @@ require 'treetop'
 module Mongoid
   module Oslc
     module Grammar
-      class GrammarNode < Treetop::Runtime::SyntaxNode
+      class BinaryDecision < Treetop::Runtime::SyntaxNode
         def to_mongo_query
-          elements[0].to_mongo_query
+          operand_1.to_mongo_query.deep_merge(operand_2.to_mongo_query)
         end
       end
 
-      class BinaryDecision < GrammarNode
-
-        def to_mongo_query
-          operand_1 = elements[0].to_mongo_query
-          operand_2 = elements[2].to_mongo_query
-          operand_1.deep_merge(operand_2)
-        end
-      end
-
-      class LogicalOperator < GrammarNode
-      end
-
-      class Field < GrammarNode
-        def to_mongo_query
-          text_content
-        end
-      end
-
-      class Operator < GrammarNode
+      class Operator < Treetop::Runtime::SyntaxNode
         OPERATORS = {
           "="   => "$in",
           "!="  => "$ne",
@@ -38,10 +20,6 @@ module Mongoid
           "in"  => "$in"
         }
 
-        def to_mongo_query
-          OPERATORS[text_value]
-        end
-
         def to_mongo_query_with_value(value)
           if text_value == "="
             value
@@ -51,49 +29,44 @@ module Mongoid
         end
       end
 
-      class InOp < GrammarNode
-        def to_mongo_query
-          "$in"
-        end
-
+      class InOp < Treetop::Runtime::SyntaxNode
         def to_mongo_query_with_value(value)
           { "$in" => value }
         end
       end
 
-      class InVal < GrammarNode
+      class InVal < Treetop::Runtime::SyntaxNode
         def to_mongo_query
-          # "[\"First\",\"Second\"]" -> ["First", "Second"]
-          eval text_value
+          [first_value.to_mongo_query] + rest_values.elements.map{|comma_and_value| comma_and_value.rest_value.to_mongo_query }
         end
       end
 
-      class UriRefEsc < GrammarNode
+      class UriRefEsc < Treetop::Runtime::SyntaxNode
         def to_mongo_query
           # TODO: an angle bracket-delimited URI reference in which > and \ are \-escaped.
           text_content
         end
       end
 
-      class BooleanValue < GrammarNode
+      class BooleanValue < Treetop::Runtime::SyntaxNode
         def to_mongo_query
           text_value == "true"
         end
       end
 
-      class BlankValue < GrammarNode
+      class BlankValue < Treetop::Runtime::SyntaxNode
         def to_mongo_query
           nil
         end
       end
 
-      class DecimalValue < GrammarNode
+      class DecimalValue < Treetop::Runtime::SyntaxNode
         def to_mongo_query
           text_value.to_f
         end
       end
 
-      class StringEsc < GrammarNode
+      class StringEsc < Treetop::Runtime::SyntaxNode
         def to_mongo_query
           value = text_value[1...-1]
           if value.starts_with?("*") || value.ends_with?("*")
@@ -105,14 +78,13 @@ module Mongoid
         end
       end
 
-      class Condition < GrammarNode
+      class Condition < Treetop::Runtime::SyntaxNode
         def to_mongo_query
-          oslc_name = elements[0].text_value
+          oslc_name = field_name.text_value
           field     = Mongoid::Oslc.resources.field_name(oslc_name)
-          value     = elements[2].to_mongo_query
+          value     = field_value.to_mongo_query
           value     = [] if value.nil? && Mongoid::Oslc.resources.is_field_array?(oslc_name)
-          operator_with_value = elements[1].to_mongo_query_with_value(value)
-          { field => operator_with_value }
+          { field => operator.to_mongo_query_with_value(value) }
         end
       end
     end

data/lib/mongoid/oslc/grammar.treetop

@@ -39,11 +39,13 @@ grammar Grammar
   end
 
   rule term
-    field comparison_op value <Mongoid::Oslc::Grammar::Condition> / field space in_op space? in_val <Mongoid::Oslc::Grammar::Condition>
+    field_name:field operator:comparison_op field_value:value <Mongoid::Oslc::Grammar::Condition>
+    /
+    field_name:field space operator:in_op space? field_value:in_val <Mongoid::Oslc::Grammar::Condition>
   end
 
   rule boolean_op
-    'and' <Mongoid::Oslc::Grammar::LogicalOperator>
+    'and'
   end
 
   rule in_op
@@ -51,7 +53,7 @@ grammar Grammar
   end
 
   rule in_val
-    '[' value (',' value)* ']' <Mongoid::Oslc::Grammar::InVal>
+    '[' first_value:value rest_values:(',' rest_value:value)* ']' <Mongoid::Oslc::Grammar::InVal>
   end
 
   rule space
@@ -59,7 +61,7 @@ grammar Grammar
   end
 
   rule field
-    [\w\:]+ <Mongoid::Oslc::Grammar::Field>
+    [\w\:]+
   end
 
   rule comparison_op

data/lib/mongoid/oslc/strategy.rb

@@ -16,18 +16,8 @@ module Mongoid
         tree = @parser.parse(query)
         raise Mongoid::Oslc::QueryParsingError.new(query, @parser.index) if tree.nil?
 
-        clean_tree(tree)
-
         tree.to_mongo_query
       end
-
-      private
-
-      def self.clean_tree(root_node)
-        return if(root_node.elements.nil?)
-        root_node.elements.delete_if{|node| node.class.name == "Treetop::Runtime::SyntaxNode" }
-        root_node.elements.each {|node| self.clean_tree(node) }
-      end
     end
   end
 end

data/lib/mongoid/oslc/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Oslc
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

data/spec/lib/mongoid/oslc/strategy_spec.rb

@@ -17,6 +17,10 @@ describe Mongoid::Oslc::Strategy do
       parse_query('dcterms:title="requirement"').should eql({title: "requirement"})
     end
 
+    it "should parse not simple query" do
+      parse_query('dcterms:title="requirement" and dcterms:description="desc" and dcterms:creator=blank').should eql({title: "requirement", description: 'desc', creators: []})
+    end
+
     it "should parse query with conjunction" do
       parse_query('dcterms:title="requirement" and dcterms:description="first"').should eql({
         title: "requirement", description: "first"
@@ -64,7 +68,7 @@ describe Mongoid::Oslc::Strategy do
     end
 
     it "should parse query with array values" do
-      parse_query('dcterms:title in ["First","Second"]').should eql({title: {"$in"=>["First", "Second"]}})
+      parse_query('dcterms:title in ["First","Second",false,blank,+5]').should eql({title: {"$in"=>["First", "Second", false, nil, 5.0]}})
     end
 
     it "should parse query with wild char" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_oslc
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -155,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3967237591695565408
+      hash: 4140121173363015006
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3967237591695565408
+      hash: 4140121173363015006
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24