carrierwave-base64 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6b7f164c614c501edd82cdc4f902e3cbf830a67
-  data.tar.gz: 6330e788f837fdf14cac8f330f3c2403a3b9ebea
+  metadata.gz: b81321c57f7f1474d1fa455b97329989f4484d5d
+  data.tar.gz: 2d0f412d61b8fe5f22801a89263ea618f68794f1
 SHA512:
-  metadata.gz: 13b57035d23637c2baa0fcd87a5cb47d9bdb5849e5550c046ce768370dbcaa3c1bdf75dd7b49aced83dbb4438e3f0c970798cbe6a9a5dc3970597b8b6033d93e
-  data.tar.gz: 24efd2af689ccab46857d7047ab252ab2ec2f06aee343ff825bebb15b2da4120f1a39a6366f2c3701db63239c3fef5578ea52e1b83299f46aa7486fd4094a99c
+  metadata.gz: 3117dcaef41677818a683f1f46fce1607e0dbe8081e37ea630a20b65acbb699663e3e332a0d9370c546c8dffc5cb305900d6fa642e548fa73235dc4ccf0ec855
+  data.tar.gz: 2fd4303a312208ce26434e2abca58be7d0d6085411c21881c4a3b7f11f0fc4e171c61e2fb45baa3ac03875d011e50467cd1d8e584dd1592348f478f88b66a2cf

data/lib/carrierwave/base64/base64_string_io.rb

@@ -3,27 +3,27 @@ module Carrierwave
     class Base64StringIO < StringIO
       class ArgumentError < StandardError; end
 
-      attr_accessor :image_format
+      attr_accessor :file_format
 
-      def initialize(encoded_image)
-        description, encoded_bytes = encoded_image.split(",")
+      def initialize(encoded_file)
+        description, encoded_bytes = encoded_file.split(",")
 
         raise ArgumentError unless encoded_bytes
 
-        @image_format = get_image_format description
+        @file_format = get_file_format description
         bytes = ::Base64.decode64 encoded_bytes
 
         super bytes
       end
 
       def original_filename
-        File.basename("image.#{@image_format}")
+        File.basename("file.#{@file_format}")
       end
 
       private
 
-      def get_image_format(description)
-        regex = /\Adata:image\/([a-z]+);base64\z/i
+      def get_file_format(description)
+        regex = /([a-z]+);base64\z/
         regex.match(description).try(:[], 1)
       end
     end

data/lib/carrierwave/base64/orm/activerecord.rb

@@ -7,7 +7,7 @@ module Carrierwave
         mount_uploader attribute, uploader_class
 
         define_method "#{attribute}=" do |data|
-          if data.present? && data.is_a?(String) && data.strip.start_with?("data:image")
+          if data.present? && data.is_a?(String) && data.strip.start_with?("data")
             super(Carrierwave::Base64::Base64StringIO.new(data.strip))
           else
             super(data)

data/lib/carrierwave/base64/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Base64
-    VERSION = "1.3"
+    VERSION = "1.4"
   end
 end

data/spec/base64_string_io_spec.rb

@@ -6,11 +6,24 @@ RSpec.describe Carrierwave::Base64::Base64StringIO do
     subject { described_class.new image_data }
 
     it "determines the image format from the Dara URI scheme" do
-      expect(subject.image_format).to eql("jpg")
+      expect(subject.file_format).to eql("jpg")
     end
 
     it "should respond to :original_filename" do
-      expect(subject.original_filename).to eql("image.jpg")
+      expect(subject.original_filename).to eql("file.jpg")
+    end
+  end
+
+  context "correct pdf data" do
+    let(:image_data) { "data:application/pdf;base64,/9j/4AAQSkZJRgABAQEASABKdhH//2Q==" }
+    subject { described_class.new image_data }
+
+    it "determines the image format from the Dara URI scheme" do
+      expect(subject.file_format).to eql("pdf")
+    end
+
+    it "should respond to :original_filename" do
+      expect(subject.original_filename).to eql("file.pdf")
     end
   end
 

data/spec/orm/activerecord_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Carrierwave::Base64::ActiveRecord do
       subject.image = File.read(file_path("fixtures", "base64_image.fixture")).strip
       subject.save!
       subject.reload
-      expect(subject.image.current_path).to eq file_path("../uploads", "image.jpg")
+      expect(subject.image.current_path).to eq file_path("../uploads", "file.jpg")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-base64
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Yury Lebedev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave