carrierwave-base64 2.5.1.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b15712c569ca9849c2d0269932920b6ec796dec7
-  data.tar.gz: a50333de3bdbe8bbba125bd5cc8b871923f3eefd
+  metadata.gz: 1bf3a0864b2f90cac7985e88aaa336bfba20730f
+  data.tar.gz: a64c775e1a9f9922a621593a9dc0c9f748aa04ba
 SHA512:
-  metadata.gz: 90f8eb4468cbbc5a04e8cf39f273f887aaebcad8c5e75003f5af5ed6c9f571aa02103c6644b4195828dc5af081aac16a8a935728cc2a483c56100f97f55368b1
-  data.tar.gz: 5c2c86306cee493271f224a60e120bd75bb3ce6d5df86a034bd49af0a6688cc2c29e3ac47d821af51260bd3caa922f108a16048301e07ccbf3842e32d03b9125
+  metadata.gz: 5a799a89394c9c5e16481edde7c3db7c67746ff0257adfcb6e9d56fec393c2a0dc37705f9266cbe20df8e3c606b18edc93426a3b8a0afabea3589439a482d5d4
+  data.tar.gz: 989f85844ff4302d89efc9d3b912739d07712c69e8eaa5515ddab714505f255842f7aa98a772b548be36a8362c46e603c5b1c8de7aed260ff117d0d05ab6c9e5

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # carrierwave-base64 changelog
 
