mongo_ql 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1f6676de369add0c89989cb95013bd170cc5925959f50b74ee1a7824e148b30
-  data.tar.gz: 0cd46af4aa9fa2b9a98e10e6ba7532c3aef216e3ca2d3af983b739db2fec2237
+  metadata.gz: 1b2d85bf237fe01d81f3c4f07053f2f536220bee0142678693be766e9f1f4caf
+  data.tar.gz: 783abc9d2dc5ca65fed6064ee10978f7cd8d59faa41dfe58f9fb4d57b847fed7
 SHA512:
-  metadata.gz: cc76501d7a5e6e1a13a58fd4164de221f5038afd7006aa7cd8b7b1ec2b4792d278e2797b2d4d0daa117779dd63b4bf34a8c7d5c8b9d110d0ec1c8f3bedde5fd2
-  data.tar.gz: 2ec8a62fd293bcd9fc8d266424f18a3206db5be9a8e16ebcb4eb2d9e2679bfbab39e54fd64287440f6235463989a5bae220976dad4ee615b89c5b86d8b29ebb7
+  metadata.gz: b57f65ea24dcad07a359ae7ed500f5be06679495b1ce9b0c3d67b57d25188fb1a34de044997b55b8a4fbc37b5c9de59ab66cd6da5c73148e2fd3326c370ffd4c
+  data.tar.gz: 13e6bd11d96fa929b6ce186ddc21457c570cbc4a958e03b383c1a5f3a97b86df5fd2e7d634ac8553addd01b7f7d3dfc6b279e5e75628abb24c6b7bd19aaed48f

data/.github/workflows/ruby.yml

@@ -0,0 +1,20 @@
+name: Ruby
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - name: Build and test with Rake
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bundle exec rake test

data/Gemfile

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+source "https://rubygems.org"
+gemspec

data/README.md

