carrierwave-base64 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55f67ddadc62c0a941377c122f982964d08008a6
-  data.tar.gz: eff00b8df379f7571f9cdb431dd70716afc44137
+  metadata.gz: 50240c7cf3c2cc6381e0f4b6fd264e26378acf8e
+  data.tar.gz: 814aa3ed6143aac25487da35fd311053e50ab5ea
 SHA512:
-  metadata.gz: c0659cc1714eed37c8206b4272f4d735b40946f5b0880de3db1474655f6a8bc40eff6db7202ebecb218a2eff1167125832385f051595dddc30e0c511f7c05976
-  data.tar.gz: c467c8953100fa9ad18dbbca235045098b753eff940d9870f783b72821a8626fbb502c3277319d319a998b9315ed7574f77babfbf902c6461fdd59676aeb09e8
+  metadata.gz: 4c7c1c2b46ab8120ca6a6d6cb11e06668627de9a7ee6b3b6d36bf9bfc01a762e49a6d68ad97c3bb6f4596e540c2e65a1cc40b5bce8eef7f2f1e0eb75828cc3c5
+  data.tar.gz: 807f88ed34208638470d32eff7e5d509f078364908a12037988f2b9ad942e6a1c2df3d7fe7443e05c05aeada8d4517d5b8671a6b017eb935c0b32ad134017f12

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # carrierwave-base64 changelog
 
+## 2.5.1
+
+ - Fixed the issue with the filename to be set once for a model, and never updated again (@dustMason, #55)
+
 ## 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)

data/README.md

@@ -38,7 +38,15 @@ Now you can also upload files by passing an encoded base64 string to the attribu
 
 The file extension for the uploaded base64 string is identified automatically using the [mime-types](https://github.com/mime-types/ruby-mime-types/) gem and `content_type` from the uploaded string.
 
-If the required MIME type is not registered, you can add it, using [MIME::Types#add](http://www.rubydoc.info/gems/mime-types/MIME/Types#add-class_method).
+If the required MIME type is not registered, you can add it, using [MIME::Types#add](http://www.rubydoc.info/gems/mime-types/MIME/Types#add-class_method):
+
+```ruby
+MIME::Types.add(
+  MIME::Type.new('application/icml').tap do |type|
+    type.add_extensions 'icml'
+  end
+)
+```
 
 ## Setting the file name
 

data/carrierwave-base64.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
@@ -23,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'carrierwave', '>= 0.8.0'
   spec.add_dependency 'mime-types', '~> 3.0'
 
-  spec.add_development_dependency 'rails', '>= 3.2.0'
+  spec.add_development_dependency 'rails', '~> 4'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'mongoid'
   spec.add_development_dependency 'carrierwave-mongoid'

data/lib/carrierwave/base64/adapter.rb

@@ -6,6 +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 }
 
         define_method "#{attribute}=" do |data|
           return if data == send(attribute).to_s
@@ -17,13 +18,13 @@ module Carrierwave
           return super(data) unless data.is_a?(String) &&
                                     data.strip.start_with?('data')
 
-          options[:file_name] ||= -> { attribute }
-          if options[:file_name].is_a?(Proc) && options[:file_name].arity == 1
-            options[:file_name] = options[:file_name].curry[self]
-          end
-          super(Carrierwave::Base64::Base64StringIO.new(
-            data.strip, options[:file_name]
-          ))
+          filename = if options[:file_name].respond_to?(:call)
+                       options[:file_name].call(self)
+                     else
+                       options[:file_name].to_s
+                     end
+
+          super Carrierwave::Base64::Base64StringIO.new(data.strip, filename)
         end
         # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
         # rubocop:enable Metrics/CyclomaticComplexity

data/lib/carrierwave/base64/version.rb

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

data/spec/adapter_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe Carrierwave::Base64::Adapter do
       User.mount_base64_uploader(
         :image, uploader, file_name: ->(u) { u.username }
       )
-      User.new
+      User.new(username: 'batman')
     end
 
     let(:mongoid_model) do
@@ -66,6 +66,25 @@ RSpec.describe Carrierwave::Base64::Adapter do
           mongoid_model.image = 'test.jpg'
         end.not_to raise_error
       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(
+            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
 
     context 'stored uploads exist for the field' do

data/spec/base64_string_io_spec.rb

@@ -1,6 +1,6 @@
 RSpec.describe Carrierwave::Base64::Base64StringIO do
-  %w(application/vnd.openxmlformats-officedocument.wordprocessingml.document
-     image/jpeg application/pdf audio/mpeg).each do |content_type|
+  %w[application/vnd.openxmlformats-officedocument.wordprocessingml.document
+     image/jpeg application/pdf audio/mpeg].each do |content_type|
     context "correct #{content_type} data" do
       let(:data) do
         "data:#{content_type};base64,/9j/4AAQSkZJRgABAQEASABKdhH//2Q=="
@@ -22,7 +22,9 @@ RSpec.describe Carrierwave::Base64::Base64StringIO do
 
       it 'calls a function that returns the file_name' do
         method = ->(u) { u.username }
-        base64_string_io = described_class.new data, method.curry[User.new]
+        base64_string_io = described_class.new(
+          data, method.curry[User.new(username: 'batman')]
+        )
         expect(base64_string_io.file_name).to eql('batman')
       end
 
@@ -30,6 +32,20 @@ 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
 

data/spec/spec_helper.rb

@@ -22,6 +22,7 @@ ActiveRecord::Base.establish_connection(
 
 load 'support/schema.rb'
 require 'support/models'
+require 'support/custom_expectations/warn_expectation'
 
 def file_path(*paths)
   File.expand_path(File.join(File.dirname(__FILE__), *paths))

data/spec/support/custom_expectations/warn_expectation.rb

@@ -0,0 +1,30 @@
+RSpec::Matchers.define :warn do |message|
+  match do |block|
+    fake_stderr(&block).include? message
+  end
+
+  description do
+    "warn \"#{message}\""
+  end
+
+  failure_message_for_should do
+    "expected to #{description}"
+  end
+
+  failure_message_for_should_not do
+    "expected to not #{description}"
+  end
+
+  def fake_stderr
+    original_stderr = $stderr
+    $stderr = StringIO.new
+    yield
+    $stderr.string
+  ensure
+    $stderr = original_stderr
+  end
+
+  def supports_block_expectations?
+    true
+  end
+end

data/spec/support/models.rb

@@ -1,7 +1,5 @@
 class User < ActiveRecord::Base
-  def username
-    'batman'
-  end
+  attr_accessor :username
 end
 
 class MongoidModel

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-base64
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Yury Lebedev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -42,16 +42,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -205,6 +205,7 @@ files:
 - spec/fixtures/base64_image.fixture
 - spec/fixtures/test.jpg
 - spec/spec_helper.rb
+- spec/support/custom_expectations/warn_expectation.rb
 - spec/support/models.rb
 - spec/support/schema.rb
 homepage: https://github.com/lebedev-yury/carrierwave-base64
@@ -227,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Upload images encoded as base64 to carrierwave.
@@ -237,5 +238,6 @@ test_files:
 - spec/fixtures/base64_image.fixture
 - spec/fixtures/test.jpg
 - spec/spec_helper.rb
+- spec/support/custom_expectations/warn_expectation.rb
 - spec/support/models.rb
 - spec/support/schema.rb