active_storage_base64 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44449a327924040d5967252b57bcc967f07b568e
-  data.tar.gz: cb42213139e6db2b629104f72e392965e6e659d3
+  metadata.gz: 8467d90fdcbc07a9672049395a208a4a10d32391
+  data.tar.gz: 961a61666f9a74011ab564875c013ec6461e402e
 SHA512:
-  metadata.gz: 24750064b2e4a13f316b732fb6423ce0b8fb7f7d10cf862b7e0bab7aafa584096fb930c5d1900160511063a240613cc3eca4f3e1fbbe180ef53db092f7ab955d
-  data.tar.gz: 80cdc756a28d7014a278e503696d1f5276f90faf14a499a4937759308c5ad0c566cb2b56e244564dff78ed09e5e44ec706e0a4ab5e8216f941dc9b7c62de5060
+  metadata.gz: af92f7ff33c42eba9cc2fdecabd06c36adb967a672df2b77e4bc047ff2dd65d907bd9d6de08f801cb5c84e0f94cbe32fd4bd61b5db8ed9ed3e063ea49ebf7c9e
+  data.tar.gz: f5638f30bf22ff55b917f2ed816711d3c351c9c5810953b2b1d035486860f075af389ab6f72fcdf2db2bc2ab91bd3ab3308471678ef7b670743dfc3d4a17cd8b

data/README.md

@@ -59,7 +59,7 @@ class User < ActiveRecord::Base
 end
 ```
 
-on your controller you could do something like this:
+on your controller you could do any of the following:
 ```ruby
 class UsersController < ApplicationController
   def create
@@ -69,17 +69,16 @@ class UsersController < ApplicationController
   private
 
   def user_params
-    params.require(:user).permit(avatar: [:data], :username, :email)
+    params.require(:user).permit(avatar: :data, :username, :email)
   end
 end
 ```
 
-Or you could also do:
 ```ruby
 class UsersController < ApplicationController
   def create
     user = User.create(user_params)
-    user.avatar.attach(params[:avatar])
+    user.avatar.attach(data: params[:avatar]) # params[:avatar] => 'data:image/png;base64,[base64 data]'
   end
 
   private
@@ -90,12 +89,30 @@ class UsersController < ApplicationController
 end
 ```
 
-Here's another option to achieve the same:
 ```ruby
 class UsersController < ApplicationController
   def create
     user = User.create(user_params)
-    user.avatar = { data: params[:avatar] }
+    user.avatar.attach(avatar_params) # avatar_params => { data: 'data:image/png;base64,[base64 data]' }
+  end
+
+  private
+
+  def user_params
+    params.require(:user).permit(:username, :email)
+  end
+
+  def avatar_params
+    params.require(:avatar).permit(:data)
+  end
+end
+```
+
+```ruby
+class UsersController < ApplicationController
+  def create
+    user = User.create(user_params)
+    user.avatar = { data: params[:avatar] } # params[:avatar] => 'data:image/png;base64,[base64 data]'
     user.save
   end
 
@@ -115,7 +132,7 @@ Check the following example:
 class UsersController < ApplicationController
   def create
     user = User.create(user_params)
-    user.avatar.attach(data: params[:avatar], filename: 'your_filename', content_type: 'content/type', identify: 'false')
+    user.avatar.attach(data: params[:avatar], filename: 'your_filename', content_type: 'content/type', identify: 'false') # params[:avatar] => 'data:image/png;base64,[base64 data]'
   end
 
   private

data/lib/active_storage_support/base64_attach.rb

@@ -4,6 +4,8 @@ module ActiveStorageSupport
     module_function
 
     def attachment_from_data(attachment)
+      attachment = attachment.to_h if attachment.is_a?(ActionController::Parameters)
+
       if attachment.is_a?(Hash)
         attachment = attachment.symbolize_keys
         fill_attachment_data(attachment, attachment.delete(:data))

data/lib/active_storage_support/support_for_base64.rb

@@ -5,12 +5,14 @@ module ActiveStorageSupport
   module SupportForBase64
     extend ActiveSupport::Concern
     class_methods do
-      def has_one_base64_attached(name, dependent: :purge_later)
-        has_one_attached name, dependent: dependent
+      def has_one_base64_attached(name, dependent: :purge_later, service: nil, strict_loading: false)
+        has_one_attached name, dependent: dependent, service: service, strict_loading: strict_loading
 
         generated_association_methods.class_eval <<-CODE, __FILE__, __LINE__ + 1
+          # frozen_string_literal: true
           def #{name}
-            @active_storage_attached_#{name} ||= ActiveStorageSupport::Base64One.new("#{name}", self)
+            @active_storage_attached ||= {}
+            @active_storage_attached[:#{name}] ||= ActiveStorageSupport::Base64One.new("#{name}", self)
           end
           def #{name}=(attachable)
             attachment_changes["#{name}"] =
@@ -25,12 +27,14 @@ module ActiveStorageSupport
         CODE
       end
 
-      def has_many_base64_attached(name, dependent: :purge_later)
-        has_many_attached name, dependent: dependent
+      def has_many_base64_attached(name, dependent: :purge_later, service: nil, strict_loading: false)
+        has_many_attached name, dependent: dependent, service: service, strict_loading: strict_loading
 
         generated_association_methods.class_eval <<-CODE, __FILE__, __LINE__ + 1
+          # frozen_string_literal: true
           def #{name}
-            @active_storage_attached_#{name} ||= ActiveStorageSupport::Base64Many.new("#{name}", self)
+            @active_storage_attached ||= {}
+            @active_storage_attached[:#{name}] ||= ActiveStorageSupport::Base64Many.new("#{name}", self)
           end
           def #{name}=(attachables)
             if ActiveStorage.replace_on_assign_to_many

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_base64
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ricardo Cortio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-23 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.8.1
+        version: 5.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.8.1
+        version: 5.5.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -114,19 +114,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
-- CODE_OF_CONDUCT.md
-- CONTRIBUTING.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- active_storage_base64.gemspec
-- config.reek
-- gemfiles/RailsHeadGemfile
 - lib/active_storage_base64.rb
 - lib/active_storage_support/base64_attach.rb
 - lib/active_storage_support/base64_many.rb
@@ -144,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.gitignore

@@ -1,4 +0,0 @@
-Gemfile.lock
-spec/dummy/log
-spec/dummy/db/**.sqlite3
-/coverage/

data/.rspec

@@ -1 +0,0 @@
---format d

data/.rubocop.yml

@@ -1,69 +0,0 @@
-Documentation:
-  Enabled: false
-
-Layout/SpaceBeforeFirstArg:
-  Exclude:
-
-Lint/AmbiguousBlockAssociation:
-  Exclude:
-    - spec/**/*
-
-Metrics/AbcSize:
-  # The ABC size is a calculated magnitude, so this number can be an Integer or
-  # a Float.
-  Max: 15
-
-Metrics/BlockLength:
-  CountComments: false  # count full line comments?
-  Max: 25
-  Exclude:
-    - config/**/*
-    - spec/**/*
-  ExcludedMethods:
-    - class_methods
-
-Metrics/BlockNesting:
-  Max: 4
-
-Metrics/ClassLength:
-  CountComments: false  # count full line comments?
-  Max: 200
-
-# Avoid complex methods.
-Metrics/CyclomaticComplexity:
-  Max: 7
-
-Metrics/MethodLength:
-  CountComments: false  # count full line comments?
-  Max: 24
-
-Metrics/ModuleLength:
-  CountComments: false  # count full line comments?
-  Max: 200
-
-Metrics/LineLength:
-  Max: 100
-  # To make it possible to copy or click on URIs in the code, we allow lines
-  # containing a URI to be longer than Max.
-  AllowURI: true
-  URISchemes:
-    - http
-    - https
-  Exclude:
-    - spec/dummy/db/schema.rb
-
-Metrics/ParameterLists:
-  Max: 5
-  CountKeywordArgs: true
-
-Metrics/PerceivedComplexity:
-  Max: 12
-
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-Style/ModuleFunction:
-  Enabled: false
-
-Naming/PredicateName:
-  Enabled: false

data/.travis.yml

@@ -1,31 +0,0 @@
-language: ruby
-
-before_install:
-  - gem install bundler -v "~> 1.17"
-
-rvm:
-  - 2.5.0
-  - 2.6.0
-  - ruby-head
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-
-sudo: false
-
-env:
-  global:
-    - CC_TEST_REPORTER_ID=7196b4aa257fde33f24463218af32db6a6efd23d9148204822f757fa614a093e
-
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-
-script:
-  - bundle exec rake code_analysis
-  - bundle exec rspec
-
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/CODE_OF_CONDUCT.md

@@ -1,78 +0,0 @@
-Contributor Covenant Code of Conduct
-
-Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-
-Examples of unacceptable behavior by participants include:
-
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others’ private information, such as a physical or electronic
-address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-professional setting
-
-
-Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at ricardo@rootstrap.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project’s leadership.
-
-Attribution
-
-This Code of Conduct is adapted from the Contributor Covenant, version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq

data/CONTRIBUTING.md

@@ -1,42 +0,0 @@
-## Contributing ##
-
-You can contribute to this repo if you have an issue, found a bug or think there's some functionality required that would add value to the gem. To do so, please check if there's not already an [issue](https://github.com/rootstrap/active-storage-base64/issues) for that, if you find there's not, create a new one with as much detail as possible.
-
-If you want to contribute with code as well, please follow the next steps:
-
-1. Read, understand and agree to our [code of conduct](https://github.com/rootstrap/active-storage-base64/blob/master/CODE_OF_CONDUCT.md)
-2. [Fork the repo](https://help.github.com/articles/about-forks/)
-3. Clone the project into your machine:
-`$ git clone git@github.com:[YOUR GITHUB USERNAME]/active-storage-base64.git`
-4. Access the repo:
-`$ cd active-storage-base64`
-5. Create your feature/bugfix branch:
-`$ git checkout -b your_new_feature`
-or
-`$ git checkout -b fix/your_fix` in case of a bug fix
-(if your PR is to address an existing issue, it would be good to name the branch after the issue, for example: if you are trying to solve issue 182, then a good idea for the branch name would be `182_your_new_feature`)
-6. Write tests for your changes (feature/bug)
-7. Code your (feature/bugfix)
-8. Run the code analysis tool by doing:
-`$ rake code_analysis`
-9. Run the tests:
-`$ bundle exec rspec`
-All tests must pass. If all tests (both code analysis and rspec) do pass, then you are ready to go to the next step:
-10. Commit your changes:
-`$ git commit -m 'Your feature or bugfix title'`
-11. Push to the branch `$ git push origin your_new_feature`
-12. Create a new [pull request](https://help.github.com/articles/creating-a-pull-request/)
-
-Some helpful guides that will help you know how we work:
-1. [Code review](https://github.com/rootstrap/tech-guides/tree/master/code-review)
-2. [GIT workflow](https://github.com/rootstrap/tech-guides/tree/master/git)
-3. [Ruby style guide](https://github.com/rootstrap/tech-guides/tree/master/ruby)
-4. [Rails style guide](https://github.com/rootstrap/tech-guides/blob/master/ruby/rails.md)
-5. [RSpec style guide](https://github.com/rootstrap/tech-guides/blob/master/ruby/rspec/README.md)
-
-For more information or guides like the ones mentioned above, please check our [tech guides](https://github.com/rootstrap/tech-guides). Keep in mind that the more you know about these guides, the easier it will be for your code to get approved and merged.
-
-Note: We work with one commit per pull request, so if you make your commit and realize you were missing something or want to add something more to it, don't create a new commit with the changes, but use `$ git commit --amend` instead. This same principle also applies for when changes are requested on an open pull request.
-
-
-Thank you very much for your time and for considering helping in this project.

data/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec

data/Rakefile

@@ -1,4 +0,0 @@
-task :code_analysis do
-  sh 'bundle exec rubocop lib spec'
-  sh 'bundle exec reek lib'
-end

data/active_storage_base64.gemspec

@@ -1,29 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = 'active_storage_base64'
-  s.version = '1.0.0'
-  s.summary = 'Base64 support for ActiveStorage'
-  s.description = s.summary
-
-  s.files = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-
-  s.require_paths = ['lib']
-  s.authors = ['Ricardo Cortio']
-  s.license = 'MIT'
-  s.homepage = 'https://github.com/rootstrap/active-storage-base64'
-  s.email = 'ricardo@rootstrap.com'
-
-  s.required_ruby_version = '>= 2.2.2'
-
-  # Dependencies
-  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.4.1'
-end

data/config.reek

@@ -1,81 +0,0 @@
-Attribute:
-  enabled: false
-  exclude: []
-BooleanParameter:
-  enabled: true
-  exclude: []
-ClassVariable:
-  enabled: false
-  exclude: []
-ControlParameter:
-  enabled: true
-DataClump:
-  enabled: true
-  max_copies: 2
-  min_clump_size: 2
-DuplicateMethodCall:
-  enabled: true
-  exclude: []
-  max_calls: 1
-  allow_calls: []
-FeatureEnvy:
-  enabled: true
-  exclude: []
-InstanceVariableAssumption:
-  enabled: false
-IrresponsibleModule:
-  enabled: false
-  exclude: []
-LongParameterList:
-  enabled: true
-  exclude: []
-  max_params: 4
-  overrides:
-    initialize:
-      max_params: 5
-LongYieldList:
-  enabled: true
-  exclude: []
-  max_params: 3
-NestedIterators:
-  enabled: true
-  exclude: []
-  max_allowed_nesting: 2
-  ignore_iterators: []
-NilCheck:
-  enabled: false
-  exclude: []
-PrimaDonnaMethod:
-  enabled: false
-  exclude: []
-RepeatedConditional:
-  enabled: true
-  exclude: []
-  max_ifs: 3
-TooManyInstanceVariables:
-  enabled: true
-  exclude: []
-  max_instance_variables: 9
-TooManyMethods:
-  enabled: true
-  exclude: []
-  max_methods: 25
-TooManyStatements:
-  enabled: true
-  exclude: []
-  max_statements: 12
-UncommunicativeMethodName:
-  enabled: false
-UncommunicativeModuleName:
-  enabled: false
-UncommunicativeParameterName:
-  enabled: false
-UncommunicativeVariableName:
-  enabled: false
-UnusedParameters:
-  enabled: true
-  exclude: []
-UnusedPrivateMethod:
-  enabled: false
-UtilityFunction:
-  enabled: false

data/gemfiles/RailsHeadGemfile

@@ -1,13 +0,0 @@
-source 'https://rubygems.org'
-
-git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-
-gem "rails", github: "rails/rails", branch: "master", require: false
-
-group :test do
-  gem 'rubocop', '~> 0.56.0'
-  gem 'reek', '~> 4.8.1'
-  gem 'rspec-rails', '~> 3.8.0'
-  gem 'sqlite3', '1.3.13'
-  gem 'pry-rails', '~> 0.3.6'
-end