Add ObjectId() support

Author: baumandm

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.3.0
+
+- Add ObjectId() support
+
 ## 0.2.1
 
 - Renamed grammar file to avoid potential conflicts

project.clj

@@ -1,4 +1,4 @@
-(defproject monglorious "0.2.1"
+(defproject monglorious "0.3.0"
   :author "Dave Bauman"
   :description "Query MongoDB using strings!"
   :url "https://github.com/baumandm/monglorious"

resources/monglorious-grammar.ebnf

@@ -10,25 +10,25 @@ roles = <'ROLES'>
 profile = <'PROFILE'>
 databases = <'DATABASES'>
 
-collection-command = DB DOT collection-name function-application+
+collection-command = DB DOT collection-name (DOT function-application)+
 <collection-name> = identifier
-function-application = DOT function-name LPAREN (literal (COMMA literal)*)? RPAREN
+function-application = function-name LPAREN (literal (COMMA literal)*)? RPAREN
 <function-name> = identifier
 
 run-command = DB DOT <'RUNCOMMAND'> LPAREN literal RPAREN
 
 (* Common Definitions *)
 identifier = #'\$?[a-zA-Z0-9_]+'
-<literal> = string | number | map | list | boolean
+<literal> = string | number | map | list | boolean | objectid
 <string> = single-quoted-string | double-quoted-string
 single-quoted-string = #'(?s)\'\'|\'(?:.*?([^\\]|\\\\))?\''
 double-quoted-string = #'(?s)\"\"|\"(?:.*?([^\\]|\\\\))\"'
 number = #'[-+]?(0(\.\d*)?|([1-9]\d*\.?\d*)|(\.\d+))([Ee][+-]?\d+)?'
-
 list = <'['> (literal (COMMA literal)*)? <']'>
 map = <'{'> (map-item (COMMA map-item)*)? <'}'>
 <map-item> = (identifier | string) <':'> literal
 boolean = TRUE | FALSE
+objectid = <'objectid'> LPAREN string RPAREN
 
 <DB> = <'DB'>
 <DOT> = <'.'>

src/monglorious/parser.clj

@@ -46,6 +46,9 @@
                              (let [keys (take-nth 2 args)
                                    vals (take-nth 2 (rest args))]
                                (zipmap keys vals)))
+     :objectid             (fn [value] (if (nil? value)
+                                         (monger.util/object-id)
+                                         (monger.util/object-id value)))
      :db-object            (fn [db-object] (first db-object))
      :function-application (fn [name & args] (into [(lower-case name)] args))
      }

test/monglorious/parser_test.clj

@@ -36,6 +36,10 @@
       (parse-query "{x:[1,2,3],y:{a:\"b\"}}" :literal) => [{"x" [1 2 3] "y" { "a" "b"}}]
       (parse-query "{x:{y:{z:1}}}" :literal) => [{"x" {"y" {"z" 1}}}])
 
+(fact "Monglorious parses ObjectIds"
+      (parse-query "ObjectId('581d36e347aee26883837eb7')" :literal) => [(monger.util/object-id "581d36e347aee26883837eb7")]
+      (parse-query "ObjectId(\"581d36e347aee26883837eb7\")" :literal) => [(monger.util/object-id "581d36e347aee26883837eb7")])
+
 (fact "Monglorious parses SHOW ___ commands"
       (parse-query "show dbs") => [:show-command :dbs]
       (parse-query "show collections") => [:show-command :collections]

test/monglorious/transforms_test.clj

@@ -77,7 +77,7 @@
            (let [conn (mg/connect)
                  db (mg/get-db conn "testdb")]
              (mc/remove db "documents")
-             (mc/insert-batch db "documents" [{:name "Alan" :age 27 :score 17772}
+             (mc/insert-batch db "documents" [{:name "Alan" :age 27 :score 17772 :_id (monger.util/object-id "581d36e347aee26883830000")}
                                               {:name "Joe" :age 32 :score 8277}
                                               {:name "Teresa" :age 31 :score 495044}
                                               {:name "Macy" :age 29 :score 8837777}
@@ -122,6 +122,9 @@
         (execute {} "testdb" "db.documents.find({ age: 18 })") => #(and (coll? %) (= 2 (count %)))
         (execute {} "testdb" "db.documents.find({ score: 100, child: true })") => #(and (coll? %) (= 1 (count %)) (= "Zoey" (:name (first %)))))
 
+  (fact "Monglorious finds documents with ObjectId filters"
+        (execute {} "testdb" "db.documents.find({ _id: ObjectId('581d36e347aee26883830000') })") => #(and (coll? %) (= 1 (count %)) (= "Alan" (:name (first %)))))
+
   (fact "Monglorious finds documents with complex filters"
         (execute {} "testdb" "db.documents.find({ child: { $ne: true }})") => #(and (coll? %) (= 7 (count %)))
         (execute {} "testdb" "db.documents.find({ name: { $in: ['Anna', 'Bartleby', 'Xavier', 'Zoey'] }})") => #(and (coll? %) (= 3 (count %))))