active_storage_base64 0.1.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a89024b9798e7c3adfef588638e62623c6891eb52ad0d6ba2aebfa1a603dd6ce
-  data.tar.gz: 405e6a9a85a3b3755e06e8f4b958d5731d0558b73bc41ff71dc048dcd5b630c3
+SHA1:
+  metadata.gz: 44449a327924040d5967252b57bcc967f07b568e
+  data.tar.gz: cb42213139e6db2b629104f72e392965e6e659d3
 SHA512:
-  metadata.gz: 39d2cbb297b0e4cabc48543917b1c2c4ec7c5f1b12578f384cebd8ea1824a369a0561aac0ead6e72a8f4e28669e56c053d2dc59f242bf63d9bf526be7c7f49a6
-  data.tar.gz: d1910ba15650555ece8837356b2c580a22a214f7357918422eaf38d6bdfebb88b8e4d452250d51bfab7be8f3b2fb4e141f45c625988dd2afd09491b059536b72
+  metadata.gz: 24750064b2e4a13f316b732fb6423ce0b8fb7f7d10cf862b7e0bab7aafa584096fb930c5d1900160511063a240613cc3eca4f3e1fbbe180ef53db092f7ab955d
+  data.tar.gz: 80cdc756a28d7014a278e503696d1f5276f90faf14a499a4937759308c5ad0c566cb2b56e244564dff78ed09e5e44ec706e0a4ab5e8216f941dc9b7c62de5060

data/.rubocop.yml

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

data/.travis.yml

@@ -4,12 +4,14 @@ 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:
+  allow_failures:
+    - rvm: ruby-head
+
 sudo: false
 
 env:

data/README.md

@@ -4,26 +4,22 @@
 
 # ActiveStorageBase64
 
-Gem used to add support for base64 images for Rails's ActiveStorage.
+Adds support for base64 attachments to ActiveStorage.
 
-## Getting Started
+## Installation
 
 In order to get the gem working on your project you just need to add the gem to your project like this:
 ```ruby
 gem 'active_storage_base64'
 ```
 
-### Prerequisites
+## Prerequisites
 
-The only two prerequisites for using this gem are having Rails version 5.2.0 or higher installed on your project and having ActiveStorage setup properly (for more information on how to do this, check this [Active Storage Overview](https://edgeguides.rubyonrails.org/active_storage_overview.html))
+The only prerequisites for using this gem are having Rails version 5.2.0 or higher installed on your project and having ActiveStorage properly set up (for more information on how to do this, check [Active Storage Overview](https://edgeguides.rubyonrails.org/active_storage_overview.html))
 
-```ruby
-gem 'rails', '5.2.0'
-```
+## Usage
 
-### Installing
-
-In order to use the gem's functionality, you'll need to include the module into your ActiveRecord inheriting class.
+In order to use the gem's functionality, you need to include the `ActiveStorageSupport::SupportForBase64` module in your ActiveRecord models.
 For example:
 ```ruby
 class User < ActiveRecord::Base
@@ -32,7 +28,7 @@ end
 ```
 
 Note:
-We highly recomment using an alternative class that inherits from ActiveRecord and includes the module so instead of including the module for each of your classes, you make them inherit from this new class, check below:
+We highly recommend using an alternative class that inherits from `ActiveRecord::Base` and includes the module so instead of including the module for each of your classes, you make them inherit from this new class, check below:
 ```ruby
 class ApplicationRecord < ActiveRecord::Base
   include ActiveStorageSupport::SupportForBase64
@@ -43,7 +39,7 @@ class User < ApplicationRecord
 end
 ```
 
-After you have the module included in your class you'll be able to use the following two helper methods for working with base64 files:
+After you have the module included in your class you'll be able to use the following two helper methods to work with base64 files:
 When you need a single image attached:
 ```ruby
 has_one_base64_attached
@@ -54,7 +50,7 @@ has_many_base64_attached
 ```
 These helpers will work just like the `has_one_attached` and `has_many_attached` helper methods from ActiveStorage.
 
-A working example for this, assuming we have a model `User` with only an `avatar` attached would be:
+A working example for this, assuming we have a model `User` with an `avatar` attached would be:
 ```ruby
 class User < ActiveRecord::Base
   include ActiveStorageSupport::SupportForBase64
@@ -100,6 +96,7 @@ class UsersController < ApplicationController
   def create
     user = User.create(user_params)
     user.avatar = { data: params[:avatar] }
+    user.save
   end
 
   private
@@ -110,9 +107,9 @@ class UsersController < ApplicationController
 end
 ```
 
-## Specifying a filename or content_type
+### Specifying a filename or content type
 
-If you are willing to add a specific filename to your attachment, or send in a specific content_type for your file, you can use `data:` to attach the base64 data and specify your `filename:`, `content_type:` and/or `identify:` hash keys.
+If you are willing to add a specific filename to your attachment, or send in a specific content type for your file, you can use `data:` to attach the base64 data and specify your `filename:`, `content_type:` and/or `identify:` hash keys.
 Check the following example:
 ```ruby
 class UsersController < ApplicationController
@@ -147,7 +144,13 @@ class UsersController < ApplicationController
 end
 ```
 
-For more information on how to work with ActiveStorage, please check the [Active Storage Overview](https://edgeguides.rubyonrails.org/active_storage_overview.html) mentioned above, all points in there apply to this gem as well.
+### Data Format
+
+To attach base64 data it is required to come in the form of [Data URIs](https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs) .
+For example:
+```
+data:image/png;base64,[base64 data]
+```
 
 ## Contributing
 

data/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,7 +17,7 @@ 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'
@@ -25,5 +25,5 @@ Gem::Specification.new do |s|
   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

data/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:

data/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

data/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

data/lib/active_storage_support/support_for_base64.rb

@@ -8,24 +8,48 @@ module ActiveStorageSupport
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_base64
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Ricardo Cortio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-08 00:00:00.000000000 Z
+date: 2019-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: 1.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: 1.4.1
 description: Base64 support for ActiveStorage
 email: ricardo@rootstrap.com
 executables: []
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Base64 support for ActiveStorage