carrierwave-base64 2.9.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3af16036cb1f1a6f3ae6ffce52db973a32c09c76287cde31036bed14b9989d3f
-  data.tar.gz: 62500de72742bb64cae9f3839124892f33463044c554f245b256868262c64e5d
+  metadata.gz: 4b2f2aa6a1eb39ec42dd3cc71e85a56a8f838181d81e568965a2ced1557585ed
+  data.tar.gz: 525afd0612b8e5a29801cb8a7c94ab3abb23b0add71710fc1e164a61718dac35
 SHA512:
-  metadata.gz: f7e8b717582744821f8bd91437ced8f9fe7e794c6c9821e613a3b1c4eb4f33f5e4774b15428a74ddf8e1080143a9444b958776e7c8c156c2004bb97767e84e60
-  data.tar.gz: aad329e8d107294400e2ea177cd6d7ef4e40751b6bf57fa4987782705d4c9f30ba0f013df1e24e73f96af27ec98a90189f4207f1fbc6eec79726012bc7a19bad
+  metadata.gz: 758a65bf080107ea0a79192f4aeb929e1754d3a568cb3c3fc55eee281a4b817da808c5866aee4953e36c2396c4880e29749c12158f57245a416d833c812f77f6
+  data.tar.gz: 2d05d217b7a3141bcfaf3e4d038e32bd0c00d18848ae054362dc3aa8a0c3109c6d317ed72559a9be6a48ac3ca34f4bcec2dccab5382bc06144ec0b563fc3fb40

data/.circleci/config.yml

@@ -0,0 +1,36 @@
+version: 2.1
+
+orbs:
+  ruby: circleci/ruby@2.1.1
+
+jobs:
+  build:
+    parameters:
+      ruby_version:
+        type: string
+
+    docker:
+      - image: cimg/ruby:<< parameters.ruby_version >>
+
+    steps:
+      - checkout
+      - run:
+          name: Install dependencies
+          command: |
+            gem install bundler
+            bundle install
+      - run:
+          name: Tests
+          command: bundle exec rspec
+      - run:
+          name: Lint
+          command: bundle exec rubocop
+
+workflows:
+  workflow:
+    jobs:
+      - build:
+          matrix:
+            name: build-<< matrix.ruby_version >>
+            parameters:
+              ruby_version: ["2.7", "3.0", "3.1", "3.2", "3.3"]

data/.rubocop.yml

@@ -14,3 +14,6 @@ Style/SafeNavigation:
 
 Lint/SendWithMixinArgument:
   Enabled: false
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # carrierwave-base64 changelog
 
+## 2.11.0
+
+ - Add ability to remove upload by assigning nil value to the field
+
+## 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)

data/README.md

@@ -1,7 +1,7 @@
 # Carrierwave::Base64
 
