carrierwave-base64 2.8.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9da0e56ae6151c3068b895309bd70f9bfba959b28785b8fafde064bfecc9047
-  data.tar.gz: b723fcc95905b624fdc54394129bd9629b8bc1aa781061fc992f6f2ec3405d6f
+  metadata.gz: dcc0254f7258899a78ff178e32c60221aea32cf3551a1dc0702ff1675645024b
+  data.tar.gz: dc0f4f9de01fe428086ac3a3289ae808e53c2a0f80713cee51b8ef177ad542d4
 SHA512:
-  metadata.gz: ccb2e7e949025a1eb37ba1bea875219ea269b561f6783f44203ba3085f9e2455913f9e01eb540e54165d0f4e5cc371cae4009dc367a2a278d9f65b6d26c01dc0
-  data.tar.gz: a429b36e280b49ac842bcf26ccf73c096cce0a3a67129ee97a3c92fd391a38ffb3486220c947a9a243e8d7db7a4997b81cfad9b36d0e3c974ad451d6f1b71286
+  metadata.gz: 7e9df88c09c107a39403c969dedd523e7bcd9a152bdcb548ee3250ea63b4e8498b80a33a52903f66530f4ba95bc61c3b63081de7c08e64f62779613cc9ff486c
+  data.tar.gz: d104d6d00b5ee4b3772dd696f9136c0d3335aa460d3fd8543fa484050c22817a1189b21d731a748960f14fbf550c5b060f8e353c137017cda5377be19811a215

data/.rubocop.yml

@@ -5,3 +5,12 @@ Metrics/BlockLength:
   Exclude:
     - "spec/**/*"
     - "*.gemspec"
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/SafeNavigation:
+  Enabled: false
+
+Lint/SendWithMixinArgument:
+  Enabled: false

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 
 rvm:
- - 2.2.10
- - 2.3.8
- - 2.4.5
- - 2.5.2
+ - 2.4.9
+ - 2.5.7
+ - 2.6.5
+ - 2.7.0
  - ruby-head
  - jruby-head
 
@@ -18,6 +18,10 @@ gemfile:
 
 sudo: false
 
+before_install:
+  - gem update --system
+  - gem update bundler
+
 script:
   - bundle exec rspec
   - bundle exec rubocop

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # carrierwave-base64 changelog
 
+## 2.10.0
+
+ - Allow `mount_base64_uploader` to take a block as an argument (#83, @shuuuuun)
+
+## 2.9.0
+
+ - Mimemagic gem is replaced with Marcel (#87, @oakbow)
+
 ## 2.8.0
 
  - Mime Type is now detected from file contents, falling back to the type, specified by the user. (#73, @justisb)

data/README.md

@@ -3,7 +3,6 @@
 [![Gem Version](https://badge.fury.io/rb/carrierwave-base64.svg)](http://badge.fury.io/rb/carrierwave-base64)
 [![Build Status](https://travis-ci.org/y9v/carrierwave-base64.svg?branch=master)](https://travis-ci.org/y9v/carrierwave-base64)
 [![Code Climate](https://codeclimate.com/github/y9v/carrierwave-base64/badges/gpa.svg)](https://codeclimate.com/github/y9v/carrierwave-base64)
-[![Inch CI](https://inch-ci.org/github/y9v/carrierwave-base64.svg?branch=master)](https://inch-ci.org/github/y9v/carrierwave-base64)
 
 Upload files encoded as base64 to carrierwave.
 
@@ -33,7 +32,7 @@ Mount the uploader to your model:
 mount_base64_uploader :image, ImageUploader
 ```
 
-Now you can also upload files by passing an encoded base64 string to the attribute.
+Now you can also upload files by passing an encoded base64 string to the attribute. This also works for normal file uploads from file fields inside an HTML form, so you can safely replace `mount_uploader` with `mount_base64_uploader` to support both file input and base64 encoded input
 
 ## Upload file extension
 
@@ -69,9 +68,7 @@ mount_base64_uploader :image, ImageUploader, file_name: -> { 'userpic' }
 
 ## Data format
 
-The string with the encoded data, should be prefixed with Data URI scheme format.
-
-Keep in mind, that the content type specified in this string, would be used to identified the file extension. So if you have some custom content type uploaded, don't forget to register a Mime Type for it.
+File extention for the uploaded file is identified automatically based on the file contents. If it can't be identified automaticaly, it falls back to the content-type, specified in the data string.
 
 ```
 data:image/jpeg;base64,(base64 encoded data)

data/Rakefile

@@ -1,8 +1 @@
 require 'bundler/gem_tasks'
-
-require 'rspec/core/rake_task'
-
-desc 'Run all examples'
-RSpec::Core::RakeTask.new(:spec)
-
-task default: [:spec]

data/carrierwave-base64.gemspec

@@ -19,16 +19,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'carrierwave', '>= 0.8.0'
+  spec.add_dependency 'carrierwave', '>= 2.2.1'
   spec.add_dependency 'mime-types', '~> 3.0'
-  spec.add_dependency 'mimemagic', '~> 0.3.2'
+  spec.add_dependency 'marcel', '~> 1.0.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'carrierwave-mongoid'
   spec.add_development_dependency 'mongoid'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rails', '~> 5'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.3.3'
   spec.add_development_dependency 'rspec', '~> 2.14'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'sham_rack'

data/lib/carrierwave/base64/adapter.rb

@@ -17,9 +17,16 @@ module Carrierwave
       #   mount_base64_uploader :image, ImageUploader,
       #     file_name: -> (u) { u.username }
       #
+      # @example Mount the uploader with a block, overriding the store_dir
+      #   mount_base64_uploader :image, ImageUploader do
+      #     def store_dir
+      #       'images'
+      #     end
+      #   end
+      #
       # @return [Symbol] the defined writer method name
-      def mount_base64_uploader(attribute, uploader_class, options = {})
-        mount_uploader attribute, uploader_class, options
+      def mount_base64_uploader(attribute, uploader_class, options = {}, &block)
+        mount_uploader attribute, uploader_class, options, &block
         options[:file_name] ||= proc { attribute }
 
         Carrierwave::Base64::MountingHelper.check_for_deprecations(options)

data/lib/carrierwave/base64/base64_string_io.rb

@@ -1,5 +1,4 @@
-require 'mimemagic'
-require 'mimemagic/overlay'
+require 'marcel'
 
 module Carrierwave
   module Base64
@@ -48,7 +47,7 @@ module Carrierwave
 
       # Determine content type from input, with provided type as fallback
       def get_file_extension(description, bytes)
-        detected_type = MimeMagic.by_magic(bytes)
+        detected_type = Marcel::Magic.by_magic(bytes)
         content_type = (detected_type && detected_type.type) ||
                        description.split(';base64').first
         mime_type = MIME::Types[content_type].last

data/lib/carrierwave/base64/railtie.rb

@@ -8,8 +8,7 @@ module Carrierwave
       end
 
       ActiveSupport.on_load :mongoid do
-        Mongoid::Document::ClassMethods.send :include,
-                                             Carrierwave::Base64::Adapter
+        Mongoid::Document::ClassMethods.include Carrierwave::Base64::Adapter
       end
     end
   end

data/lib/carrierwave/base64/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Base64
-    VERSION = '2.8.0'.freeze
+    VERSION = '2.10.0'.freeze
   end
 end

data/spec/adapter_spec.rb

@@ -170,5 +170,24 @@ RSpec.describe Carrierwave::Base64::Adapter do
         expect { subject.update!(username: 'new-username') }.not_to raise_error
       end
     end
+
+    context 'models with a block for the uploader' do
+      subject do
+        User.mount_base64_uploader(:image, uploader) do
+          def monkey
+            'blah'
+          end
+        end
+        User.new
+      end
+
+      it 'should return an instance of a subclass of CarrierWave::Uploader::Base' do
+        expect(subject.image).to be_a(CarrierWave::Uploader::Base)
+      end
+
+      it 'should apply any custom modifications' do
+        expect(subject.image.monkey).to eq('blah')
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-base64
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Yury Lebedev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -39,33 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: mimemagic
+  name: marcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: carrierwave-mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -247,7 +247,7 @@ homepage: https://github.com/lebedev-yury/carrierwave-base64
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -262,9 +262,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Upload images encoded as base64 to carrierwave.
 test_files: