mongoid 5.2.0 → 5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c45686b0e53c4e404c5f52563b399c2ae3909dce
-  data.tar.gz: aea6ea222ae4e97af3ec984a7cb185cce8de966a
+  metadata.gz: a5ae2a3a33da11eae20a6d6b268ad3e69d601a13
+  data.tar.gz: 661ff308d0402ab14a5a3920534a1a88f879e3ec
 SHA512:
-  metadata.gz: 033d87560a04cdcae0e2353117eccaa5f14ab4ea273e9bc491cd4cef659ae3488008f17894161375d6910c7be9533d249722eda57a556b8d388419761863366e
-  data.tar.gz: df6a8a161d146fd07a8ddc9867b0105c8f5285273770b169cd280b47c211d54ae31b7bb1ca96f27c35cc43a5e7ccf9e12485592722522efae0541f43d5ac42cf
+  metadata.gz: a910a280572a11c133f8f3900f878fdb719c548998381bb38c08714c911cbfc1ebfd508ffb84621489cdd8806a8e054cbb55aa041a189267f1fdb30d322d8895
+  data.tar.gz: 0bfeada8b1bc927fde4414f1accdfe30037b36d56776c5f9b904b041e5356bd4df7a202fbb69e40edda9c165d84a78cdc0f4971ebb7afcad021bd7526d9e6cf0

data/lib/mongoid/extensions.rb

@@ -39,6 +39,7 @@ require "mongoid/extensions/module"
 require "mongoid/extensions/nil_class"
 require "mongoid/extensions/object"
 require "mongoid/extensions/object_id"
+require "mongoid/extensions/origin/regexp_raw"
 require "mongoid/extensions/range"
 require "mongoid/extensions/regexp"
 require "mongoid/extensions/set"

data/lib/mongoid/extensions/origin/regexp_raw.rb

@@ -0,0 +1,43 @@
+module Origin
+  module Extensions
+
+    # This module contains additional bson raw regex behaviour.
+    module Regexp
+
+      module Raw
+
+        # Is the object a regexp?
+        #
+        # @example Is the object a regex?
+        #   bson_raw_regexp.regexp?
+        #
+        # @return [ true ] Always true.
+        #
+        # @since 5.2.1
+        def regexp?; true; end
+
+        module ClassMethods
+
+          # Evolve the object into a raw bson regex.
+          #
+          # @example Evolve the object to a regex.
+          #   BSON::Regexp::Raw.evolve("^[123]")
+          #
+          # @param [ BSON::Regexp::Raw, String ] object The object to evolve.
+          #
+          # @return [ BSON::Regexp::Raw ] The evolved raw regex.
+          #
+          # @since 5.2.1
+          def evolve(object)
+            __evolve__(object) do |obj|
+              obj.is_a?(String) ? BSON::Regexp::Raw.new(obj) : obj
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+BSON::Regexp::Raw.__send__(:include, Origin::Extensions::Regexp::Raw)
+BSON::Regexp::Raw.__send__(:extend, Origin::Extensions::Regexp::Raw::ClassMethods)

data/lib/mongoid/matchable.rb

@@ -12,6 +12,7 @@ require "mongoid/matchable/ne"
 require "mongoid/matchable/nin"
 require "mongoid/matchable/or"
 require "mongoid/matchable/size"
+require "mongoid/matchable/regexp"
 
 module Mongoid
 
@@ -115,6 +116,8 @@ module Mongoid
           else
             Default.new(extract_attribute(document, key))
           end
+        elsif value.regexp?
+          Regexp.new(extract_attribute(document, key))
         else
           case key.to_s
             when "$or" then Or.new(value, document)
@@ -143,7 +146,11 @@ module Mongoid
         if (key_string = key.to_s) =~ /.+\..+/
           key_string.split('.').inject(document.as_document) do |_attribs, _key|
             if _attribs.is_a?(::Array)
-              _attribs.map { |doc| doc.try(:[], _key) }
+              if _key =~ /\A\d+\z/ && _attribs.none? {|doc| doc.is_a?(Hash)}
+                _attribs.try(:[], _key.to_i)
+              else
+                _attribs.map { |doc| doc.try(:[], _key) }
+              end
             else
               _attribs.try(:[], _key)
             end

data/lib/mongoid/matchable/regexp.rb