+[![CircleCI](https://dl.circleci.com/status-badge/img/gh/y9v/carrierwave-base64/tree/master.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/y9v/carrierwave-base64/tree/master)
 [![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)
 
 Upload files encoded as base64 to carrierwave.

data/carrierwave-base64.gemspec

@@ -20,18 +20,18 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'carrierwave', '>= 2.2.1'
-  spec.add_dependency 'mime-types', '~> 3.0'
   spec.add_dependency 'marcel', '~> 1.0.0'
+  spec.add_dependency 'mime-types', '~> 3.0'
 
-  spec.add_development_dependency 'bundler', '~> 2.1'
-  spec.add_development_dependency 'carrierwave-mongoid'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'carrierwave-mongoid', '~> 1.4.0'
   spec.add_development_dependency 'mongoid'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rails', '~> 5'
-  spec.add_development_dependency 'rake', '~> 12.3.3'
-  spec.add_development_dependency 'rspec', '~> 2.14'
+  spec.add_development_dependency 'rails'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'sham_rack'
-  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'sqlite3', '~> 1.7.3'
   spec.add_development_dependency 'yard'
 end

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/mounting_helper.rb

@@ -43,14 +43,14 @@ module Carrierwave
       def define_writer(klass, attr, options)
         klass.send(:define_method, "#{attr}=") do |data|
           # rubocop:disable Lint/NonLocalExitFromIterator
-          return if data.to_s.empty? || data == send(attr).to_s
-
+          return if data == send(attr).to_s
           # rubocop:enable Lint/NonLocalExitFromIterator
 
           send("#{attr}_will_change!") if respond_to?("#{attr}_will_change!")
 
-          return super(data) unless data.is_a?(String) &&
-                                    data.strip.start_with?('data')
+          return send("remove_#{attr}=", true) if data.to_s.strip == ''
+
+          return super(data) unless data.is_a?(String) && data.strip.start_with?('data')
 
           super Carrierwave::Base64::Base64StringIO.new(
             data.strip,

data/lib/carrierwave/base64/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Base64
-    VERSION = '2.9.0'.freeze
+    VERSION = '2.11.0'.freeze
   end
 end

data/spec/adapter_spec.rb

@@ -40,9 +40,7 @@ RSpec.describe Carrierwave::Base64::Adapter do
 
     context 'models with file_name options for the uploader' do
       subject do
-        User.mount_base64_uploader(
-          :image, uploader, file_name: ->(u) { u.username }
-        )
+        User.mount_base64_uploader(:image, uploader, file_name: :username.to_proc)
         User.new(username: 'batman')
       end
 
@@ -63,9 +61,7 @@ RSpec.describe Carrierwave::Base64::Adapter do
       context 'when file_name is a proc' do
         it 'does NOT issue a deprecation warning' do
           expect do
-            User.mount_base64_uploader(
-              :image, uploader, file_name: ->(u) { u.username }
-            )
+            User.mount_base64_uploader(:image, uploader, file_name: :username.to_proc)
           end.not_to warn('Deprecation')
         end
       end
@@ -149,6 +145,12 @@ RSpec.describe Carrierwave::Base64::Adapter do
           subject.save!
           expect(subject.image.file).to be_nil
         end
+
+        it 'removes files when setting the attribute to nil' do
+          subject.image = nil
+          subject.save!
+          expect(subject.image.file).to be_nil
+        end
       end
     end
 
@@ -170,5 +172,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

data/spec/base64_string_io_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe Carrierwave::Base64::Base64StringIO do
       end
 
       it 'calls a function that returns the file_name' do
-        method = ->(u) { u.username }
+        method = :username.to_proc
         base64_string_io = described_class.new(
           data, method.curry[User.new(username: 'batman')]
         )

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require 'pry'
 require 'sham_rack'
 
 require 'rails'

data/spec/support/custom_expectations/warn_expectation.rb

@@ -7,11 +7,11 @@ RSpec::Matchers.define :warn do |message|
     "warn \"#{message}\""
   end
 
-  failure_message_for_should do
+  failure_message do
     "expected to #{description}"
   end
 
-  failure_message_for_should_not do
+  failure_message_when_negated do
     "expected to not #{description}"
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-base64
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Yury Lebedev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2024-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -25,61 +25,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.2.1
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: marcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: marcel
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: carrierwave-mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -112,44 +112,44 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -182,16 +182,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.3
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -214,10 +214,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -236,7 +236,7 @@ files:
 - spec/fixtures/base64_image.fixture
 - spec/fixtures/test.docx
 - spec/fixtures/test.jpeg
-- spec/fixtures/test.mp3
+- spec/fixtures/test.mpga
 - spec/fixtures/test.pdf
 - spec/fixtures/test.png
 - spec/spec_helper.rb
@@ -262,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.5.17
 signing_key:
 specification_version: 4
 summary: Upload images encoded as base64 to carrierwave.
@@ -272,7 +272,7 @@ test_files:
 - spec/fixtures/base64_image.fixture
 - spec/fixtures/test.docx
 - spec/fixtures/test.jpeg
-- spec/fixtures/test.mp3
+- spec/fixtures/test.mpga
 - spec/fixtures/test.pdf
 - spec/fixtures/test.png
 - spec/spec_helper.rb

data/.travis.yml

@@ -1,27 +0,0 @@
-language: ruby
-
-rvm:
- - 2.4.9
- - 2.5.7
- - 2.6.5
- - 2.7.0
- - ruby-head
- - jruby-head
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-
-gemfile:
-  - Gemfile
-
-sudo: false
-
-before_install:
-  - gem update --system
-  - gem update bundler
-
-script:
-  - bundle exec rspec
-  - bundle exec rubocop