origin 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67afcab5f2627b154dbe6dedf6dbec074115e13f
-  data.tar.gz: d53486d4fc1c1f543ce11523f0cccad6fb7944c6
+  metadata.gz: 0b18444ac7a70fe5f8b4ffb6cfc3561007018adb
+  data.tar.gz: df43b397e418dbe94ae4435252f73490d4ba8d2a
 SHA512:
-  metadata.gz: 19f0fc16f76f16408f3d73880db1c15af02877559772b456e0b4cecd5dd05589940e499fc6a83322e06ce73a8d3c347f33517e967b6f3ece6957e39eb4011190
-  data.tar.gz: 6b0e86e432fbd806d3ea038314948f8401fe5612d7e18b6e8edc0bafdd64d0283930ed50cd702af4fe7b9d2cab79d0730592eb25330298cdf837fbad1a22a877
+  metadata.gz: 29d9b33aba3b290a0112d0d8b02d446d881da38de59c612f0da08aede046ed695bffd6b03ff1bf1a6db01c6dd7b146078c538e05f3caedd6118314333816f6e5
+  data.tar.gz: 6e917ba1a28baf310037fac320b9db36ba54aa6ba69868183db13eb30e02db042775ed33ef36a317e209ab7089c3cd31e5dea9abce09f2885755b3fafa85b8b3

data/CHANGELOG.md

@@ -1,12 +1,5 @@
 # Overview
 
-## 2.1.1
-
-### Resolved Issues
-
-* Fixed integer evolution when a trailing "." existed but no fraction provided,
-  ie "7.1"
-
 ## 2.1.0
 
 ### New Features

data/lib/origin/optional.rb

@@ -267,6 +267,42 @@ module Origin
       end
     end
 
+    # Associate a comment with the query.
+    #
+    # @example Add a comment.
+    #   optional.comment('slow query')
+    #
+    # @note Set profilingLevel to 2 and the comment will be logged in the profile
+    #   collection along with the query.
+    #
+    # @param [ String ] comment The comment to be associated with the query.
+    #
+    # @return [ Optional ] The cloned optional.
+    #
+    # @since 2.2.0
+    def comment(comment = nil)
+      clone.tap do |query|
+        query.options.store(:comment, comment)
+      end
+    end
+
+    # Set the cursor type.
+    #
+    # @example Set the cursor type.
+    #   optional.cursor_type(:tailable)
+    #   optional.cursor_type(:tailable_await)
+    #
+    # @note The cursor can be type :tailable or :tailable_await.
+    #
+    # @param [ Symbol ] type The type of cursor to create.
+    #
+    # @return [ Optional ] The cloned optional.
+    #
+    # @since 2.2.0
+    def cursor_type(type)
+      clone.tap { |query| query.options.store(:cursor_type, type) }
+    end
+
     private
 
     # Add a single sort option.
@@ -284,7 +320,7 @@ module Origin
     #
     # @since 1.0.0
     def add_sort_option(options, field, direction)
-      if driver == :mongo
+      if driver == :mongo1x
         sorting = (options[:sort] || []).dup
         sorting.push([ field, direction ])
         options.store(:sort, sorting)

data/lib/origin/queryable.rb

@@ -58,7 +58,7 @@ module Origin
     # @param [ Symbol ] driver The driver being used.
     #
     # @since 1.0.0
-    def initialize(aliases = {}, serializers = {}, driver = :moped)
+    def initialize(aliases = {}, serializers = {}, driver = :mongo)
       @aliases, @driver, @serializers = aliases, driver.to_sym, serializers
       @options = Options.new(aliases, serializers)
       @selector = Selector.new(aliases, serializers)

data/lib/origin/selectable.rb

@@ -491,6 +491,32 @@ module Origin
       ::Integer.evolve(value)
     end
 
+    # Construct a text search selector.
+    #
+    # @example Construct a text search selector.
+    #   selectable.text_search("testing")
+    #
+    # @example Construct a text search selector with options.
+    #   selectable.text_search("testing", :$language => "fr")
+    #
+    # @param [ String, Symbol ] terms A string of terms that MongoDB parses
+    #   and uses to query the text index.
+    # @param [ Hash ] opts Text search options. See MongoDB documentation
+    #   for options.
+    #
+    # @return [ Selectable ] The cloned selectable.
+    #
+    # @since 2.2.0
+    def text_search(terms, opts = nil)
+      clone.tap do |query|
+        if terms
+          criterion = { :$text => { :$search => terms } }
+          criterion[:$text].merge!(opts) if opts
+          query.selector = criterion
+        end
+      end
+    end
+
     # This is the general entry point for most MongoDB queries. This either
     # creates a standard field: value selection, and expanded selection with
     # the use of hash methods, or a $where selection if a string is provided.

data/lib/origin/selector.rb

@@ -18,7 +18,9 @@ module Origin
     def merge!(other)
       other.each_pair do |key, value|
         if value.is_a?(Hash) && self[key.to_s].is_a?(Hash)
-          value = self[key.to_s].merge(value)
+          value = self[key.to_s].merge(value) do |_key, old_val, new_val|
+            multi_value?(_key) ? (old_val + new_val).uniq : new_val
+          end
         end
         if multi_selection?(key)
           value = (self[key.to_s] || []).concat(value)
@@ -154,7 +156,7 @@ module Origin
       end
     end
 
-    # Determines if the selection is a multi-select, like an $and or $or
+    # Determines if the selection is a multi-select, like an $and or $or or $nor
     # selection.
     #
     # @api private
@@ -168,7 +170,23 @@ module Origin
     #
     # @since 1.0.0
     def multi_selection?(key)
-      key =~ /\$and|\$or/
+      key =~ /\$and|\$or|\$nor/
+    end
+
+    # Determines if the selection operator takes a list. Returns true for $in and $nin.
+    #
+    # @api private
+    #
+    # @example Does the selection operator take multiple values?
+    #   selector.multi_value?("$nin")
+    #
+    # @param [ String ] key The key to check.
+    #
+    # @return [ true, false ] If the key is $in or $nin.
+    #
+    # @since 2.1.1
+    def multi_value?(key)
+      key =~ /\$nin|\$in/
     end
   end
 end

data/lib/origin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origin
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Durran Jordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies: []
 description: Origin is a simple DSL for generating MongoDB selectors and options
 email:
@@ -71,8 +71,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: origin
-rubygems_version: 2.2.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Simple DSL for MongoDB query generation
 test_files: []
+has_rdoc: