carrierwave-base64 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d249b3b150b00ce5d437c1800800c7ccad72c8fb
-  data.tar.gz: 9c9b87841ced55ecc87b887b3de826af16100262
+  metadata.gz: 6cf760a50a5b061dd501f3ef738c93e11deef874
+  data.tar.gz: b934e247e3419fbc7adcbaf7bb66d2f15a1442e0
 SHA512:
-  metadata.gz: 6cf7446b85f54a298aae229b152382c2597fbde5b3ffb229bbe181aa3875bffce41affbddfa1cfdcee3f8351fca0a6298d3c482fe6beaf4736812312406c1b73
-  data.tar.gz: e6e6ac3219ac7116d0e8373e244eb63b8806cb2fbb141cdd1758f39a78d789d44333563060b36909dff0fd6c0bdcd16ecd01674ffa6aa087face8f17f6f1a523
+  metadata.gz: c5e14194c1a0b7e76d32c708de7f46c675bdb9f2cd642f6cc2d75956e9c1ea71d9a4e8f7251e29ab978fb2571ccf26fb63bf50b658a16bb0e255aeadc2f85309
+  data.tar.gz: cda44171485b7081c9b005ac372a1a88b0a8cdf7dc0a8fb92392593532353ea1818205f060ec6c379b6614ad70df43e26a4329de21624d769574c189e6295124

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,2 @@
+Documentation:
+  Enabled: false

data/.travis.yml

@@ -2,14 +2,20 @@ language: ruby
 
 rvm:
  - 2.0.0
- - 2.1.5
- - 2.2.2
+ - 2.1.9
+ - 2.2.5
+ - 2.3.1
  - ruby-head
 
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+
 gemfile:
   - Gemfile
 
 sudo: false
 
-notifications:
-  email: false
+script:
+  - bundle exec rspec
+  - bundle exec rubocop

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# carrierwave-base64 changelog
+
+## 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/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in carrierwave-base64.gemspec
 gemspec

data/README.md

@@ -7,7 +7,7 @@ Upload files encoded as base64 to carrierwave.
 
 This small gem can be useful for API's that interact with mobile devices.
 
-As of version 2.2.0, this gem requires Ruby 2.0 or higher
+As of version 2.3.0, this gem requires Ruby 2.0 or higher
 
 ## Installation
 
@@ -33,6 +33,16 @@ mount_base64_uploader :image, ImageUploader
 
 Now you can also upload files by passing an encoded base64 string to the attribute.
 
+## Setting the file name
+
+To set the file name for the uploaded files, use the `:file_name` option:
+
+```ruby
+mount_base64_uploader :image, ImageUploader, file_name: 'userpic'
+```
+
+This value will be used, when naming stored files. Extention will be taked from the base64 content-type spec.
+
 ## Data format
 
 The string with the encoded data, should be prefixed with Data URI scheme format:

data/Rakefile

@@ -1,10 +1,8 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
-require "rspec/core/rake_task"
+require 'rspec/core/rake_task'
 
-desc "Run all examples"
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = %w[--color]
-end
+desc 'Run all examples'
+RSpec::Core::RakeTask.new(:spec)
 
 task default: [:spec]

data/carrierwave-base64.gemspec

@@ -1,31 +1,33 @@
 # coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require "carrierwave/base64/version"
+require 'carrierwave/base64/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "carrierwave-base64"
+  spec.name          = 'carrierwave-base64'
   spec.version       = Carrierwave::Base64::VERSION
-  spec.authors       = ["Yury Lebedev"]
-  spec.email         = ["lebedev.yurii@gmail.com"]
-  spec.summary       = %q{Upload images encoded as base64 to carrierwave.}
-  spec.description   = %q{This gem can be useful, if you need to upload files to your API from mobile devises.}
-  spec.homepage      = "https://github.com/lebedev-yury/carrierwave-base64"
-  spec.license       = "MIT"
+  spec.authors       = ['Yury Lebedev']
+  spec.email         = ['lebedev.yurii@gmail.com']
+  spec.summary       = 'Upload images encoded as base64 to carrierwave.'
+  spec.description   = 'This gem can be useful, if you need to upload files '\
+                       'to your API from mobile devises.'
+  spec.homepage      = 'https://github.com/lebedev-yury/carrierwave-base64'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "carrierwave", [">= 0.8.0", "< 0.12.0"]
+  spec.add_dependency 'carrierwave', ['>= 0.8.0', '< 0.12.0']
 
-  spec.add_development_dependency "rails", ">= 3.2.0"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", ["~> 10.0"]
-  spec.add_development_dependency "rspec", ["~> 2.14"]
-  spec.add_development_dependency "sham_rack"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency 'rails', '>= 3.2.0'
+  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'rake', ['~> 10.0']
+  spec.add_development_dependency 'rspec', ['~> 2.14']
+  spec.add_development_dependency 'sham_rack'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rubocop'
 end

data/lib/carrierwave/base64.rb

@@ -1,6 +1,6 @@
-require "carrierwave/base64/version"
-require "carrierwave/base64/base64_string_io"
-require "carrierwave/base64/adapter"
+require 'carrierwave/base64/version'
+require 'carrierwave/base64/base64_string_io'
+require 'carrierwave/base64/adapter'
 
 module Carrierwave
   module Base64
@@ -10,7 +10,8 @@ module Carrierwave
       end
 
       ActiveSupport.on_load :mongoid do
-        Mongoid::Document::ClassMethods.send :include, Carrierwave::Base64::Adapter
+        Mongoid::Document::ClassMethods.send :include,
+                                             Carrierwave::Base64::Adapter
       end
     end
   end

data/lib/carrierwave/base64/adapter.rb

@@ -7,11 +7,12 @@ module Carrierwave
         define_method "#{attribute}=" do |data|
           send "#{attribute}_will_change!" if data.present?
 
-          if data.present? && data.is_a?(String) && data.strip.start_with?("data")
-            super(Carrierwave::Base64::Base64StringIO.new(data.strip))
-          else
-            super(data)
-          end
+          super(data) unless data.is_a?(String) &&
+                             data.strip.start_with?('data')
+
+          super(Carrierwave::Base64::Base64StringIO.new(
+            data.strip, options[:file_name] || 'file'
+          ))
         end
       end
     end

data/lib/carrierwave/base64/base64_string_io.rb

@@ -3,14 +3,15 @@ module Carrierwave
     class Base64StringIO < StringIO
       class ArgumentError < StandardError; end
 
-      attr_accessor :file_format
+      attr_accessor :file_format, :file_name
 
-      def initialize(encoded_file)
-        description, encoded_bytes = encoded_file.split(",")
+      def initialize(encoded_file, file_name)
+        description, encoded_bytes = encoded_file.split(',')
 
         raise ArgumentError unless encoded_bytes
-        raise ArgumentError if encoded_bytes.eql?("(null)")
+        raise ArgumentError if encoded_bytes.eql?('(null)')
 
+        @file_name = file_name
         @file_format = get_file_format description
         bytes = ::Base64.decode64 encoded_bytes
 
@@ -18,7 +19,7 @@ module Carrierwave
       end
 
       def original_filename
-        File.basename("file.#{@file_format}")
+        File.basename("#{@file_name}.#{@file_format}")
       end
 
       private

data/lib/carrierwave/base64/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Base64
-    VERSION = "2.2.0"
+    VERSION = '2.3.0'.freeze
   end
 end

data/spec/.#base64_string_io_spec.rb

@@ -0,0 +1 @@
+lebedev@MacBook-Pro-2.local.4354

data/spec/adapter_spec.rb

@@ -1,7 +1,5 @@
-require "spec_helper"
-
 RSpec.describe Carrierwave::Base64::Adapter do
-  describe ".mount_base64_uploader" do
+  describe '.mount_base64_uploader' do
     let(:uploader) { Class.new CarrierWave::Uploader::Base }
 
     subject do
@@ -9,40 +7,64 @@ RSpec.describe Carrierwave::Base64::Adapter do
       Post.new
     end
 
-    it "mounts the uploader on the image field" do
+    it 'mounts the uploader on the image field' do
       expect(subject.image).to be_an_instance_of(uploader)
     end
 
-    it "handles normal file uploads" do
-      sham_rack_app = ShamRack.at('www.example.com').stub
-      sham_rack_app.register_resource("/test.jpg", file_path("fixtures", "test.jpg"), "images/jpg")
-      subject[:image] = "test.jpg"
-      expect(subject.changed?).to be_truthy
-      subject.save!
-      subject.reload
-      expect(subject.image.current_path).to eq file_path("../uploads", "test.jpg")
-    end
+    context 'normal file uploads' do
+      before(:each) do
+        sham_rack_app = ShamRack.at('www.example.com').stub
+        sham_rack_app.register_resource(
+          '/test.jpg', file_path('fixtures', 'test.jpg'), 'images/jpg'
+        )
+        subject[:image] = 'test.jpg'
+      end
+
+      it 'sets will_change for the attribute' do
+        expect(subject.changed?).to be_truthy
+      end
 
-    it "handles data-urls" 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", "file.jpg")
+      it 'saves the file' do
+        subject.save!
+        subject.reload
+
+        expect(
+          subject.image.current_path
+        ).to eq file_path('../uploads', 'test.jpg')
+      end
     end
 
-    it "marks the attribute as changed" do
-      subject.image = File.read(file_path("fixtures", "base64_image.fixture")).strip
-      expect(subject.changed?).to be_truthy
+    context 'base64 strings' do
+      before(:each) do
+        subject.image = File.read(
+          file_path('fixtures', 'base64_image.fixture')
+        ).strip
+      end
+
+      it 'creates a file' do
+        subject.save!
+        subject.reload
+
+        expect(
+          subject.image.current_path
+        ).to eq file_path('../uploads', 'file.jpg')
+      end
+
+      it 'sets will_change for the attribute' do
+        expect(subject.changed?).to be_truthy
+      end
     end
 
-    context "stored uploads exist for the field" do
+    context 'stored uploads exist for the field' do
       before :each do
-        subject.image = File.read(file_path("fixtures", "base64_image.fixture")).strip
+        subject.image = File.read(
+          file_path('fixtures', 'base64_image.fixture')
+        ).strip
         subject.save!
         subject.reload
       end
 
-      it "removes persisted files when remove_ with the field name attribute is set to true" do
+      it 'removes files when remove_* is set to true' do
         subject.remove_image = true
         subject.save!
         expect(subject.reload.image.file).to be_nil

data/spec/base64_string_io_spec.rb

@@ -1,55 +1,34 @@
-require "spec_helper"
-
 RSpec.describe Carrierwave::Base64::Base64StringIO do
-  context "correct image data" do
-    let(:image_data) { "data:image/jpg;base64,/9j/4AAQSkZJRgABAQEASABKdhH//2Q==" }
-    subject { described_class.new image_data }
-
-    it "determines the image format from the Data URI scheme" do
-      expect(subject.file_format).to eql("jpg")
-    end
-
-    it "should respond to :original_filename" do
-      expect(subject.original_filename).to eql("file.jpg")
-    end
-  end
+  %w(image/jpg application/pdf audio/mp3).each do |content_type|
+    context "correct #{content_type} data" do
+      let(:data) do
+        "data:#{content_type};base64,/9j/4AAQSkZJRgABAQEASABKdhH//2Q=="
+      end
 
-  context "correct pdf data" do
-    let(:image_data) { "data:application/pdf;base64,/9j/4AAQSkZJRgABAQEASABKdhH//2Q==" }
-    subject { described_class.new image_data }
+      let(:file_format) { content_type.split('/').last }
 
-    it "determines the image format from the Data 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
-
-  context "correct mp3 data" do
-    let(:audio_data) { "data:audio/mp3;base64,/9j/4AAQSkZJRgABAQEASABKdhH//2Q==" }
-    subject { described_class.new audio_data }
+      subject { described_class.new data, 'file' }
 
-    it "determines the image format from the Data URI scheme" do
-      expect(subject.file_format).to eql("mp3")
-    end
+      it 'determines the file format from the Data URI content type' do
+        expect(subject.file_format).to eql(file_format)
+      end
 
-    it "should respond to :original_filename" do
-      expect(subject.original_filename).to eql("file.mp3")
+      it 'should respond to :original_filename' do
+        expect(subject.original_filename).to eql("file.#{file_format}")
+      end
     end
   end
 
-  context "incorrect image data" do
-    it "raises an ArgumentError if Data URI scheme format is missing" do
+  context 'invalid image data' do
+    it 'raises an ArgumentError if Data URI content type is missing' do
       expect do
-        described_class.new("/9j/4AAQSkZJRgABAQEASABIAADKdhH//2Q==")
+        described_class.new('/9j/4AAQSkZJRgABAQEASABIAADKdhH//2Q==', 'file')
       end.to raise_error(Carrierwave::Base64::Base64StringIO::ArgumentError)
     end
 
-    it "raises ArgumentError if base64 data eql (null)" do
+    it 'raises ArgumentError if base64 data eql (null)' do
       expect do
-        described_class.new("data:image/jpg;base64,(null)")
+        described_class.new('data:image/jpg;base64,(null)', 'file')
       end.to raise_error(Carrierwave::Base64::Base64StringIO::ArgumentError)
     end
   end

data/spec/spec_helper.rb

@@ -1,21 +1,22 @@
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-require "pry"
-require "sham_rack"
+require 'pry'
+require 'sham_rack'
 
-require "rails"
-require "active_record"
+require 'rails'
+require 'active_record'
 
-require "carrierwave"
-require "carrierwave/orm/activerecord"
+require 'carrierwave'
+require 'carrierwave/orm/activerecord'
 
-require "carrierwave/base64"
+require 'carrierwave/base64'
 
-ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+ActiveRecord::Base.raise_in_transactional_callbacks = true
+ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
 
-load "support/schema.rb"
-require "support/models"
+load 'support/schema.rb'
+require 'support/models'
 
 def file_path(*paths)
   File.expand_path(File.join(File.dirname(__FILE__), *paths))

data/spec/support/schema.rb

@@ -1,9 +1,9 @@
 ActiveRecord::Schema.define do
   self.verbose = false
 
-  create_table "posts", force: :cascade do |t|
-    t.string   "image"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+  create_table 'posts', force: :cascade do |t|
+    t.string   'image'
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-base64
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Yury Lebedev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -128,6 +128,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem can be useful, if you need to upload files to your API from
   mobile devises.
 email:
@@ -137,7 +151,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -147,6 +164,7 @@ files:
 - lib/carrierwave/base64/adapter.rb
 - lib/carrierwave/base64/base64_string_io.rb
 - lib/carrierwave/base64/version.rb
+- spec/.#base64_string_io_spec.rb
 - spec/adapter_spec.rb
 - spec/base64_string_io_spec.rb
 - spec/fixtures/base64_image.fixture
@@ -179,6 +197,7 @@ signing_key:
 specification_version: 4
 summary: Upload images encoded as base64 to carrierwave.
 test_files:
+- spec/.#base64_string_io_spec.rb
 - spec/adapter_spec.rb
 - spec/base64_string_io_spec.rb
 - spec/fixtures/base64_image.fixture