Merge pull request #151 from carrierwaveuploader/mongoid5

Allow mongoid 5

carrierwave-mongoid.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "carrierwave", [">= 0.8.0", "< 0.11.0"]
-  s.add_dependency "mongoid", [">= 3.0", "< 5.0"]
+  s.add_dependency "mongoid", [">= 3.0", "<= 6.0"]
   s.add_dependency "mongoid-grid_fs", [">= 1.3", "< 3.0"]
   s.add_development_dependency "rspec", ["~> 2.14"]
   s.add_development_dependency "rake", ["~> 10.0"]

gemfiles/mongoid-3.1.gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "mongoid", github: "mongoid/mongoid", branch: "3.1.0-stable"
+gem "mongoid", "~> 3.1.0"
 
 gemspec path: "../"

gemfiles/mongoid-4.0.gemfile

@@ -1,6 +1,5 @@
 source "https://rubygems.org"
 
-gem "mongoid-grid_fs", github: "ahoward/mongoid-grid_fs", branch: "master"
-gem "mongoid", github: "mongoid/mongoid", branch: "master"
+gem "mongoid", "~> 4.0.0"
 
 gemspec path: "../"

gemfiles/mongoid-5.0.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "mongoid", "~> 5.0.0"
+
+gemspec path: "../"

spec/mongoid_spec.rb

@@ -383,13 +383,13 @@ def extension_white_list
 
       it "deletes the instance of MongoUser after save" do
         @doc.save
-        MongoUser.count.should eql(1)
+        MongoUser.count.should eq(1)
         @doc.destroy
       end
 
       it "deletes the instance of MongoUser after save and then re-looking up the instance" do
         @doc.save
-        MongoUser.count.should eql(1)
+        MongoUser.count.should eq(1)
         @doc = MongoUser.first
         @doc.destroy
       end

spec/spec_helper.rb

@@ -44,6 +44,8 @@ def stub_tempfile(filename, mime_type=nil, fake_name=nil)
     end
 
     module I18nHelpers
+      I18n.enforce_available_locales = false if I18n.respond_to? :enforce_available_locales=
+
       def change_locale_and_store_translations(locale, translations, &block)
         current_locale = I18n.locale
         current_enforce = I18n.config.enforce_available_locales