administrate-field-active_storage 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3930e26efcb0aa795b6606100a6dd6e8da523f80e7f201def1aa5ab79219217
-  data.tar.gz: '0286fd8dcca57e38402f283fef4971b62cb88d909d4a6d00255aaffa3581286e'
+  metadata.gz: 400847147cef13ebaf2becff0f8d6f60ab159e42373aab67e39d7823900b7061
+  data.tar.gz: 28dcb24685789156e988f3aa1a2065a50c6d147e1863b277cc93c6ce73d91f56
 SHA512:
-  metadata.gz: 2942162811a236a3adc02f9607a2d941f002e40b422b3a39c83a148666390542eb15235ae3a6f65d906b3a2075b19e7946e4278091af55ce254ad423886ae923
-  data.tar.gz: 4e7800b780d17f2bf6ee6faa0d0b11a1e22e1456397d46d8e38a04d619be800ae7fc2778364c23f1041ef1e42c34276b11db8ca58fd34906db5822d42a99ccb1
+  metadata.gz: a4395b379fb47e7efc923ef5c69cdc7d85f26f0cb1aa0efde7b31cd8f7dd4916f6ca650d94a8772d1a522510669fc0f125a02e69399e6d7ee0c68972c232934f
+  data.tar.gz: c9966fd2cc8194963455def07ea138d28a19394d680c14edad1ec7d05740eedd7856dd1484ad4f16dd8db76eefaf0dab0993dde43e907d92a7a330798f53531f

data/.github/workflows/main.yml

@@ -0,0 +1,21 @@
+name: CI
+
+on: [push,pull_request]
+
+env:
+  RAILS_MASTER_KEY: ca18e029a12884a87e96cf6a64a12fb5
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+    - uses: actions/cache@v2
+      with:
+        path: vendor/bundle
+        key: bundle-use-ruby-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/Gemfile.lock') }}
+        restore-keys: |
+          bundle-use-ruby-${{ matrix.os }}-${{ matrix.ruby }}-
+    - run: test_app/bin/setup
+    - run: cd test_app && bundle exec rails test

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.ruby-version

@@ -1 +1 @@
-2.6.5
+3.0.0

data/Gemfile.lock

