carrierwave-mongoid 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 546cccccad42fd221e2e5b7eb648a6496938066e
-  data.tar.gz: d72d1396c3087ce802928b71ed3ddaf46c400069
+  metadata.gz: e6d704a82ae744ea8d3986f24ec4f23595197f15
+  data.tar.gz: 219c19a07e25c6843b7a6ad5c704df981838c8fc
 SHA512:
-  metadata.gz: 623ddf9f57b47f8f5578b99c502d7aa5835e6bc9da8b678f3524dd9e9076d3f3054be2d97ab76b1f05f2937b5f6dc4de1cb6e45fb28d93e4f22e93a01f613746
-  data.tar.gz: 571f755e7e4f399a84867a3079136fd79189a38867ea7d63e13c08147261aea732722d250eed800f7bedf046ddd99c352ae4c0e9599d81299310e796403d81e1
+  metadata.gz: 7c3224e77f60d7f838ae6aaacfae419117a8e2ce7b30c40a1db665697b7c0a3f358f849c4dbc330c14b41679a6b395419577f2807f4bc0e7816f0f5aae9c1917
+  data.tar.gz: 800f1a5496c8b70b828e2c31dd6fcc946e0ae415cecbfce741a84e3f28be33f4c51bd4ad2e8ab1cadca954168ef1c3214d126fb63ee4f72cb809bbef259e381d

data/.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 services: mongodb
 
 notifications:
@@ -6,16 +7,19 @@ notifications:
 language: ruby
 cache: bundler
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1
+  - 2.2
   - jruby-19mode
 
 gemfile:
   - Gemfile
-  - gemfiles/carrierwave-0.8.gemfile
   - gemfiles/carrierwave-0.9.gemfile
   - gemfiles/carrierwave-master.gemfile
-  - gemfiles/mongoid-3.0.gemfile
   - gemfiles/mongoid-3.1.gemfile
   - gemfiles/mongoid-4.0.gemfile
+
+matrix:
+  allow_failures:
+    - gemfile: gemfiles/carrierwave-master.gemfile
+  fast_finish: true

data/README.md

