mongo_aggregation_dsl 0.0.2.alpha → 0.0.3alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf04296272e988d1f33eb80b9c529c2d0c1debdc
-  data.tar.gz: 309b6f158ed999d4f1c87d269102cbb1151bb800
+  metadata.gz: b0bfb829de9382240792a0899fc54f54dad1bfcc
+  data.tar.gz: ded7e2f31ee34100a8e0eaf6ea7acb8ec04d6b00
 SHA512:
-  metadata.gz: 69bf0d84c9036935cebe0d1d1582c071bc8accd4b686f2f0ec8c44e120f8a89195d734653e9d427226326ecb488dce9ed660690b592108f1cdceebee05c40d5d
-  data.tar.gz: c947143db1ac1d8cc94062df4029d03b01801417227463d89bd654134c4740c1c2bcb79da2810d7f0dcd41ae8d881fd13b20b7a9c7f2e654475078ff5a66a17c
+  metadata.gz: 9347a316bf8cbe67e159f501018d5147093ebd4bccd778680bcd7b49a65836de17ddb31100e76238b54cef4934eb0672217e3ac0220fff3cd55ea82633745d4a
+  data.tar.gz: f90f48e5e50f24d890b0d45a76f5a92071fccd7d47e06ebf82f1e6d8fb3f33c1f4b5c084fbcb4b9d58e096348446e8af11799e1c143309f1bc9dfb58c282def7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongo_aggregation_dsl (0.0.2.alpha)
+    mongo_aggregation_dsl (0.0.3alpha)
       autoloaded (~> 2)
       contracts-lite
       mongo (~> 2.6.2)

data/lib/aggregate/pipeline.rb

@@ -7,28 +7,27 @@ module Aggregate
     attr_reader :stages
 
     def initialize(klass = nil)
-      @klass  = klass
+      @klass = klass
       @stages = []
     end
 
     def to_s
-      inspect
+      transpose
     end
 
     def inspect
-      @stages.to_s
+      transpose.to_s
+    end
+
+    def transpose
+      @stages.map(&:transpose)
     end
 
     # :reek:NilCheck
     def execute
       raise "Pipeline initializer must specify a class in order to be executable" if @klass.nil?
 
-      db      = Mongoid.default_client.database
-      command = "function(){return db.#{@klass.collection_name}.aggregate(#{self}).toArray()}"
-
-      # https://github.com/mongodb/mongo-ruby-driver/blob/master/lib/mongo/operation/result.rb
-      result = db.command("$eval": command, nolock: true, await_data: true)
-      result.documents
+      @klass.collection.aggregate(transpose)
     end
 
     Aggregate::Stages.constants.each do |klass|

data/lib/aggregate/stages/base.rb

@@ -13,7 +13,15 @@ module Aggregate
       # :reek:NilCheck
       def initialize(options)
         value_handler = self.class.value_handlers.detect { |handler| handler.handles?(options) }
-        @options = value_handler.nil? ? options : value_handler.new(options, false)
+        @options = value_handler.nil? ? options : value_handler.new(options, false).transpose
+      end
+
+      def to_s
+        transpose.to_s
+      end
+
+      def inspect
+        transpose.to_s
       end
     end
   end

data/lib/aggregate/stages/facet.rb

@@ -12,12 +12,8 @@ module Aggregate
         super(options)
       end
 
-      def to_s
-        inspect
-      end
-
-      def inspect
-        "{ $facet: #{options} }"
+      def transpose
+        { '$facet': options }
       end
     end
   end

data/lib/aggregate/stages/group.rb

@@ -13,12 +13,8 @@ module Aggregate
         super(options)
       end
 
-      def to_s
-        inspect
-      end
-
-      def inspect
-        "{ $group: #{options} }"
+      def transpose
+        { '$group': options }
       end
     end
   end

data/lib/aggregate/stages/hash_base.rb

@@ -6,7 +6,7 @@ module Aggregate
     class HashBase < Base
       Contract C::HashMinLength[1] => Any
       def initialize(options)
