mongo-parser-rb 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ca72a97d873ee39341d3940cd420c4356d3f36d
-  data.tar.gz: 8cd517a154c3e5f8f0777c8160565cc39b413ad9
+  metadata.gz: 3e5c3c9944b9b2262bf312b33c3de09ab007635c
+  data.tar.gz: da70df6109d44a394390c39bcd917e78430a6797
 SHA512:
-  metadata.gz: 248798735c41f7905a3d24cf26986161715fd97d60e1b15b7b84c53535efa2a57a6aa0201680fee05329ab3bbd93fb5a00e578b3d9fdae8e8a0e643aaf8905db
-  data.tar.gz: 86e95e493e18b9e524f5ff7a1da9cfc66a5c6b502bea4ca6ea68ce92aa37f719264b2d66365a0655493bd19175322b871eca9561439bd745c396d0de87db2bad
+  metadata.gz: 8530e477fa457e89422e3804231d746b82dece1f0b7d0730273d3481aca7b216c9533bc7a2b317f1bf9e8a6655fa544c669344a98913db80354ce799426097ad
+  data.tar.gz: c640747cd0855739e8d422f79105ff70f01f9f61d1346f7ced2a833389553d23261abea5654f6dcd122d2447314346a3bf80bba952fdea64ffde542ac8a8b0cd

data/lib/mongo-parser-rb/query/expression.rb

@@ -46,9 +46,19 @@ module MongoParserRB
         def equality_operator?(operator)
           equality_operators.include?(operator)
         end
+        
+        def elemMatch_operators
+          @elemMatch_operators ||= [
+            :$elemMatch
+          ]
+        end
+        
+        def elemMatch_operator?(operator)
+          elemMatch_operators.include?(operator)
+        end
 
         def operator?(operator)
-          equality_operator?(operator) || conjunction_operator?(operator) || inversion_operator?(operator)
+          equality_operator?(operator) || conjunction_operator?(operator) || inversion_operator?(operator) || elemMatch_operator?(operator)
         end
 
       end
@@ -74,6 +84,8 @@ module MongoParserRB
           evaluate_equality(document)
         when *Expression.inversion_operators
           evaluate_inversion(document)
+        when *Expression.elemMatch_operators
+          evaluate_elemMatch(document)
         end
       rescue NoMethodError, TypeError
         false
@@ -81,6 +93,14 @@ module MongoParserRB
 
       private
 
+      def evaluate_elemMatch(document)
+        @field.value_in_document(document).any? do |subdocument|
+          @arguments.all? do |arg|
+            arg.evaluate(subdocument)
+          end
+        end
+      end
+      
       def evaluate_inversion(document)
         # Mongo negative equality operators return true when
         # the specified field does not exist on a document.

data/lib/mongo-parser-rb/query.rb

@@ -53,6 +53,10 @@ module MongoParserRB
           else
             Expression.new(:$not, field, Expression.new(:$eq, field, value))
           end
+        when *Expression.elemMatch_operators
+          Expression.new(:$elemMatch, field, value.to_a.map do |(key, value)|
+            parse_sub_expression(key, value)
+          end)
         else
           Expression.new(key, field, value)
         end

data/lib/mongo-parser-rb/version.rb

@@ -1,3 +1,3 @@
 module MongoParserRB
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/test/mongo-parser-rb/query_test.rb

@@ -219,7 +219,19 @@ class QueryTest < MiniTest::Unit::TestCase
     query = MongoParserRB::Query.parse(:array_key => {:$ne => [1]})
     assert query.matches_document?(:array_key => [1,2])
   end
-
+  
+  def test_elemMatch
+    query = MongoParserRB::Query.parse({:user_event_summaries => {:$elemMatch=> {:name => "second-support", :count => 3}}})
+    refute query.matches_document?(:user_event_summaries => [{:name => "first-support", :count => 3}, {:name => "second-support", :count => 4}])
+    assert query.matches_document?(:user_event_summaries => [{:name => "first-support", :count => 4}, {:name => "second-support", :count => 3}])
+  end
+  
+  def test_elemMatch_inequality
+    query = MongoParserRB::Query.parse(:user_event_summaries => {:$elemMatch=> {:count => {:$ne => 2}, :name => "second-support"}})
+    refute query.matches_document?(:user_event_summaries => [{:name => "first-support", :count => 3}, {:name => "second-support", :count => 2}])
+    assert query.matches_document?(:user_event_summaries => [{:name => "first-support", :count => 3}, {:name => "second-support", :count => 3}])
+  end
+  
   def test_datatype_mismatch
     query = MongoParserRB::Query.parse(:integer_key => {:$gt => 5})
     refute query.matches_document?(:integer_key => "hello")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongo-parser-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Ben McRedmond
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies: []
 description: Parse and evaluate mongo queries in Ruby
 email: