mongoid_oslc 0.0.6 → 0.0.7

data/lib/mongoid/oslc/exceptions.rb

@@ -0,0 +1,28 @@
+module Mongoid
+  module Oslc
+    class QuerySyntaxError < Exception
+      attr :query
+      def initialize(message, query = nil)
+        @query = query
+        super(message)
+      end
+    end
+
+    class QueryParsingError < Exception
+      attr :query, :index
+      def initialize(query = "", index = 0, message = "")
+        @query = query
+        @index = index
+        super("Parse error at offset: #{@index} #{highlight_error(@query, @index)}")
+      end
+
+      protected
+
+      def highlight_error(str, index)
+        error_str = "\n#{str}\n"
+        (index - 1).times { error_str << "-" }
+        error_str << "^"
+      end
+    end
+  end
+end

data/lib/mongoid/oslc/grammar.rb

@@ -51,6 +51,23 @@ module Mongoid
         end
       end
 
+      class InOp < GrammarNode
+        def to_mongo_query
+          "$in"
+        end
+
+        def to_mongo_query_with_value(value)
+          { "$in" => value }
+        end
+      end
+
+      class InVal < GrammarNode
+        def to_mongo_query
+          # "[\"First\",\"Second\"]" -> ["First", "Second"]
+          eval text_value
+        end
+      end
+
       class UriRefEsc < GrammarNode
         def to_mongo_query
           # TODO: an angle bracket-delimited URI reference in which > and \ are \-escaped.

data/lib/mongoid/oslc/grammar.treetop

@@ -35,13 +35,21 @@ grammar Grammar
   end
 
   rule term
-    field comparison_op value <Mongoid::Oslc::Grammar::Condition>
+    field comparison_op value <Mongoid::Oslc::Grammar::Condition> / field space in_op space? in_val <Mongoid::Oslc::Grammar::Condition>
   end
 
   rule boolean_op
     'and' <Mongoid::Oslc::Grammar::LogicalOperator>
   end
 
+  rule in_op
+    'in' <Mongoid::Oslc::Grammar::InOp>
+  end
+
+  rule in_val
+    '[' value (',' value)* ']' <Mongoid::Oslc::Grammar::InVal>
+  end
+
   rule space
     ' '
   end

data/lib/mongoid/oslc/strategy.rb

@@ -14,7 +14,7 @@ module Mongoid
         @parser = GrammarParser.new
 
         tree = @parser.parse(query)
-        raise Search::QueryParsingError.new(query, @parser.index) if tree.nil?
+        raise Mongoid::Oslc::QueryParsingError.new(query, @parser.index) if tree.nil?
 
         clean_tree(tree)
 

data/lib/mongoid/oslc/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Oslc
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
   end
 end

data/lib/mongoid/oslc.rb

@@ -1,6 +1,7 @@
 require 'mongoid'
 require 'mongoid/oslc/config'
 require 'mongoid/oslc/version'
+require 'mongoid/oslc/exceptions'
 require 'mongoid/oslc/strategy'
 require 'active_support/concern'
 

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

@@ -36,6 +36,14 @@ describe Mongoid::Oslc::Strategy do
       parse_query('oslc_cm:closed=false').should eql({"closed"=> false})
     end
 
+    it "should parse query with one values" do
+      parse_query('dcterms:title in ["First"]').should eql({"title"=>{"$in"=>["First"]}})
+    end
+
+    it "should parse query with array values" do
+      parse_query('dcterms:title in ["First","Second"]').should eql({"title"=>{"$in"=>["First", "Second"]}})
+    end
+
     describe "custom fields" do
       describe "defined by fields_mapping" do
         before { Mongoid::Oslc.config.stub(:fields_mapping => {'rtc:frontColor' => 'front_color'}) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_oslc
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -111,6 +111,7 @@ files:
 - Rakefile
 - lib/mongoid/oslc.rb
 - lib/mongoid/oslc/config.rb
+- lib/mongoid/oslc/exceptions.rb
 - lib/mongoid/oslc/grammar.rb
 - lib/mongoid/oslc/grammar.treetop
 - lib/mongoid/oslc/strategy.rb
@@ -134,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2845718114999846246
+      hash: -466769109880562586
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -143,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2845718114999846246
+      hash: -466769109880562586
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24