@@ -1,4 +1,4 @@
-# CarrierWave for Mongoid [![Gem Version](https://badge.fury.io/rb/carrierwave-mongoid.svg)](http://badge.fury.io/rb/carrierwave-mongoid) [![Build Status](https://travis-ci.org/carrierwaveuploader/carrierwave-mongoid.svg)](http://travis-ci.org/carrierwaveuploader/carrierwave-mongoid) [![Code Climate](http://img.shields.io/codeclimate/github/carrierwaveuploader/carrierwave-mongoid.svg)](https://codeclimate.com/github/carrierwaveuploader/carrierwave-mongoid)
+# CarrierWave for Mongoid
 
 This gem adds support for Mongoid and MongoDB's GridFS to
 [CarrierWave](https://github.com/carrierwaveuploader/carrierwave/)
@@ -6,6 +6,8 @@ This gem adds support for Mongoid and MongoDB's GridFS to
 This functionality used to be part of CarrierWave but has since been extracted
 into this gem.
 
+[![Gem Version](http://img.shields.io/gem/v/carrierwave-mongoid.svg)](https://rubygems.org/gems/carrierwave-mongoid) [![Build Status](https://travis-ci.org/carrierwaveuploader/carrierwave-mongoid.svg)](http://travis-ci.org/carrierwaveuploader/carrierwave-mongoid) [![Code Climate](http://img.shields.io/codeclimate/github/carrierwaveuploader/carrierwave-mongoid.svg)](https://codeclimate.com/github/carrierwaveuploader/carrierwave-mongoid)
+
 ## Installation
 
 Install the latest release:
@@ -34,7 +36,7 @@ gem 'mongoid-grid_fs', github: 'ahoward/mongoid-grid_fs'
 ## Getting Started
 
 Follow the "Getting Started" directions in the main
-[Carrierwave repository](https://raw.github.com/carrierwaveuploader/carrierwave/).
+[Carrierwave repository](https://github.com/carrierwaveuploader/carrierwave/).
 
 [Suggested] Add the field to your attr_accessor list for mass assignment
 protection:

data/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"]

data/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: "../"

data/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: "../"

data/gemfiles/{carrierwave-0.8.gemfile → mongoid-5.0.gemfile}

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

data/lib/carrierwave/mongoid.rb

@@ -44,8 +44,10 @@ module CarrierWave
         end
 
         def remove_#{column}=(arg)
-          column = _mounter(:#{column}).serialization_column
-          send(:"\#{column}_will_change!")
+          if ['1', true].include?(arg)
+            column = _mounter(:#{column}).serialization_column
+            send(:"\#{column}_will_change!")
+          end
           super
         end
 

data/lib/carrierwave/mongoid/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Mongoid
-    VERSION = "0.7.1"
+    VERSION = "0.8.0"
   end
 end

data/spec/mongoid_spec.rb

@@ -238,11 +238,43 @@ describe CarrierWave::Mongoid do
 
   end
 
+  describe '#remove_image=' do
+    before do
+      mongo_user_klass = reset_mongo_class
+      @doc = mongo_user_klass.new
+    end
+
+    it "treats true argument such that attribute is marked as changed" do
+      @doc.remove_image = true
+      @doc.should be_image_changed
+    end
+
+    it "treats '1' argument such that attribute is marked as changed" do
+      @doc.remove_image = '1'
+      @doc.should be_image_changed
+    end
+
+    it "treats false argument such that attribute is not marked as changed" do
+      @doc.remove_image = false
+      @doc.should_not be_image_changed
+    end
+
+    it "treats nil argument such that attribute is not marked as changed" do
+      @doc.remove_image = nil
+      @doc.should_not be_image_changed
+    end
+
+    it "treats '0' argument such that attribute is not marked as changed" do
+      @doc.remove_image = '0'
+      @doc.should_not be_image_changed
+    end
+  end
+
   describe "#save" do
 
     it "after it was initialized with params" do
       doc = reset_mongo_class.new(:image => stub_file('test.jpg'))
-      doc.save.should be_true
+      doc.save.should be_truthy
       doc.image.should be_an_instance_of(MongoUploader)
       doc.image.current_path.should == public_path('uploads/test.jpg')
     end
@@ -255,7 +287,7 @@ describe CarrierWave::Mongoid do
     context "when no file is assigned" do
 
       it "image is blank" do
-        @doc.save.should be_true
+        @doc.save.should be_truthy
         @doc.image.should be_blank
       end
 
@@ -265,14 +297,14 @@ describe CarrierWave::Mongoid do
 
       it "copies the file to the upload directory" do
         @doc.image = stub_file('test.jpg')
-        @doc.save.should be_true
+        @doc.save.should be_truthy
         @doc.image.should be_an_instance_of(MongoUploader)
         @doc.image.current_path.should == public_path('uploads/test.jpg')
       end
 
       it "saves the filename in the database" do
         @doc.image = stub_file('test.jpg')
-        @doc.save.should be_true
+        @doc.save.should be_truthy
         @doc[:image].should == 'test.jpg'
         @doc.image_identifier.should == 'test.jpg'
       end
@@ -283,7 +315,7 @@ describe CarrierWave::Mongoid do
           @doc.image = stub_file('test.jpeg')
           @doc.save
           @doc.remove_image = true
-          @doc.save.should be_true
+          @doc.save.should be_truthy
           @doc.reload
           @doc.image.should be_blank
           @doc.image_identifier.should be_blank
@@ -292,14 +324,14 @@ describe CarrierWave::Mongoid do
       end
 
       it "should mark image as changed when saving a new image" do
-        @doc.image_changed?.should be_false
+        @doc.image_changed?.should be_falsey
         @doc.image = stub_file("test.jpeg")
-        @doc.image_changed?.should be_true
+        @doc.image_changed?.should be_truthy
         @doc.save
         @doc.reload
-        @doc.image_changed?.should be_false
+        @doc.image_changed?.should be_falsey
         @doc.image = stub_file("test.jpg")
-        @doc.image_changed?.should be_true
+        @doc.image_changed?.should be_truthy
       end
 
     end
@@ -337,12 +369,12 @@ describe CarrierWave::Mongoid do
 
       it "removes the file from the filesystem" do
         @doc.image = stub_file('test.jpeg')
-        @doc.save.should be_true
-        File.exist?(public_path('uploads/test.jpeg')).should be_true
+        @doc.save.should be_truthy
+        File.exist?(public_path('uploads/test.jpeg')).should be_truthy
         @doc.image.should be_an_instance_of(MongoUploader)
         @doc.image.current_path.should == public_path('uploads/test.jpeg')
         @doc.destroy
-        File.exist?(public_path('uploads/test.jpeg')).should be_false
+        File.exist?(public_path('uploads/test.jpeg')).should be_falsey
       end
 
     end
@@ -351,13 +383,13 @@ describe CarrierWave::Mongoid do
 
       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
@@ -374,8 +406,8 @@ describe CarrierWave::Mongoid do
       @class.field :foo
       @doc = @class.new
       @doc.image = stub_file('old.jpeg')
-      @doc.save.should be_true
-      File.exists?(public_path('uploads/old.jpeg')).should be_true
+      @doc.save.should be_truthy
+      File.exists?(public_path('uploads/old.jpeg')).should be_truthy
     end
 
     after do
@@ -386,30 +418,30 @@ describe CarrierWave::Mongoid do
 
       it "should remove old file if old file had a different path" do
         @doc.image = stub_file('new.jpeg')
-        @doc.save.should be_true
-        File.exists?(public_path('uploads/new.jpeg')).should be_true
-        File.exists?(public_path('uploads/old.jpeg')).should be_false
+        @doc.save.should be_truthy
+        File.exists?(public_path('uploads/new.jpeg')).should be_truthy
+        File.exists?(public_path('uploads/old.jpeg')).should be_falsey
       end
 
       it "should not remove old file if old file had a different path but config is false" do
         @uploader.stub(:remove_previously_stored_files_after_update).and_return(false)
         @doc.image = stub_file('new.jpeg')
-        @doc.save.should be_true
-        File.exists?(public_path('uploads/new.jpeg')).should be_true
-        File.exists?(public_path('uploads/old.jpeg')).should be_true
+        @doc.save.should be_truthy
+        File.exists?(public_path('uploads/new.jpeg')).should be_truthy
+        File.exists?(public_path('uploads/old.jpeg')).should be_truthy
       end
 
       it "should not remove file if old file had the same path" do
         @doc.image = stub_file('old.jpeg')
-        @doc.save.should be_true
-        File.exists?(public_path('uploads/old.jpeg')).should be_true
+        @doc.save.should be_truthy
+        File.exists?(public_path('uploads/old.jpeg')).should be_truthy
       end
 
       it "should not remove file if validations fail on save" do
         @class.validate { |r| r.errors.add :textfile, "FAIL!" }
         @doc.image = stub_file('new.jpeg')
-        @doc.save.should be_false
-        File.exists?(public_path('uploads/old.jpeg')).should be_true
+        @doc.save.should be_falsey
+        File.exists?(public_path('uploads/old.jpeg')).should be_truthy
       end
     end
 
@@ -423,60 +455,60 @@ describe CarrierWave::Mongoid do
 
         @doc.image = stub_file('old.jpeg')
         @doc.foo = "test"
-        @doc.save.should be_true
-        File.exists?(public_path('uploads/test.jpeg')).should be_true
+        @doc.save.should be_truthy
+        File.exists?(public_path('uploads/test.jpeg')).should be_truthy
         @doc.image.read.should == "this is stuff"
       end
 
       it "should not remove file if old file had the same dynamic path" do
         @doc.image = stub_file('test.jpeg')
-        @doc.save.should be_true
-        File.exists?(public_path('uploads/test.jpeg')).should be_true
+        @doc.save.should be_truthy
+        File.exists?(public_path('uploads/test.jpeg')).should be_truthy
       end
 
       it "should remove old file if old file had a different dynamic path" do
         @doc.foo = "new"
         @doc.image = stub_file('test.jpeg')
-        @doc.save.should be_true
-        File.exists?(public_path('uploads/new.jpeg')).should be_true
-        File.exists?(public_path('uploads/test.jpeg')).should be_false
+        @doc.save.should be_truthy
+        File.exists?(public_path('uploads/new.jpeg')).should be_truthy
+        File.exists?(public_path('uploads/test.jpeg')).should be_falsey
       end
     end
 
     shared_examples "embedded documents" do
       it "should remove old file if old file had a different path" do
         @embedded_doc.image = stub_file('new.jpeg')
-        @embedded_doc.save.should be_true
-        File.exists?(public_path('uploads/new.jpeg')).should be_true
-        File.exists?(public_path('uploads/old.jpeg')).should be_false
+        @embedded_doc.save.should be_truthy
+        File.exists?(public_path('uploads/new.jpeg')).should be_truthy
+        File.exists?(public_path('uploads/old.jpeg')).should be_falsey
       end
 
       it "should not remove old file if old file had a different path but config is false" do
         @embedded_doc.image.stub(:remove_previously_stored_files_after_update).and_return(false)
         @embedded_doc.image = stub_file('new.jpeg')
-        @embedded_doc.save.should be_true
-        File.exists?(public_path('uploads/new.jpeg')).should be_true
-        File.exists?(public_path('uploads/old.jpeg')).should be_true
+        @embedded_doc.save.should be_truthy
+        File.exists?(public_path('uploads/new.jpeg')).should be_truthy
+        File.exists?(public_path('uploads/old.jpeg')).should be_truthy
       end
 
       it "should not remove file if old file had the same path" do
         @embedded_doc.image = stub_file('old.jpeg')
-        @embedded_doc.save.should be_true
-        File.exists?(public_path('uploads/old.jpeg')).should be_true
+        @embedded_doc.save.should be_truthy
+        File.exists?(public_path('uploads/old.jpeg')).should be_truthy
       end
 
       it "should not remove file if validations fail on save" do
         @embedded_doc_class.validate { |r| r.errors.add :textfile, "FAIL!" }
         @embedded_doc.image = stub_file('new.jpeg')
-        @embedded_doc.save.should be_false
-        File.exists?(public_path('uploads/old.jpeg')).should be_true
+        @embedded_doc.save.should be_falsey
+        File.exists?(public_path('uploads/old.jpeg')).should be_truthy
       end
 
       it "should not touch parent's dirty attributes" do
         @class.field :title
         @doc.title = "Title"
         @embedded_doc.image = stub_file('new.jpeg')
-        @embedded_doc.save.should be_true
+        @embedded_doc.save.should be_truthy
         @doc.title.should == "Title"
       end
     end
@@ -484,30 +516,30 @@ describe CarrierWave::Mongoid do
     shared_examples "double embedded documents" do
       it "should remove old file if old file had a different path" do
         @double_embedded_doc.image = stub_file('new.jpeg')
-        @double_embedded_doc.save.should be_true
-        File.exists?(public_path('uploads/new.jpeg')).should be_true
-        File.exists?(public_path('uploads/old.jpeg')).should be_false
+        @double_embedded_doc.save.should be_truthy
+        File.exists?(public_path('uploads/new.jpeg')).should be_truthy
+        File.exists?(public_path('uploads/old.jpeg')).should be_falsey
       end
 
       it "should not remove old file if old file had a different path but config is false" do
         @double_embedded_doc.image.stub(:remove_previously_stored_files_after_update).and_return(false)
         @double_embedded_doc.image = stub_file('new.jpeg')
-        @double_embedded_doc.save.should be_true
-        File.exists?(public_path('uploads/new.jpeg')).should be_true
-        File.exists?(public_path('uploads/old.jpeg')).should be_true
+        @double_embedded_doc.save.should be_truthy
+        File.exists?(public_path('uploads/new.jpeg')).should be_truthy
+        File.exists?(public_path('uploads/old.jpeg')).should be_truthy
       end
 
       it "should not remove file if old file had the same path" do
         @double_embedded_doc.image = stub_file('old.jpeg')
-        @double_embedded_doc.save.should be_true
-        File.exists?(public_path('uploads/old.jpeg')).should be_true
+        @double_embedded_doc.save.should be_truthy
+        File.exists?(public_path('uploads/old.jpeg')).should be_truthy
       end
 
       it "should not remove file if validations fail on save" do
         @double_embedded_doc_class.validate { |r| r.errors.add :textfile, "FAIL!" }
         @double_embedded_doc.image = stub_file('new.jpeg')
-        @double_embedded_doc.save.should be_false
-        File.exists?(public_path('uploads/old.jpeg')).should be_true
+        @double_embedded_doc.save.should be_falsey
+        File.exists?(public_path('uploads/old.jpeg')).should be_truthy
       end
 
     end
@@ -527,7 +559,7 @@ describe CarrierWave::Mongoid do
         @doc = @class.new
         @embedded_doc = @doc.build_mongo_location
         @embedded_doc.image = stub_file('old.jpeg')
-        @embedded_doc.save.should be_true
+        @embedded_doc.save.should be_truthy
       end
 
       include_examples "embedded documents"
@@ -549,7 +581,7 @@ describe CarrierWave::Mongoid do
         @doc = @class.new
         @embedded_doc = @doc.build_mongo_location
         @embedded_doc.image = stub_file('old.jpeg')
-        @embedded_doc.save.should be_true
+        @embedded_doc.save.should be_truthy
       end
 
       include_examples "embedded documents"
@@ -571,7 +603,7 @@ describe CarrierWave::Mongoid do
         @doc = @class.new
         @embedded_doc = @doc.mongo_locations.build
         @embedded_doc.image = stub_file('old.jpeg')
-        @embedded_doc.save.should be_true
+        @embedded_doc.save.should be_truthy
       end
 
       include_examples "embedded documents"
@@ -579,11 +611,11 @@ describe CarrierWave::Mongoid do
       it "attaches a new file to an existing document that had no file at first" do
         doc = @class.new
         doc.mongo_locations.build
-        doc.save.should be_true
+        doc.save.should be_truthy
         doc.reload
 
         doc.mongo_locations.first.image = stub_file('test.jpeg')
-        doc.save.should be_true
+        doc.save.should be_truthy
         doc.reload
 
         doc.mongo_locations.first[:image].should == 'test.jpeg'
@@ -617,11 +649,11 @@ describe CarrierWave::Mongoid do
           @doc = @class.new
           @embedded_doc = @doc.mongo_locations.build
           @embedded_doc.image = stub_file('old.jpeg')
-          @embedded_doc.save.should be_true
+          @embedded_doc.save.should be_truthy
 
           @double_embedded_doc = @embedded_doc.mongo_items.build
           @double_embedded_doc.image = stub_file('old.jpeg')
-          @double_embedded_doc.save.should be_true
+          @double_embedded_doc.save.should be_truthy
         end
 
         include_examples "double embedded documents"
@@ -644,7 +676,7 @@ describe CarrierWave::Mongoid do
         @doc = @class.new
         @embedded_doc = @doc.mongo_locations.build
         @embedded_doc.image = stub_file('old.jpeg')
-        @embedded_doc.save.should be_true
+        @embedded_doc.save.should be_truthy
       end
 
       include_examples "embedded documents"
@@ -665,11 +697,11 @@ describe CarrierWave::Mongoid do
           @doc = @class.new
           @embedded_doc = @doc.mongo_locations.build
           @embedded_doc.image = stub_file('old.jpeg')
-          @embedded_doc.save.should be_true
+          @embedded_doc.save.should be_truthy
 
           @double_embedded_doc = @embedded_doc.mongo_items.build
           @double_embedded_doc.image = stub_file('old.jpeg')
-          @double_embedded_doc.save.should be_true
+          @double_embedded_doc.save.should be_truthy
         end
 
         include_examples "double embedded documents"
@@ -690,7 +722,7 @@ describe CarrierWave::Mongoid do
         end
 
         @doc = @class.new(mongo_locations_attributes: [{image: stub_file("old.jpeg")}])
-        @doc.save.should be_true
+        @doc.save.should be_truthy
         @embedded_doc = @doc.mongo_locations.first
       end
 
@@ -701,7 +733,7 @@ describe CarrierWave::Mongoid do
       end
 
       it "should update the image on update_attributes" do
-        @doc.update_attributes(mongo_locations_attributes: [{id: @embedded_doc.id, image: stub_file("new.jpeg")}]).should be_true
+        @doc.update_attributes(mongo_locations_attributes: [{id: @embedded_doc.id, image: stub_file("new.jpeg")}]).should be_truthy
         @doc.reload
         @doc.mongo_locations.first.image.path.should match(/new\.jpeg$/)
         @embedded_doc.image.path.should match(/new\.jpeg$/)
@@ -717,9 +749,9 @@ describe CarrierWave::Mongoid do
       @class = reset_mongo_class(@uploader)
       @doc = @class.new
       @doc.image = stub_file('old.jpeg')
-      @doc.save.should be_true
-      File.exists?(public_path('uploads/old.jpeg')).should be_true
-      File.exists?(public_path('uploads/thumb_old.jpeg')).should be_true
+      @doc.save.should be_truthy
+      File.exists?(public_path('uploads/old.jpeg')).should be_truthy
+      File.exists?(public_path('uploads/thumb_old.jpeg')).should be_truthy
     end
 
     after do
@@ -728,18 +760,18 @@ describe CarrierWave::Mongoid do
 
     it "should remove old file if old file had a different path" do
       @doc.image = stub_file('new.jpeg')
-      @doc.save.should be_true
-      File.exists?(public_path('uploads/new.jpeg')).should be_true
-      File.exists?(public_path('uploads/thumb_new.jpeg')).should be_true
-      File.exists?(public_path('uploads/old.jpeg')).should be_false
-      File.exists?(public_path('uploads/thumb_old.jpeg')).should be_false
+      @doc.save.should be_truthy
+      File.exists?(public_path('uploads/new.jpeg')).should be_truthy
+      File.exists?(public_path('uploads/thumb_new.jpeg')).should be_truthy
+      File.exists?(public_path('uploads/old.jpeg')).should be_falsey
+      File.exists?(public_path('uploads/thumb_old.jpeg')).should be_falsey
     end
 
     it "should not remove file if old file had the same path" do
       @doc.image = stub_file('old.jpeg')
-      @doc.save.should be_true
-      File.exists?(public_path('uploads/old.jpeg')).should be_true
-      File.exists?(public_path('uploads/thumb_old.jpeg')).should be_true
+      @doc.save.should be_truthy
+      File.exists?(public_path('uploads/old.jpeg')).should be_truthy
+      File.exists?(public_path('uploads/thumb_old.jpeg')).should be_truthy
     end
   end
 
@@ -753,9 +785,9 @@ describe CarrierWave::Mongoid do
       @doc = @class.new
       @doc.image = stub_file('old.jpeg')
       @doc.textfile = stub_file('old.txt')
-      @doc.save.should be_true
-      File.exists?(public_path('uploads/old.jpeg')).should be_true
-      File.exists?(public_path('uploads/old.txt')).should be_true
+      @doc.save.should be_truthy
+      File.exists?(public_path('uploads/old.jpeg')).should be_truthy
+      File.exists?(public_path('uploads/old.txt')).should be_truthy
     end
 
     after do
@@ -765,32 +797,32 @@ describe CarrierWave::Mongoid do
     it "should remove old file1 and file2 if old file1 and file2 had a different paths" do
       @doc.image = stub_file('new.jpeg')
       @doc.textfile = stub_file('new.txt')
-      @doc.save.should be_true
-      File.exists?(public_path('uploads/new.jpeg')).should be_true
-      File.exists?(public_path('uploads/old.jpeg')).should be_false
-      File.exists?(public_path('uploads/new.txt')).should be_true
-      File.exists?(public_path('uploads/old.txt')).should be_false
+      @doc.save.should be_truthy
+      File.exists?(public_path('uploads/new.jpeg')).should be_truthy
+      File.exists?(public_path('uploads/old.jpeg')).should be_falsey
+      File.exists?(public_path('uploads/new.txt')).should be_truthy
+      File.exists?(public_path('uploads/old.txt')).should be_falsey
     end
 
     it "should remove old file1 but not file2 if old file1 had a different path but old file2 has the same path" do
       @doc.image = stub_file('new.jpeg')
       @doc.textfile = stub_file('old.txt')
-      @doc.save.should be_true
-      File.exists?(public_path('uploads/new.jpeg')).should be_true
-      File.exists?(public_path('uploads/old.jpeg')).should be_false
-      File.exists?(public_path('uploads/old.txt')).should be_true
+      @doc.save.should be_truthy
+      File.exists?(public_path('uploads/new.jpeg')).should be_truthy
+      File.exists?(public_path('uploads/old.jpeg')).should be_falsey
+      File.exists?(public_path('uploads/old.txt')).should be_truthy
     end
 
     it "should not remove file1 or file2 if file1 and file2 have the same paths" do
       @doc.image = stub_file('old.jpeg')
       @doc.textfile = stub_file('old.txt')
-      @doc.save.should be_true
-      File.exists?(public_path('uploads/old.jpeg')).should be_true
-      File.exists?(public_path('uploads/old.txt')).should be_true
+      @doc.save.should be_truthy
+      File.exists?(public_path('uploads/old.jpeg')).should be_truthy
+      File.exists?(public_path('uploads/old.txt')).should be_truthy
     end
   end
 
-  describe '#mount_uploader removing old files with with mount_on' do
+  describe '#mount_uploader removing old files with mount_on' do
 
     before do
       @class = reset_mongo_class
@@ -798,8 +830,8 @@ describe CarrierWave::Mongoid do
       @class.mount_uploader(:avatar, @uploader1, :mount_on => :another_image)
       @doc = @class.new
       @doc.avatar = stub_file('old.jpeg')
-      @doc.save.should be_true
-      File.exists?(public_path('uploads/old.jpeg')).should be_true
+      @doc.save.should be_truthy
+      File.exists?(public_path('uploads/old.jpeg')).should be_truthy
     end
 
     after do
@@ -808,15 +840,15 @@ describe CarrierWave::Mongoid do
 
     it "should remove old file if old file had a different path" do
       @doc.avatar = stub_file('new.jpeg')
-      @doc.save.should be_true
-      File.exists?(public_path('uploads/new.jpeg')).should be_true
-      File.exists?(public_path('uploads/old.jpeg')).should be_false
+      @doc.save.should be_truthy
+      File.exists?(public_path('uploads/new.jpeg')).should be_truthy
+      File.exists?(public_path('uploads/old.jpeg')).should be_falsey
     end
 
     it "should not remove file if old file had the same path" do
       @doc.avatar = stub_file('old.jpeg')
-      @doc.save.should be_true
-      File.exists?(public_path('uploads/old.jpeg')).should be_true
+      @doc.save.should be_truthy
+      File.exists?(public_path('uploads/old.jpeg')).should be_truthy
     end
   end
 
@@ -832,21 +864,21 @@ describe CarrierWave::Mongoid do
         end
 
         @doc = @class.new(image: stub_file("old.jpeg"))
-        @doc.save.should be_true
+        @doc.save.should be_truthy
       end
 
       it "should not remove underlying image after #destroy" do
-        @doc.destroy.should be_true
+        @doc.destroy.should be_truthy
         @class.count.should eql(0)
         @class.deleted.count.should eql(1)
-        File.exist?(public_path('uploads/old.jpeg')).should be_true
+        File.exist?(public_path('uploads/old.jpeg')).should be_truthy
       end
 
       it "should remove underlying image after #destroy!" do
-        @doc.destroy!.should be_true
+        @doc.destroy!.should be_truthy
         @class.count.should eql(0)
         @class.deleted.count.should eql(0)
-        File.exist?(public_path('uploads/old.jpeg')).should be_false
+        File.exist?(public_path('uploads/old.jpeg')).should be_falsey
       end
     end
   end

data/spec/spec_helper.rb

@@ -44,6 +44,8 @@ module CarrierWave
     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
         begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Jonas Nicklas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -38,9 +38,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -48,9 +48,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: mongoid-grid_fs
   requirement: !ruby/object:Gem::Requirement
@@ -141,12 +141,11 @@ files:
 - README.md
 - Rakefile
 - carrierwave-mongoid.gemspec
-- gemfiles/carrierwave-0.8.gemfile
 - gemfiles/carrierwave-0.9.gemfile
 - gemfiles/carrierwave-master.gemfile
-- gemfiles/mongoid-3.0.gemfile
 - gemfiles/mongoid-3.1.gemfile
 - gemfiles/mongoid-4.0.gemfile
+- gemfiles/mongoid-5.0.gemfile
 - lib/carrierwave/mongoid.rb
 - lib/carrierwave/mongoid/version.rb
 - lib/carrierwave/storage/grid_fs.rb
@@ -181,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: carrierwave-mongoid
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Mongoid support for CarrierWave

data/gemfiles/mongoid-3.0.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem "mongoid", github: "mongoid/mongoid", branch: "3.0.0-stable"
-gem "activemodel", "~> 3.2"
-
-gemspec path: "../"