tybo 0.0.24 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f138be56ff33db2fcedafd153fc1cee963e47d792dbe0c4ee17bc754e66ee66
-  data.tar.gz: 2bf0ce49099e0634292b659c228a18b3abec4045dade3126e29897b8d8c43989
+  metadata.gz: 5fbea06a07d892cf6275cb13c24757606e007cd02e32a46ecabbe48a285ef16e
+  data.tar.gz: eeac4d661b717d758bac0afdc97fca2f937906316dec84653e1aab408c096beb
 SHA512:
-  metadata.gz: d069473a8f19c67a1247364b82ae0c2063e46204e51a64b6067107c0d9569e9434e4b142449d345845217672a233edd3b7297f5b6b9b9c8a633ca9396bbe79e8
-  data.tar.gz: 632f6ba0d1ca819621414385afcabe9b32ee77513a419bf4bfc857b397e36edd0d4cedf9857a8f1f1bb6e17974a03ab3910d52206b51f9ffc0060ec2f695c369
+  metadata.gz: f892ee8c9c883acc0940845639654b64fa27087391a445ac905268793dc8c1e0c7ee355cab54762e841b7369404dec38549779463590359520f97167663210af
+  data.tar.gz: af85a402e65ec548dc5485532a8c1ad20e44141984f239ec40ce5e06e786eb075122b8408c65517ed6c8bb644d59eb4063e2dc1a7d2dcdd26f8d968d1c07e8c7

data/app/views/layouts/_flash.html.erb

@@ -1,5 +1,5 @@
 <% flash.each do |key, errors| %>
-<div class="rounded-md <%= classes_for_flash(key) %> p-4"  data-controller="flash">
+<div class="rounded-md <%= classes_for_flash(key) %> p-4 m-4"  data-controller="flash">
   <div class="flex">
     <div class="flex-shrink-0">
       <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">

data/lib/generators/bo/bo_generator.rb

@@ -69,19 +69,19 @@ class BoGenerator < Rails::Generators::NamedBase
 
   def permited_params
     params = {}
-    action_text_columns = has_one_assoc&.select { |a| a.options[:class_name] == 'ActionText::RichText' }
     permitted_columns&.map do |col|
       params["#{col}".to_sym] = nil
     end
-    action_text_columns&.map do |col|
-      params["#{col.name.to_s.remove('rich_text_' )}".to_sym] = nil
+    storage_assoc&.map do |col|
+      params["#{col.name.to_s.remove('_attachment' )}".to_sym] = nil
+    end
+    rich_text_assoc&.map do |col|
+      params["#{col.name.to_s.remove('rich_text_')}".to_sym] = nil
     end
     has_many_assoc&.map do |association|
        params["#{association.name.to_s.singularize}_ids".to_sym] = []
     end
     has_one_assoc&.map do |association|
-      next if association.options[:class_name] == 'ActionText::RichText'
-
       attributes = association.klass.column_names.map(&:to_sym).delete_if { |attr| excluded_columns.include?(attr) }
       params["#{association.name.to_s.singularize}_attributes".to_sym] = attributes
     end
@@ -97,7 +97,22 @@ class BoGenerator < Rails::Generators::NamedBase
   end
 
   def has_one_assoc
-    bo_model.reflect_on_all_associations(:has_one)
+    excluded = ['ActiveStorage::Attachment', 'ActionText::RichText', 'ActiveStorage::Blob']
+    bo_model.reflect_on_all_associations(:has_one).reject do |assoc|
+       excluded.include?(assoc.options[:class_name])
+    end
+  end
+
+  def storage_assoc
+    bo_model.reflect_on_all_associations(:has_one).select do |assoc|
+      assoc.options[:class_name] == 'ActiveStorage::Attachment'
+    end
+  end
+
+  def rich_text_assoc
+    bo_model.reflect_on_all_associations(:has_one).select do |assoc|
+      assoc.options[:class_name] == 'ActionText::RichText'
+    end
   end
 
   def permitted_columns

data/lib/generators/bo/templates/_form.html.erb

@@ -8,14 +8,19 @@
   <%- belongs_to_assoc.each do |association| -%>
   <%%= f.association :<%= association.name.to_s.singularize %>, collection:  <%= association.klass.name %>.all.map { |item| [item.<%=bo_model_title(association.klass.name.constantize)%>, item.id] } %>
   <%- end -%>
-  <!-- has_one Associations -->
-  <%- has_one_assoc.each do |association| -%>
-  <%- if association.options[:class_name] == "ActionText::RichText" -%>
+  <!-- RichText Associations -->
+  <%- rich_text_assoc.each do |association| -%>
   <label class="block my-5 block text-sm font-medium text-gray-700 string optional text-sm font-medium text-gray-600">
     <%%= I18n.t('bo.<%= class_name.underscore %>.attributes.<%=- association.name.to_s.singularize.to_s.remove('rich_text_') -%>') %>
   </label>
   <%%= f.rich_text_area :<%= association.name.to_s.singularize.to_s.remove('rich_text_')%> %>
-  <%- else -%>
+  <% end %>
+  <!-- File Associations -->
+  <%- storage_assoc.each do |association| -%>
+  <%%= render(Input::FileComponent.new(item: <%= class_name.underscore %>, field: '<%= association.name.to_s.singularize.to_s.remove('_attachment') %>', form: f)) %>
+  <%- end -%>
+  <!-- has_one Associations -->
+  <%- has_one_assoc.each do |association| -%>
   <%%= render(Forms::HasOneFormComponent.new(title: I18n.t('bo.<%= association.name %>.one') )) do %>
     <%%= f.simple_fields_for :<%= association.name.to_s %> do |<%= association.name.to_s %>_form| %>
       <%- association.klass.column_names.each do |column| -%>
@@ -25,8 +30,6 @@
       <%- end -%>
     <%% end %> 
   <%% end %>
-
-  <%- end -%>
   <%- end -%>
   <!-- has_many Associations -->
   <%- has_many_assoc.each do |association| -%>

data/lib/generators/bo/templates/controller.rb

@@ -15,7 +15,6 @@ module <%= options[:namespace].camelize %>
     def show
       authorize! @<%= class_name.underscore %>, to: :show?, namespace:, strict_namespace: true
     <%- has_one_assoc.each do |association| -%>
-    <%- next if association.options[:class_name] == "ActionText::RichText" -%>
       @<%= class_name.underscore %>.build_<%= association.name %> if @<%= class_name.underscore %>.<%= association.name %>.nil?
     <%- end -%>
     end
@@ -24,7 +23,6 @@ module <%= options[:namespace].camelize %>
       @<%= class_name.underscore %> = <%= class_name %>.new
       authorize! @<%= class_name.underscore %>, to: :new?, namespace:, strict_namespace: true
       <%- has_one_assoc.each do |association| -%>
-      <%- next if association.options[:class_name] == "ActionText::RichText" -%>
       @<%= class_name.underscore %>.build_<%= association.name %>
       <%- end -%>
     end

data/lib/tybo/version.rb

@@ -1,3 +1,3 @@
 module Tybo
-  VERSION = '0.0.24'
+  VERSION = '0.0.26'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: tybo
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.26
 platform: ruby
 authors:
 - Michel Delpierre
 - Julien Camblan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-10 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -271,7 +271,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://rubygems.org/gems/tybo
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -287,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3.1
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A tailwind custom admin engine for Ruby on Rails
 test_files: []