+## 2.5.2
+
+ - Fixed the exception for uploads without `file_name` option set (issue #56 by @hanhdt, fix by @szajbus)
+
 ## 2.5.1
 
  - Fixed the issue with the filename to be set once for a model, and never updated again (@dustMason, #55)

data/lib/carrierwave/base64/adapter.rb

@@ -6,7 +6,7 @@ module Carrierwave
       # rubocop:disable Metrics/PerceivedComplexity
       def mount_base64_uploader(attribute, uploader_class, options = {})
         mount_uploader attribute, uploader_class, options
-        options[:file_name] ||= -> { attribute }
+        options[:file_name] ||= proc { attribute }
 
         define_method "#{attribute}=" do |data|
           return if data == send(attribute).to_s

data/lib/carrierwave/base64/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Base64
-    VERSION = '2.5.1.1'.freeze
+    VERSION = '2.5.2'.freeze
   end
 end

data/spec/adapter_spec.rb

@@ -2,110 +2,138 @@ RSpec.describe Carrierwave::Base64::Adapter do
   describe '.mount_base64_uploader' do
     let(:uploader) { Class.new CarrierWave::Uploader::Base }
 
-    subject do
-      User.mount_base64_uploader(
-        :image, uploader, file_name: ->(u) { u.username }
-      )
-      User.new(username: 'batman')
-    end
-
-    let(:mongoid_model) do
-      MongoidModel.mount_base64_uploader(:image, uploader)
-      MongoidModel.new
-    end
+    context 'mongoid models' do
+      let(:mongoid_model) do
+        MongoidModel.mount_base64_uploader(:image, uploader)
+        MongoidModel.new
+      end
 
-    it 'mounts the uploader on the image field' do
-      expect(subject.image).to be_an_instance_of(uploader)
+      it 'does not call will_change' do
+        expect do
+          mongoid_model.image = 'test.jpg'
+        end.not_to raise_error
+      end
     end
 
-    context 'normal file uploads' do
-      before(:each) do
-        sham_rack_app = ShamRack.at('www.example.com').stub
-        sham_rack_app.register_resource(
-          '/test.jpg', file_path('fixtures', 'test.jpg'), 'images/jpg'
-        )
-        subject[:image] = 'test.jpg'
+    context 'models without file_name option for the uploader' do
+      subject do
+        User.mount_base64_uploader(:image, uploader)
+        User.new
       end
 
-      it 'sets will_change for the attribute on activerecord models' do
-        expect(subject.changed?).to be_truthy
-      end
+      context 'base64 strings' do
+        before(:each) do
+          subject.image = File.read(
+            file_path('fixtures', 'base64_image.fixture')
+          ).strip
+        end
 
-      it 'saves the file' do
-        subject.save!
-        subject.reload
+        it 'creates a file' do
+          subject.save!
+          subject.reload
 
-        expect(
-          subject.image.current_path
-        ).to eq file_path('../uploads', 'test.jpg')
+          expect(
+            subject.image.current_path
+          ).to eq file_path('../uploads', 'image.jpeg')
+        end
       end
     end
 
-    context 'base64 strings' do
-      before(:each) do
-        subject.image = File.read(
-          file_path('fixtures', 'base64_image.fixture')
-        ).strip
+    context 'models with file_name options for the uploader' do
+      subject do
+        User.mount_base64_uploader(
+          :image, uploader, file_name: ->(u) { u.username }
+        )
+        User.new(username: 'batman')
       end
 
-      it 'creates a file' do
-        subject.save!
-        subject.reload
-
-        expect(
-          subject.image.current_path
-        ).to eq file_path('../uploads', 'batman.jpeg')
+      it 'mounts the uploader on the image field' do
+        expect(subject.image).to be_an_instance_of(uploader)
       end
 
-      it 'sets will_change for the attribute' do
-        expect(subject.changed?).to be_truthy
-      end
+      context 'normal file uploads' do
+        before(:each) do
+          sham_rack_app = ShamRack.at('www.example.com').stub
+          sham_rack_app.register_resource(
+            '/test.jpg', file_path('fixtures', 'test.jpg'), 'images/jpg'
+          )
+          subject[:image] = 'test.jpg'
+        end
 
-      it 'does not call will_change mongoid models' do
-        expect do
-          mongoid_model.image = 'test.jpg'
-        end.not_to raise_error
+        it 'sets will_change for the attribute on activerecord models' do
+          expect(subject.changed?).to be_truthy
+        end
+
+        it 'saves the file' do
+          subject.save!
+          subject.reload
+
+          expect(
+            subject.image.current_path
+          ).to eq file_path('../uploads', 'test.jpg')
+        end
       end
 
-      context 'with additional instances of the mounting class' do
-        let(:another_subject) do
-          another_subject = User.new(username: 'robin')
-          another_subject.image = File.read(
+      context 'base64 strings' do
+        before(:each) do
+          subject.image = File.read(
             file_path('fixtures', 'base64_image.fixture')
           ).strip
-          another_subject
         end
 
-        it 'should invoke the file_name proc upon each upload' do
+        it 'creates a file' do
           subject.save!
-          another_subject.save!
-          another_subject.reload
+          subject.reload
+
           expect(
-            another_subject.image.current_path
-          ).to eq file_path('../uploads', 'robin.jpeg')
+            subject.image.current_path
+          ).to eq file_path('../uploads', 'batman.jpeg')
         end
-      end
-    end
 
-    context 'stored uploads exist for the field' do
-      before :each do
-        subject.image = File.read(
-          file_path('fixtures', 'base64_image.fixture')
-        ).strip
-        subject.save!
-        subject.reload
-      end
+        it 'sets will_change for the attribute' do
+          expect(subject.changed?).to be_truthy
+        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
+        context 'with additional instances of the mounting class' do
+          let(:another_subject) do
+            another_subject = User.new(username: 'robin')
+            another_subject.image = File.read(
+              file_path('fixtures', 'base64_image.fixture')
+            ).strip
+            another_subject
+          end
+
+          it 'should invoke the file_name proc upon each upload' do
+            subject.save!
+            another_subject.save!
+            another_subject.reload
+            expect(
+              another_subject.image.current_path
+            ).to eq file_path('../uploads', 'robin.jpeg')
+          end
+        end
       end
 
-      it 'removes files when remove_* is set to true' do
-        subject.remove_image = true
-        subject.save!
-        expect(subject.reload.image.file).to be_nil
+      context 'stored uploads exist for the field' do
+        before :each do
+          subject.image = File.read(
+            file_path('fixtures', 'base64_image.fixture')
+          ).strip
+          subject.save!
+          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!
+          expect(subject.reload.image.file).to be_nil
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-base64
 version: !ruby/object:Gem::Version
-  version: 2.5.1.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Yury Lebedev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave