wallaby 6.1.5 → 7.0.0.beta1

data/app/views/wallaby/resources/index/_percent.html.erb

@@ -0,0 +1,10 @@
+<%# @param object [model] model instance %>
+<%# @param field_name [String] name of the field %>
+<%# @param value [Object] value of the field %>
+<%# @param metadata [Hash] metadata of the field %>
+<%= if value.nil?
+  null
+else
+  "%.#{ metadata[:precision] || 2 }f%%" %
+    (value.to_f * (metadata[:is_percent] ? 1 : 100))
+end %>

data/app/views/wallaby/resources/index/_polygon.html.erb

@@ -5,7 +5,7 @@
 <%= if value.nil?
   null
 else
-  max = metadata[:max] || default_metadata.max
+  max = metadata[:max] || max_text_length
   value = value.to_s
   if value.length > max
     concat content_tag(:code, value.truncate(max))

data/app/views/wallaby/resources/index/_sti.html.erb

@@ -5,7 +5,7 @@
 <%= if value.nil?
   null
 else
-  max = metadata[:max] || default_metadata.max
+  max = metadata[:max] || max_text_length
   value = value.to_s
   if value.length > max
     concat content_tag(:span, value.truncate(max))

data/app/views/wallaby/resources/index/_string.html.erb

@@ -5,7 +5,7 @@
 <%= if value.nil?
   null
 else
-  max = metadata[:max] || default_metadata.max
+  max = metadata[:max] || max_text_length
   value = value.to_s
   if value.length > max
     concat content_tag(:span, value.truncate(max))

data/app/views/wallaby/resources/index/_text.html.erb

@@ -5,7 +5,7 @@
 <%= if value.nil?
   null
 else
-  max = metadata[:max] || default_metadata.max
+  max = metadata[:max] || max_text_length
   value = value.to_s
   if value.length > max
     concat content_tag(:span, value.truncate(max))

data/app/views/wallaby/resources/index/_tinytext.html.erb

@@ -5,7 +5,7 @@
 <%= if value.nil?
   null
 else
-  max = metadata[:max] || default_metadata.max
+  max = metadata[:max] || max_text_length
   value = value.to_s
   if value.length > max
     concat content_tag(:span, value.truncate(max))

data/app/views/wallaby/resources/index/_tsvector.html.erb

@@ -5,7 +5,7 @@
 <%= if value.nil?
   null
 else
-  max = metadata[:max] || default_metadata.max
+  max = metadata[:max] || max_text_length
   value = value.to_s
   if value.length > max
     concat content_tag(:span, value.truncate(max))

data/app/views/wallaby/resources/index/_uuid.html.erb

@@ -5,7 +5,7 @@
 <%= if value.nil?
   null
 else
-  max = metadata[:max] || default_metadata.max
+  max = metadata[:max] || max_text_length
   value = value.to_s
   if value.length > max
     concat content_tag(:span, value.truncate(max))

data/app/views/wallaby/resources/index/_xml.html.erb

@@ -5,7 +5,7 @@
 <%= if value.nil?
   null
 else
-  max = metadata[:max] || default_metadata.max
+  max = metadata[:max] || max_text_length
   value = value.to_s
   if value.length > max
     concat content_tag(:code, value.truncate(max))

data/app/views/wallaby/resources/index.csv.erb

@@ -8,7 +8,13 @@
 <%
 decorated_collection.each do |decorated|
   data = current_model_decorator.index_field_names.map do |field_name|
-    type_render decorated.index_type_of(field_name), object: decorated, field_name: field_name
+    render(
+      decorated.index_type_of(field_name),
+      object: decorated,
+      field_name: field_name,
+      value: decorated.try(field_name),
+      metadata: decorated.index_metadata_of(field_name)
+    )
   end
 %>
 <%= ::CSV.generate_line(data).strip.html_safe %>

data/app/views/wallaby/resources/index.html.erb

@@ -1,54 +1 @@
-<%
-# decorate first on every page or partial
-decorated_collection = decorate collection
-%>
-<article class="resources">
-  <div class="resources__header">
-    <h1><%= to_model_label(current_model_class) %></h1>
-    <%= render 'index_query' %>
-    <%= render 'index_filters' %>
-    <%= render 'index_pagination' %>
-  </div>
-  <%= render 'flash_messages' %>
-
-  <section>
-    <% # Data table %>
-    <% if decorated_collection.present? %>
-      <% field_names = current_model_decorator.index_field_names %>
-      <div class="resources__container">
-        <table class="resources__data">
-          <thead>
-            <tr>
-              <% field_names.each do |field_name| %>
-                <%= content_tag :th, class: sort_link_builder.current_sort[field_name] do %>
-                  <%= sort_link_builder.build field_name %>
-                <% end %>
-              <% end %>
-              <th>&nbsp;</th>
-            </tr>
-          </thead>
-          <tbody>
-            <% decorated_collection.each do |decorated| %>
-              <tr>
-                <% field_names.each do |field_name| %>
-                  <td>
-                    <%= type_render decorated.index_type_of(field_name), object: decorated, field_name: field_name %>
-                  </td>
-                <% end %>
-                <td class="resource__actions">
-                  <%= render 'resource_actions', decorated: decorated %>
-                </td>
-              </tr>
-            <% end %>
-          </tbody>
-        </table>
-      </div>
-    <% else %>
-      <div class="resources__not-found">
-        <%= image_tag 'wallaby/not_found.png' %>
-        <%= wt 'errors.not_found.collection' %>
-      </div>
-    <% end %>
-    <% # /Data table %>
-  </section>
-</article>
+<%= render 'index_page' %>

data/app/views/wallaby/resources/new.html.erb

@@ -1,18 +1 @@
-<% decorated = decorate resource %>
-<article class="resource">
-  <div class="resource__header">
-    <h1><%= wt 'labels.create', model: to_model_label(current_model_class) %></h1>
-    <%= render 'resource_navs' %>
-  </div>
-  <%= render 'flash_messages' %>
-  <section>
-    <div class="resource__container">
-      <%= form_for(
-        decorated, url: url_for(action: (params[:resource] ? :show : :index)),
-        method: :post, html: { :multipart => true }, builder: Wallaby::FormBuilder
-      ) do |form| %>
-        <%= render 'form', form: form, decorated: decorated %>
-      <% end %>
-    </div>
-  </section>
-</article>
+<%= render 'new_page' %>

data/app/views/wallaby/resources/show/_active_storage.html.erb

@@ -0,0 +1,5 @@
+<%# @param object [model] model instance %>
+<%# @param field_name [String] name of the field %>
+<%# @param value [Object] value of the field %>
+<%# @param metadata [Hash] metadata of the field %>
+<%= value.try(:attachment) ? link_to(value.attachment.blob.filename, rails_blob_path(value)) : null %>

data/app/views/wallaby/resources/show.html.erb

@@ -1,35 +1 @@
-<article class="resource">
-  <%
-  if resource
-    # decorate first on every page or partial
-    decorated = decorate resource
-  %>
-    <div class="resource__header">
-      <h1><%= show_title decorated %></h1>
-      <%= render 'resource_navs' %>
-    </div>
-    <%= render 'flash_messages' %>
-    <section>
-      <div class="resource__container">
-        <% decorated.show_field_names.each do |field_name| %>
-          <dl>
-            <dt><%= decorated.show_label_of field_name %></dt>
-            <dd><%= type_render decorated.show_type_of(field_name), object: decorated, field_name: field_name %></dd>
-          </dl>
-        <% end %>
-      </div>
-    </section>
-  <% else %>
-    <div class="resource__header">
-      <h1><%= to_model_label(current_model_class) %></h1>
-      <%= render 'resource_navs' %>
-    </div>
-    <%= render 'flash_messages' %>
-    <section>
-      <div class="resource__not-found">
-        <%= image_tag 'wallaby/not_found.png' %>
-        <%= wt 'errors.not_found.resource', resource: to_model_label(current_model_class) %>
-      </div>
-    </section>
-  <% end %>
-</article>
+<%= render 'show_page' %>

data/lib/generators/wallaby/engine/partials/USAGE

@@ -0,0 +1,23 @@
+Description:
+    Copy the main partials and templates for the given NAME (default to 'admin').
+
+Example:
+    rails generate wallaby:engine:partials admin
+
+    This will create:
+    - app/views/admin/application/_footer.html.erb
+    - app/views/admin/application/_frontend.html.erb
+    - app/views/admin/application/_logo.html.erb
+    - app/views/admin/application/_navs.html.erb
+    - app/views/admin/application/_title.html.erb
+    - app/views/admin/application/_user_menu.html.erb
+    - app/views/admin/application/_index_actions.html.erb
+    - app/views/admin/application/_index_filters.html.erb
+    - app/views/admin/application/_index_pagination.html.erb
+    - app/views/admin/application/_index_query.html.erb
+    - app/views/admin/application/_resource_navs.html.erb
+    - app/views/admin/application/index.html.erb
+    - app/views/admin/application/new.html.erb
+    - app/views/admin/application/show.html.erb
+    - app/views/admin/application/edit.html.erb
+    - app/views/admin/application/_form.html.erb

data/lib/generators/wallaby/engine/partials/partials_generator.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Wallaby
+  class Engine
+    # `wallaby:engine:partials` generator
+    class PartialsGenerator < Rails::Generators::NamedBase
+      source_root File.expand_path('../../../../../', __dir__)
+      argument :name, type: :string, default: 'admin'
+
+      # @see https://github.com/wallaby-rails/wallaby/blob/master/lib/generators/wallaby/engine/partials/USAGE
+      def install
+        destination_prefix = "app/views/#{file_name}/application"
+        %w[
+          _footer _frontend _logo _navs _title _user_menu
+          _index_actions _index_filters _index_pagination _index_query _resource_navs
+        ].each do |name|
+          copy_file(
+            "#{source_paths.first}/app/views/wallaby/resources/#{name}.html.erb",
+            "#{destination_prefix}/#{name}.html.erb"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/generators/wallaby/install/install_generator.rb

@@ -3,7 +3,6 @@
 module Wallaby
   # `wallaby:install` generator
   class InstallGenerator < Rails::Generators::NamedBase
-    source_root File.expand_path('templates', __dir__)
     argument :name, type: :string, default: 'admin'
 
     class_option \
@@ -32,59 +31,7 @@ module Wallaby
 
     # @see https://github.com/wallaby-rails/wallaby/blob/master/lib/generators/wallaby/install/USAGE
     def install
-      mount_wallaby_to_given_name
-      return if options[:mount_only]
-
-      create_wallaby_initializer_file
-      create_application_files
-    end
-
-    private
-
-    def commenting
-      file_name == self.class.arguments.first.default && '# ' || ''
-    end
-
-    def mount_wallaby_to_given_name
-      route %(mount Wallaby::Engine, at: '/#{file_name}')
-    rescue StandardError => e
-      Rails.logger.error "WARNING: #{e.message}"
-    end
-
-    def create_wallaby_initializer_file
-      template 'initializer.rb.erb', 'config/initializers/wallaby.rb'
-    end
-
-    def create_application_files
-      create_basic_files
-      create_application_authorizer if options[:include_authorizer]
-      create_application_paginator if options[:include_paginator]
-      create_application_partials if options[:include_partials]
-    end
-
-    def create_basic_files
-      template 'application_controller.rb.erb', "app/controllers/#{file_name}/application_controller.rb"
-      template 'application_decorator.rb.erb', "app/decorators/#{file_name}/application_decorator.rb"
-      template 'application_servicer.rb.erb', "app/servicers/#{file_name}/application_servicer.rb"
-    end
-
-    def create_application_authorizer
-      template 'application_authorizer.rb.erb', "app/authorizers/#{file_name}/application_authorizer.rb"
-    end
-
-    def create_application_paginator
-      template 'application_paginator.rb.erb', "app/paginators/#{file_name}/application_paginator.rb"
-    end
-
-    def create_application_partials
-      source_prefix = '../../../../../app/views/wallaby/resources'
-      destination_prefix = "app/views/#{file_name}/application"
-      %w(
-        footer frontend logo navs title user_menu
-        index_actions index_filters index_pagination index_query resource_navs
-      ).each do |name|
-        copy_file "#{source_prefix}/_#{name}.html.erb", "#{destination_prefix}/_#{name}.html.erb"
-      end
+      invoke 'wallaby:engine:install', [name], options.dup
     end
   end
 end

data/lib/wallaby/ui_engine.rb

@@ -16,7 +16,7 @@ module Wallaby
 
     initializer 'wallaby.assets.precompile' do |_|
       config.assets.precompile +=
-        %w(
+        %w[
           wallaby/application.js
           wallaby/application.css
           wallaby/bad_request.png
@@ -26,7 +26,8 @@ module Wallaby
           wallaby/not_implemented.png
           wallaby/unauthorized.png
           wallaby/unprocessable_entity.png
-        )
+        ]
+      config.assets.paths << config.root.join("app", "assets", "fonts")
     end
   end
 end

data/lib/wallaby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wallaby
-  VERSION = '6.1.5' # :nodoc:
+  VERSION = '7.0.0.beta1' # :nodoc:
 end

data/lib/wallaby/views.rb

@@ -3,15 +3,6 @@
 # NOTE: We need to require the following rails engines
 # so that the main app could pick up the assets from these engines
 # even if they don't appear in the `Gemfile`
-require 'sass-rails'
-
-require 'bootstrap'
-require 'font-awesome-sass'
-require 'bootstrap4-datetime-picker-rails'
-require 'jquery-minicolors-rails'
-require 'jquery-rails'
-require 'momentjs-rails'
-require 'summernote-rails'
-require 'twitter-typeahead-rails'
-require 'jbuilder'
 require 'csv'
+require 'jbuilder'
+require 'sprockets/railtie'