carrierwave-base64 2.5.2 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bf3a0864b2f90cac7985e88aaa336bfba20730f
-  data.tar.gz: a64c775e1a9f9922a621593a9dc0c9f748aa04ba
+  metadata.gz: 7dff45d674c5e293cfead7291d9a6c53be492672
+  data.tar.gz: 628856bf8cccdf7dd686ae2ee57deef2d5077e4d
 SHA512:
-  metadata.gz: 5a799a89394c9c5e16481edde7c3db7c67746ff0257adfcb6e9d56fec393c2a0dc37705f9266cbe20df8e3c606b18edc93426a3b8a0afabea3589439a482d5d4
-  data.tar.gz: 989f85844ff4302d89efc9d3b912739d07712c69e8eaa5515ddab714505f255842f7aa98a772b548be36a8362c46e603c5b1c8de7aed260ff117d0d05ab6c9e5
+  metadata.gz: dee1bc71961ec31d297fb70af591fe833c4934bb38685e862ab33ff58bc9f69e34f4850b26a86b7189c8c0c775e581e89d20e0f89b5ea56c20e05e1957dc3169
+  data.tar.gz: d4be112dc0dec5e83a78e6bd1027422f559da7f8d61f3afc1bb30baee75ece8783823dd2026bf5e78d062f01b978c2b16ef78de5af9273a1f8ef44f98ddc64e2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # carrierwave-base64 changelog
 
+## 2.5.3
+
+ - Fixed an incorrect deprecation warning that fired even with `file_name` option set to a Proc (#60, @frodsan)
+
 ## 2.5.2
 
  - Fixed the exception for uploads without `file_name` option set (issue #56 by @hanhdt, fix by @szajbus)

data/lib/carrierwave/base64/adapter.rb

@@ -8,6 +8,14 @@ module Carrierwave
         mount_uploader attribute, uploader_class, options
         options[:file_name] ||= proc { attribute }
 
+        if options[:file_name].is_a?(String)
+          warn(
+            '[Deprecation warning] Setting `file_name` option to a string is '\
+            'deprecated and will be removed in 3.0.0. If you want to keep the '\
+            'existing behaviour, wrap the string in a Proc'
+          )
+        end
+
         define_method "#{attribute}=" do |data|
           return if data == send(attribute).to_s
 
@@ -21,8 +29,8 @@ module Carrierwave
           filename = if options[:file_name].respond_to?(:call)
                        options[:file_name].call(self)
                      else
-                       options[:file_name].to_s
-                     end
+                       options[:file_name]
+                     end.to_s
 
           super Carrierwave::Base64::Base64StringIO.new(data.strip, filename)
         end

data/lib/carrierwave/base64/base64_string_io.rb

@@ -5,13 +5,13 @@ module Carrierwave
 
       attr_accessor :file_extension, :file_name
 
-      def initialize(encoded_file, file_name_proc_or_string)
+      def initialize(encoded_file, file_name)
         description, encoded_bytes = encoded_file.split(',')
 
         raise ArgumentError unless encoded_bytes
         raise ArgumentError if encoded_bytes.eql?('(null)')
 
-        @file_name = extract_file_name(file_name_proc_or_string)
+        @file_name = file_name
         @file_extension = get_file_extension description
         bytes = ::Base64.decode64 encoded_bytes
 
@@ -32,19 +32,6 @@ module Carrierwave
         end
         mime_type.preferred_extension
       end
-
-      def extract_file_name(proc_or_string)
-        if proc_or_string.is_a?(Proc)
-          proc_or_string.call
-        else
-          warn(
-            '[Deprecation warning] Setting `file_name` option to a string is '\
-            'deprecated and will be removed in 3.0.0. If you want to keep the '\
-            'existing behaviour, wrap the string in a Proc'
-          )
-          proc_or_string
-        end
-      end
     end
   end
 end

data/lib/carrierwave/base64/version.rb

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

data/spec/adapter_spec.rb

@@ -51,6 +51,26 @@ RSpec.describe Carrierwave::Base64::Adapter do
         expect(subject.image).to be_an_instance_of(uploader)
       end
 
+      context 'when file_name is a string' do
+        it 'issues a deprecation warning' do
+          expect do
+            User.mount_base64_uploader(
+              :image, uploader, file_name: 'file_name'
+            )
+          end.to warn('Deprecation')
+        end
+      end
+
+      context 'when file_name is a proc' do
+        it 'does NOT issue a deprecation warning' do
+          expect do
+            User.mount_base64_uploader(
+              :image, uploader, file_name: ->(u) { u.username }
+            )
+          end.not_to warn('Deprecation')
+        end
+      end
+
       context 'normal file uploads' do
         before(:each) do
           sham_rack_app = ShamRack.at('www.example.com').stub

data/spec/base64_string_io_spec.rb

@@ -32,20 +32,6 @@ RSpec.describe Carrierwave::Base64::Base64StringIO do
         model = described_class.new data, 'string-file-name'
         expect(model.file_name).to eql('string-file-name')
       end
-
-      it 'issues deprecation warning when string given for file name' do
-        str = ->(u) { u.username }.curry[User.new(username: 'batman')]
-        expect do
-          described_class.new(data, str).file_name
-        end.to warn('Deprecation')
-      end
-
-      it 'does NOT issue deprecation warning when Proc given for file name' do
-        prc = -> { 'String' }
-        expect do
-          described_class.new(data, prc).file_name
-        end.not_to warn('Deprecation')
-      end
     end
   end
 

metadata

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