@@ -0,0 +1,217 @@
+PATH
+  remote: .
+  specs:
+    administrate-field-active_storage (0.3.6)
+      administrate (>= 0.2.2)
+      rails (>= 6.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (6.1.1)
+      actionpack (= 6.1.1)
+      activesupport (= 6.1.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.1.1)
+      actionpack (= 6.1.1)
+      activejob (= 6.1.1)
+      activerecord (= 6.1.1)
+      activestorage (= 6.1.1)
+      activesupport (= 6.1.1)
+      mail (>= 2.7.1)
+    actionmailer (6.1.1)
+      actionpack (= 6.1.1)
+      actionview (= 6.1.1)
+      activejob (= 6.1.1)
+      activesupport (= 6.1.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.1.1)
+      actionview (= 6.1.1)
+      activesupport (= 6.1.1)
+      rack (~> 2.0, >= 2.0.9)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.1)
+      actionpack (= 6.1.1)
+      activerecord (= 6.1.1)
+      activestorage (= 6.1.1)
+      activesupport (= 6.1.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.1)
+      activesupport (= 6.1.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.1.1)
+      activesupport (= 6.1.1)
+      globalid (>= 0.3.6)
+    activemodel (6.1.1)
+      activesupport (= 6.1.1)
+    activerecord (6.1.1)
+      activemodel (= 6.1.1)
+      activesupport (= 6.1.1)
+    activestorage (6.1.1)
+      actionpack (= 6.1.1)
+      activejob (= 6.1.1)
+      activerecord (= 6.1.1)
+      activesupport (= 6.1.1)
+      marcel (~> 0.3.1)
+      mimemagic (~> 0.3.2)
+    activesupport (6.1.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    administrate (0.14.0)
+      actionpack (>= 4.2)
+      actionview (>= 4.2)
+      activerecord (>= 4.2)
+      autoprefixer-rails (>= 6.0)
+      datetime_picker_rails (~> 0.0.7)
+      jquery-rails (>= 4.0)
+      kaminari (>= 1.0)
+      momentjs-rails (~> 2.8)
+      sassc-rails (~> 2.1)
+      selectize-rails (~> 0.6)
+    ast (2.4.2)
+    autoprefixer-rails (10.2.0.0)
+      execjs
+    builder (3.2.4)
+    concurrent-ruby (1.1.8)
+    crass (1.0.6)
+    datetime_picker_rails (0.0.7)
+      momentjs-rails (>= 2.8.1)
+    erubi (1.10.0)
+    execjs (2.7.0)
+    ffi (1.14.2)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    highline (2.0.3)
+    i18n (1.8.7)
+      concurrent-ruby (~> 1.0)
+    i18n-tasks (0.9.34)
+      activesupport (>= 4.0.2)
+      ast (>= 2.1.0)
+      erubi
+      highline (>= 2.0.0)
+      i18n
+      parser (>= 2.2.3.0)
+      rails-i18n
+      rainbow (>= 2.2.2, < 4.0)
+      terminal-table (>= 1.5.1)
+    jquery-rails (4.4.0)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
+    kaminari (1.2.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.2.1)
+      kaminari-activerecord (= 1.2.1)
+      kaminari-core (= 1.2.1)
+    kaminari-actionview (1.2.1)
+      actionview
+      kaminari-core (= 1.2.1)
+    kaminari-activerecord (1.2.1)
+      activerecord
+      kaminari-core (= 1.2.1)
+    kaminari-core (1.2.1)
+    loofah (2.9.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
+    mini_mime (1.0.2)
+    minitest (5.14.3)
+    momentjs-rails (2.20.1)
+      railties (>= 3.1)
+    nio4r (2.5.4)
+    nokogiri (1.11.1-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.11.1-x86_64-linux)
+      racc (~> 1.4)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    racc (1.5.2)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.1.1)
+      actioncable (= 6.1.1)
+      actionmailbox (= 6.1.1)
+      actionmailer (= 6.1.1)
+      actionpack (= 6.1.1)
+      actiontext (= 6.1.1)
+      actionview (= 6.1.1)
+      activejob (= 6.1.1)
+      activemodel (= 6.1.1)
+      activerecord (= 6.1.1)
+      activestorage (= 6.1.1)
+      activesupport (= 6.1.1)
+      bundler (>= 1.15.0)
+      railties (= 6.1.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    rails-i18n (6.0.0)
+      i18n (>= 0.7, < 2)
+      railties (>= 6.0.0, < 7)
+    railties (6.1.1)
+      actionpack (= 6.1.1)
+      activesupport (= 6.1.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (~> 1.0)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
+    selectize-rails (0.12.6)
+    sprockets (4.0.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.2)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.4.2)
+    terminal-table (3.0.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thor (1.1.0)
+    tilt (2.0.10)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (1.7.0)
+    websocket-driver (0.7.3)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  x86_64-darwin-20
+  x86_64-linux
+
+DEPENDENCIES
+  administrate-field-active_storage!
+  i18n-tasks (~> 0.9.34)
+  sqlite3 (~> 1.4)
+
+BUNDLED WITH
+   2.2.14

data/README.md

@@ -1,5 +1,6 @@
 # Administrate::Field::ActiveStorage
 ![rails](https://img.shields.io/badge/rails-%3E%3D5.2.0-red.svg)
+![CI](https://github.com/Dreamersoul/administrate-field-active_storage/workflows/CI/badge.svg)
 
 ## Things To Know:
 - To preview pdf files you need to install `mupdf` or `Poppler`.
@@ -16,7 +17,7 @@ gem "image_processing"
 
 for rails 5.x use the following
 ```ruby
-gem 'administrate-field-active_storage' -v 0.1.8
+gem 'administrate-field-active_storage', "0.1.8"
 ```
 
 Install:
@@ -59,6 +60,8 @@ class ModelDashboard < Administrate::BaseDashboard
 ```
 I know it is not ideal, if you have a workaround please submit a PR.
 
+Note: Rails 6 introduced a new config to determine the behavior on updates to `has_many_attached`.  Setting `Rails.application.config.active_storage.replace_on_assign_to_many` to `true` will overwrite any existing values (purging the old ones), and setting it to `false` will append the new values.
+
 ### Prevent N+1 queries
 In order to prevent N+1 queries from active storage you have to modify your admin model controller, below an example for a model called `User` and with attached avatars
 ```ruby
@@ -201,6 +204,10 @@ Defaults to `false`.
 
 Don't forget to include [ActiveStorage JavaScript](https://edgeguides.rubyonrails.org/active_storage_overview.html#direct-uploads). You can use `rails generate administrate:assets:javascripts` to be able to customize Administrate JavaScripts in your application.
 
+## I18n
+
+You can see translation example [here](https://github.com/Dreamersoul/administrate-field-active_storage/blob/master/config/locales/administrate-field-active_storage.en.yml).
+
 ## Things To Do:
 - [x] upload single file
 - [x] adding image support through url_for to support 3rd party cloud storage

data/administrate-field-active_storage.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name = "administrate-field-active_storage"
-  gem.version = "0.3.6"
+  gem.version = "0.3.7"
   gem.authors = ["Hamad AlGhanim"]
   gem.email = ["hamadyalghanim@gmail.com"]
   gem.homepage = "https://github.com/Dreamersoul/administrate-field-active_storage"
@@ -17,5 +17,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "administrate", ">= 0.2.2"
   gem.add_dependency "rails", ">= 6.0"
 
-  gem.add_development_dependency "rspec", "~> 3.4"
+  gem.add_development_dependency 'sqlite3', '~> 1.4'
+  gem.add_development_dependency 'i18n-tasks', '~> 0.9.34'
 end

data/app/views/fields/active_storage/_form.html.erb

@@ -25,7 +25,10 @@ By default, the input is a text field for the image's URL.
   <% end %>
 
   <div>
-    <%= field.can_add_attachment? ? "Add:" : "Replace:" %>
+    <%= field.can_add_attachment? ?
+          I18n.t("administrate.fields.active_storage.add", default: 'Add') :
+          I18n.t("administrate.fields.active_storage.replace", default: 'Replace')
+    %>
     <%= f.file_field field.attribute, multiple: field.many?, direct_upload: field.direct? %>
   </div>
 </div>

data/app/views/fields/active_storage/_index.html.erb

@@ -32,7 +32,10 @@ By default, the attribute is rendered as an image tag.
 
   <% if field.index_display_count? %>
     <div class="attachments-count">
-      <%= pluralize(field.attachments.count, 'Attachment') %>
+      <%= pluralize(field.attachments.count,
+                    I18n.t("administrate.fields.active_storage.attachment", default: 'Attachment')
+          )
+      %>
     </div>
   <% end %>
 <% end %>

data/app/views/fields/active_storage/_item.html.erb

@@ -36,7 +36,8 @@ controlled via a boolean local variable.
 <% if field.destroy_url.present? %>
   <% destroy_url = field.destroy_url.call(namespace, field.data.record, attachment) %>
   <div>
-    <%= link_to 'Remove', destroy_url, method: :delete, class: 'remove-attachment-link', data: { confirm: t("administrate.actions.confirm") } %>
+    <%= link_to I18n.t("administrate.fields.active_storage.remove", default: 'Remove'),
+                destroy_url, method: :delete, class: 'remove-attachment-link', data: { confirm: t("administrate.actions.confirm") } %>
   </div>
   <hr>
 <% end %>

data/app/views/fields/active_storage/_show.html.erb

@@ -18,5 +18,5 @@ By default, the attribute is rendered as an image tag.
 <% if field.attached? %>
   <%= render partial: 'fields/active_storage/items', locals: { field: field } %>
 <% else %>
-  No attachment
+  <%= I18n.t("administrate.fields.active_storage.no_attachment", default: 'No attachment') %>
 <% end %>

data/config/i18n-tasks.yml

@@ -0,0 +1,8 @@
+base_locale: en
+
+data:
+  read:
+    - config/locales/administrate-field-active_storage.%{locale}.yml
+
+ignore:
+  - 'administrate.actions.*'

data/config/locales/administrate-field-active_storage.en.yml

@@ -0,0 +1,10 @@
+---
+en:
+  administrate:
+    fields:
+      active_storage:
+        add: Add
+        attachment: Attachment
+        no_attachment: No attachment
+        remove: Remove
+        replace: Replace

data/config/locales/administrate-field-active_storage.ru.yml

@@ -0,0 +1,10 @@
+---
+ru:
+  administrate:
+    fields:
+      active_storage:
+        add: Добавить
+        attachment: Вложение
+        no_attachment: Нет
+        remove: Удалить
+        replace: Заменить

data/contribute.md

@@ -13,3 +13,4 @@
 - Sébastien Dubois [@sedubois](https://github.com/sedubois)
 - Jazzy Gasper [@jazzygasper](https://github.com/jazzygasper)
 - David Ma [@taikon](https://github.com/taikon)
+- Dmitry Davydov [@haukot](https://github.com/haukot)

data/lib/administrate/field/active_storage.rb

@@ -70,7 +70,7 @@ module Administrate
       end
 
       def attachments
-        data.attachments if attached?
+        many? ? data.attachments : [data.attachment] if attached?
       end
     end
   end

data/spec/i18n_spec.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'i18n/tasks'
+
+# Template i18n-tasks test file from https://github.com/glebm/i18n-tasks/blob/main/templates/rspec/i18n_spec.rb
+RSpec.describe I18n do
+  let(:i18n) { I18n::Tasks::BaseTask.new }
+  let(:missing_keys) { i18n.missing_keys }
+  let(:unused_keys) { i18n.unused_keys }
+  let(:inconsistent_interpolations) { i18n.inconsistent_interpolations }
+
+  it 'does not have missing keys' do
+    expect(missing_keys).to be_empty,
+                            "Missing #{missing_keys.leaves.count} i18n keys, run `i18n-tasks missing' to show them"
+  end
+
+  it 'does not have unused keys' do
+    expect(unused_keys).to be_empty,
+                           "#{unused_keys.leaves.count} unused i18n keys, run `i18n-tasks unused' to show them"
+  end
+
+  it 'files are normalized' do
+    non_normalized = i18n.non_normalized_paths
+    error_message = "The following files need to be normalized:\n" \
+                    "#{non_normalized.map { |path| "  #{path}" }.join("\n")}\n" \
+                    "Please run `i18n-tasks normalize' to fix"
+    expect(non_normalized).to be_empty, error_message
+  end
+
+  it 'does not have inconsistent interpolations' do
+    error_message = "#{inconsistent_interpolations.leaves.count} i18n keys have inconsistent interpolations.\n" \
+                    "Run `i18n-tasks check-consistent-interpolations' to show them"
+    expect(inconsistent_interpolations).to be_empty, error_message
+  end
+end