carrierwave-mongoid 0.1.4 → 0.1.5

data/README.md

@@ -68,6 +68,16 @@ end
 
 ## Known issues and limitations
 
-Note that files mounted in embedded documents aren't saved when parent documents are saved.
-You must explicitly call save on embedded documents in order to save their attached files.
+Note that files mounted in embedded documents aren't saved when parent documents
+are saved. By default, mongoid does not cascade callbacks on embedded
+documents. In order to save the attached files on embedded documents, you must
+either explicitly call save on the embedded documents or you must configure the
+embedded association to cascade the callbacks automatically. For example:
+
+```ruby
+class User
+  embeds_many :pictures, cascade_callbacks: true
+end
+```
+
 You can read more about this [here](https://github.com/jnicklas/carrierwave/issues#issue/81)

data/Rakefile

@@ -1,4 +1,4 @@
-require 'bundler'
+require 'bundler/setup'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'

data/lib/carrierwave/mongoid.rb

@@ -43,7 +43,8 @@ module CarrierWave
             ancestors       = [[ self.metadata.key, self._parent ]].tap { |x| x.unshift([ x.first.last.metadata.key, x.first.last._parent ]) while x.first.last.embedded? }
             first_parent = ancestors.first.last
             reloaded_parent = first_parent.class.find(first_parent.to_key.first)
-            ancestors.inject(reloaded_parent) { |parent,(key,ancestor)| (parent.is_a?(Array) ? parent.find(ancestor.to_key.first) : parent).send(key) }.find(to_key.first)
+            association = ancestors.inject(reloaded_parent) { |parent,(key,ancestor)| (parent.is_a?(Array) ? parent.find(ancestor.to_key.first) : parent).send(key) }
+            association.is_a?(Array) ? association.find(to_key.first) : association
           else
             self.class.find(to_key.first)
           end

data/lib/carrierwave/mongoid/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Mongoid
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/spec/mongoid_spec.rb

@@ -21,16 +21,20 @@ end
 
 class MongoUploader < CarrierWave::Uploader::Base; end
 
-class WhiteListUploader < CarrierWave::Uploader::Base
+class IntegrityErrorUploader < CarrierWave::Uploader::Base
+  process :monkey
+  def monkey
+    raise CarrierWave::IntegrityError
+  end
   def extension_white_list
-    %w(txt)
+    %w(jpg)
   end
 end
 
 class ProcessingErrorUploader < CarrierWave::Uploader::Base
   process :monkey
   def monkey
-    raise CarrierWave::ProcessingError, "Ohh noez!"
+    raise CarrierWave::ProcessingError
   end
   def extension_white_list
     %w(jpg)
@@ -142,7 +146,7 @@ describe CarrierWave::Mongoid do
 
     context 'when validating integrity' do
       before do
-        mongo_user_klass = reset_mongo_class(WhiteListUploader)
+        mongo_user_klass = reset_mongo_class(IntegrityErrorUploader)
         @doc = mongo_user_klass.new
         @doc.image = stub_file('test.jpg')
       end
@@ -153,7 +157,7 @@ describe CarrierWave::Mongoid do
 
       it "should use I18n for integrity error messages" do
         @doc.valid?
-        @doc.errors[:image].should == ['is not an allowed file type']
+        @doc.errors[:image].should == ['is not of an allowed file type']
 
         change_locale_and_store_translations(:pt, :mongoid => {
           :errors => {
@@ -252,6 +256,7 @@ describe CarrierWave::Mongoid do
       end
 
       it "should mark image as changed when saving a new image" do
+        pending "This isn't working with Mongoid's current Dirty module. Mongoid's *_changed? methods don't behave the same as ActiveModel's *_changed? methods."
         @doc.image_changed?.should be_false
         @doc.image = stub_file("test.jpeg")
         @doc.image_changed?.should be_true
@@ -403,25 +408,7 @@ describe CarrierWave::Mongoid do
       end
     end
 
-    describe 'with embedded documents' 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
-        end
-
-        @doc = @class.new
-        @embedded_doc = @doc.mongo_locations.build
-        @embedded_doc.image = stub_file('old.jpeg')
-        @embedded_doc.save.should be_true
-      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
@@ -457,6 +444,49 @@ describe CarrierWave::Mongoid do
         @embedded_doc.save.should be_true
         @doc.title.should == "Title"
       end
+    end
+
+
+    describe 'with document embedded as embeds_one' 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_one :mongo_location
+        end
+
+        @doc = @class.new
+        @embedded_doc = @doc.build_mongo_location
+        @embedded_doc.image = stub_file('old.jpeg')
+        @embedded_doc.save.should be_true
+      end
+
+      include_examples "embedded documents"
+    end
+
+    describe 'with embedded documents' 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
+        end
+
+        @doc = @class.new
+        @embedded_doc = @doc.mongo_locations.build
+        @embedded_doc.image = stub_file('old.jpeg')
+        @embedded_doc.save.should be_true
+      end
+
+      include_examples "embedded documents"
 
       describe 'with double embedded documents' do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000 Z
+date: 2012-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &70289858492260 !ruby/object:Gem::Requirement
+  requirement: &70093414050040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *70289858492260
+  version_requirements: *70093414050040
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70289858490460 !ruby/object:Gem::Requirement
+  requirement: &70093414036060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70289858490460
+  version_requirements: *70093414036060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70289858489440 !ruby/object:Gem::Requirement
+  requirement: &70093414035240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70289858489440
+  version_requirements: *70093414035240
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70289858488840 !ruby/object:Gem::Requirement
+  requirement: &70093414034580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70289858488840
+  version_requirements: *70093414034580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70289858487980 !ruby/object:Gem::Requirement
+  requirement: &70093414034080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70289858487980
+  version_requirements: *70093414034080
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &70289858487300 !ruby/object:Gem::Requirement
+  requirement: &70093414033660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70289858487300
+  version_requirements: *70093414033660
 description: Mongoid support for CarrierWave
 email:
 - jonas.nicklas@gmail.com
@@ -116,12 +116,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 887805465808785246
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 887805465808785246
 requirements: []
 rubyforge_project: carrierwave-mongoid
 rubygems_version: 1.8.11