trestle-active_storage 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7afe155600a65f0a430762dd74d885234377f3f4587c08813f3a7b8ab2ef9e2
-  data.tar.gz: ac66a74dac13db2f3df90b0c30591d135780f0036c9e9923a194045c5ef8074a
+  metadata.gz: 1dc007395a6923c10983c54ed4bd8b4f2073eaa230cdc60878a4b35e2d808a7a
+  data.tar.gz: 8fcb932920c938072708e39dd7a7712f8b07167af062b332ec80b2a3897036dc
 SHA512:
-  metadata.gz: 9023b24a2bda93e2441cbce24eea0bfe70dc964b5b0702fabb4b33cc1f0aa45c33d22ceca066ffd0ae152a475a63717d76479085432badd376dd7266662a1c44
-  data.tar.gz: b9472272e26f4b3643830247b3ae5e10037aa83a71143a612877e7aaeca1f7d34489a78a752152eba00020b3171092c0e8261dfa6a52f1e6cf43bc07908624cb
+  metadata.gz: a208efb0445661502d8cb641f0f10aab91aaceb312b60c9192083521e1f911a6002da14c847cba99f1099c57222585a5ee7e9990b80376027eef53fbd9b0b496
+  data.tar.gz: 95e5ac5377b3bbb0cd10cad88f156e97128b90f4c7df0d89ad937c9e068ce71901ab447b1f20a3a3c2af3f2b43827360de57ec9c833fcb1e3cb9aac808cf6197

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,18 @@ 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
+
+| <img src="https://avatars.githubusercontent.com/richardvenneman?s=100" width="100" alt="richard venneman" /><br />[<sub>Richard Venneman</sub>](https://www.cityspotters.com)<br />[💻](https://github.com/richardvenneman/trestle-active_storage/commits?author=richardvenneman) [📖](https://github.com/richardvenneman/trestle-active_storage/commits?author=richardvenneman) 👀 | <img src="https://avatars.githubusercontent.com/tachyons?s=100" width="100" alt="aboobacker mk" /><br />[<sub>Aboobacker MK</sub>](http://aboobacker.in/)<br />💡 | <img src="https://avatars.githubusercontent.com/PunkMaldito?s=100" width="100" alt="rafael porto" /><br />[<sub>Rafael Porto</sub>](http://euodeiovoce.com.br/)<br />[💻](https://github.com/richardvenneman/trestle-active_storage/commits?author=PunkMaldito) |
+| :---: | :---: | :---: |
+
+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 :images do %>
+    <div class="active-storage">
+      <% if attachments.attached? %>
+        <% 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/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/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 = '2.1.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: 2.1.0
 platform: ruby
 authors:
 - Richard Venneman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2018-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0.beta2
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0.beta2
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -55,9 +55,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

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