mongo_ql 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9bf8890c39c8a91c22cbf5125294c46f5f5d56cb347872e1413739708ef35ad
-  data.tar.gz: e5a07cce5320dd7e5a1b9d8eb47d3418992d57b35fe629f01bcfb0fefb218bf7
+  metadata.gz: 397c8071669a33bfe85662de3439d9746d26bcb80ccb69dcc602471224da7f12
+  data.tar.gz: 683ad4555c980a6ce2593a2dbf1efa20f182d836e0ca16ea98511638dadd8502
 SHA512:
-  metadata.gz: 922f53c459b910bbaedde04c798f6e3ac270f3ba7d691c4563685adbb9a765183eefc5fc81921fe502f8e3b015d8f5883f8733ecec2ca9822a1a4d33e37fc7ec
-  data.tar.gz: d5517cffc1e722928f91210708a8781ac7dcec86b3decec423031ea5dcfee1828a9c41e4e1bef20621d1a3a99b669bd2c00993b2beb145aab8a69ff84f6d9863
+  metadata.gz: f1fe54f5ffad72f4184202af5ab4cf5c923f6e79bb4e9b0de73d618668319f3f63c43a1529bbf73771ec7ca5886c393d623cc70ddca3b8e0a7c466fe003856f3
+  data.tar.gz: 563766df5b880b08870f9b084fbb866ce9883fc79f20a0d202f508ca5560f483053a37f74c2565a3b92e6fbe859c6ff1d3e4bc8b05892f2a5f767f283361ced5

data/lib/mongo_ql/expression/field_node.rb

@@ -24,10 +24,6 @@ module MongoQL
       field_name.to_s
     end
 
-    def name
-      field_name.to_s
-    end
-
     def dsc
       Expression::Descend.new(self)
     end

data/lib/mongo_ql/expression/value_node.rb

@@ -14,12 +14,14 @@ module MongoQL
     def initialize(val)
       Expression::ValueNode.valid!(val)
       @value = val
+      convert_to_date_if_possible
     end
 
     def to_ast
       case value
       when Date, DateTime
-        Expression::ValueNode.new(value.iso8601).to_date.to_ast
+        # Expression::ValueNode.new(value.iso8601).to_date.to_ast
+        { "$toDate" => value.iso8601 }
       when MongoQL::Expression::ValueNode
         value.to_ast
       else
@@ -27,6 +29,12 @@ module MongoQL
       end
     end
 
+    def convert_to_date_if_possible
+      self.value = DateTime.iso8601(value)
+    rescue => _
+      value
+    end
+
     def self.valid?(value)
       SUPPORTED_TYPES.any? { |type| value.is_a?(type) }
     end

data/lib/mongo_ql/stage/lookup.rb

@@ -81,8 +81,8 @@ module MongoQL
         else
           if from&.respond_to?(:collection)
             from&.collection&.name
-          elsif  from&.respond_to?(:name)
-            from.name
+          elsif from&.respond_to?(:field_name)
+            from.field_name
           else
             raise ArgumentError, "#{from} is not a valid collection"
           end

data/lib/mongo_ql/stage_context.rb

@@ -9,6 +9,18 @@ module MongoQL
       @injected_vars = {}
     end
 
+    def scope(mongo_scope)
+      criteria = nil
+      if mongo_scope.respond_to?(:all)
+        criteria = mongo_scope.all.selector.transform_keys { |k| k.to_sym }
+      end
+
+      if mongo_scope.is_a?(Hash)
+        criteria = mongo_scope.transform_keys { |k| k.to_sym }
+      end
+      where(**criteria) if criteria
+    end
+
     def where(*args)
       pipeline << Stage::Match.new(self, *args)
     end
@@ -69,7 +81,7 @@ module MongoQL
       pipeline.map(&:to_ast)
     end
 
-    %w(where match project select sort flatten unwind lookup join).each do |m|
+    %w(scope where match project select sort flatten unwind lookup join).each do |m|
       alias_method :"#{m.capitalize}", m
     end
   end

data/lib/mongo_ql/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MongoQL
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongo_ql
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Xizheng Ding
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake