carrierwave-mongoid 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c4cb70605ad487c0a0bc63a1e56a13aa35972e7
-  data.tar.gz: 290b467324f4e499eceba2a1ee28a7dff4e4cf36
+  metadata.gz: 213d8790d4c5ce59989b25b2a7cf381c32999565
+  data.tar.gz: 4bf5807ca58f0508eca2abb2fb732cb40ea181ea
 SHA512:
-  metadata.gz: 550171721afa4e19fa32c87ac862cb80511738111440e0a88c413dc1fbcf83c10a808b5d170a3bf9a2ea22e3e592998cf78a964a7a32cd4988d29c975359f4aa
-  data.tar.gz: 1151676161af15142e4302ee52ac7ea42e164a8b801ddbbb35634ff7e4e82e1ab4c8628a365450b8a240045a0bb2b3ab570f4355025a4f636875a4cc55903c08
+  metadata.gz: 7f0b95117e0a82f6a39d406ccbe97cc026ab73de9536c39e0b48b2a72d683dfb4301b1d3895326291fe11045dcc4cc0550d5b0a33b2ea66cd87d9b76f3b3bc8f
+  data.tar.gz: d351d3ff807fdbdddabcf0e7f49c188a0b9fe11615003523a7832e145d75e9be7a9fb214a11f323d03996aa91e729fe9d4f733969de83208a63079e65bb58e17

data/README.md

@@ -24,6 +24,13 @@ Or, in Rails you can add it to your Gemfile:
 gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
 ```
 
+Note: If using Rails 4, you'll need to make sure `mongoind-grid_fs` is `>= 1.9.0`.
+If in doubt, run `bundle update mongoind-grid_fs`
+
+```ruby
+gem 'mongoid-grid_fs', github: 'ahoward/mongoid-grid_fs'
+```
+
 ## Getting Started
 
 Follow the "Getting Started" directions in the main
@@ -153,14 +160,14 @@ match '/uploads/grid/user/avatar/:id/:filename' => 'gridfs#thumb_avatar', constr
 | ~> 0.2.0 | ([compare][compare-0.2], [dependencies][deps-0.2]) Rails >= 3.2, Mongoid ~> 2.0 |
 | ~> 0.1.0 | ([compare][compare-0.1], [dependencies][deps-0.1]) Rails <= 3.1                 |
 
-[compare-0.6]: https://github.com/carrierwaveuploader/carrierwave-mongoid/compare/v0.5.0...v0.6.1
+[compare-0.6]: https://github.com/carrierwaveuploader/carrierwave-mongoid/compare/v0.5.0...v0.6.2
 [compare-0.5]: https://github.com/carrierwaveuploader/carrierwave-mongoid/compare/v0.4.0...v0.5.0
 [compare-0.4]: https://github.com/carrierwaveuploader/carrierwave-mongoid/compare/v0.3.1...v0.4.0
 [compare-0.3]: https://github.com/carrierwaveuploader/carrierwave-mongoid/compare/v0.2.1...v0.3.1
 [compare-0.2]: https://github.com/carrierwaveuploader/carrierwave-mongoid/compare/v0.1.7...v0.2.2
 [compare-0.1]: https://github.com/carrierwaveuploader/carrierwave-mongoid/compare/v0.1.1...v0.1.7
 
-[deps-0.6]: https://rubygems.org/gems/carrierwave-mongoid/versions/0.6.1
+[deps-0.6]: https://rubygems.org/gems/carrierwave-mongoid/versions/0.6.2
 [deps-0.5]: https://rubygems.org/gems/carrierwave-mongoid/versions/0.5.0
 [deps-0.4]: https://rubygems.org/gems/carrierwave-mongoid/versions/0.4.0
 [deps-0.3]: https://rubygems.org/gems/carrierwave-mongoid/versions/0.3.1

data/lib/carrierwave/mongoid.rb

@@ -57,6 +57,14 @@ module CarrierWave
           changed_attributes.has_key?("#{column}")
         end
 
+        # The default Mongoid attribute_will_change! method is not enough
+        # when we want to upload a new file in an existing embedded document.
+        # The custom version of that method forces the callbacks to be
+        # ran and so does the upload.
+        def #{column}_will_change!
+          changed_attributes["#{column}"] = '_new_'
+        end
+
         def find_previous_model_for_#{column}
           if self.embedded?
             ancestors       = [[ self.metadata.key, self._parent ]].tap { |x| x.unshift([ x.first.last.metadata.key, x.first.last._parent ]) while x.first.last.embedded? }

data/lib/carrierwave/mongoid/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Mongoid
-    VERSION = "0.6.1"
+    VERSION = "0.6.2"
   end
 end

data/spec/mongoid_spec.rb

@@ -569,6 +569,7 @@ describe CarrierWave::Mongoid do
 
         @class.class_eval do
           embeds_many :mongo_locations, cascade_callbacks: true
+          accepts_nested_attributes_for :mongo_locations
         end
 
         @doc = @class.new
@@ -592,6 +593,12 @@ describe CarrierWave::Mongoid do
         doc.mongo_locations.first[:image].should == 'test.jpeg'
       end
 
+      it "changes the file" do
+        @doc.update_attributes mongo_locations_attributes: { '0' => { _id: @embedded_doc._id, image: stub_file('test.jpeg') } }
+        @doc.reload
+        @doc.mongo_locations.first[:image].should == 'test.jpeg'
+      end
+
       describe 'with double embedded documents' do
 
         before do
@@ -666,6 +673,38 @@ describe CarrierWave::Mongoid do
         include_examples "double embedded documents"
       end
     end
+
+    describe 'with embedded documents and nested attributes' do
+      before do
+        @embedded_doc_class = define_mongo_class('MongoLocation') do
+          include Mongoid::Document
+          mount_uploader :image, @uploader
+          embedded_in :mongo_user
+        end
+
+        @class.class_eval do
+          embeds_many :mongo_locations, cascade_callbacks: true
+          accepts_nested_attributes_for :mongo_locations
+        end
+
+        @doc = @class.new(mongo_locations_attributes: [{image: stub_file("old.jpeg")}])
+        @doc.save.should be_true
+        @embedded_doc = @doc.mongo_locations.first
+      end
+
+      it "should set the image on a save" do
+        @doc.reload
+        @doc.mongo_locations.first.image.path.should match(/old\.jpeg$/)
+        @embedded_doc.image.path.should match(/old\.jpeg$/)
+      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.reload
+        @doc.mongo_locations.first.image.path.should match(/new\.jpeg$/)
+        @embedded_doc.image.path.should match(/new\.jpeg$/)
+      end
+    end
   end
 
   describe '#mount_uploader removing old files with versions' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Jonas Nicklas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave