carrierwave-base64 2.3.4 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c51cad701a3c7e8051997d469afb8cf49b546409
-  data.tar.gz: 653308f4522090cd60e8f6c522fc73c608b9361d
+  metadata.gz: 43ded0d0612bfca0092a8f69bf75f2cea936c1d2
+  data.tar.gz: 4ade936bbe6f44cc7e25e5aac7f34cc11a6866fe
 SHA512:
-  metadata.gz: 03ef9d8787dea43e25ee9a563c7cb0711fe6126ee655fc9a23198d1ba89fdc45cdde6cabac79e357576cf9b3479d5b0c26e710abe5c3ecc37aa89b6d4ba65212
-  data.tar.gz: 60f319ef16802348c20f474a9fa718ed8192f8f1db772d53cdd071b13f2bd23a4c4c674c118ab5d7cba4175a4f98236d1a34bd3b53109ca6c4cc0728866a004e
+  metadata.gz: 502a3d71f3829b95dd92f47b1079e338976189ecf448a1c1c5a680b927f267006a3bc084a376d27f9deb7910a0971f29c3e2ab32a8464a389e70144129b3fdef
+  data.tar.gz: 7c18f72082d986903560a01c20ff51e6e04fb5afc6e03054e7e3535e3e0a806d7e7158063c1509d5a54f30f13b71a34a3c2fef99d63f04a1b46defada8cc54a4

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # carrierwave-base64 changelog
 
+## 2.3.5
+
+  - Fixed issue with mongoid models, when `attribute_will_change!` method was called, that wasn't defined in Mongoid models (credits to @cuongnm53)
+
 ## 2.3.3
 
   - Added proc support for the `:file_name` option for the `mount_base64_uploader` method. (credits to @hendricius)

data/carrierwave-base64.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'rails', '>= 3.2.0'
   spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'mongoid'
+  spec.add_development_dependency 'carrierwave-mongoid'
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', ['~> 10.0']
   spec.add_development_dependency 'rspec', ['~> 2.14']

data/lib/carrierwave/base64/adapter.rb

@@ -1,11 +1,14 @@
 module Carrierwave
   module Base64
     module Adapter
+      # rubocop:disable Metrics/MethodLength
       def mount_base64_uploader(attribute, uploader_class, options = {})
         mount_uploader attribute, uploader_class, options
 
         define_method "#{attribute}=" do |data|
-          send "#{attribute}_will_change!" if data.present?
+          if respond_to?("#{attribute}_will_change!") && data.present?
+            send "#{attribute}_will_change!"
+          end
 
           return super(data) unless data.is_a?(String) &&
                                     data.strip.start_with?('data')
@@ -14,6 +17,7 @@ module Carrierwave
             data.strip, options[:file_name] || 'file'
           ))
         end
+        # rubocop:enable Metrics/MethodLength
       end
     end
   end

data/lib/carrierwave/base64/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Base64
-    VERSION = '2.3.4'.freeze
+    VERSION = '2.3.5'.freeze
   end
 end

data/spec/adapter_spec.rb

@@ -7,6 +7,11 @@ RSpec.describe Carrierwave::Base64::Adapter do
       Post.new
     end
 
+    let(:mongoid_model) do
+      MongoidModel.mount_base64_uploader(:image, uploader)
+      MongoidModel.new
+    end
+
     it 'mounts the uploader on the image field' do
       expect(subject.image).to be_an_instance_of(uploader)
     end
@@ -20,7 +25,7 @@ RSpec.describe Carrierwave::Base64::Adapter do
         subject[:image] = 'test.jpg'
       end
 
-      it 'sets will_change for the attribute' do
+      it 'sets will_change for the attribute on activerecord models' do
         expect(subject.changed?).to be_truthy
       end
 
@@ -53,6 +58,12 @@ RSpec.describe Carrierwave::Base64::Adapter do
       it 'sets will_change for the attribute' do
         expect(subject.changed?).to be_truthy
       end
+
+      it 'does not call will_change mongoid models' do
+        expect do
+          mongoid_model.image = 'test.jpg'
+        end.not_to raise_error
+      end
     end
 
     context 'stored uploads exist for the field' do

data/spec/spec_helper.rb

@@ -6,14 +6,19 @@ require 'sham_rack'
 
 require 'rails'
 require 'active_record'
+require 'mongoid'
 
 require 'carrierwave'
 require 'carrierwave/orm/activerecord'
+require 'carrierwave/mongoid'
 
 require 'carrierwave/base64'
 
 ActiveRecord::Base.raise_in_transactional_callbacks = true
-ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
+ActiveRecord::Base.establish_connection(
+  adapter: 'sqlite3',
+  database: ':memory:'
+)
 
 load 'support/schema.rb'
 require 'support/models'

data/spec/support/models.rb

@@ -1,2 +1,6 @@
 class Post < ActiveRecord::Base
 end
+
+class MongoidModel
+  include Mongoid::Document
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-base64
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors:
 - Yury Lebedev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -52,6 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  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'
+- !ruby/object:Gem::Dependency
+  name: carrierwave-mongoid
+  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'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Upload images encoded as base64 to carrierwave.