Merge pull request #36 from rootstrap/support-rails-6

Support Rails 6

Author: santib

.rubocop.yml

@@ -19,6 +19,8 @@ Metrics/BlockLength:
   Exclude:
     - config/**/*
     - spec/**/*
+  ExcludedMethods:
+    - class_methods
 
 Metrics/BlockNesting:
   Max: 4

.travis.yml

@@ -4,10 +4,8 @@ before_install:
   - gem install bundler -v "~> 1.17"
 
 rvm:
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
   - 2.5.0
+  - 2.6.0
   - ruby-head
 
 matrix:

README.md

@@ -96,6 +96,7 @@ class UsersController < ApplicationController
   def create
     user = User.create(user_params)
     user.avatar = { data: params[:avatar] }
+    user.save
   end
 
   private

active_storage_base64.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'active_storage_base64'
-  s.version = '0.1.4'
+  s.version = '1.0.0'
   s.summary = 'Base64 support for ActiveStorage'
   s.description = s.summary
 
@@ -17,13 +17,13 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.2.2'
 
   # Dependencies
-  s.add_dependency 'rails', '~> 5.2'
+  s.add_dependency 'rails', '~> 6.0'
 
   # Development dependencies
   s.add_development_dependency 'pry-rails', '~> 0.3.6'
   s.add_development_dependency 'reek', '~> 4.8.1'
   s.add_development_dependency 'rspec-rails', '~> 3.8.0'
   s.add_development_dependency 'rubocop', '~> 0.56.0'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'sqlite3', '1.3.13'
+  s.add_development_dependency 'sqlite3', '1.4.1'
 end

config.reek

@@ -9,10 +9,8 @@ ClassVariable:
   exclude: []
 ControlParameter:
   enabled: true
-  exclude: ['ActiveStorageSupport::SupportForBase64#add_helper_method']
 DataClump:
   enabled: true
-  exclude: ['ActiveStorageSupport::SupportForBase64']
   max_copies: 2
   min_clump_size: 2
 DuplicateMethodCall:

lib/active_storage_support/base64_many.rb

@@ -1,12 +1,14 @@
 module ActiveStorageSupport
   class Base64Many < ActiveStorage::Attached::Many
     def attach(*attachables)
-      super base64_attachments(attachables)
+      super self.class.from_base64(attachables)
     end
 
-    def base64_attachments(attachments)
-      attachments.flatten.map do |attachment|
-        ActiveStorageSupport::Base64Attach.attachment_from_data(attachment)
+    def self.from_base64(attachables)
+      attachables = [attachables] unless attachables.is_a?(Array)
+
+      attachables.flatten.map do |attachable|
+        ActiveStorageSupport::Base64Attach.attachment_from_data(attachable)
       end
     end
   end

lib/active_storage_support/base64_one.rb

@@ -1,8 +1,11 @@
 module ActiveStorageSupport
   class Base64One < ActiveStorage::Attached::One
     def attach(attachable)
-      attachment = ActiveStorageSupport::Base64Attach.attachment_from_data(attachable)
-      super attachment
+      super self.class.from_base64(attachable)
+    end
+
+    def self.from_base64(attachable)
+      ActiveStorageSupport::Base64Attach.attachment_from_data(attachable)
     end
   end
 end

lib/active_storage_support/support_for_base64.rb

@@ -8,24 +8,48 @@ module SupportForBase64
       def has_one_base64_attached(name, dependent: :purge_later)
         has_one_attached name, dependent: dependent
 
-        add_helper_method(ActiveStorageSupport::Base64One, name, dependent: dependent)
+        generated_association_methods.class_eval <<-CODE, __FILE__, __LINE__ + 1
+          def #{name}
+            @active_storage_attached_#{name} ||= ActiveStorageSupport::Base64One.new("#{name}", self)
+          end
+          def #{name}=(attachable)
+            attachment_changes["#{name}"] =
+              if attachable.nil?
+                ActiveStorage::Attached::Changes::DeleteOne.new("#{name}", self)
+              else
+                ActiveStorage::Attached::Changes::CreateOne.new(
+                  "#{name}", self, ActiveStorageSupport::Base64One.from_base64(attachable)
+                )
+              end
+          end
+        CODE
       end
 
       def has_many_base64_attached(name, dependent: :purge_later)
         has_many_attached name, dependent: dependent
 
-        add_helper_method(ActiveStorageSupport::Base64Many, name, dependent: dependent)
-      end
-
-      def add_helper_method(type, name, dependent:)
-        class_eval <<-CODE, __FILE__, __LINE__ + 1
+        generated_association_methods.class_eval <<-CODE, __FILE__, __LINE__ + 1
           def #{name}
-            @active_storage_attached_#{name} ||=
-              #{type}.new("#{name}", self, dependent: #{dependent == :purge_later ? ':purge_later' : 'false'})
+            @active_storage_attached_#{name} ||= ActiveStorageSupport::Base64Many.new("#{name}", self)
           end
-
-          def #{name}=(data)
-            #{name}.attach(data)
+          def #{name}=(attachables)
+            if ActiveStorage.replace_on_assign_to_many
+              attachment_changes["#{name}"] =
+                if Array(attachables).none?
+                  ActiveStorage::Attached::Changes::DeleteMany.new("#{name}", self)
+                else
+                  ActiveStorage::Attached::Changes::CreateMany.new(
+                    "#{name}", self, ActiveStorageSupport::Base64Many.from_base64(attachables)
+                  )
+                end
+            else
+              if Array(attachables).any?
+                attachment_changes["#{name}"] =
+                  ActiveStorage::Attached::Changes::CreateMany.new(
+                    "#{name}", self, #{name}.blobs + ActiveStorageSupport::Base64Many.from_base64(attachables)
+                  )
+              end
+            end
           end
         CODE
       end

spec/user_base64_spec.rb

@@ -56,12 +56,14 @@
         context 'when only data is specified' do
           it 'attaches an avatar to the user' do
             user.avatar = base64_data
+            user.save
 
             expect(user.avatar.attached?).to be
           end
 
           it 'attached file matches attachment file' do
             user.avatar = base64_data
+            user.save
 
             expect(
               File.open(ActiveStorage::Blob.service.send(:path_for, user.avatar.key)).read
@@ -72,6 +74,7 @@
         context 'when filename is specified along with data' do
           it 'assigns the specified filename' do
             user.avatar = data_with_filename
+            user.save
 
             expect(user.avatar.filename.to_s).to eq(filename)
           end
@@ -218,12 +221,14 @@
           context 'when only data is specified' do
             it 'attaches a picture to the user' do
               user.pictures = base64_data
+              user.save
 
               expect(user.pictures.attached?).to be
             end
 
             it 'attached file matches attachment file' do
               user.pictures = base64_data
+              user.save
 
               expect(
                 File.open(ActiveStorage::Blob.service.send(:path_for, user.pictures.last.key)).read
@@ -234,6 +239,7 @@
           context 'when filename is specified' do
             it 'assigns the specified filename' do
               user.pictures = data_with_filename
+              user.save
 
               expect(user.pictures.first.filename.to_s).to eq(filename)
             end
@@ -244,21 +250,23 @@
           context 'when only data is specified' do
             it 'attaches an array of pictures to the user' do
               user.pictures = pictures_attachments
+              user.save
 
               expect(user.pictures.count).to eq(2)
             end
 
             it 'attached file matches attachment file' do
               user.pictures = pictures_attachments
+              user.save
 
               expect(
                 File.open(ActiveStorage::Blob.service.send(:path_for, user.pictures.last.key)).read
               ).to match(second_file)
             end
 
             it 'attaches multiple individual pictures to the user' do
-              user.pictures = base64_data
-              user.pictures = second_base64_data
+              user.pictures = [base64_data, second_base64_data]
+              user.save
 
               expect(user.pictures.count).to eq(2)
             end
@@ -267,14 +275,15 @@
           context 'when pictures have a specified filename' do
             it 'assigns the specified filename for the array of pictures' do
               user.pictures = attachments_with_filename
+              user.save
 
               expect(user.pictures.first.filename.to_s).to eq(filename)
               expect(user.pictures.second.filename.to_s).to eq(second_filename)
             end
 
             it 'assigns the specified filename for each individual picture' do
-              user.pictures = data_with_filename
-              user.pictures = second_data_with_filename
+              user.pictures = [data_with_filename, second_data_with_filename]
+              user.save
 
               expect(user.pictures.first.filename.to_s).to eq(filename)
               expect(user.pictures.second.filename.to_s).to eq(second_filename)
@@ -358,6 +367,40 @@
               expect(first_url).not_to eq(second_url)
             end
           end
+
+          context 'when replacing on assign' do
+            before do
+              @previous = ActiveStorage.replace_on_assign_to_many
+              ActiveStorage.replace_on_assign_to_many = true
+            end
+
+            after do
+              ActiveStorage.replace_on_assign_to_many = @previous
+            end
+
+            it 'updates the existing record replacing attachments' do
+              user.pictures = pictures_attachments
+              user.save
+              expect(user.pictures.count).to eq(2)
+            end
+          end
+
+          context 'when appending on assign' do
+            before do
+              @previous = ActiveStorage.replace_on_assign_to_many
+              ActiveStorage.replace_on_assign_to_many = false
+            end
+
+            after do
+              ActiveStorage.replace_on_assign_to_many = @previous
+            end
+
+            it 'updates the existing record appending the new attachments' do
+              user.pictures = pictures_attachments
+              user.save
+              expect(user.pictures.count).to eq(4)
+            end
+          end
         end
       end
     end

spec/user_file_spec.rb

@@ -37,12 +37,14 @@
       context 'when "user.avatar=" is called' do
         it 'attaches an avatar to the user' do
           user.avatar = file
+          user.save
 
           expect(user.avatar.attached?).to be
         end
 
         it 'assigns the specified filename' do
           user.avatar = file
+          user.save
 
           expect(user.avatar.filename.to_s).to eq(filename)
         end
@@ -163,12 +165,14 @@
         context 'when it is called with only one picture' do
           it 'attaches a picture to the user' do
             user.pictures = file
+            user.save
 
             expect(user.pictures.attached?).to be
           end
 
           it 'assigns the specified filename' do
             user.pictures = file
+            user.save
 
             expect(user.pictures.first.filename.to_s).to eq(filename)
           end
@@ -178,12 +182,14 @@
           context 'when called with an array' do
             it 'attaches an array of pictures to the user' do
               user.pictures = pictures_attachments
+              user.save
 
               expect(user.pictures.count).to eq(2)
             end
 
             it 'assigns the specified filename' do
               user.pictures = pictures_attachments
+              user.save
 
               expect(user.pictures.first.filename).to eq(filename)
               expect(user.pictures.second.filename).to eq(second_filename)
@@ -192,15 +198,15 @@
 
           context 'when called with muiltiple individual pictures' do
             it 'attaches multiple individual pictures to the user' do
-              user.pictures = file
-              user.pictures = second_file
+              user.pictures = [file, second_file]
+              user.save
 
               expect(user.pictures.count).to eq(2)
             end
 
             it 'assigns the specified filename' do
-              user.pictures = file
-              user.pictures = second_file
+              user.pictures = [file, second_file]
+              user.save
 
               expect(user.pictures.first.filename).to eq(filename)
               expect(user.pictures.second.filename).to eq(second_filename)