@@ -1,33 +1,35 @@
+# MongoQL
+[![Gem](https://img.shields.io/gem/v/mongo_ql.svg?style=flat)](http://rubygems.org/gems/mongo_ql "View this project in Rubygems")
+[![Actions Status](https://github.com/dingxizheng/mongo_ql/workflows/Ruby/badge.svg)](https://github.com/dingxizheng/mongo_ql/actions)
+[![MIT license](http://img.shields.io/badge/license-MIT-brightgreen.svg)](http://opensource.org/licenses/MIT)
+
+## Installation
+Install from RubyGems by adding it to your `Gemfile`, then bundling.
 
-# Query DSL
 ```ruby
-Order.where { tax != 0 }                          
-#=> Order.where(tax: { "$ne": 0 })
-Order.where { total >= 100 }                      
-#=> Order.where(total: { "$gte": 100 })
-Order.where { (total >= 100) & (total_tax < 15) } 
-#=> Order.where({ "$and": [{ total: { "$gte": 100 }}, { total_tax: { "$lt": 15 }}]})
-Order.where { tax > (shipping / 2) }              
-#=> Order.where(tax: { "$gt": { "$divide": [ "$shipping", 2]}})
-Order.where { total  >= If(currency == "CAD", 100, 80) }
-#=> Order.where(total: { "$cond": { if: { "$eq": ["$currency", "CAD"]}, then: 100, else: 80 }})
+# Gemfile
+gem 'mongo_ql'
+```
+
+```
+$ bundle install
 ```
 
-# Aggregation Pipeline DSL
+## Aggregation Pipeline DSL
 ```ruby
-Order.all.mongo_ql do
-  join    Customer,
+MongoQL.compose do
+  lookup  customers,
           on: customer_id == _id.to_id, 
           as: customers
 
-  join    Shipping, :as => shippings do |doc|
+  lookup  shippings, :as => shippings do |doc|
     match  order_id == doc._id, 
            status   == :shipped
   end
 
-  match   province == "ON"
+  where   province == "ON"
   
-  project _id, 
+  project :_id, 
           total, 
           customer  => customers.name,
           tax       => total * tax_rate
@@ -36,47 +38,72 @@ Order.all.mongo_ql do
           total     => total.sum,
           total_tax => tax.sum * 5
 
-  sort_by age.desc
+  sort    age.dsc
 end
+```
 
-# The above aggregation is equivalent to the following mognodb pipeline
-Order.collection.pipeline([
-  { "$lookup":  {
-    from:         "customers",
-    localField:   "$customer_id",
-    foreignField: "$_id",
-    as:           "customers"
-  }},
-  { "$unwind":  {
-    path:         "customers"
-  }},
-  { "$lookup":  {
-    from:         "shippings",
-    as:           "shippings",
-    let:          { doc_id: "$_id" },
-    pipeline:     [{
+## The above aggregation is equivalent to the following mognodb pipeline
+```json
+[{
+  "$lookup": {
+    "from": "customers",
+    "as": "customers",
+    "localField": "customer_id",
+    "foreignField": {
+      "$toString": {
+        "$toObjectId": "$_id"
+      }
+    }
+  }
+}, {
+  "$lookup": {
+    "from": "shippings",
+    "as": "shippings",
+    "pipeline": [{
       "$match": {
-        order_id: { "$eq": "$$dock_id" },
-        status: :shipped  
+        "$expr": {
+          "$and": [{
+            "$eq": ["$order_id", "$$var__id"]
+          }, {
+            "$eq": ["$status", "shipped"]
+          }]
+        }
       }
-    }]
-  }},
-  { "$unwind":  {
-    path:         "customers"
-  }},
-  { "$match":   {
-    province:     { "$eq": "ON" }
-  }},
-  { "$project": {
-    _id:          1,
-    total:        1,
-    customer:     "$customers.name",
-    tax:          { "$multiply": ["$total", "$tax_rate"] }
-  }},
-  { "$group":   {
-    _id:          "$customer",
-    total:        { "$sum": "$total" },
-    total_tax:    { "$multiply": [{ "$sum": "$tax" }, 5] }
-  }}
-])
+    }],
+    "let": {
+      "var__id": "$_id"
+    }
+  }
+}, {
+  "$match": {
+    "$expr": {
+      "$eq": ["$province", "ON"]
+    }
+  }
+}, {
+  "$project": {
+    "_id": 1,
+    "total": 1,
+    "customer": "customers",
+    "tax": {
+      "$multiply": ["$total", "$tax_rate"]
+    }
+  }
+}, {
+  "$group": {
+    "_id": "$customer",
+    "total": {
+      "$sum": "$total"
+    },
+    "total_tax": {
+      "$multiply": [{
+        "$sum": "$tax"
+      }, 5]
+    }
+  }
+}, {
+  "$sort": {
+    "age": -1
+  }
+}]
 ```

data/lib/mongo_ql/collection_operators.rb

@@ -32,6 +32,12 @@ module MongoQL
       }
     end
 
+    def concat_arrays(*expressions)
+      Expression::MethodCall.new "$concatArrays", self, ast_template: -> (target, **_args) {
+        [target, *expressions]
+      }
+    end
+
     def map(&block)
       evaled_in = block.call(Expression::FieldNode.new("$item"))
       Expression::MethodCall.new "$map", self, ast_template: -> (target, **_args) {

data/lib/mongo_ql/expression/value_node.rb

@@ -17,7 +17,7 @@ module MongoQL
     end
 
     def to_ast
-      value
+      value.is_a?(MongoQL::Expression::ValueNode) ? value.to_ast : value
     end
 
     def self.valid?(value)

data/lib/mongo_ql/stage/group.rb

@@ -14,7 +14,7 @@ module MongoQL
     def to_ast
       ast = {
         "$group" => {
-          "_id" => by.to_ast,
+          "_id" => by,
         }.merge(fields)
       }
       MongoQL::Utils.deep_transform_values(ast, &MongoQL::EXPRESSION_TO_AST_MAPPER)

data/lib/mongo_ql/version.rb

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

data/mongo_ql.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Xizheng Ding"]
   spec.email         = ["dingxizheng@gamil.com"]
 
-  spec.summary       = "A DSL for building mongo query in a more natual way"
+  spec.summary       = "A DSL for building MongoDB query in a more natual way"
   spec.homepage      = "https://github.com/dingxizheng/mongo_ql"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongo_ql
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Xizheng Ding
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-25 00:00:00.000000000 Z
+date: 2019-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -45,13 +45,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".vscode/launch.json"
+- Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- Untitled-1
 - bin/console
 - bin/setup
 - debug.sh
@@ -106,5 +107,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: A DSL for building mongo query in a more natual way
+summary: A DSL for building MongoDB query in a more natual way
 test_files: []

data/Untitled-1

@@ -1,4 +0,0 @@
-include MongoQL
-define_singleton_method(:method_missing) do |m, *args, &block|
-  MongoQL::Expression::FieldNode.new(m)
-end