mongo-parser-rb 0.0.8 → 0.0.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2ca72a97d873ee39341d3940cd420c4356d3f36d
+  data.tar.gz: 8cd517a154c3e5f8f0777c8160565cc39b413ad9
+SHA512:
+  metadata.gz: 248798735c41f7905a3d24cf26986161715fd97d60e1b15b7b84c53535efa2a57a6aa0201680fee05329ab3bbd93fb5a00e578b3d9fdae8e8a0e643aaf8905db
+  data.tar.gz: 86e95e493e18b9e524f5ff7a1da9cfc66a5c6b502bea4ca6ea68ce92aa37f719264b2d66365a0655493bd19175322b871eca9561439bd745c396d0de87db2bad

data/README.md

@@ -23,7 +23,7 @@ q.matches_document?({:comment_count => 11}) => false
 q.matches_document?({:comment_count => 6}) => true
 ```
 
-The following operators are currently supported: `$and`, `$or`, `$in`, `$nin`, `$ne`, `$gt`, `$gte`, `$lt`, `$lte`.
+The following operators are currently supported: `$and`, `$or`, `$in`, `$nin`, `$ne`, `$gt`, `$gte`, `$lt`, `$lte`, `$not`.
 
 Regexps are also supported:
 

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

@@ -41,12 +41,18 @@ module MongoParserRB
         parse_sub_expression(key, value, field)
       end)
     end
-    
+
     def parse_sub_expression(key, value, field = nil)
       if Expression.operator?(key)
         case key 
         when *Expression.conjunction_operators
           Expression.new(key, value.map { |v| parse_root_expression(v) })
+        when *Expression.inversion_operators
+          if value.kind_of?(Hash)
+            Expression.new(:$not, field, parse_root_expression(value, field))
+          else
+            Expression.new(:$not, field, Expression.new(:$eq, field, value))
+          end
         else
           Expression.new(key, field, value)
         end

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

@@ -4,6 +4,16 @@ module MongoParserRB
 
       class << self
 
+        def inversion_operators
+          @inversion_operators ||= [
+            :$not
+          ]
+        end
+
+        def inversion_operator?(operator)
+          inversion_operators.include?(operator)
+        end
+
         def conjunction_operators
           @conjunction_operators ||= [
             :$and,
@@ -38,7 +48,7 @@ module MongoParserRB
         end
 
         def operator?(operator)
-          equality_operator?(operator) || conjunction_operator?(operator)
+          equality_operator?(operator) || conjunction_operator?(operator) || inversion_operator?(operator)
         end
 
       end
@@ -46,7 +56,7 @@ module MongoParserRB
       def initialize(operator, *args)
         @operator = operator
 
-        if Expression.conjunction_operator? @operator
+        if Expression.conjunction_operator?(@operator)
           @arguments = args[0]
         else
           @field = Field.new(args[0])
@@ -62,6 +72,8 @@ module MongoParserRB
           evaluate_negative_equality(document)
         when *Expression.equality_operators
           evaluate_equality(document)
+        when *Expression.inversion_operators
+          evaluate_inversion(document)
         end
       rescue NoMethodError, TypeError
         false
@@ -69,6 +81,13 @@ module MongoParserRB
 
       private
 
+      def evaluate_inversion(document)
+        # Mongo negative equality operators return true when
+        # the specified field does not exist on a document.
+        return true if !@field.value_in_document(document) && !@field.in_document?(document)
+        !@arguments.evaluate(document)
+      end
+
       def evaluate_conjunction(document)
         case @operator
         when :$and

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

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

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

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class QueryTest < MiniTest::Unit::TestCase
-
   def test_raises_if_not_parsed
     assert_raises(MongoParserRB::NotParsedError) do
       query = MongoParserRB::Query.new(:integer_key => 10)
@@ -28,6 +27,22 @@ class QueryTest < MiniTest::Unit::TestCase
     refute query.matches_document?(:integer_key => 9)
   end
 
+  def test_integer_not_gt
+    query = MongoParserRB::Query.parse(:integer_key => {:$not => {:$gt => 10}})
+    refute query.matches_document?(:integer_key => 11)
+    assert query.matches_document?(:integer_key => 10)
+    assert query.matches_document?(:integer_key => 9)
+    assert query.matches_document?({})
+  end
+
+  def test_integer_not_gt_or_lt
+    query = MongoParserRB::Query.parse(:integer_key => {:$not => {:$gt => 8, :$lt => 10}})
+    assert query.matches_document?(:integer_key => 6)
+    assert query.matches_document?(:integer_key => 11)
+    refute query.matches_document?(:integer_key => 9)
+    assert query.matches_document?({})
+  end
+
   def test_integer_lt
     query = MongoParserRB::Query.parse(:integer_key => {:$lt => 10})
     query.matches_document?(:integer_key => 9)
@@ -135,6 +150,14 @@ class QueryTest < MiniTest::Unit::TestCase
     refute query.matches_document?(:integer_key => 3)
   end
 
+  def test_integer_in_and_ne
+    query = MongoParserRB::Query.parse(:integer_key => {:$in => [1,2,3], :$ne => 3})
+    assert query.matches_document?(:integer_key => 1)
+    assert query.matches_document?(:integer_key => 2)
+    refute query.matches_document?(:integer_key => 3)
+    refute query.matches_document?(:integer_key => 4)
+  end
+
   def test_eq_nil
     query = MongoParserRB::Query.parse(:string_key => nil)
     assert query.matches_document?(:string_key => nil)
@@ -160,6 +183,12 @@ class QueryTest < MiniTest::Unit::TestCase
     refute query.matches_document?(:string_key => 'world')
   end
 
+  def test_regex_not_eq
+    query = MongoParserRB::Query.parse(:string_key => {:$not => /hello/})
+    assert query.matches_document?(:string_key => 'world')
+    refute query.matches_document?(:string_key => 'hello world')
+  end
+
   def test_operator_data_type_mismatch
     query = MongoParserRB::Query.parse(:array_key => {:$in => [1]})
     refute query.matches_document?(:array_key => "hey")
@@ -195,5 +224,4 @@ class QueryTest < MiniTest::Unit::TestCase
     query = MongoParserRB::Query.parse(:integer_key => {:$gt => 5})
     refute query.matches_document?(:integer_key => "hello")
   end
-    
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongo-parser-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 0.0.9
 platform: ruby
 authors:
 - Ben McRedmond
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies: []
 description: Parse and evaluate mongo queries in Ruby
 email:
@@ -36,27 +35,26 @@ files:
 - test/test_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Parse and evaluate mongo queries in Ruby
 test_files:
 - test/mongo-parser-rb/field_test.rb