carrierwave-base64 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39e8fd07baef760e5937db3b05ed6ce369369e52
-  data.tar.gz: ed5d91745c21ac7d8642a0d9ee9edaed2e559466
+  metadata.gz: 55f67ddadc62c0a941377c122f982964d08008a6
+  data.tar.gz: eff00b8df379f7571f9cdb431dd70716afc44137
 SHA512:
-  metadata.gz: 3471e8152f7431832ff5cf1e9e09fd8e4ef3dcc1659532da9702f884be8c32e10201e1a241335d738be8aed6dfcbc017564fa566868a6b1ec9ba9afbfd2eeab3
-  data.tar.gz: d339ff54885830de362f14a82dd8dc3adf57c83c5ec961d7f731187d67dbf4436d4d2905d403d35fdb281d36d58f998d345da5b558c5aa300d32838d48838f9d
+  metadata.gz: c0659cc1714eed37c8206b4272f4d735b40946f5b0880de3db1474655f6a8bc40eff6db7202ebecb218a2eff1167125832385f051595dddc30e0c511f7c05976
+  data.tar.gz: c467c8953100fa9ad18dbbca235045098b753eff940d9870f783b72821a8626fbb502c3277319d319a998b9315ed7574f77babfbf902c6461fdd59676aeb09e8

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # carrierwave-base64 changelog
 
+## 2.5.0
+
+  - The uploaded file is not deleted, when the attribute is set to the existing file name (@lebedev-yury, bug-report #51 by @jmuheim)
+
 ## 2.4.0
 
   - The `:file_name` option accepts a lambda with an argument, to which the model instance would be passed. This allows you to set the filename based on some model attribute (@lebedev-yury).

data/README.md

@@ -60,10 +60,12 @@ mount_base64_uploader :image, ImageUploader, file_name: -> { 'userpic' }
 
 ## Data format
 
-The string with the encoded data, should be prefixed with Data URI scheme format:
+The string with the encoded data, should be prefixed with Data URI scheme format.
+
+Keep in mind, that the content type specified in this string, would be used to identified the file extension. So if you have some custom content type uploaded, don't forget to register a Mime Type for it.
 
 ```
-data:image/jpg;base64,(base64 encoded data)
+data:image/jpeg;base64,(base64 encoded data)
 ```
 
 ## Contributing

data/lib/carrierwave/base64/adapter.rb

@@ -3,10 +3,13 @@ module Carrierwave
     module Adapter
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
       def mount_base64_uploader(attribute, uploader_class, options = {})
         mount_uploader attribute, uploader_class, options
 
         define_method "#{attribute}=" do |data|
+          return if data == send(attribute).to_s
+
           if respond_to?("#{attribute}_will_change!") && data.present?
             send "#{attribute}_will_change!"
           end
@@ -24,6 +27,7 @@ module Carrierwave
         end
         # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
         # rubocop:enable Metrics/CyclomaticComplexity
+        # rubocop:enable Metrics/PerceivedComplexity
       end
     end
   end

data/lib/carrierwave/base64/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Base64
-    VERSION = '2.4.0'.freeze
+    VERSION = '2.5.0'.freeze
   end
 end

data/spec/adapter_spec.rb

@@ -77,6 +77,12 @@ RSpec.describe Carrierwave::Base64::Adapter do
         subject.reload
       end
 
+      it 'keeps the file when setting the attribute to existing value' do
+        expect(File.exist?(subject.reload.image.file.file)).to be_truthy
+        subject.update!(image: subject.image.to_s)
+        expect(File.exist?(subject.reload.image.file.file)).to be_truthy
+      end
+
       it 'removes files when remove_* is set to true' do
         subject.remove_image = true
         subject.save!

data/spec/spec_helper.rb

@@ -26,3 +26,5 @@ require 'support/models'
 def file_path(*paths)
   File.expand_path(File.join(File.dirname(__FILE__), *paths))
 end
+
+CarrierWave.root = ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-base64
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Yury Lebedev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Upload images encoded as base64 to carrierwave.