carrierwave-base64 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e27bf83c49c8234d534ff1d78fe7f46fc9dcdb2
-  data.tar.gz: eae79370b4a5ff5b51373782e95a4938bf840c99
+  metadata.gz: 5bc1a39edc33de0936f042be74a0c6f93a2cac55
+  data.tar.gz: 9935e027ef2bed8357b96bf3bd564d0ed5539134
 SHA512:
-  metadata.gz: fdda8a90b767e0ee2022302856d2d34da88f699d7effacb62654bab09fb49cccd924b3c290a155ea7c8acaa195d762f4d0083a8f53fcc3a276ab1666b2f5cd11
-  data.tar.gz: b7586ed0b9387c68218ed153852c5577f2ad765ba84fa20bb5c138be4dc355cbbac7ce5d50847f09d5d891eb6e08ea2f3b0cd487a2e00a4f1fee304886d85b35
+  metadata.gz: 2916598308787dffa654be574d6f7d5cd3ef8685b5f3c4408aaa8867e14107f81c2ed6b25f2d0e8381d848f060e0140332810a2b5864dd59b922d275c3ce5307
+  data.tar.gz: cefdd00be933111e828805801830ece26bfe1263a1128b8dbcaf0ffd9acb8767442acd45292556ddd8f2731e6ba8433b4fd0a7a9949b73268e58fa767b4ac16b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # carrierwave-base64 changelog
 
+## 2.3.3
+
+  - Added proc support for the `:file_name` option for the `mount_base64_uploader` method. (credits to @hendricius)
+
 ## 2.3.0
 
   - Added `:file_name` option for `mount_base64_uploader` method. All base64 uploads for this attribute will use the given filename for the stored file. The `:file_name` option should not contain the file extention (it will be taken from the content type of base64 string). (@HarenBroog, thanks for the idea)

data/README.md

@@ -42,6 +42,12 @@ To set the file name for the uploaded files, use the `:file_name` option (withou
 mount_base64_uploader :image, ImageUploader, file_name: 'userpic'
 ```
 
+You can also pass a Proc for the file-name to allow dynamic filenames.
+
+```ruby
+mount_base64_uploader :image, ImageUploader, file_name: -> { "file-#{DateTime.now.to_i}" }
+```
+
 ## Data format
 
 The string with the encoded data, should be prefixed with Data URI scheme format:

data/lib/carrierwave/base64/base64_string_io.rb

@@ -5,13 +5,13 @@ module Carrierwave
 
       attr_accessor :file_format, :file_name
 
-      def initialize(encoded_file, file_name)
+      def initialize(encoded_file, file_name_method_or_string)
         description, encoded_bytes = encoded_file.split(',')
 
         raise ArgumentError unless encoded_bytes
         raise ArgumentError if encoded_bytes.eql?('(null)')
 
-        @file_name = file_name
+        @file_name = extract_file_name(file_name_method_or_string)
         @file_format = get_file_format description
         bytes = ::Base64.decode64 encoded_bytes
 
@@ -28,6 +28,14 @@ module Carrierwave
         regex = /([a-z0-9]+);base64\z/
         regex.match(description).try(:[], 1)
       end
+
+      def extract_file_name(method_or_string)
+        if method_or_string.is_a?(Proc)
+          method_or_string.call
+        else
+          method_or_string
+        end
+      end
     end
   end
 end

data/lib/carrierwave/base64/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Base64
-    VERSION = '2.3.2'.freeze
+    VERSION = '2.3.3'.freeze
   end
 end

data/spec/base64_string_io_spec.rb

@@ -16,6 +16,17 @@ RSpec.describe Carrierwave::Base64::Base64StringIO do
       it 'should respond to :original_filename' do
         expect(subject.original_filename).to eql("file.#{file_format}")
       end
+
+      it 'calls a function that returns the file_name' do
+        method = -> { 'file-name-through-method' }
+        model = described_class.new data, method
+        expect(model.file_name).to eql('file-name-through-method')
+      end
+
+      it 'accepts a string as the file name as well' do
+        model = described_class.new data, 'string-file-name'
+        expect(model.file_name).to eql('string-file-name')
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-base64
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Yury Lebedev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-30 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Upload images encoded as base64 to carrierwave.