MONGOID-5222 fix array, set, regexp mongoize

Author: neilshweky

lib/mongoid/criteria/queryable/extensions/array.rb

@@ -133,7 +133,8 @@ module ClassMethods
             #
             # @return [ Object ] The evolved object.
             def evolve(object)
-              if object.is_a?(::Array)
+              case object
+              when ::Array, ::Set
                 object.map { |obj| obj.class.evolve(obj) }
               else
                 object

lib/mongoid/extensions/array.rb

@@ -147,7 +147,8 @@ def __mongoize_fk__(association, object)
         # @return [ Array | nil ] The object mongoized or nil.
         def mongoize(object)
           return if object.nil?
-          if object.is_a?(::Array)
+          case object
+          when ::Array, ::Set
             evolve(object).collect{ |obj| obj.class.mongoize(obj) }
           end
         end

lib/mongoid/extensions/regexp.rb

@@ -22,6 +22,8 @@ def mongoize(object)
           when ::Regexp then object
           when BSON::Regexp::Raw then object.compile
           end
+        rescue RegexpError
+          nil
         end
       end
     end

lib/mongoid/extensions/set.rb

@@ -41,7 +41,8 @@ def demongoize(object)
         def mongoize(object)
           return if object.nil?
           case object
-          when Array, Set then ::Array.mongoize(object.to_a)
+          when ::Set then ::Array.mongoize(object.to_a)
+          when ::Array then ::Array.mongoize(object).uniq
           end
         end
       end

spec/mongoid/criteria/queryable/extensions/array_spec.rb

@@ -33,6 +33,13 @@
         expect(described_class.evolve("testing")).to eq("testing")
       end
     end
+
+    context "when providing a set" do
+
+      it "returns an array" do
+        expect(described_class.evolve([ 1, 2, 3 ].to_set)).to eq([ 1, 2, 3 ])
+      end
+    end
   end
 
   describe "#__add__" do

spec/mongoid/extensions/array_spec.rb

@@ -488,12 +488,12 @@
       Date.new(2012, 1, 1)
     end
 
-    let(:array) do
+    let(:input) do
       [ date ]
     end
 
     let(:mongoized) do
-      Array.mongoize(array)
+      Array.mongoize(input)
     end
 
     it "mongoizes each element in the array" do
@@ -503,6 +503,20 @@
     it "converts the elements properly" do
       expect(mongoized.first).to eq(Time.utc(2012, 1, 1, 0, 0, 0))
     end
+
+    context "when passing in a set" do
+      let(:input) do
+        [ date ].to_set
+      end
+
+      it "mongoizes to an array" do
+        expect(mongoized).to be_a(Array)
+      end
+
+      it "converts the elements properly" do
+        expect(mongoized.first).to eq(Time.utc(2012, 1, 1, 0, 0, 0))
+      end
+    end
   end
 
   describe "#mongoize" do

spec/mongoid/extensions/regexp_spec.rb

@@ -72,6 +72,28 @@
         expect(value).to eq(/hello/)
       end
     end
+
+    context "when providing an invalid regexp" do
+
+      let(:value) do
+        Regexp.mongoize("[")
+      end
+
+      it "returns nil" do
+        expect(value).to be_nil
+      end
+    end
+
+    context "when providing an invalid Regexp to a BSON::Regexp::Raw" do
+
+      let(:value) do
+        Regexp.mongoize(BSON::Regexp::Raw.new("["))
+      end
+
+      it "returns nil" do
+        expect(value).to be_nil
+      end
+    end
   end
 
   describe "#mongoize" do

spec/mongoid/extensions/set_spec.rb

@@ -31,5 +31,48 @@
     it "returns an array" do
       expect(set.mongoize).to eq([ "test" ])
     end
+
+    context "when there are mongoizable values in the container" do
+      let(:date) do
+        Date.new(2012, 1, 1)
+      end
+
+      let(:mongoized) do
+        Set.mongoize(input)
+      end
+
+      context "when the input is an array" do
+
+        let(:input) do
+          [ date ]
+        end
+
+        it "mongoizes to a set" do
+          expect(mongoized).to be_a(Array)
+        end
+
+        it "mongoizes each element in the array" do
+          expect(mongoized.first).to be_a(Time)
+        end
+
+        it "converts the elements properly" do
+          expect(mongoized.first).to eq(Time.utc(2012, 1, 1, 0, 0, 0))
+        end
+      end
+
+      context "when the input is a set" do
+        let(:input) do
+          [ date ].to_set
+        end
+
+        it "mongoizes to a set" do
+          expect(mongoized).to be_a(Array)
+        end
+
+        it "converts the elements properly" do
+          expect(mongoized.first).to eq(Time.utc(2012, 1, 1, 0, 0, 0))
+        end
+      end
+    end
   end
 end