mongoid 6.0.3 → 6.1.0.rc0

data/spec/mongoid/criteria_spec.rb

@@ -3477,6 +3477,25 @@ describe Mongoid::Criteria do
         end
       end
 
+      context "when querying on a BSON::Decimal128", if: decimal128_supported? do
+
+        let(:decimal) do
+          BSON::Decimal128.new("0.0005")
+        end
+
+        let!(:band) do
+          Band.create(name: "Boards of Canada", decimal: decimal)
+        end
+
+        let(:from_db) do
+          Band.where(decimal: decimal).first
+        end
+
+        it "finds the document by the big decimal value" do
+          expect(from_db).to eq(band)
+        end
+      end
+
       context 'when querying on a polymorphic relation' do
 
         let(:movie) do

data/spec/mongoid/extensions/boolean_spec.rb

@@ -82,6 +82,13 @@ describe Mongoid::Boolean do
         end
       end
 
+      context "when provided on" do
+
+        it "returns true" do
+          expect(described_class.mongoize("on")).to eq(true)
+        end
+      end
+
       context "when provided false" do
 
         it "returns false" do
@@ -123,6 +130,13 @@ describe Mongoid::Boolean do
           expect(described_class.mongoize("n")).to eq(false)
         end
       end
+
+      context "when provided off" do
+
+        it "returns true" do
+          expect(described_class.mongoize("off")).to eq(false)
+        end
+      end
     end
   end
 

data/spec/mongoid/extensions/decimal128_spec.rb

@@ -0,0 +1,44 @@
+require "spec_helper"
+
+describe Mongoid::Extensions::Decimal128 do
+
+  let(:decimal128) do
+    BSON::Decimal128.new("0.0005")
+  end
+
+  describe "#__evolve_decimal128__" do
+
+    it "returns the same instance" do
+      expect(decimal128.__evolve_decimal128__).to be(decimal128)
+    end
+  end
+
+  describe ".evolve" do
+
+    context "when provided a single decimal128" do
+
+      let(:evolved) do
+        BSON::Decimal128.evolve(decimal128)
+      end
+
+      it "returns the decimal128" do
+        expect(evolved).to be(decimal128)
+      end
+    end
+
+    context "when provided an array of decimal128s" do
+
+      let(:other_decimal128) do
+        BSON::Decimal128.new("3.14")
+      end
+
+      let(:evolved) do
+        BSON::ObjectId.evolve([decimal128, other_decimal128])
+      end
+
+      it "returns the array of decimal128s" do
+        expect(evolved).to eq([decimal128, other_decimal128])
+      end
+    end
+  end
+end

data/spec/mongoid/indexable_spec.rb

@@ -122,6 +122,34 @@ describe Mongoid::Indexable do
         expect(indexes.get(_type: 1)).to_not be_nil
       end
     end
+
+    context "when a collation option is specified", if: collation_supported? do
+
+      let(:klass) do
+        Class.new do
+          include Mongoid::Document
+          store_in collection: "test_db_indexes"
+          index({ name: 1 }, { collation: { locale: 'en_US', strength: 2 }})
+        end
+      end
+
+      before do
+        klass.create_indexes
+      end
+
+      after do
+        klass.remove_indexes
+      end
+
+      let(:indexes) do
+        klass.collection.indexes
+      end
+
+      it "creates the indexes" do
+        expect(indexes.get("name_1")["collation"]).to_not be_nil
+        expect(indexes.get("name_1")["collation"]["locale"]).to eq('en_US')
+      end
+    end
   end
 
   describe ".add_indexes" do
@@ -270,6 +298,21 @@ describe Mongoid::Indexable do
       end
     end
 
+    context "when providing a collation option", if: collation_supported? do
+
+      before do
+        klass.index({ name: 1 }, collation: { locale: 'en_US', strength: 2 })
+      end
+
+      let(:options) do
+        klass.index_specification(name: 1).options
+      end
+
+      it "sets the index with a collation option" do
+        expect(options).to eq(collation: { locale: 'en_US', strength: 2 })
+      end
+    end
+
     context "when providing a compound index" do
 
       before do

data/spec/mongoid/query_cache_spec.rb

@@ -164,6 +164,40 @@ describe Mongoid::QueryCache do
         end
       end
 
+      context 'when the first query has a collation', if: collation_supported? do
+
+        before do
+          Band.where(name: 'DEPECHE MODE').collation(locale: 'en_US', strength: 2).to_a
+        end
+
+        context "when the next query has the same collation" do
+
+          it "uses the cache" do
+            expect_no_queries do
+              Band.where(name: 'DEPECHE MODE').collation(locale: 'en_US', strength: 2).to_a
+            end
+          end
+        end
+
+        context "when the next query does not have the same collation" do
+
+          it "queries again" do
+            expect_query(1) do
+              Band.where(name: 'DEPECHE MODE').collation(locale: 'fr', strength: 2).to_a
+            end
+          end
+        end
+
+        context "when the next query does not have a collation" do
+
+          it "queries again" do
+            expect_query(1) do
+              Band.where(name: 'DEPECHE MODE').to_a
+            end
+          end
+        end
+      end
+
       context "when the first query has no limit" do
 
         let(:game) do

