origin 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f7f42f517c065e2637b932e5119de41a5cfa9a8
-  data.tar.gz: 98564f55e804ec82becb6c0a55de3f6170e237e9
+  metadata.gz: dd6f1f3f0a2cf6b1b19bdc7e0a051d15f58ddb57
+  data.tar.gz: 019112dbd0b6225ef841cf80a9c3dd35ce17c126
 SHA512:
-  metadata.gz: e5d21e8cd4fc5bb3fe58753e8f5b2e5595c265580d99fe1a818c5bd2bc29ef0a16467cb4ac2324ab6e7b09669f3b2c960688f53c00752f6e29f7411ddf7aaaf4
-  data.tar.gz: 0f1af6aac4824259221d9866379efd3f1e1dd1cc0eaad11bc532e0411e611b604b5887ce960b60513bdffc389e45f679a8df443a471a37e3926e9b5dec0e5c8c
+  metadata.gz: 9863446021f0b971a3d9e991bb0839a4ee511d1cf92eb57f1ac57c5efced191a45acca109cb79bbe71f80b93003cd45565d85151b3128e993c75b259fc63efe4
+  data.tar.gz: 249349b204180085c1491be78815c61bd3ea64ef6bc753417ffd6e9cb65dc4d679a2f871a5d19fd97d680564878097799eec6c6ceb34dc5f3af1b11e1052b79a

data/CHANGELOG.md

@@ -1,6 +1,48 @@
 # Overview
 
-## 1.1.0 (branch: master)
+## 2.0.0 (branch: master)
+
+### Major Changes (Backwards Incompatible)
+
+* \#60 Array evolution no longer modifies in place.
+
+* Legacy geo selection has been removed, use geo_spacial now.
+
+* \#48 `not` negation no longer ignores parameters without expressions
+  which follow them, but not negates them with `$ne` instead.
+
+      Previously:
+
+        selection = query.not.where(field: 1)
+        selection.selector # { "field" =>  1 }
+
+      Now:
+
+        selection = query.not.where(field: 1)
+        selection.selector # { "field" => { "$ne" =>  1 }}
+
+### New Features
+
+* \#82 Added support for $geoIntersects and $geoWithin queries via the
+  geo_spacial method. Examples:
+
+      query.geo_spacial(:location.intersects_line => [[ 1, 10 ], [ 2, 10 ]])
+      query.geo_spacial(:location.intersects_point => [[ 1, 10 ]])
+      query.geo_spacial(:location.intersects_polygon => [[ 1, 10 ], [ 2, 10 ], [ 1, 10 ]])
+      query.geo_spacial(:location.within_polygon => [[ 1, 10 ], [ 2, 10 ], [ 1, 10 ]])
+
+### Resolved Issues
+
+* \#83 Internal smart hashes (Smashes) now can get directly by key or alias.
+  (Gosha Arinich)
+
+* \#66 Array evolution now properly coerces non arrays into arrays.
+  (Jared Wyatt)
+
+* \#61 `only` and `without` can now be used together. It is up to the user
+  to determine when this is valid or not. (Rodrigo Saito)
+
+## 1.1.0
 
 ### Resolved Issues
 

data/README.md

