carrierwave-mongoid 0.2.0 → 0.2.1

data/lib/carrierwave/mongoid.rb

@@ -52,11 +52,11 @@ module CarrierWave
           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? }
             first_parent = ancestors.first.last
-            reloaded_parent = first_parent.class.find(first_parent.to_key.first)
+            reloaded_parent = first_parent.class.unscoped.find(first_parent.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)
+            self.class.unscoped.find(to_key.first)
           end
         end
 

data/lib/carrierwave/mongoid/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Mongoid
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/spec/mongoid_spec.rb

@@ -470,6 +470,36 @@ describe CarrierWave::Mongoid do
       end
     end
 
+    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
+      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
+      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
+      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
+      end
+
+    end
 
     describe 'with document embedded as embeds_one' do
       before do
@@ -492,6 +522,28 @@ describe CarrierWave::Mongoid do
       include_examples "embedded documents"
     end
 
+    describe 'with document embedded as embeds_one and parent document not matched the default scope' 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
+          default_scope where(:always_false => false)
+        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
@@ -535,36 +587,56 @@ describe CarrierWave::Mongoid do
           @double_embedded_doc.save.should be_true
         end
 
-        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
+        include_examples "double embedded documents"
+      end
+    end
+
+    describe 'with embedded documents and parent document not matched the default scope' do
+      before do
+        @embedded_doc_class = define_mongo_class('MongoLocation') do
+          include Mongoid::Document
+          mount_uploader :image, @uploader
+          embedded_in :mongo_user
         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
+        @class.class_eval do
+          embeds_many :mongo_locations
+          default_scope where(:always_false => false)
         end
 
-        it "should not remove file if old file had the same path" do
+        @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
+
+        before do
+          @double_embedded_doc_class = define_mongo_class('MongoItem') do
+            include Mongoid::Document
+            mount_uploader :image, @uploader
+            embedded_in :mongo_location
+          end
+
+          @embedded_doc_class.class_eval do
+            embeds_many :mongo_items
+          end
+
+          @doc = @class.new
+          @embedded_doc = @doc.mongo_locations.build
+          @embedded_doc.image = stub_file('old.jpeg')
+          @embedded_doc.save.should be_true
+
+          @double_embedded_doc = @embedded_doc.mongo_items.build
           @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
-        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
         end
 
+        include_examples "double embedded documents"
       end
-
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000 Z
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &70329431625080 !ruby/object:Gem::Requirement
+  requirement: &70153292588880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70329431625080
+  version_requirements: *70153292588880
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70329431624400 !ruby/object:Gem::Requirement
+  requirement: &70153292588280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70329431624400
+  version_requirements: *70153292588280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70329431623900 !ruby/object:Gem::Requirement
+  requirement: &70153292587700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70329431623900
+  version_requirements: *70153292587700
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70329431623420 !ruby/object:Gem::Requirement
+  requirement: &70153292587120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70329431623420
+  version_requirements: *70153292587120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70329431622880 !ruby/object:Gem::Requirement
+  requirement: &70153292586540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70329431622880
+  version_requirements: *70153292586540
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &70329431622380 !ruby/object:Gem::Requirement
+  requirement: &70153292585880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70329431622380
+  version_requirements: *70153292585880
 description: Mongoid support for CarrierWave
 email:
 - jonas.nicklas@gmail.com
@@ -119,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1522479817545957250
+      hash: 3527585187429890130
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1522479817545957250
+      hash: 3527585187429890130
 requirements: []
 rubyforge_project: carrierwave-mongoid
 rubygems_version: 1.8.11