origin 1.0.8 → 1.0.9

data/CHANGELOG.md

@@ -6,6 +6,12 @@
 
 ### Resolved Issues
 
+## 1.0.9
+
+### Resolved Issues
+
+* \#45 Fixed $not query negation with regular expressions. (Andrew Bennett)
+
 ## 1.0.8
 
 ### Resolved Issues

data/lib/origin/extensions/string.rb

@@ -59,7 +59,7 @@ module Origin
       #
       # @since 1.0.0
       def specify(value, negating = false)
-        { self => value }
+        (negating && value.regexp?) ? { self => { "$not" => value } } : { self => value }
       end
 
       # Get the string as a sort direction.

data/lib/origin/extensions/symbol.rb

@@ -17,7 +17,7 @@ module Origin
       #
       # @since 1.0.0
       def specify(value, negating = false)
-        { self => value }
+        (negating && value.regexp?) ? { self => { "$not" => value } } : { self => value }
       end
 
       # Get the symbol as a sort direction.

data/lib/origin/key.rb

@@ -57,7 +57,7 @@ module Origin
     def specify(object, negating = false)
       value = block ? block[object] : object
       expression = { operator => expanded ? { expanded => value } : value }
-      { name.to_s => negating ? { "$not" => expression } : expression }
+      { name.to_s => (negating && operator != "$not") ? { "$not" => expression } : expression }
     end
 
     # Get the key as raw Mongo sorting options.

data/lib/origin/selectable.rb

@@ -352,12 +352,21 @@ module Origin
     # @example Negate the selection.
     #   selectable.not.in(field: [ 1, 2 ])
     #
+    # @example Add the $not criterion.
+    #   selectable.not(name: /Bob/)
+    #
+    # @example Execute a $not in a where query.
+    #   selectable.where(:field.not => /Bob/)
+    #
+    # @param [ Hash ] criterion The field/value pairs to negate.
+    #
     # @return [ Selectable ] The negated selectable.
     #
     # @since 1.0.0
-    def not
-      tap { |query| query.negating = true }
+    def not(*criterion)
+      (criterion.size == 0) ? tap { |query| query.negating = true } : __override__(criterion.first, "$not")
     end
+    key :not, :override, "$not"
 
     # Adds $or selection to the selectable.
     #

data/lib/origin/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Origin
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: origin
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-01 00:00:00.000000000 Z
+date: 2012-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2365278983119177575
+      hash: 1767126872631308027
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: