carrierwave-mongoid 0.10.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e99261d64cb64243eef199fc22b4599d572c4034
-  data.tar.gz: 6f33d3f051088d74eade5ccf6eeb34a563272330
+  metadata.gz: 04bf7a5d64de29d4e762df968da6ed5aaab22360
+  data.tar.gz: 46a9e9b1ab8d7708e909607b9b9d0c71c48b6640
 SHA512:
-  metadata.gz: 351fa894f2dfb310e734f47d442c10a919387f3f466602677221cda23a5c7d0bced7cba49fa009a48e7a307a1d56b6d95d02e3b7ef3d046e4077b53c96757ac0
-  data.tar.gz: 8c7280d676824d24a6071238a6c3319da67ed616f8cd458cc1bd4b78fd7c80016f1e22111283cba0e60f18db539e848ea54a0d85edab2e33333efd32088a2add
+  metadata.gz: 65b94440d485d166451a18d624e0ffa2418961fe45dde38c7a23b6fe2684586164b90d2aac2f07070a5c4b96571b9e2513edda55a41cfac1443eb50972ad89c0
+  data.tar.gz: f14e0428c3e97646c4a0465e06058077a577bfa016b22d6637ed3e2b5672f283bc934883b2b74d2367ac2fd284fb5fbb2712d8b95c7e2d10da54777ac41b92ac

data/.travis.yml

@@ -7,26 +7,20 @@ notifications:
 language: ruby
 cache: bundler
 rvm:
-  - 2.1.9
-  - 2.2.5
-  - 2.3.1
-  - jruby-19mode
+  - 2.2.8
+  - 2.3.5
+  - 2.4.2
 
 gemfile:
   - Gemfile
-  - gemfiles/carrierwave-0.9.gemfile
   - gemfiles/carrierwave-0.10.gemfile
-  - gemfiles/carrierwave-master.gemfile
+  - gemfiles/carrierwave-0.11.gemfile
+  - gemfiles/carrierwave-1.0.gemfile
+  - gemfiles/carrierwave-1.1.gemfile
   - gemfiles/mongoid-3.1.gemfile
   - gemfiles/mongoid-4.0.gemfile
   - gemfiles/mongoid-5.0.gemfile
+  - gemfiles/mongoid-6.0.gemfile
 
 matrix:
-  allow_failures:
-    - gemfile: gemfiles/carrierwave-master.gemfile
   fast_finish: true
-  include:
-    - rvm: 2.2.5
-      gemfile: gemfiles/mongoid-6.0.gemfile
-    - rvm: 2.3.1
-      gemfile: gemfiles/mongoid-6.0.gemfile

data/Gemfile

@@ -1,8 +1,4 @@
 source "http://rubygems.org"
 
-group :development, :test do
-  gem 'json', :platforms => [:jruby]
-end
-
 # Specify your gem's dependencies in carrierwave-mongoid.gemspec
 gemspec

data/README.md

@@ -156,18 +156,22 @@ match '/uploads/grid/user/avatar/:id/:filename' => 'gridfs#thumb_avatar', constr
 
 ## Version differences
 
-| Version  | Notes                                                                           |
-|----------|---------------------------------------------------------------------------------|
-| ~> 0.9.0 | ([compare][compare-0.9], [dependencies][deps-0.9]) Carrierwave 0.11 support     |
-| ~> 0.8.0 | ([compare][compare-0.8], [dependencies][deps-0.8]) Mongoid 5 support, bug fixes |
-| ~> 0.7.0 | ([compare][compare-0.7], [dependencies][deps-0.7]) Mongoid 3 & 4, bug fixes     |
-| ~> 0.6.0 | ([compare][compare-0.6], [dependencies][deps-0.6]) Mongoid 3 & 4, bug fixes     |
-| ~> 0.5.0 | ([compare][compare-0.5], [dependencies][deps-0.5]) Mongoid::Paranoia support    |
-| ~> 0.4.0 | ([compare][compare-0.4], [dependencies][deps-0.4]) Carrierwave bump             |
-| ~> 0.3.0 | ([compare][compare-0.3], [dependencies][deps-0.3]) Mongoid >= 3.0               |
-| ~> 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                 |
-
+| Version   | Notes                                                                           |
+|-----------|---------------------------------------------------------------------------------|
+| ~> 1.0.0  | ([compare][compare-1.0], [dependencies][deps-1.0]) Carrierwave 1.x support      |
+| ~> 0.10.0 | ([compare][compare-0.10], [dependencies][deps-0.10]) Mongoid 6.0  support       |
+| ~> 0.9.0  | ([compare][compare-0.9], [dependencies][deps-0.9]) Carrierwave 0.11 support     |
+| ~> 0.8.0  | ([compare][compare-0.8], [dependencies][deps-0.8]) Mongoid 5 support, bug fixes |
+| ~> 0.7.0  | ([compare][compare-0.7], [dependencies][deps-0.7]) Mongoid 3 & 4, bug fixes     |
+| ~> 0.6.0  | ([compare][compare-0.6], [dependencies][deps-0.6]) Mongoid 3 & 4, bug fixes     |
+| ~> 0.5.0  | ([compare][compare-0.5], [dependencies][deps-0.5]) Mongoid::Paranoia support    |
+| ~> 0.4.0  | ([compare][compare-0.4], [dependencies][deps-0.4]) Carrierwave bump             |
+| ~> 0.3.0  | ([compare][compare-0.3], [dependencies][deps-0.3]) Mongoid >= 3.0               |
+| ~> 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-1.0]: https://github.com/carrierwaveuploader/carrierwave-mongoid/compare/v0.10.0...v1.0.0
+[compare-0.10]: https://github.com/carrierwaveuploader/carrierwave-mongoid/compare/v0.9.0...v0.10.0
 [compare-0.9]: https://github.com/carrierwaveuploader/carrierwave-mongoid/compare/v0.8.1...v0.9.0
 [compare-0.8]: https://github.com/carrierwaveuploader/carrierwave-mongoid/compare/v0.7.1...v0.8.1
 [compare-0.7]: https://github.com/carrierwaveuploader/carrierwave-mongoid/compare/v0.6.3...v0.7.1
@@ -178,6 +182,8 @@ match '/uploads/grid/user/avatar/:id/:filename' => 'gridfs#thumb_avatar', constr
 [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-1.0]: https://rubygems.org/gems/carrierwave-mongoid/versions/1.0.0
+[deps-0.10]: https://rubygems.org/gems/carrierwave-mongoid/versions/0.10.0
 [deps-0.9]: https://rubygems.org/gems/carrierwave-mongoid/versions/0.9.0
 [deps-0.8]: https://rubygems.org/gems/carrierwave-mongoid/versions/0.8.1
 [deps-0.7]: https://rubygems.org/gems/carrierwave-mongoid/versions/0.7.1

data/carrierwave-mongoid.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "carrierwave", [">= 0.8.0", "< 0.12.0"]
+  s.add_dependency "carrierwave", [">= 0.8", "< 1.3"]
   s.add_dependency "mongoid", [">= 3.0", "< 7.0"]
   s.add_dependency "mongoid-grid_fs", [">= 1.3", "< 3.0"]
   s.add_dependency "mime-types", "< 3" if RUBY_VERSION < "2.0" # mime-types 3+ doesn't support ruby 1.9

data/gemfiles/carrierwave-0.11.gemfile

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

data/gemfiles/{carrierwave-0.9.gemfile → carrierwave-1.0.gemfile}

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

data/gemfiles/carrierwave-1.1.gemfile

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

data/gemfiles/mongoid-4.0.gemfile

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

data/gemfiles/mongoid-5.0.gemfile

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

data/gemfiles/mongoid-6.0.gemfile

@@ -1,5 +1,6 @@
 source "https://rubygems.org"
 
 gem "mongoid", "~> 6.0.0.beta"
+gem "carrierwave", "~> 0.11.0"
 
 gemspec path: "../"

data/lib/carrierwave/mongoid.rb

@@ -29,13 +29,24 @@ module CarrierWave
       after_save :"store_#{column}!"
       before_save :"write_#{column}_identifier"
       after_destroy :"remove_#{column}!"
-      before_update :"store_previous_model_for_#{column}"
+      if Gem::Version.new(CarrierWave::VERSION) >= Gem::Version.new("1.0.beta")
+        before_update :"store_previous_changes_for_#{column}"
+      else
+        before_update :"store_previous_model_for_#{column}"
+      end
       after_save :"remove_previously_stored_#{column}"
 
       class_eval <<-RUBY, __FILE__, __LINE__+1
         def #{column}=(new_file)
           column = _mounter(:#{column}).serialization_column
 
+          # We're using _new_ and _old_ placeholder values to force Mongoid to
+          # recognize changes in embedded documents. Before we assign these
+          # values, we need to store the original file name in case we need to
+          # delete it when document is saved.
+          previous_uploader_value = read_uploader(column)
+          @_previous_uploader_value_for_#{column} = previous_uploader_value
+
           # mongoid won't upload a new file if there was no file previously.
           write_uploader(column, '_old_') if self.persisted? && read_uploader(column).nil?
 
@@ -73,6 +84,29 @@ module CarrierWave
           changed_attributes["#{column}"] = '_new_'
         end
 
+        # Since we had to use tricks with _old_ and _new_ values to properly
+        # track changes in embedded documents, we need to overwrite this method
+        # to remove the original file if it was replaced with a new one that
+        # had a different name.
+        if Gem::Version.new(CarrierWave::VERSION) >= Gem::Version.new("1.0.beta")
+          def remove_previously_stored_#{column}
+            before, after = @_previous_changes_for_#{column}
+            # Don't delete if the files had the same name
+            return if before.nil? && after.nil?
+            # Proceed to remove the file, use the original name instead of '_new_'
+            before = @_previous_uploader_value_for_#{column} || before
+            _mounter(:#{column}).remove_previous([before], [after])
+          end
+        end
+
+        # CarrierWave 1.1 references ::ActiveRecord constant directly which
+        # will fail in projects without ActiveRecord. We need to overwrite this
+        # method to avoid it.
+        # See https://github.com/carrierwaveuploader/carrierwave/blob/07dc4d7bd7806ab4b963cf8acbad73d97cdfe74e/lib/carrierwave/mount.rb#L189
+        def store_previous_changes_for_#{column}
+          @_previous_changes_for_#{column} = changes[_mounter(:#{column}).serialization_column]
+        end
+
         def find_previous_model_for_#{column}
           if self.embedded?
             if self.respond_to?(:__metadata) # Mongoid >= 4.0.0.beta1
@@ -97,7 +131,12 @@ module CarrierWave
 
           self.class.uploaders.each do |column, uploader|
             if (!only && !except) || (only && only.include?(column.to_s)) || (except && !except.include?(column.to_s))
-              hash[column.to_s] = _mounter(column.to_sym).uploader.serializable_hash
+              if Gem::Version.new(CarrierWave::VERSION) >= Gem::Version.new("1.0.beta")
+                next if _mounter(column.to_sym).uploaders.blank?
+                hash[column.to_s] = _mounter(column.to_sym).uploaders[0].serializable_hash
+              else
+                hash[column.to_s] = _mounter(column.to_sym).uploader.serializable_hash
+              end
             end
           end
           super(options).merge(hash)

data/lib/carrierwave/mongoid/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Mongoid
-    VERSION = "0.10.0"
+    VERSION = "1.0.0"
   end
 end

data/spec/mongoid_spec.rb

@@ -117,7 +117,11 @@ describe CarrierWave::Mongoid do
         @doc.save!
         @doc.reload
 
-        expect(JSON.parse({:data => @doc.image}.to_json)).to eq("data"=>{"image"=>{"url"=>"/uploads/test.jpeg"}})
+        if Gem::Version.new(CarrierWave::VERSION) >= Gem::Version.new("1.0.beta")
+          expect(JSON.parse({:data => @doc.image}.to_json)).to eq({"data"=>{"url"=>"/uploads/test.jpeg"}})
+        else
+          expect(JSON.parse({:data => @doc.image}.to_json)).to eq("data"=>{"image" => {"url"=>"/uploads/test.jpeg"}})
+        end
       end
 
       it "should respect options[:only] when passed to to_json for the serializable hash" do
@@ -409,7 +413,7 @@ describe CarrierWave::Mongoid do
     end
 
     after do
-      FileUtils.rm_rf(file_path("uploads"))
+      FileUtils.rm_rf(public_path("uploads"))
     end
 
     describe 'normally' do
@@ -422,7 +426,7 @@ describe CarrierWave::Mongoid do
       end
 
       it "should not remove old file if old file had a different path but config is false" do
-        allow(@uploader).to receive(:remove_previously_stored_files_after_update).and_return(false)
+        @doc.image.class.remove_previously_stored_files_after_update = false
         @doc.image = stub_file('new.jpeg')
         expect(@doc.save).to be_truthy
         expect(File.exists?(public_path('uploads/new.jpeg'))).to be_truthy
@@ -482,7 +486,7 @@ describe CarrierWave::Mongoid do
       end
 
       it "should not remove old file if old file had a different path but config is false" do
-        allow(@embedded_doc.image).to receive(:remove_previously_stored_files_after_update).and_return(false)
+        @embedded_doc.image.class.remove_previously_stored_files_after_update = false
         @embedded_doc.image = stub_file('new.jpeg')
         expect(@embedded_doc.save).to be_truthy
         expect(File.exists?(public_path('uploads/new.jpeg'))).to be_truthy
@@ -520,7 +524,7 @@ describe CarrierWave::Mongoid do
       end
 
       it "should not remove old file if old file had a different path but config is false" do
-        allow(@double_embedded_doc.image).to receive(:remove_previously_stored_files_after_update).and_return(false)
+        @double_embedded_doc.image.class.remove_previously_stored_files_after_update = false
         @double_embedded_doc.image = stub_file('new.jpeg')
         expect(@double_embedded_doc.save).to be_truthy
         expect(File.exists?(public_path('uploads/new.jpeg'))).to be_truthy

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jonas Nicklas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -17,20 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -142,8 +142,9 @@ files:
 - Rakefile
 - carrierwave-mongoid.gemspec
 - gemfiles/carrierwave-0.10.gemfile
-- gemfiles/carrierwave-0.9.gemfile
-- gemfiles/carrierwave-master.gemfile
+- gemfiles/carrierwave-0.11.gemfile
+- gemfiles/carrierwave-1.0.gemfile
+- gemfiles/carrierwave-1.1.gemfile
 - gemfiles/mongoid-3.1.gemfile
 - gemfiles/mongoid-4.0.gemfile
 - gemfiles/mongoid-5.0.gemfile
@@ -182,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: carrierwave-mongoid
-rubygems_version: 2.6.4
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Mongoid support for CarrierWave

data/gemfiles/carrierwave-master.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "carrierwave", github: "carrierwaveuploader/carrierwave", branch: "master"
-
-gemspec path: "../"