@@ -1,4 +1,4 @@
-Origin [![Build Status](https://secure.travis-ci.org/mongoid/origin.png?branch=master&.png)](http://travis-ci.org/mongoid/origin)
+Origin [![Build Status](https://secure.travis-ci.org/mongoid/origin.png?branch=master&.png)](http://travis-ci.org/mongoid/origin) [![Code Climate](https://codeclimate.com/github/mongoid/origin.png)](https://codeclimate.com/github/mongoid/origin) [![Coverage Status](https://coveralls.io/repos/mongoid/origin/badge.png?branch=master)](https://coveralls.io/r/mongoid/origin?branch=master)
 ========
 
 Origin is a DSL for building MongoDB queries.
@@ -8,7 +8,6 @@ Project Tracking
 
 * [Mongoid Google Group](http://groups.google.com/group/mongoid)
 * [Origin Website and Documentation](http://mongoid.org/en/origin/)
-* [Origin Code Climate](https://codeclimate.com/github/mongoid/origin)
 
 Compatibility
 -------------

data/lib/origin/aggregable.rb

@@ -0,0 +1,116 @@
+# encoding: utf-8
+module Origin
+
+  # Provides a DSL around crafting aggregation framework commands.
+  #
+  # @since 2.0.0
+  module Aggregable
+    extend Macroable
+
+    # @attribute [r] pipeline The aggregation pipeline.
+    attr_reader :pipeline
+
+    # @attribute [rw] aggregating Flag for whether or not we are aggregating.
+    attr_writer :aggregating
+
+    # Has the aggregable enter an aggregation state. Ie, are only aggregation
+    # operations allowed at this point on.
+    #
+    # @example Is the aggregable aggregating?
+    #   aggregable.aggregating?
+    #
+    # @return [ true, false ] If the aggregable is aggregating.
+    #
+    # @since 2.0.0
+    def aggregating?
+      !!@aggregating
+    end
+
+    # Add a group ($group) operation to the aggregation pipeline.
+    #
+    # @example Add a group operation being verbose.
+    #   aggregable.group(count: { "$sum" => 1 }, max: { "$max" => "likes" })
+    #
+    # @example Add a group operation using symbol shortcuts.
+    #   aggregable.group(:count.sum => 1, :max.max => "likes")
+    #
+    # @param [ Hash ] operation The group operation.
+    #
+    # @return [ Aggregable ] The aggregable.
+    #
+    # @since 2.0.0
+    def group(operation)
+      aggregation(operation) do |pipeline|
+        pipeline.group(operation)
+      end
+    end
+    key :avg, :override, "$avg"
+    key :max, :override, "$max"
+    key :min, :override, "$min"
+    key :sum, :override, "$sum"
+    key :last, :override, "$last"
+    key :push, :override, "$push"
+    key :first, :override, "$first"
+    key :add_to_set, :override, "$addToSet"
+
+    # Add a projection ($project) to the aggregation pipeline.
+    #
+    # @example Add a projection to the pipeline.
+    #   aggregable.project(author: 1, name: 0)
+    #
+    # @param [ Hash ] criterion The projection to make.
+    #
+    # @return [ Aggregable ] The aggregable.
+    #
+    # @since 2.0.0
+    def project(operation = nil)
+      aggregation(operation) do |pipeline|
+        pipeline.project(operation)
+      end
+    end
+
+    # Add an unwind ($unwind) to the aggregation pipeline.
+    #
+    # @example Add an unwind to the pipeline.
+    #   aggregable.unwind(:field)
+    #
+    # @param [ String, Symbol ] field The name of the field to unwind.
+    #
+    # @return [ Aggregable ] The aggregable.
+    #
+    # @since 2.0.0
+    def unwind(field)
+      aggregation(field) do |pipeline|
+        pipeline.unwind(field)
+      end
+    end
+
+    private
+
+    # Add the aggregation operation.
+    #
+    # @api private
+    #
+    # @example Aggregate on the operation.
+    #   aggregation(operation) do |pipeline|
+    #     pipeline.push("$project" => operation)
+    #   end
+    #
+    # @param [ Hash ] operation The operation for the pipeline.
+    #
+    # @return [ Aggregable ] The cloned aggregable.
+    #
+    # @since 2.0.0
+    def aggregation(operation)
+      return self unless operation
+      clone.tap do |query|
+        unless aggregating?
+          query.pipeline.concat(query.selector.to_pipeline)
+          query.pipeline.concat(query.options.to_pipeline)
+          query.aggregating = true
+        end
+        yield(query.pipeline)
+      end
+    end
+  end
+end

data/lib/origin/extensions/array.rb

@@ -167,7 +167,7 @@ module Origin
         # @since 1.0.0
         def evolve(object)
           if object.is_a?(::Array)
-            object.map!{ |obj| obj.class.evolve(obj) }
+            object.map { |obj| obj.class.evolve(obj) }
           else
             object
           end

data/lib/origin/extensions/hash.rb

@@ -146,7 +146,7 @@ module Origin
       def __expand_complex__
         replacement = {}
         each_pair do |key, value|
-          replacement.merge!(key.specify(value.__expand_complex__))
+          replacement.merge!(key.__expr_part__(value.__expand_complex__))
         end
         replacement
       end

data/lib/origin/extensions/object.rb

@@ -186,7 +186,7 @@ module Origin
           return nil if object.nil?
           case object
           when ::Array
-            object.map!{ |obj| evolve(obj) }
+            object.map{ |obj| evolve(obj) }
           when ::Range
             { "$gte" => evolve(object.min), "$lte" => evolve(object.max) }
           else

data/lib/origin/extensions/string.rb

@@ -30,6 +30,18 @@ module Origin
         ::Time.parse(self).utc
       end
 
+      # Get the string as a mongo expression, adding $ to the front.
+      #
+      # @example Get the string as an expression.
+      #   "test".__mongo_expression__
+      #
+      # @return [ String ] The string with $ at the front.
+      #
+      # @since 2.0.0
+      def __mongo_expression__
+        start_with?("$") ? self : "$#{self}"
+      end
+
       # Get the string as a sort option.
       #
       # @example Get the string as a sort option.
@@ -50,7 +62,7 @@ module Origin
       # Get the string as a specification.
       #
       # @example Get the string as a criteria.
-      #   "field".specify(value)
+      #   "field".__expr_part__(value)
       #
       # @param [ Object ] value The value of the criteria.
       # @param [ true, false ] negating If the selection should be negated.
@@ -58,8 +70,8 @@ module Origin
       # @return [ Hash ] The selection.
       #
       # @since 1.0.0
-      def specify(value, negating = false)
-        (negating && value.regexp?) ? { self => { "$not" => value } } : { self => value }
+      def __expr_part__(value, negating = false)
+        ::String.__expr_part__(self, value, negating)
       end
 
       # Get the string as a sort direction.
@@ -76,6 +88,26 @@ module Origin
 
       module ClassMethods
 
+        # Get the value as a expression.
+        #
+        # @example Get the value as an expression.
+        #   String.__expr_part__("field", value)
+        #
+        # @param [ String, Symbol ] key The field key.
+        # @param [ Object ] value The value of the criteria.
+        # @param [ true, false ] negating If the selection should be negated.
+        #
+        # @return [ Hash ] The selection.
+        #
+        # @since 2.0.0
+        def __expr_part__(key, value, negating = false)
+          if negating
+            { key => { "$#{value.regexp? ? "not" : "ne"}" => value }}
+          else
+            { key => value }
+          end
+        end
+
         # Evolves the string into a MongoDB friendly value - in this case
         # a string.
         #

data/lib/origin/extensions/symbol.rb

@@ -8,7 +8,7 @@ module Origin
       # Get the symbol as a specification.
       #
       # @example Get the symbol as a criteria.
-      #   :field.specify(value)
+      #   :field.__expr_part__(value)
       #
       # @param [ Object ] value The value of the criteria.
       # @param [ true, false ] negating If the selection should be negated.
@@ -16,8 +16,8 @@ module Origin
       # @return [ Hash ] The selection.
       #
       # @since 1.0.0
-      def specify(value, negating = false)
-        (negating && value.regexp?) ? { self => { "$not" => value } } : { self => value }
+      def __expr_part__(value, negating = false)
+        ::String.__expr_part__(self, value, negating)
       end
 
       # Get the symbol as a sort direction.

data/lib/origin/key.rb

@@ -57,7 +57,7 @@ module Origin
     # Gets the raw selector that would be passed to Mongo from this key.
     #
     # @example Specify the raw selector.
-    #   key.specify(50)
+    #   key.__expr_part__(50)
     #
     # @param [ Object ] object The value to be included.
     # @param [ true, false ] negating If the selection should be negated.
@@ -65,7 +65,7 @@ module Origin
     # @return [ Hash ] The raw MongoDB selector.
     #
     # @since 1.0.0
-    def specify(object, negating = false)
+    def __expr_part__(object, negating = false)
       value = block ? block[object] : object
       expression = { operator => expanded ? { expanded => value } : value }
       { name.to_s => (negating && operator != "$not") ? { "$not" => expression } : expression }

data/lib/origin/mergeable.rb

@@ -94,6 +94,25 @@ module Origin
       end
     end
 
+    # Perform a straight merge of the criterion into the selection and let the
+    # symbol overrides do all the work.
+    #
+    # @api private
+    #
+    # @example Straight merge the expanded criterion.
+    #   mergeable.__merge__(location: [ 1, 10 ])
+    #
+    # @param [ Hash ] criterion The criteria.
+    #
+    # @return [ Mergeable ] The cloned object.
+    #
+    # @since 2.0.0
+    def __merge__(criterion)
+      selection(criterion) do |selector, field, value|
+        selector.merge!(field.__expr_part__(value))
+      end
+    end
+
     # Adds the criterion to the existing selection.
     #
     # @api private
@@ -131,7 +150,7 @@ module Origin
           next unless expr
           criteria = sel[operator] || []
           normalized = expr.inject({}) do |hash, (field, value)|
-            hash.merge!(field.specify(value.__expand_complex__))
+            hash.merge!(field.__expr_part__(value.__expand_complex__))
             hash
           end
           sel.store(operator, criteria.push(normalized))

data/lib/origin/optional.rb

@@ -83,7 +83,11 @@ module Origin
     #
     # @since 1.0.0
     def limit(value = nil)
-      option(value) { |options| options.store(:limit, value.to_i) }
+      option(value) do |options, query|
+        val = value.to_i
+        options.store(:limit, val)
+        query.pipeline.push("$limit" => val) if aggregating?
+      end
     end
 
     # Adds the option to limit the number of documents scanned in the
@@ -127,7 +131,7 @@ module Origin
       args = args.flatten
       option(*args) do |options|
         options.store(
-          :fields, args.inject({}){ |sub, field| sub.tap { sub[field] = 1 }}
+          :fields, args.inject(options[:fields] || {}){ |sub, field| sub.tap { sub[field] = 1 }}
         )
       end
     end
@@ -164,11 +168,12 @@ module Origin
     #
     # @since 1.0.0
     def order_by(*spec)
-      option(spec) do |options|
+      option(spec) do |options, query|
         spec.compact.each do |criterion|
           criterion.__sort_option__.each_pair do |field, direction|
             add_sort_option(options, field, direction)
           end
+          query.pipeline.push("$sort" => options[:sort]) if aggregating?
         end
       end
     end
@@ -184,7 +189,11 @@ module Origin
     #
     # @since 1.0.0
     def skip(value = nil)
-      option(value) { |options| options.store(:skip, value.to_i) }
+      option(value) do |options, query|
+        val = value.to_i
+        options.store(:skip, val)
+        query.pipeline.push("$skip" => val) if aggregating?
+      end
     end
     alias :offset :skip
 
@@ -236,7 +245,7 @@ module Origin
       args = args.flatten
       option(*args) do |options|
         options.store(
-          :fields, args.inject({}){ |sub, field| sub.tap { sub[field] = 0 }}
+          :fields, args.inject(options[:fields] || {}){ |sub, field| sub.tap { sub[field] = 0 }}
         )
       end
     end
@@ -285,7 +294,7 @@ module Origin
     def option(*args)
       clone.tap do |query|
         unless args.compact.empty?
-          yield(query.options)
+          yield(query.options, query)
         end
       end
     end
@@ -304,10 +313,11 @@ module Origin
     #
     # @since 1.0.0
     def sort_with_list(*fields, direction)
-      option(fields) do |options|
+      option(fields) do |options, query|
         fields.flatten.compact.each do |field|
           add_sort_option(options, field, direction)
         end
+        query.pipeline.push("$sort" => options[:sort]) if aggregating?
       end
     end
 

data/lib/origin/options.rb

@@ -70,6 +70,22 @@ module Origin
     end
     alias :[]= :store
 
+    # Convert the options to aggregation pipeline friendly options.
+    #
+    # @example Convert the options to a pipeline.
+    #   options.to_pipeline
+    #
+    # @return [ Array<Hash> ] The options in pipeline form.
+    #
+    # @since 2.0.0
+    def to_pipeline
+      pipeline = []
+      pipeline.push({ "$skip" => skip }) if skip
+      pipeline.push({ "$limit" => limit }) if limit
+      pipeline.push({ "$sort" => sort }) if sort
+      pipeline
+    end
+
     private
 
     # Evolve a single key selection with various types of values.

data/lib/origin/pipeline.rb

@@ -0,0 +1,107 @@
+# encoding: utf-8
+module Origin
+
+  # Represents an aggregation pipeline.
+  #
+  # @since 2.0.0
+  class Pipeline < Array
+
+    # @attribute [r] aliases The field aliases.
+    attr_reader :aliases
+
+    # Deep copy the aggregation pipeline. Will clone all the values in the
+    # pipeline as well as the pipeline itself.
+    #
+    # @example Deep copy the pipeline.
+    #   pipeline.__deep_copy__
+    #
+    # @return [ Pipeline ] The cloned pipeline.
+    #
+    # @since 2.0.0
+    def __deep_copy__
+      self.class.new(aliases) do |copy|
+        each do |entry|
+          copy.push(entry.__deep_copy__)
+        end
+      end
+    end
+
+    # Add a group operation to the aggregation pipeline.
+    #
+    # @example Add a group operation.
+    #   pipeline.group(:count.sum => 1, :max.max => "likes")
+    #
+    # @param [ Hash ] entry The group entry.
+    #
+    # @return [ Pipeline ] The pipeline.
+    #
+    # @since 2.0.0
+    def group(entry)
+      push("$group" => evolve(entry.__expand_complex__))
+    end
+
+    # Initialize the new pipeline.
+    #
+    # @example Initialize the new pipeline.
+    #   Origin::Pipeline.new(aliases)
+    #
+    # @param [ Hash ] aliases A hash of mappings from aliases to the actual
+    #   field names in the database.
+    #
+    # @since 2.0.0
+    def initialize(aliases = {})
+      @aliases = aliases
+      yield(self) if block_given?
+    end
+
+    # Adds a $project entry to the aggregation pipeline.
+    #
+    # @example Add the projection.
+    #   pipeline.project(name: 1)
+    #
+    # @param [ Hash ] entry The projection.
+    #
+    # @return [ Pipeline ] The pipeline.
+    def project(entry)
+      push("$project" => evolve(entry))
+    end
+
+    # Add the $unwind entry to the pipeline.
+    #
+    # @example Add the unwind.
+    #   pipeline.unwind(:field)
+    #
+    # @param [ String, Symbol ] field The name of the field.
+    #
+    # @return [ Pipeline ] The pipeline.
+    #
+    # @since 2.0.0
+    def unwind(field)
+      normalized = field.to_s
+      name = aliases[normalized] || normalized
+      push("$unwind" => name.__mongo_expression__)
+    end
+
+    private
+
+    # Evolve the entry using the aliases.
+    #
+    # @api private
+    #
+    # @example Evolve the entry.
+    #   pipeline.evolve(name: 1)
+    #
+    # @param [ Hash ] entry The entry to evolve.
+    #
+    # @return [ Hash ] The evolved entry.
+    #
+    # @since 2.0.0
+    def evolve(entry)
+      aggregate = Selector.new(aliases)
+      entry.each_pair do |field, value|
+        aggregate.merge!(field.to_s => value)
+      end
+      aggregate
+    end
+  end
+end

data/lib/origin/queryable.rb

@@ -4,6 +4,8 @@ require "origin/key"
 require "origin/macroable"
 require "origin/mergeable"
 require "origin/smash"
+require "origin/aggregable"
+require "origin/pipeline"
 require "origin/optional"
 require "origin/options"
 require "origin/selectable"
@@ -19,6 +21,8 @@ module Origin
   #     include Origin::Queryable
   #   end
   module Queryable
+    include Mergeable
+    include Aggregable
     include Selectable
     include Optional
 
@@ -56,8 +60,9 @@ module Origin
     # @since 1.0.0
     def initialize(aliases = {}, serializers = {}, driver = :moped)
       @aliases, @driver, @serializers = aliases, driver.to_sym, serializers
-      @options, @selector =
-        Options.new(aliases, serializers), Selector.new(aliases, serializers)
+      @options = Options.new(aliases, serializers)
+      @selector = Selector.new(aliases, serializers)
+      @pipeline = Pipeline.new(aliases)
       yield(self) if block_given?
     end
 
@@ -72,6 +77,7 @@ module Origin
     def initialize_copy(other)
       @options = other.options.__deep_copy__
       @selector = other.selector.__deep_copy__
+      @pipeline = other.pipeline.__deep_copy__
     end
   end
 end

data/lib/origin/selectable.rb

@@ -5,9 +5,23 @@ module Origin
   # document from the database. The selectable module brings all functionality
   # to the selectable that has to do with building MongoDB selectors.
   module Selectable
-    include Mergeable
     extend Macroable
 
+    # Constant for a LineString $geometry.
+    #
+    # @since 2.0.0
+    LINE_STRING = "LineString"
+
+    # Constant for a Point $geometry.
+    #
+    # @since 2.0.0
+    POINT = "Point"
+
+    # Constant for a Polygon $geometry.
+    #
+    # @since 2.0.0
+    POLYGON = "Polygon"
+
     # @attribute [rw] negating If the next spression is negated.
     # @attribute [rw] selector The query selector.
     attr_accessor :negating, :selector
@@ -118,6 +132,47 @@ module Origin
       ::Boolean.evolve(value)
     end
 
+    # Add a $geoIntersects or $geoWithin selection. Symbol operators must be used as shown in
+    # the examples to expand the criteria.
+    #
+    # @note The only valid geometry shapes for a $geoIntersects are:
+    #   :intersects_line, :intersects_point, and :intersects_polygon.
+    #
+    # @note The only valid geometry shape for a $geoWithin is :within_polygon
+    #
+    # @example Add a geo intersect criterion for a line.
+    #   query.geo_spacial(:location.intersects_line => [[ 1, 10 ], [ 2, 10 ]])
+    #
+    # @example Add a geo intersect criterion for a point.
+    #   query.geo_spacial(:location.intersects_point => [[ 1, 10 ]])
+    #
+    # @example Add a geo intersect criterion for a polygon.
+    #   query.geo_spacial(:location.intersects_polygon => [[ 1, 10 ], [ 2, 10 ], [ 1, 10 ]])
+    #
+    # @example Add a geo within criterion for a polygon.
+    #   query.geo_spacial(:location.within_polygon => [[ 1, 10 ], [ 2, 10 ], [ 1, 10 ]])
+    #
+    # @param [ Hash ] criterion The criterion.
+    #
+    # @return [ Selectable ] The cloned selectable.
+    #
+    # @since 2.0.0
+    def geo_spacial(criterion = nil)
+      __merge__(criterion)
+    end
+    key :intersects_line, :override, "$geoIntersects", "$geometry" do |value|
+      { "type" => LINE_STRING, "coordinates" => value }
+    end
+    key :intersects_point, :override, "$geoIntersects", "$geometry" do |value|
+      { "type" => POINT, "coordinates" => value }
+    end
+    key :intersects_polygon, :override, "$geoIntersects", "$geometry" do |value|
+      { "type" => POLYGON, "coordinates" => value }
+    end
+    key :within_polygon, :override, "$geoWithin", "$geometry" do |value|
+      { "type" => POLYGON, "coordinates" => value }
+    end
+
     # Add the $gt criterion to the selector.
     #
     # @example Add the $gt criterion.
@@ -364,7 +419,11 @@ module Origin
     #
     # @since 1.0.0
     def not(*criterion)
-      (criterion.size == 0) ? tap { |query| query.negating = true } : __override__(criterion.first, "$not")
+      if criterion.empty?
+        tap { |query| query.negating = true }
+      else
+        __override__(criterion.first, "$not")
+      end
     end
     key :not, :override, "$not"
 
@@ -451,82 +510,6 @@ module Origin
       criterion.is_a?(String) ? js_query(criterion) : expr_query(criterion)
     end
 
-    # Adds the $within/$box selection to the selectable.
-    #
-    # @example Add the selection.
-    #   selectable.within_box(location: [[ 1, 10 ], [ 10, 1 ]])
-    #
-    # @example Execute an $within/$box in a where query.
-    #   selectable.where(:field.within_box => [[ 1, 10 ], [ 10, 1 ]])
-    #
-    # @param [ Hash ] criterion The field/box corner criterion.
-    #
-    # @return [ Selectable ] The cloned selectable.
-    #
-    # @since 1.0.0
-    def within_box(criterion = nil)
-      __expanded__(criterion, "$within", "$box")
-    end
-    key :within_box, :expanded, "$within", "$box"
-
-    # Adds the $within/$center selection to the selectable.
-    #
-    # @example Add the selection.
-    #   selectable.within_circle(location: [[ 1, 10 ], 25 ])
-    #
-    # @example Execute an $within/$center in a where query.
-    #   selectable.where(:field.within_circle => [[ 1, 10 ], 25 ])
-    #
-    # @param [ Hash ] criterion The field/radius criterion.
-    #
-    # @return [ Selectable ] The cloned selectable.
-    #
-    # @since 1.0.0
-    def within_circle(criterion = nil)
-      __expanded__(criterion, "$within", "$center")
-    end
-    key :within_circle, :expanded, "$within", "$center"
-
-    # Adds the $within/$polygon selection to the selectable.
-    #
-    # @example Add the selection.
-    #   selectable.within_polygon(
-    #     location: [[ 10, 20 ], [ 10, 40 ], [ 30, 40 ], [ 30, 20 ]]
-    #   )
-    #
-    # @example Execute an $within/$polygon in a where query.
-    #   selectable.where(
-    #     :field.within_polygon => [[ 10, 20 ], [ 10, 40 ], [ 30, 40 ], [ 30, 20 ]]
-    #   )
-    #
-    # @param [ Hash ] criterion The field/polygon points criterion.
-    #
-    # @return [ Selectable ] The cloned selectable.
-    #
-    # @since 1.0.0
-    def within_polygon(criterion = nil)
-      __expanded__(criterion, "$within", "$polygon")
-    end
-    key :within_polygon, :expanded, "$within", "$polygon"
-
-    # Adds the $within/$centerSphere selection to the selectable.
-    #
-    # @example Add the selection.
-    #   selectable.within_spherical_circle(location: [[ 1, 10 ], 25 ])
-    #
-    # @example Execute an $within/$centerSphere in a where query.
-    #   selectable.where(:field.within_spherical_circle => [[ 1, 10 ], 25 ])
-    #
-    # @param [ Hash ] criterion The field/distance criterion.
-    #
-    # @return [ Selectable ] The cloned selectable.
-    #
-    # @since 1.0.0
-    def within_spherical_circle(criterion = nil)
-      __expanded__(criterion, "$within", "$centerSphere")
-    end
-    key :within_spherical_circle, :expanded, "$within", "$centerSphere"
-
     private
 
     # Create the standard expression query.
@@ -543,7 +526,7 @@ module Origin
     # @since 1.0.0
     def expr_query(criterion)
       selection(criterion) do |selector, field, value|
-        selector.merge!(field.specify(value.__expand_complex__, negating?))
+        selector.merge!(field.__expr_part__(value.__expand_complex__, negating?))
       end
     end
 

data/lib/origin/selector.rb

@@ -49,6 +49,20 @@ module Origin
     end
     alias :[]= :store
 
+    # Convert the selector to an aggregation pipeline entry.
+    #
+    # @example Convert the selector to a pipeline.
+    #   selector.to_pipeline
+    #
+    # @return [ Array<Hash> ] The pipeline entry for the selector.
+    #
+    # @since 2.0.0
+    def to_pipeline
+      pipeline = []
+      pipeline.push({ "$match" => self }) unless empty?
+      pipeline
+    end
+
     private
 
     # Evolves a multi-list selection, like an $and or $or criterion, and

data/lib/origin/smash.rb

@@ -42,6 +42,20 @@ module Origin
       yield(self) if block_given?
     end
 
+    # Get an item from the smart hash by the provided key.
+    #
+    # @example Get an item by the key.
+    #   smash["test"]
+    #
+    # @param [ String ] key The key.
+    #
+    # @return [ Object ] The found object.
+    #
+    # @since 2.0.0
+    def [](key)
+      fetch(aliases[key]) { super }
+    end
+
     private
 
     # Get the normalized value for the key. If localization is in play the

data/lib/origin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origin
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Durran Jordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies: []
 description: Origin is a simple DSL for generating MongoDB selectors and options
 email:
@@ -17,6 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/origin/aggregable.rb
 - lib/origin/extensions/array.rb
 - lib/origin/extensions/big_decimal.rb
 - lib/origin/extensions/boolean.rb
@@ -40,6 +41,7 @@ files:
 - lib/origin/mergeable.rb
 - lib/origin/optional.rb
 - lib/origin/options.rb
+- lib/origin/pipeline.rb
 - lib/origin/queryable.rb
 - lib/origin/selectable.rb
 - lib/origin/selector.rb
@@ -69,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: origin
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Simple DSL for MongoDB query generation