@@ -0,0 +1,27 @@
+module Mongoid
+  module Matchable
+
+    # Defines behavior for handling regular expressions in embedded documents.
+    class Regexp < Default
+
+      # Does the supplied query match the attribute?
+      #
+      # @example Does this match?
+      #   matcher.matches?(/^Em/)
+      #   matcher.matches?(BSON::Regex::Raw.new("^Em"))
+      #
+      # @param [ BSON::Regexp::Raw, Regexp ] regexp The regular expression object.
+      #
+      # @return [ true, false ] True if matches, false if not.
+      #
+      # @since 5.2.1
+      def matches?(regexp)
+        if native_regexp = regexp.try(:compile)
+          super(native_regexp)
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "5.2.0"
+  VERSION = "5.2.1"
 end

data/spec/mongoid/criteria_spec.rb

@@ -3314,6 +3314,17 @@ describe Mongoid::Criteria do
         end
       end
 
+      context 'when the criteria contains a BSON::Regexp::Raw' do
+
+        let(:criteria) do
+          Band.where(name: BSON::Regexp::Raw.new("^Depeche"))
+        end
+
+        it "returns the matching documents" do
+          expect(criteria).to eq([ match ])
+        end
+      end
+
       context "when the criteria is an exact fk array match" do
 
         let(:id_one) do

data/spec/mongoid/extensions/origin/regexp_raw_spec.rb

@@ -0,0 +1,89 @@
+require "spec_helper"
+
+describe Origin::Extensions::Regexp::Raw do
+
+  describe ".evolve" do
+
+    context "when provided a bson raw regexp" do
+
+      let(:regexp) do
+        BSON::Regexp::Raw.new("^[123]")
+      end
+
+      let(:evolved) do
+        BSON::Regexp::Raw.evolve(regexp)
+      end
+
+      it "returns the regexp" do
+        expect(evolved).to be(regexp)
+      end
+    end
+
+    context "when providing a string" do
+
+      let(:regexp_string) do
+        '^[123]'
+      end
+
+      let(:evolved) do
+        BSON::Regexp::Raw.evolve(regexp_string)
+      end
+
+      it "returns the converted raw regexp" do
+        expect(evolved).to eq(BSON::Regexp::Raw.new(regexp_string))
+      end
+    end
+
+    context "when provided an array" do
+
+      context "when the elements are bson raw regexps" do
+
+        let(:regexp) do
+          BSON::Regexp::Raw.new("^[123]")
+        end
+
+        let(:array) do
+          [ regexp ]
+        end
+
+        let(:evolved) do
+          BSON::Regexp::Raw.evolve(array)
+        end
+
+        it "returns the array containing raw regexps" do
+          expect(evolved).to eq([ regexp ])
+        end
+
+        it "does not evolve in place" do
+          expect(evolved).to_not equal(array)
+        end
+      end
+
+      context "when the elements are strings" do
+
+        let(:regexp_string) do
+          "^[123]"
+        end
+
+        let(:evolved) do
+          BSON::Regexp::Raw.evolve([ regexp_string ])
+        end
+
+        it "returns the regexps" do
+          expect(evolved).to eq([ BSON::Regexp::Raw.new(regexp_string) ])
+        end
+      end
+    end
+  end
+
+  describe "#regexp?" do
+
+    let(:regexp) do
+      BSON::Regexp::Raw.new('^[123]')
+    end
+
+    it "returns true" do
+      expect(regexp).to be_regexp
+    end
+  end
+end

data/spec/mongoid/matchable/regexp_spec.rb

@@ -0,0 +1,59 @@
+require "spec_helper"
+
+describe Mongoid::Matchable::Regexp do
+
+  let(:matcher) do
+    described_class.new(attribute)
+  end
+
+  let(:attribute) do
+    'Emily'
+  end
+
+  describe '#matches?' do
+
+    context 'when a BSON::Regexp::Raw object is passed' do
+
+      let(:regexp) do
+        BSON::Regexp::Raw.new('^Em')
+      end
+
+      it 'compiles the regexp object to a native regexp for the matching' do
+        expect(matcher.matches?(regexp)).to be(true)
+      end
+
+      context 'when the value does not match the attribute' do
+
+        let(:attribute) do
+          'ily'
+        end
+
+        it 'compiles the regexp object to a native regexp for the matching' do
+          expect(matcher.matches?(regexp)).to be(false)
+        end
+      end
+    end
+
+    context 'when a native Regexp object is passed' do
+
+      let(:regexp) do
+        /^Em/
+      end
+
+      it 'calls super with the native regexp' do
+        expect(matcher.matches?(regexp)).to be(true)
+      end
+
+      context 'when the value does not match the attribute' do
+
+        let(:attribute) do
+          'ily'
+        end
+
+        it 'compiles the regexp object to a native regexp for the matching' do
+          expect(matcher.matches?(regexp)).to be(false)
+        end
+      end
+    end
+  end
+end

data/spec/mongoid/matchable_spec.rb

@@ -9,12 +9,13 @@ describe Mongoid::Matchable do
       let(:document) do
         Address.new(street: "Clarkenwell Road")
       end
+      let(:occupants){[{'name' => 'Tim'}]}
 
       before do
         document.locations << Location.new(
           name: 'No.1',
           info: { 'door' => 'Red'},
-          occupants: [{'name' => 'Tim'}]
+          occupants: occupants
         )
       end
 
@@ -76,6 +77,33 @@ describe Mongoid::Matchable do
         end
       end
 
+      context "when matching index of an array" do
+
+        let(:occupants){["Tim","Logan"]}
+
+        context "when the contents match" do
+
+          let(:selector) do
+            { "occupants.0" => "Tim" }
+          end
+          
+          it "returns true" do
+            expect(document.locations.first.matches?(selector)).to be true
+          end
+        end
+
+        context "when the contents do not match" do
+
+          let(:selector) do
+            { "occupants.0" => "Logan" }
+          end
+
+          it "returns false" do
+            expect(document.locations.first.matches?(selector)).to be false
+          end
+        end
+      end
+
       context "when matching values of multiple embedded hashes" do
 
         context "when the contents match" do
@@ -141,6 +169,28 @@ describe Mongoid::Matchable do
           expect(document.matches?(selector)).to be false
         end
       end
+
+      context 'when a BSON::Regexp::Raw object is used' do
+
+        let(:selector) do
+          { street: BSON::Regexp::Raw.new("^Clarkenwell") }
+        end
+
+        it "returns true" do
+          expect(document.matches?(selector)).to be true
+        end
+      end
+
+      context 'when a native Regexp object is used' do
+
+        let(:selector) do
+          { street: /^Clarkenwell/ }
+        end
+
+        it "returns true" do
+          expect(document.matches?(selector)).to be true
+        end
+      end
     end
 
     context "when performing complex matching" do

metadata

@@ -1,36 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.1
 platform: ruby
 authors:
 - Durran Jordan
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQUFADBCMRQwEgYDVQQDDAtkcml2
-  ZXItcnVieTEVMBMGCgmSJomT8ixkARkWBTEwZ2VuMRMwEQYKCZImiZPyLGQBGRYD
-  Y29tMB4XDTE2MTIwMTE0MDcxMloXDTE3MTIwMTE0MDcxMlowQjEUMBIGA1UEAwwL
-  ZHJpdmVyLXJ1YnkxFTATBgoJkiaJk/IsZAEZFgUxMGdlbjETMBEGCgmSJomT8ixk
-  ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANFdSAa8fRm1
-  bAM9za6Z0fAH4g02bqM1NGnw8zJQrE/PFrFfY6IFCT2AsLfOwr1maVm7iU1+kdVI
-  IQ+iI/9+E+ArJ+rbGV3dDPQ+SLl3mLT+vXjfjcxMqI2IW6UuVtt2U3Rxd4QU0kdT
-  JxmcPYs5fDN6BgYc6XXgUjy3m+Kwha2pGctdciUOwEfOZ4RmNRlEZKCMLRHdFP8j
-  4WTnJSGfXDiuoXICJb5yOPOZPuaapPSNXp93QkUdsqdKC32I+KMpKKYGBQ6yisfA
-  5MyVPPCzLR1lP5qXVGJPnOqUAkvEUfCahg7EP9tI20qxiXrR6TSEraYhIFXL0EGY
-  u8KAcPHm5KkCAwEAAaN9MHswCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
-  BBYEFFt3WbF+9JpUjAoj62cQBgNb8HzXMCAGA1UdEQQZMBeBFWRyaXZlci1ydWJ5
-  QDEwZ2VuLmNvbTAgBgNVHRIEGTAXgRVkcml2ZXItcnVieUAxMGdlbi5jb20wDQYJ
-  KoZIhvcNAQEFBQADggEBAKBDaVkycCUC1zMfpAkXIgWtji2Nr2ZygYQR53AgxOaE
-  7nqxdh5Lh8pnfwa71/ucrZFJt+g/mEhen9lFNmcizvpP43Hh4rYf8j6T8Y+mQ6tr
-  sp5xWiv93DlLXGmas0hv9VRYDvV1vLFaG05FHOAZKdo6pD2t6jNyMSAn4fMHKctw
-  UoYN5FLt84jacRQF5nhy9gBhfgvA19LcjeMLQC11x3fykDLzCXF2wEe5Q5iYaWvb
-  cGiNQIiHBj/9/xHfOyOthBPUevTiVnuffarDr434z/LGLwYzgaG5EcJFvZqpvUpP
-  fGcAPtAZUMGLXwcOB1BJEFkDxUQIJiEpSmf4YzzZhEM=
-  -----END CERTIFICATE-----
-date: 2017-01-26 00:00:00.000000000 Z
+cert_chain: []
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -218,6 +196,7 @@ files:
 - lib/mongoid/extensions/nil_class.rb
 - lib/mongoid/extensions/object.rb
 - lib/mongoid/extensions/object_id.rb
+- lib/mongoid/extensions/origin/regexp_raw.rb
 - lib/mongoid/extensions/range.rb
 - lib/mongoid/extensions/regexp.rb
 - lib/mongoid/extensions/set.rb
@@ -253,6 +232,7 @@ files:
 - lib/mongoid/matchable/ne.rb
 - lib/mongoid/matchable/nin.rb
 - lib/mongoid/matchable/or.rb
+- lib/mongoid/matchable/regexp.rb
 - lib/mongoid/matchable/size.rb
 - lib/mongoid/persistable.rb
 - lib/mongoid/persistable/creatable.rb
@@ -668,6 +648,7 @@ files:
 - spec/mongoid/extensions/nil_class_spec.rb
 - spec/mongoid/extensions/object_id_spec.rb
 - spec/mongoid/extensions/object_spec.rb
+- spec/mongoid/extensions/origin/regexp_raw_spec.rb
 - spec/mongoid/extensions/range_spec.rb
 - spec/mongoid/extensions/regexp_spec.rb
 - spec/mongoid/extensions/set_spec.rb
@@ -702,6 +683,7 @@ files:
 - spec/mongoid/matchable/ne_spec.rb
 - spec/mongoid/matchable/nin_spec.rb
 - spec/mongoid/matchable/or_spec.rb
+- spec/mongoid/matchable/regexp_spec.rb
 - spec/mongoid/matchable/size_spec.rb
 - spec/mongoid/matchable_spec.rb
 - spec/mongoid/persistable/creatable_spec.rb
@@ -821,7 +803,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Elegant Persistence in Ruby for MongoDB.
@@ -1125,6 +1107,7 @@ test_files:
 - spec/mongoid/extensions/nil_class_spec.rb
 - spec/mongoid/extensions/object_id_spec.rb
 - spec/mongoid/extensions/object_spec.rb
+- spec/mongoid/extensions/origin/regexp_raw_spec.rb
 - spec/mongoid/extensions/range_spec.rb
 - spec/mongoid/extensions/regexp_spec.rb
 - spec/mongoid/extensions/set_spec.rb
@@ -1159,6 +1142,7 @@ test_files:
 - spec/mongoid/matchable/ne_spec.rb
 - spec/mongoid/matchable/nin_spec.rb
 - spec/mongoid/matchable/or_spec.rb
+- spec/mongoid/matchable/regexp_spec.rb
 - spec/mongoid/matchable/size_spec.rb
 - spec/mongoid/matchable_spec.rb
 - spec/mongoid/persistable/creatable_spec.rb

metadata.gz.sig

@@ -1 +0,0 @@
-�N�H��vb�E?���|%��wH�7ùq��({*4	�\!��?�R9��w#D��ٍ���	����9�ݒ(�s��+l�N�'������ǿ:=}%4'��3\Q����Q_¼{
A�J�$�H