data/spec/mongoid/relations/metadata_spec.rb

@@ -1982,5 +1982,4 @@ describe Mongoid::Relations::Metadata do
       end
     end
   end
-
 end

data/spec/mongoid/relations/referenced/many_spec.rb

@@ -2934,6 +2934,17 @@ describe Mongoid::Relations::Referenced::Many do
       it "applies the criteria to the documents" do
         expect(posts).to eq([ post_one ])
       end
+
+      context 'when providing a collation', if: collation_supported? do
+
+        let(:posts) do
+          person.posts.where(title: "FIRST").collation(locale: 'en_US', strength: 2)
+        end
+
+        it "applies the collation option to the query" do
+          expect(posts).to eq([ post_one ])
+        end
+      end
     end
 
     context "when providing a criteria class method" do

data/spec/mongoid/relations/referenced/many_to_many_spec.rb

@@ -2640,6 +2640,17 @@ describe Mongoid::Relations::Referenced::ManyToMany do
       it "applies the criteria to the documents" do
         expect(preferences).to eq([ preference_one ])
       end
+
+      context 'when providing a collation', if: collation_supported? do
+
+        let(:preferences) do
+          person.preferences.where(name: "FIRST").collation(locale: 'en_US', strength: 2).to_a
+        end
+
+        it "applies the collation option to the query" do
+          expect(preferences).to eq([ preference_one ])
+        end
+      end
     end
 
     context "when providing a criteria on id" do

data/spec/mongoid/scopable_spec.rb

@@ -227,6 +227,18 @@ describe Mongoid::Scopable do
 
     context "when provided a criteria" do
 
+      context 'when a collation is defined on the criteria', if: collation_supported? do
+
+        before do
+          Band.scope(:tests, ->{ Band.where(name: 'TESTING').collation(locale: 'en_US', strength: 2) })
+          Band.create(name: 'testing')
+        end
+
+        it 'applies the collation' do
+          expect(Band.tests.first['name']).to eq('testing')
+        end
+      end
+
       context "when the lambda includes a geo_near query" do
 
         before do

data/spec/spec_helper.rb

@@ -74,6 +74,15 @@ def non_legacy_server?
   Mongoid::Clients.default.cluster.servers.first.features.write_command_enabled?
 end
 
+def testing_replica_set?
+  Mongoid::Clients.default.cluster.replica_set?
+end
+
+def collation_supported?
+  Mongoid::Clients.default.cluster.next_primary.features.collation_enabled?
+end
+alias :decimal128_supported? :collation_supported?
+
 def testing_locally?
   !(ENV['CI'] == 'travis')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.1.0.rc0
 platform: ruby
 authors:
 - Durran Jordan
@@ -30,7 +30,7 @@ cert_chain:
   cGiNQIiHBj/9/xHfOyOthBPUevTiVnuffarDr434z/LGLwYzgaG5EcJFvZqpvUpP
   fGcAPtAZUMGLXwcOB1BJEFkDxUQIJiEpSmf4YzzZhEM=
   -----END CERTIFICATE-----
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -50,16 +50,22 @@ dependencies:
   name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 3.0.0
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -160,6 +166,7 @@ files:
 - lib/mongoid/errors/document_not_destroyed.rb
 - lib/mongoid/errors/document_not_found.rb
 - lib/mongoid/errors/eager_load.rb
+- lib/mongoid/errors/in_memory_collation_not_supported.rb
 - lib/mongoid/errors/invalid_collection.rb
 - lib/mongoid/errors/invalid_config_option.rb
 - lib/mongoid/errors/invalid_field.rb
@@ -206,6 +213,7 @@ files:
 - lib/mongoid/extensions/boolean.rb
 - lib/mongoid/extensions/date.rb
 - lib/mongoid/extensions/date_time.rb
+- lib/mongoid/extensions/decimal128.rb
 - lib/mongoid/extensions/false_class.rb
 - lib/mongoid/extensions/float.rb
 - lib/mongoid/extensions/hash.rb
@@ -690,6 +698,7 @@ files:
 - spec/mongoid/extensions/boolean_spec.rb
 - spec/mongoid/extensions/date_spec.rb
 - spec/mongoid/extensions/date_time_spec.rb
+- spec/mongoid/extensions/decimal128_spec.rb
 - spec/mongoid/extensions/false_class_spec.rb
 - spec/mongoid/extensions/float_spec.rb
 - spec/mongoid/extensions/hash_spec.rb
@@ -853,7 +862,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Elegant Persistence in Ruby for MongoDB.
@@ -1181,6 +1190,7 @@ test_files:
 - spec/mongoid/extensions/boolean_spec.rb
 - spec/mongoid/extensions/date_spec.rb
 - spec/mongoid/extensions/date_time_spec.rb
+- spec/mongoid/extensions/decimal128_spec.rb
 - spec/mongoid/extensions/false_class_spec.rb
 - spec/mongoid/extensions/float_spec.rb
 - spec/mongoid/extensions/hash_spec.rb