carrierwave-base64 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb281b2683a576956173494d155b372c985499a8
-  data.tar.gz: e28479d1490ba1a00ce8e20a862f9636fa1f78f5
+  metadata.gz: abcbb4f3923aeaab3fe9826578380b8ac0834507
+  data.tar.gz: 4e6a9110f48465cae3cd17934c7c6327610f59dc
 SHA512:
-  metadata.gz: f102337cef6625d4ec0ea0e281c1d4e0ff57af69d9778d0b8073e4379f1fcea9ef2212002683f92643b83b7ddd03a3bf1e8c18aec92908485a709e6beb1b1098
-  data.tar.gz: 7e18c8cc657eebcb475caf0b6e0c5a541ada043ebb09b5506354b49b0ae427ba5f0ba1c4055c2970ecc1080148852d77c6cc65a13df11759fe9199b33e899279
+  metadata.gz: 7a63f9c999f435e3f0ab00eb526c9998538bdb722f5724c250e6761d32e8d9ab3ce4bcdbb16f1f97683b530c0517f482045b2bb5dea7fcf694556785bcad9699
+  data.tar.gz: b4d47fcf52dc1a2cc6093d965780168de83ba07d12a36b2d5b8edb2f43363053e10a1433ed24a3568f2e6ac2e7c5ce83ff5eca655abc338f01c9cdf08cc3e5dd

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # carrierwave-base64 changelog
 
+## 2.6.1
+
+This release fixes the issue that the public API of the gem was changed in 2.6.0, by switching from RFC 2045 to RFC 4648 standard for base64 strings.
+
+ - Switched back to RFC 2045 standard for base64 strings (@lebedev-yury)
+
 ## 2.6.0
 
  - Fixed the issue with base64 string not being validated (#64, @sjdrabbani)

data/carrierwave-base64.gemspec

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

data/lib/carrierwave/base64/base64_string_io.rb

@@ -6,9 +6,12 @@ module Carrierwave
       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.strict_decode64 encoded_bytes
+        bytes = ::Base64.decode64 encoded_bytes
 
         super bytes
       end

data/lib/carrierwave/base64/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Base64
-    VERSION = '2.6.0'.freeze
+    VERSION = '2.6.1'.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,VGhpcyBpcyB0ZXN0IHN0cmluZw=="
+        "data:#{content_type};base64,/9j/4AAQSkZJRgABAQEASABKdhH//2Q=="
       end
 
       let(:file_extension) do
@@ -36,22 +36,16 @@ RSpec.describe Carrierwave::Base64::Base64StringIO do
   end
 
   context 'invalid image data' do
-    it 'raises UnknownMimeTypeError for unknown mime types' do
+    it 'raises ArgumentError for invalid image data' do
       expect do
         described_class.new('/9j/4AAQSkZJRgABAQEASABIAADKdhH//2Q==', 'file')
-      end.to raise_error(Carrierwave::Base64::UnknownMimeTypeError)
+      end.to raise_error(ArgumentError)
     end
 
     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(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.to raise_error(ArgumentError)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-base64
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Yury Lebedev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave