trestle-active_storage 2.1.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dc007395a6923c10983c54ed4bd8b4f2073eaa230cdc60878a4b35e2d808a7a
-  data.tar.gz: 8fcb932920c938072708e39dd7a7712f8b07167af062b332ec80b2a3897036dc
+  metadata.gz: 659e5f87dc5831589e18e8f1720f615a2449d6e41a5a68a9355dc15049683bb4
+  data.tar.gz: 77bb915b65b473bdf8696e49518c15fe5d6e4806983015ae2336c83de5d225e9
 SHA512:
-  metadata.gz: a208efb0445661502d8cb641f0f10aab91aaceb312b60c9192083521e1f911a6002da14c847cba99f1099c57222585a5ee7e9990b80376027eef53fbd9b0b496
-  data.tar.gz: 95e5ac5377b3bbb0cd10cad88f156e97128b90f4c7df0d89ad937c9e068ce71901ab447b1f20a3a3c2af3f2b43827360de57ec9c833fcb1e3cb9aac808cf6197
+  metadata.gz: bf8a035c55e8354891799b1d349798f551e59ff2d00f89e8471ec4c2d733befcaf7a0a288b1f60aa9cee203d303062545558963e21681c9cde7390dc2e0acdc2
+  data.tar.gz: 98878aeb47816a6ed4e311bf9e0bd0dc76fda5fecf4504c9c5d2c0ca2b4cbb9b5f5db41cd3a870ffaeecfe0ef58240049a2df430e405bdd0422a3724f3594254

data/README.md

@@ -50,9 +50,25 @@ If you'd like to get up and running on Heroku, check out their [documentation on
 
 ## 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) |
-| :---: | :---: | :---: |
-
+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>
+    <td align="center"><a href="https://github.com/oleg-kiviljov"><img src="https://avatars3.githubusercontent.com/u/10065250?v=4" width="100px;" alt=""/><br /><sub><b>Oleg Kiviljov</b></sub></a><br /><a href="https://github.com/richardvenneman/trestle-active_storage/issues?q=author%3Aoleg-kiviljov" title="Bug reports">🐛</a> <a href="https://github.com/richardvenneman/trestle-active_storage/commits?author=oleg-kiviljov" 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

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

@@ -1,7 +1,7 @@
 <div class='nested-fields-container'>
-  <%= builder.fields_for :images do %>
+  <%= builder.fields_for field_name do %>
     <div class="active-storage">
-      <% if attachments.attached? %>
+      <% if attachments.attached? && builder.object.persisted?  %>
         <% attachments.each do |attachment| %>
           <div class="active-storage__preview">
             <% if attachment.previewable? %>
@@ -10,17 +10,18 @@
             <% 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 %>
+            <% elsif attachment.persisted? %>
               <%= 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>
+              <div>
+                <small><%= attachment.blob.filename %></small>
+                <%= builder.check_box("delete_#{field_name}_#{attachment.blob_id}", label: "Delete this #{field_name.to_s.singularize}") %>
+              </div>
+            <% else %>
               <small><%= attachment.blob.filename %></small>
-              <%= builder.check_box("delete_#{field_name}_#{attachment.blob_id}", label: "Delete this #{field_name.to_s.singularize}") %>
-            </div>
+            <% end %>
           </div>
           <hr>
         <% end %>
@@ -29,7 +30,4 @@
 
     <%= builder.raw_file_field(field_name, class: 'active-storage__field', multiple: true, direct_upload: true) %>
   <% end %>
-</div>
-
-
-
+</div>

data/app/views/trestle/active_storage/_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/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/version.rb

@@ -1,5 +1,5 @@
 module Trestle
   module ActiveStorage
-    VERSION = '2.1.0'
+    VERSION = '3.0.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trestle-active_storage
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Richard Venneman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2020-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,27 @@ dependencies:
         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
@@ -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