carrierwave-base64 2.5.3 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dff45d674c5e293cfead7291d9a6c53be492672
-  data.tar.gz: 628856bf8cccdf7dd686ae2ee57deef2d5077e4d
+  metadata.gz: fb281b2683a576956173494d155b372c985499a8
+  data.tar.gz: e28479d1490ba1a00ce8e20a862f9636fa1f78f5
 SHA512:
-  metadata.gz: dee1bc71961ec31d297fb70af591fe833c4934bb38685e862ab33ff58bc9f69e34f4850b26a86b7189c8c0c775e581e89d20e0f89b5ea56c20e05e1957dc3169
-  data.tar.gz: d4be112dc0dec5e83a78e6bd1027422f559da7f8d61f3afc1bb30baee75ece8783823dd2026bf5e78d062f01b978c2b16ef78de5af9273a1f8ef44f98ddc64e2
+  metadata.gz: f102337cef6625d4ec0ea0e281c1d4e0ff57af69d9778d0b8073e4379f1fcea9ef2212002683f92643b83b7ddd03a3bf1e8c18aec92908485a709e6beb1b1098
+  data.tar.gz: 7e18c8cc657eebcb475caf0b6e0c5a541ada043ebb09b5506354b49b0ae427ba5f0ba1c4055c2970ecc1080148852d77c6cc65a13df11759fe9199b33e899279

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # carrierwave-base64 changelog
 
+## 2.6.0
+
+ - Fixed the issue with base64 string not being validated (#64, @sjdrabbani)
+ - Sending a base64 string with missing or unknown MIME Type will raise `Carrierwave::Base64::UnknownMimeTypeError` (@lebedev-yury)
+
 ## 2.5.3
 
  - Fixed an incorrect deprecation warning that fired even with `file_name` option set to a Proc (#60, @frodsan)

data/carrierwave-base64.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 

data/lib/carrierwave/base64.rb

@@ -1,5 +1,6 @@
 require 'mime/types/full'
 require 'carrierwave/base64/version'
+require 'carrierwave/base64/exceptions'
 require 'carrierwave/base64/base64_string_io'
 require 'carrierwave/base64/adapter'
 

data/lib/carrierwave/base64/base64_string_io.rb

@@ -1,19 +1,14 @@
 module Carrierwave
   module Base64
     class Base64StringIO < StringIO
-      class ArgumentError < StandardError; end
-
       attr_accessor :file_extension, :file_name
 
       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 = file_name
         @file_extension = get_file_extension description
-        bytes = ::Base64.decode64 encoded_bytes
+        bytes = ::Base64.strict_decode64 encoded_bytes
 
         super bytes
       end
@@ -28,7 +23,8 @@ module Carrierwave
         content_type = description.split(';base64').first
         mime_type = MIME::Types[content_type].first
         unless mime_type
-          raise ArgumentError, "Unknown MIME type: #{content_type}"
+          raise Carrierwave::Base64::UnknownMimeTypeError,
+                "Unknown MIME type: #{content_type}"
         end
         mime_type.preferred_extension
       end

data/lib/carrierwave/base64/exceptions.rb

@@ -0,0 +1,5 @@
+module Carrierwave
+  module Base64
+    class UnknownMimeTypeError < ::ArgumentError; end
+  end
+end

data/lib/carrierwave/base64/version.rb

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

data/spec/base64_string_io_spec.rb

@@ -3,7 +3,7 @@ RSpec.describe Carrierwave::Base64::Base64StringIO do
      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=="
+        "data:#{content_type};base64,VGhpcyBpcyB0ZXN0IHN0cmluZw=="
       end
 
       let(:file_extension) do
@@ -36,16 +36,22 @@ RSpec.describe Carrierwave::Base64::Base64StringIO do
   end
 
   context 'invalid image data' do
-    it 'raises an ArgumentError if Data URI content type is missing' do
+    it 'raises UnknownMimeTypeError for unknown mime types' do
       expect do
         described_class.new('/9j/4AAQSkZJRgABAQEASABIAADKdhH//2Q==', 'file')
-      end.to raise_error(Carrierwave::Base64::Base64StringIO::ArgumentError)
+      end.to raise_error(Carrierwave::Base64::UnknownMimeTypeError)
     end
 
-    it 'raises ArgumentError if base64 data eql (null)' do
+    it 'raises ArgumentError if base64 data equals to (null)' do
       expect do
         described_class.new('data:image/jpeg;base64,(null)', 'file')
-      end.to raise_error(Carrierwave::Base64::Base64StringIO::ArgumentError)
+      end.to raise_error(ArgumentError, 'invalid base64')
+    end
+
+    it 'raises ArgumentError if base64 data contains white space' do
+      expect do
+        described_class.new 'data:image/jpeg;base64,VGhpcyBpc yB0Z==', 'file'
+      end.to raise_error(ArgumentError, 'invalid base64')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-base64
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.6.0
 platform: ruby
 authors:
 - Yury Lebedev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -199,6 +199,7 @@ files:
 - lib/carrierwave/base64.rb
 - lib/carrierwave/base64/adapter.rb
 - lib/carrierwave/base64/base64_string_io.rb
+- lib/carrierwave/base64/exceptions.rb
 - lib/carrierwave/base64/version.rb
 - spec/adapter_spec.rb
 - spec/base64_string_io_spec.rb
@@ -228,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Upload images encoded as base64 to carrierwave.