-        super(Aggregate::Values::Hash.new(options, false))
+        super(options)
       end
     end
   end

data/lib/aggregate/stages/lookup.rb

@@ -21,12 +21,8 @@ module Aggregate
         super(options)
       end
 
-      def to_s
-        inspect
-      end
-
-      def inspect
-        "{ $lookup: #{options} }"
+      def transpose
+        { '$lookup': options }
       end
     end
   end

data/lib/aggregate/stages/match.rb

@@ -13,12 +13,8 @@ module Aggregate
         super(options)
       end
 
-      def to_s
-        inspect
-      end
-
-      def inspect
-        "{ $match: #{options} }"
+      def transpose
+        { '$match': options }
       end
     end
   end

data/lib/aggregate/stages/project.rb

@@ -5,12 +5,8 @@ module Aggregate
     # Represents an aggregation project
     # https://docs.mongodb.com/manual/reference/operator/aggregation/project/#pipe._S_project
     class Project < HashBase
-      def to_s
-        inspect
-      end
-
-      def inspect
-        "{ $project: #{options} }"
+      def transpose
+        { '$project': options }
       end
     end
   end

data/lib/aggregate/stages/replace_root.rb

@@ -10,12 +10,8 @@ module Aggregate
         super(new_root)
       end
 
-      def to_s
-        inspect
-      end
-
-      def inspect
-        "{ $replaceRoot: {newRoot: #{options}} }"
+      def transpose
+        { '$replaceRoot': { 'newRoot': options } }
       end
     end
   end

data/lib/aggregate/stages/unwind.rb

@@ -17,12 +17,8 @@ module Aggregate
         super(options)
       end
 
-      def to_s
-        inspect
-      end
-
-      def inspect
-        "{ $unwind: #{options} }"
+      def transpose
+        { '$unwind': options }
       end
     end
   end

data/lib/aggregate/values/array.rb

@@ -4,10 +4,10 @@ module Aggregate
   module Values
     # Takes an array and converts each to the appropriate value handler if one is available.
     class Array < Base
-      def to_s
+      def transpose
         raise ArgumentError, "Array cannot be a hash key" if is_key
 
-        "[#{value.map { |value| get_value(value, false) }.join(', ')}]"
+        value.map { |value| get_value(value, false) }
       end
 
       class << self

data/lib/aggregate/values/base.rb

@@ -25,6 +25,10 @@ module Aggregate
         @is_key = is_key
       end
 
+      def to_s
+        transpose.to_s
+      end
+
       class << self
         def value_handlers
           @value_handlers ||= (Aggregate::Values.constants - [:Base]).map do |klass|
@@ -39,7 +43,7 @@ module Aggregate
 
       def get_value(original_value, is_hash_key)
         handler = self.class.value_handlers.detect { |handler| handler.handles?(original_value) }
-        handler.nil? ? original_value : handler.new(original_value, is_hash_key)
+        handler.nil? ? original_value : handler.new(original_value, is_hash_key).transpose
       end
     end
   end

data/lib/aggregate/values/document_class.rb

@@ -4,14 +4,10 @@ module Aggregate
   module Values
     # Takes a mongoid document and returns a string containing the document collection name
     class DocumentClass < Base
-      def to_s
-        inspect
-      end
-
-      def inspect
+      def transpose
         raise ArgumentError("Document cannot be a hash key") if is_key
 
-        "'#{value.collection_name}'"
+        value.collection_name.to_s
       end
 
       class << self

data/lib/aggregate/values/hash.rb

@@ -4,14 +4,10 @@ module Aggregate
   module Values
     # Takes hash and converts each key and pair to the appropriate value handler if one is available.
     class Hash < Base
-      def to_s
-        inspect
-      end
-
-      def inspect
+      def transpose
         raise ArgumentError("Hash cannot be a hash key") if is_key
 
-        "{ #{transpose_options.map { |hash_key, hash_value| "#{hash_key}: #{hash_value}" }.join(', ')} }"
+        transpose_options
       end
 
       private

data/lib/aggregate/values/{boolean.rb → pipeline.rb}

@@ -3,18 +3,15 @@
 module Aggregate
   module Values
     # Returns a string wrapped in single quotes if the value or string if a key
-    class Boolean < Base
-      def to_s
-        inspect
-      end
-
-      def inspect
-        value.to_s
+    # Additionally adds $ to the reserved aggregation operations.
+    class Pipeline < Base
+      def transpose
+        @value.transpose
       end
 
       class << self
         def handles?(value)
-          value.is_a? ::Boolean
+          value.is_a? ::Aggregate::Pipeline
         end
       end
     end

data/lib/aggregate/values/symbol.rb

@@ -29,17 +29,13 @@ module Aggregate
       GROUP_ACCUMULATORS = %i[avg first last max min push addToSet].freeze
 
       PROJECT_ACCUMULATORS = %i[avg max min push stdDevPop stdDevSamp sum].freeze
-      def to_s
-        inspect
-      end
-
-      def inspect
+      def transpose
         is_operator = (%i[expr] + EXPRESSION_OPERATORS + GROUP_ACCUMULATORS + PROJECT_ACCUMULATORS).include?(value)
         retval = is_operator ? "$#{value}" : value
 
         retval = :_id if value == :id
 
-        "'#{retval}'"
+        is_key ? retval : retval.to_s
       end
 
       class << self

data/mongo_aggregation_dsl.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "mongo_aggregation_dsl"
-  spec.version = "0.0.2.alpha"
+  spec.version = "0.0.3alpha"
   spec.authors = ["KrimsonKla"]
   spec.email   = ["admin@cardtapp.com"]
   spec.date = "2018-09-10"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo_aggregation_dsl
 version: !ruby/object:Gem::Version
-  version: 0.0.2.alpha
+  version: 0.0.3alpha
 platform: ruby
 authors:
 - KrimsonKla
@@ -350,12 +350,9 @@ files:
 - lib/aggregate/values.rb
 - lib/aggregate/values/array.rb
 - lib/aggregate/values/base.rb
-- lib/aggregate/values/boolean.rb
 - lib/aggregate/values/document_class.rb
 - lib/aggregate/values/hash.rb
-- lib/aggregate/values/nil.rb
-- lib/aggregate/values/object_id.rb
-- lib/aggregate/values/string.rb
+- lib/aggregate/values/pipeline.rb
 - lib/aggregate/values/symbol.rb
 - lib/mongo_aggregation_dsl.rb
 - mongo_aggregation_dsl.gemspec

data/lib/aggregate/values/nil.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Aggregate
-  module Values
-    # Converts nil to null
-    # :reek:NilCheck
-    class Nil < Base
-      def to_s
-        inspect
-      end
-
-      def inspect
-        raise ArgumentError, "Nil cannot be a hash key" if is_key
-
-        "null"
-      end
-
-      class << self
-        def handles?(value)
-          value.nil?
-        end
-      end
-    end
-  end
-end

data/lib/aggregate/values/object_id.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Aggregate
-  module Values
-    # Converts a BSON::Object id to a string `ObjectId('123')`
-    class ObjectId < Base
-      def to_s
-        inspect
-      end
-
-      def inspect
-        raise ArgumentError, "ObjectId cannot be a hash key" if is_key
-
-        "ObjectId('#{value}')"
-      end
-
-      class << self
-        def handles?(value)
-          value.is_a? BSON::ObjectId
-        end
-      end
-    end
-  end
-end

data/lib/aggregate/values/string.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Aggregate
-  module Values
-    # Returns a string wrapped in single quotes if the value or string if a key
-    class String < Base
-      def to_s
-        inspect
-      end
-
-      def inspect
-        "'#{value}'"
-      end
-
-      class << self
-        def handles?(value)
-          value.is_a? ::String
-        end
-      end
-    end
-  end
-end