trestle-active_storage 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7afe155600a65f0a430762dd74d885234377f3f4587c08813f3a7b8ab2ef9e2
-  data.tar.gz: ac66a74dac13db2f3df90b0c30591d135780f0036c9e9923a194045c5ef8074a
+  metadata.gz: cb04373f55898190ff541b714e60a76339a9973d6c685e0361d81372e3ac51f7
+  data.tar.gz: 7c21f06234ffa638875cf25053ab5cc4748a2b754ae7c26177dc989f279725b5
 SHA512:
-  metadata.gz: 9023b24a2bda93e2441cbce24eea0bfe70dc964b5b0702fabb4b33cc1f0aa45c33d22ceca066ffd0ae152a475a63717d76479085432badd376dd7266662a1c44
-  data.tar.gz: b9472272e26f4b3643830247b3ae5e10037aa83a71143a612877e7aaeca1f7d34489a78a752152eba00020b3171092c0e8261dfa6a52f1e6cf43bc07908624cb
+  metadata.gz: 1f64a0a1b8b7f3c473fc52c0bc8750f7b30ae37781298963e00a66b9162422d6234eb09d3f5164b4349150854b8d622da4c2aaa770b25d1d7305e7d818844b5a
+  data.tar.gz: d6b98ed4b70d17116d477ba9bcb77ffc56de015918c3bf0de9acb4ddf843e56db6187999d25d591521c4dfabf32a30b323a534729c47c4d48ed0bcef641fb15d

data/README.md

@@ -23,6 +23,8 @@ Trestle.resource(:users) do
 end
 ```
 
+You can use the `active_storage_field` field type for both `has_one_attached` and `has_many_attached` attachments.
+
 ## Installation
 
 These instructions assume you have a working Trestle application. To integrate trestle-active_storage, first add it to your application's Gemfile:
@@ -41,11 +43,33 @@ If you'd like to get up and running on Heroku, check out their [documentation on
 
 ## TODO / Wishlist
 
-- [ ] Support for `has_many_attached` attachments
+- [x] Support for `has_many_attached` attachments
 - [x] Support for Active Storage previews
 - [ ] Preview of selected local file ([#1](https://github.com/richardvenneman/trestle-active_storage/issues/1))
 - [ ] Integration tests
 
+## Contributors
+
+Thanks goes out to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center"><a href="https://www.cityspotters.com"><img src="https://avatars1.githubusercontent.com/u/75705?v=4" width="100px;" alt=""/><br /><sub><b>Richard Venneman</b></sub></a><br /><a href="#ideas-richardvenneman" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/richardvenneman/trestle-active_storage/commits?author=richardvenneman" title="Code">💻</a> <a href="https://github.com/richardvenneman/trestle-active_storage/commits?author=richardvenneman" title="Documentation">📖</a> <a href="#question-richardvenneman" title="Answering Questions">💬</a> <a href="https://github.com/richardvenneman/trestle-active_storage/pulls?q=is%3Apr+reviewed-by%3Arichardvenneman" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="http://aboobacker.in"><img src="https://avatars1.githubusercontent.com/u/3112976?v=4" width="100px;" alt=""/><br /><sub><b>Aboobacker MK</b></sub></a><br /><a href="#ideas-tachyons" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="http://euodeiovoce.com.br"><img src="https://avatars2.githubusercontent.com/u/1027961?v=4" width="100px;" alt=""/><br /><sub><b>Rafael Porto</b></sub></a><br /><a href="https://github.com/richardvenneman/trestle-active_storage/commits?author=PunkMaldito" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/hoenth"><img src="https://avatars2.githubusercontent.com/u/62977?v=4" width="100px;" alt=""/><br /><sub><b>Tom Hoen</b></sub></a><br /><a href="https://github.com/richardvenneman/trestle-active_storage/issues?q=author%3Ahoenth" title="Bug reports">🐛</a> <a href="https://github.com/richardvenneman/trestle-active_storage/commits?author=hoenth" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/basharabdullah"><img src="https://avatars3.githubusercontent.com/u/167290?v=4" width="100px;" alt=""/><br /><sub><b>Bashar Abdullah</b></sub></a><br /><a href="https://github.com/richardvenneman/trestle-active_storage/issues?q=author%3Abasharabdullah" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/McRipper"><img src="https://avatars2.githubusercontent.com/u/58031?v=4" width="100px;" alt=""/><br /><sub><b>Emanuele Barban</b></sub></a><br /><a href="https://github.com/richardvenneman/trestle-active_storage/commits?author=McRipper" title="Code">💻</a></td>
+  </tr>
+</table>
+
+<!-- markdownlint-enable -->
+<!-- prettier-ignore-end -->
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification.
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/app/views/trestle/active_storage/_has_many_field.html.erb

@@ -0,0 +1,35 @@
+<div class='nested-fields-container'>
+  <%= builder.fields_for field_name do %>
+    <div class="active-storage">
+      <% if attachments.attached? && builder.object.persisted?  %>
+        <% attachments.each do |attachment| %>
+          <div class="active-storage__preview">
+            <% if attachment.previewable? %>
+              <%= link_to image_tag(main_app.url_for(attachment.preview(resize: "300x300>")), class: "active-storage__image"),
+                          main_app.rails_blob_path(attachment, disposition: "attachment") %>
+            <% elsif attachment.variable? %>
+              <%= link_to image_tag(main_app.url_for(attachment.variant(resize: "300x300>")), class: "active-storage__image"),
+                          main_app.rails_blob_path(attachment, disposition: "attachment") %>
+            <% else %>
+              <%= link_to main_app.rails_blob_path(attachment, disposition: "attachment"), class: "btn btn-info" do %>
+                <i class="fa fa-download"></i>
+                <span class="btn-label">Download <%= field_name %></span>
+              <% end %>
+            <% end %>
+
+            <div>
+              <small><%= attachment.blob.filename %></small>
+              <%= builder.check_box("delete_#{field_name}_#{attachment.blob_id}", label: "Delete this #{field_name.to_s.singularize}") %>
+            </div>
+          </div>
+          <hr>
+        <% end %>
+      <% end %>
+    </div>
+
+    <%= builder.raw_file_field(field_name, class: 'active-storage__field', multiple: true, direct_upload: true) %>
+  <% end %>
+</div>
+
+
+

data/app/views/trestle/active_storage/{_field.html.erb → _has_one_field.html.erb}

@@ -1,5 +1,5 @@
 <div class="active-storage">
-  <% if attachment.attached? %>
+  <% if attachment.attached? && builder.object.persisted? %>
     <div class="active-storage__preview">
       <% if attachment.previewable? %>
         <%= link_to image_tag(main_app.url_for(attachment.preview(resize: "300x300>")), class: "active-storage__image"),

data/lib/trestle/active_storage.rb

@@ -1,14 +1,15 @@
-require 'trestle/active_storage/version'
+require_relative 'active_storage/version'
+
 require 'trestle'
 
 module Trestle
   module ActiveStorage
-    extend ActiveSupport::Autoload
 
-    autoload :Builder
-    autoload :ControllerConcern
-    autoload :Resource
+    require_relative "active_storage/builder"
+    require_relative "active_storage/resource"
+    require_relative "active_storage/controller_concern"
+
   end
 end
 
-require 'trestle/active_storage/engine' if defined?(Rails)
+require_relative 'active_storage/engine' if defined?(Rails)

data/lib/trestle/active_storage/controller_concern.rb

@@ -13,13 +13,29 @@ module Trestle
           self.instance = admin.find_instance(params)
 
           admin.active_storage_fields.each do |field|
-            instance.class.send(:attr_accessor, "delete_#{field}")
+            attachment = instance.send(field)
+
+            if attachment.respond_to?(:each)
+              attachment.each do |att|
+                instance.class.send(:attr_accessor, "delete_#{field}_#{att.blob_id}")
+              end
+            else
+              instance.class.send(:attr_accessor, "delete_#{field}")
+            end
           end
         end
 
         def purge_attachments
           admin.active_storage_fields.each do |field|
-            instance.send(field).purge if instance.try("delete_#{field}") == '1'
+            attachment = instance.send(field)
+
+            if attachment.respond_to?(:each)
+              attachment.each do |att|
+                att.purge if instance.try("delete_#{field}_#{att.blob_id}") == '1'
+              end
+            else
+              instance.send(field).purge if instance.try("delete_#{field}") == '1'
+            end
           end
         end
     end

data/lib/trestle/active_storage/engine.rb

@@ -3,10 +3,13 @@ module Trestle
     class Engine < Rails::Engine
       config.assets.precompile << 'activestorage.js' << 'trestle/active_storage_fields.js'
 
+      config.to_prepare do
+        Trestle::ResourceController.send(:include, Trestle::ActiveStorage::ControllerConcern)
+      end
+
       initializer :extensions do
         Trestle::Resource.send(:include, Trestle::ActiveStorage::Resource)
         Trestle::Resource::Builder.send(:include, Trestle::ActiveStorage::Builder)
-        Trestle::Resource::Controller.send(:include, Trestle::ActiveStorage::ControllerConcern)
       end
     end
   end

data/lib/trestle/active_storage/field.rb

@@ -5,12 +5,22 @@ module Trestle
         instance = builder.object
         attachment = instance.send(name)
 
-        @template.render partial: 'trestle/active_storage/field',
-                         locals: {
-                           builder: builder,
-                           field_name: name,
-                           attachment: attachment
-                         }
+        rendering_options = {}.tap do |hash|
+          hash[:locals] = {}.tap do |locals|
+            locals[:builder] = builder
+            locals[:field_name] = name
+
+            if attachment.respond_to?(:each)
+              hash[:partial] = 'trestle/active_storage/has_many_field'
+              locals[:attachments] = attachment
+            else
+              hash[:partial] = 'trestle/active_storage/has_one_field'
+              locals[:attachment] = attachment
+            end
+          end
+        end
+
+        @template.render rendering_options
       end
     end
   end

data/lib/trestle/active_storage/version.rb

@@ -1,5 +1,5 @@
 module Trestle
   module ActiveStorage
-    VERSION = '2.0.0'
+    VERSION = '3.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trestle-active_storage
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Richard Venneman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,34 +16,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0.beta2
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0.beta2
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: trestle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.3
 description: ActiveStorage integration plugin for the Trestle admin framework.
 email:
 - richardvenneman@me.com
@@ -55,9 +61,9 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/trestle/active_storage_fields.js
-- app/views/trestle/active_storage/_field.html.erb
+- app/views/trestle/active_storage/_has_many_field.html.erb
+- app/views/trestle/active_storage/_has_one_field.html.erb
 - config/initializers/trestle.rb
-- config/routes.rb
 - lib/tasks/trestle/active_storage_tasks.rake
 - lib/trestle/active_storage.rb
 - lib/trestle/active_storage/builder.rb
@@ -85,8 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ActiveStorage integration plugin for the Trestle admin framework

data/config/routes.rb

@@ -1,3 +0,0 @@
-Trestle::Engine.routes.draw do
-  post '/active_storage/direct_uploads' => 'active_storage/direct_uploads#create', as: :rails_direct_uploads
-end