wallaby 6.1.0 → 6.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf461ecdd7f1605b7a79e4440e7b9b7f2bbe24aac0389252633cc5afc22f15de
-  data.tar.gz: 4d6357a2e6c241e382769b39e8ad26acae965210e2ff0ab3bc89c4e187ac9d72
+  metadata.gz: 193972ca366ee3de3c37d87c9ddaa57e120c450ee45e16e6be22cb9d7c6d34a2
+  data.tar.gz: c4f5319366121053b6b9e1e6ae925d98098b3bc61f501914400c7b58430e2ecf
 SHA512:
-  metadata.gz: 43add18799226503ac25d194ad88df0f251c262eaab54e0fc7a25cd7c14d519eaf9cb390569a8b0737267ccb46356f44ba940c1b615f4461ed910dfaccbd6899
-  data.tar.gz: 72fa73cdf02ecb7efe8875b819cdcdb70b3cd76cf8f172bf4f7517723408882e2a4869727dd741ee4eb0b0fe58c83c623ea40c377fbd3d29bacb690fe948ef56
+  metadata.gz: 0126a84017969ffc4647456390e394bd88c16763b29fa96d398ac874f20f89c077fc45c13ce609ed246c03b956abc6398f1f92c26cb26907a8603b8bcced0882
+  data.tar.gz: b9343daef36fede5b6394b62e8c0a35632b03c827ca98b18d9de31829c52dfcb7f440de7eae037144ba3025f8b42e33f05ece031f2d3bdc9025e3f4c8b171e63

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

@@ -8,5 +8,5 @@
 <% decorated.form_field_names.each do |field_name| %>
   <%= type_render decorated.form_type_of(field_name), field_name: field_name, form: form %>
 <% end %>
-<%= form.button t('buttons.save'), class: 'btn btn-primary' %>
+<%= form.button wt('buttons.save'), class: 'btn btn-primary' %>
 <%= cancel_link html_options: { class: 'btn btn-default' } %>

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

@@ -14,7 +14,7 @@
       <%# //Resources navigation %>
       <%# User account %>
       <ul class="navbar-nav ml-auto">
-        <% if current_user.present? %>
+        <% if wallaby_user.present? %>
           <li class="nav-item dropdown">
             <a id="user_menu" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
               class="nav-link dropdown-toggle">

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

@@ -8,7 +8,7 @@ filter = filter_name_by params[:filter], filters
       <%= filter_label(filter, filters) || all_label %>
     </a>
     <ul class="dropdown-menu" aria-labelledby="all_filters">
-      <li><em><%= t 'filters.title' %></em></li>
+      <li><em><%= wt 'filters.title' %></em></li>
       <% filters.keys.unshift(:all).each do |filter_name| %>
         <%= content_tag :li, filter_link(current_model_class, filter_name, filters: filters), { class: filter.to_s == filter_name.to_s && 'filters--current' } %>
       <% end %>

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

@@ -1,11 +1,11 @@
 <% if current_paginator.try(:paginatable?) %>
   <%
   # Get variables ready for use
-  from_to = t 'pagination.from_to', from: current_paginator.from, to: current_paginator.to
-  of = t 'pagination.of'
-  total_count = t 'pagination.total_count', total: current_paginator.total
-  pers_title = t 'pagination.pers'
-  pages_title = t 'pagination.pages'
+  from_to = wt 'pagination.from_to', from: current_paginator.from, to: current_paginator.to
+  of = wt 'pagination.of'
+  total_count = wt 'pagination.total_count', total: current_paginator.total
+  pers_title = wt 'pagination.pers'
+  pages_title = wt 'pagination.pages'
   %>
   <nav class="pagination">
     <span class="pagination__metadata">
@@ -14,7 +14,7 @@
           <%= from_to %>
         </a>
         <ul class="dropdown-menu" aria-labelledby="all_pers">
-          <li><em><%= t 'pagination.pers' %></em></li>
+          <li><em><%= wt 'pagination.pers' %></em></li>
           <% Wallaby::PERS.each do |per| %>
             <%= content_tag :li, class: current_paginator.page_size == per && 'pagination__pers--current' do %>
               <%= index_link(current_model_class, url_params: { per: per, with_query: true }) { per.to_s } %>
@@ -22,7 +22,7 @@
           <% end %>
         </ul>
       </span>
-      <%= t 'pagination.of' %>
+      <%= wt 'pagination.of' %>
       <span class="pagination__pages">
         <a id="all_pages" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
           <%= total_count %>
@@ -32,7 +32,7 @@
             <%= hidden_field_tag key, value %>
           <% end %>
           <label for="page_number">
-            <%= t 'pagination.pages' %>
+            <%= wt 'pagination.pages' %>
           </label>
           <%= number_field_tag 'page', current_paginator.page_number, id: 'page_number' %>
         <% end %>
@@ -40,12 +40,12 @@
     </span>
     <% if current_paginator.prev_page? # has prev page %>
       <span>
-        <%= index_link(current_model_class, url_params: { page: current_paginator.prev_page_number, with_query: true }) { t 'pagination.prev' } %>
+        <%= index_link(current_model_class, url_params: { page: current_paginator.prev_page_number, with_query: true }) { wt 'pagination.prev' } %>
       </span>
     <% end %>
     <% if current_paginator.next_page? # has next page %>
       <span>
-        <%= index_link(current_model_class, url_params: { page: current_paginator.next_page_number, with_query: true }) { t 'pagination.next' } %>
+        <%= index_link(current_model_class, url_params: { page: current_paginator.next_page_number, with_query: true }) { wt 'pagination.next' } %>
       </span>
     <% end %>
   </nav>

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

@@ -10,7 +10,7 @@
       <%= hidden_field_tag key, value %>
     <% end %>
     <label for="q">
-      <%= text_field_tag :q, params[:q], placeholder: t('search.hint') %>
+      <%= text_field_tag :q, params[:q], placeholder: wt('search.hint') %>
     </label>
   <% end %>
 <% end %>

data/app/views/wallaby/resources/bad_request.json.jbuilder

@@ -4,6 +4,6 @@
 decorated = decorate resource
 json.error do
   json.code 400
-  json.message t('json_errors.bad_request')
+  json.message wt('json_errors.bad_request')
   json.errors decorated.errors
 end

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

@@ -4,7 +4,7 @@ decorated = decorate resource
 %>
 <article class="resource">
   <div class="resource__header">
-    <h1><%= t 'labels.edit', id: decorated.id %></h1>
+    <h1><%= wt 'labels.edit', id: decorated.id %></h1>
     <%= render 'resource_navs' %>
   </div>
   <%= render 'flash_messages' %>

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

@@ -7,11 +7,11 @@
       <div class="card-body">
         <h1 class="card-title">
           <em><%= @code %></em>
-          <span><%= t "http_errors.#{@symbol}" %></span>
+          <span><%= wt "http_errors.#{@symbol}" %></span>
         </h1>
         <p class="card-text">
           <% if @code >= 500 && @code != 501 %>
-            <%= t "http_errors.report_error_html" %>
+            <%= wt "http_errors.report_error_html" %>
           <% else %>
             <%= @exception.try(:message) || flash[:alert] %>
           <% end %>

data/app/views/wallaby/resources/error.json.jbuilder

@@ -5,6 +5,6 @@ json.error do
   if @code < 500 && @exception.present?
     json.message @exception.message
   else
-    json.message t("json_errors.#{@symbol}")
+    json.message wt("json_errors.#{@symbol}")
   end
 end

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

@@ -18,7 +18,7 @@ The following params are the variables that can be used in this partial.
     <div class="col-sm-12">
       <%= form.label field_name, class: 'btn btn-default' do %>
         <%= form.file_field field_name, class: 'sr-only' %>
-        <%= fa_icon 'upload' %> <%= t 'labels.upload' %>
+        <%= fa_icon 'upload' %> <%= wt 'labels.upload' %>
       <% end %>
     </div>
   </div>

data/app/views/wallaby/resources/form/_belongs_to.html.erb

@@ -34,7 +34,7 @@ readonly = metadata[:class] && unauthorized?(:edit, metadata[:class])
           </div>
         <% end %>
         <div class="col-6 col-sm-4">
-          <%= form.text_field metadata[:foreign_key], value: nil, class: 'form-control', placeholder: t('labels.auto_select_hint') %>
+          <%= form.text_field metadata[:foreign_key], value: nil, class: 'form-control', placeholder: wt('labels.auto_select_hint') %>
         </div>
       </div>
       <div class="row">

data/app/views/wallaby/resources/form/_binary.html.erb

@@ -13,7 +13,7 @@ The following params are the variables that can be used in this partial.
     <div class="col-sm-12">
       <%= form.label field_name, class: 'btn btn-default' do %>
         <%= form.file_field field_name, class: 'sr-only' %>
-        <%= fa_icon 'upload' %> <%= t 'labels.upload' %>
+        <%= fa_icon 'upload' %> <%= wt 'labels.upload' %>
       <% end %>
     </div>
   </div>

data/app/views/wallaby/resources/form/_blob.html.erb

@@ -13,7 +13,7 @@ The following params are the variables that can be used in this partial.
     <div class="col-sm-12">
       <%= form.label field_name, class: 'btn btn-default' do %>
         <%= form.file_field field_name, class: 'sr-only' %>
-        <%= fa_icon 'upload' %> <%= t 'labels.upload' %>
+        <%= fa_icon 'upload' %> <%= wt 'labels.upload' %>
       <% end %>
     </div>
   </div>

data/app/views/wallaby/resources/form/_file.html.erb

@@ -13,7 +13,7 @@ The following params are the variables that can be used in this partial.
     <div class="col-sm-12">
       <%= form.label field_name, class: 'btn btn-default' do %>
         <%= form.file_field field_name, class: 'sr-only' %>
-        <%= fa_icon 'upload' %> <%= t 'labels.upload' %>
+        <%= fa_icon 'upload' %> <%= wt 'labels.upload' %>
       <% end %>
     </div>
   </div>

data/app/views/wallaby/resources/form/_has_and_belongs_to_many.html.erb

@@ -26,9 +26,9 @@ readonly = unauthorized? :edit, metadata[:class]
       %>
       <span class="auto_select" data-init="has_and_belongs_to_many" data-url="<%= url %>" data-wildcard="<%= wildcard %>">
         <div class="col-12 col-sm-6">
-          <%= form.text_field metadata[:foreign_key], value: nil, class: 'form-control', multiple: true, placeholder: t('labels.auto_select_hint') %>
+          <%= form.text_field metadata[:foreign_key], value: nil, class: 'form-control', multiple: true, placeholder: wt('labels.auto_select_hint') %>
         </div>
-        <strong class="auto_select__count"><%= t 'labels.count' %><span></span></strong>
+        <strong class="auto_select__count"><%= wt 'labels.count' %><span></span></strong>
         <ul>
           <% decorated.each do |v| %>
             <li>

data/app/views/wallaby/resources/form/_has_many.html.erb

@@ -25,9 +25,9 @@ readonly = unauthorized? :edit, metadata[:class]
       %>
       <span class="auto_select" data-init="has_many" data-url="<%= url %>" data-wildcard="<%= wildcard %>">
         <div class="col-12 col-sm-6">
-          <%= form.text_field metadata[:foreign_key], value: nil, class: 'form-control', multiple: true, placeholder: t('labels.auto_select_hint') %>
+          <%= form.text_field metadata[:foreign_key], value: nil, class: 'form-control', multiple: true, placeholder: wt('labels.auto_select_hint') %>
         </div>
-        <strong class="auto_select__count"><%= t 'labels.count' %><span></span></strong>
+        <strong class="auto_select__count"><%= wt 'labels.count' %><span></span></strong>
         <ul>
           <% decorated.each do |v| %>
             <li>

data/app/views/wallaby/resources/form/_longblob.html.erb

@@ -13,7 +13,7 @@ The following params are the variables that can be used in this partial.
     <div class="col-sm-12">
       <%= form.label field_name, class: 'btn btn-default' do %>
         <%= form.file_field field_name, class: 'sr-only' %>
-        <%= fa_icon 'upload' %> <%= t 'labels.upload' %>
+        <%= fa_icon 'upload' %> <%= wt 'labels.upload' %>
       <% end %>
     </div>
   </div>

data/app/views/wallaby/resources/form/_mediumblob.html.erb

@@ -13,7 +13,7 @@ The following params are the variables that can be used in this partial.
     <div class="col-sm-12">
       <%= form.label field_name, class: 'btn btn-default' do %>
         <%= form.file_field field_name, class: 'sr-only' %>
-        <%= fa_icon 'upload' %> <%= t 'labels.upload' %>
+        <%= fa_icon 'upload' %> <%= wt 'labels.upload' %>
       <% end %>
     </div>
   </div>

data/app/views/wallaby/resources/form/_tinyblob.html.erb

@@ -13,7 +13,7 @@ The following params are the variables that can be used in this partial.
     <div class="col-sm-12">
       <%= form.label field_name, class: 'btn btn-default' do %>
         <%= form.file_field field_name, class: 'sr-only' %>
-        <%= fa_icon 'upload' %> <%= t 'labels.upload' %>
+        <%= fa_icon 'upload' %> <%= wt 'labels.upload' %>
       <% end %>
     </div>
   </div>

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

@@ -46,7 +46,7 @@ decorated_collection = decorate collection
     <% else %>
       <div class="resources__not-found">
         <%= image_tag 'wallaby/not_found.png' %>
-        <%= t 'errors.not_found.collection' %>
+        <%= wt 'errors.not_found.collection' %>
       </div>
     <% end %>
     <% # /Data table %>

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

@@ -1,7 +1,7 @@
 <% decorated = decorate resource %>
 <article class="resource">
   <div class="resource__header">
-    <h1><%= t 'labels.create', model: to_model_label(current_model_class) %></h1>
+    <h1><%= wt 'labels.create', model: to_model_label(current_model_class) %></h1>
     <%= render 'resource_navs' %>
   </div>
   <%= render 'flash_messages' %>

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

@@ -28,7 +28,7 @@
     <section>
       <div class="resource__not-found">
         <%= image_tag 'wallaby/not_found.png' %>
-        <%= t 'errors.not_found.resource', resource: to_model_label(current_model_class) %>
+        <%= wt 'errors.not_found.resource', resource: to_model_label(current_model_class) %>
       </div>
     </section>
   <% end %>

data/lib/generators/wallaby/install/templates/application_controller.rb.erb

@@ -34,7 +34,7 @@ module <%= class_name %>
     # end
 
     # # customize how user record should be returned
-    # def current_user
+    # def wallaby_user
     #   super # do something for all the subclasses
     # end
 

data/lib/wallaby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wallaby
-  VERSION = '6.1.0' # :nodoc:
+  VERSION = '6.1.4' # :nodoc:
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: wallaby
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.4
 platform: ruby
 authors:
 - Tianwen Chen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wallaby-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: wallaby-active_record
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.7
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -962,7 +962,7 @@ homepage: https://github.com/wallaby-rails/wallaby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -978,7 +978,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Autocomplete the resourceful actions and views for ORMs for admin interface
   and other purposes.