wallaby 5.1.7 → 5.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04e4d77dd4f0c389084731a11677f20d1642110c
-  data.tar.gz: 73de158010b2874fcfe05aaf97124a5d74242c05
+  metadata.gz: 318bd15ba641b3b9df0b8c846f77c1d83b63780d
+  data.tar.gz: ae1f37f527a3f64543ee1b035922de1754f448f5
 SHA512:
-  metadata.gz: 1466a5835767aa9c31ade8afa89fd04d5a28e78550f95ca70d086344adc756a6df54c362cc5f90da04ca05728b56f13d62251344f68c924eae01f3f48d8f8195
-  data.tar.gz: ed032ac4752e3c61567126a501b9b012be88c8e77aa3d0deffb76e4760ca352d7ce97fa15ddc5c74d11a69b71aef8640cf63c6177ad37ffaf1333f51ad8dc65d
+  metadata.gz: 36fcec2d778497d8d1baa282db7377c888419c44187c1b292d324af585f8bd9343a852d6dae3f0742237065387d4fc87cc631f1fcef60072132b2d32300ed0e3
+  data.tar.gz: 43b79d5bd13336a0b4034cab3161503e527156fb0e95c1990efb1f9edd1fbc1cacb82701084ce115ee94e4516e3b8af1b47340089fd0fb0c63f577e1843d15c1

data/app/assets/javascripts/wallaby/setup.js.erb

@@ -5,7 +5,7 @@ window.readyPrefix = function readyPrefix(eventName) {
 jQuery(document).off(readyPrefix('.wallaby')).on(readyPrefix('.wallaby'), function () {
   'use strict';
 
-  jQuery('[data-toggle="tooltip"]').tooltip({ html: true, container:'body' })
+  jQuery('[data-toggle="tooltip"]').tooltip({ container:'body' })
   jQuery('#imodal').on('show.bs.modal', function (event) {
     var $button = jQuery(event.relatedTarget),
         $this = jQuery(this);

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

@@ -1,9 +1,6 @@
 <%
 filters = current_model_decorator.filters
 filter = ::Wallaby::Utils.find_filter_name index_params[:filter], filters
-html_options = proc do |filter_name|
-  { class: filter.to_s == filter_name.to_s ? 'filters--current' : '' }
-end
 %>
 <nav class="filters">
   <% if filters.present? %>
@@ -14,7 +11,7 @@ end
     <ul>
       <li><em><%= t 'filters.title' %></em></li>
       <% filters.keys.unshift(:all).each do |filter_name| %>
-        <%= content_tag :li, filter_link(current_model_class, filter_name, filters), html_options.call(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 %>
     </ul>
   <% else %>

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

@@ -3,9 +3,6 @@ paginator = paginate(current_model_class, collection, index_params)
 %>
 <% if paginator.paginatable? %>
   <%
-  active_per = proc do |per|
-    paginator.page_size == per && 'pagination__pers--current'
-  end
   from_to = t 'pagination.from_to', from: paginator.from, to: paginator.to
   of = t 'pagination.of'
   total_count = t 'pagination.total_count', total: paginator.total
@@ -23,7 +20,7 @@ paginator = paginate(current_model_class, collection, index_params)
           <ul aria-labelledby="all_pers">
             <li><em><%= t 'pagination.pers' %></em></li>
             <% Wallaby::PERS.each do |per| %>
-              <%= content_tag :li, class: active_per.call(per) do %>
+              <%= content_tag :li, class: paginator.page_size == per && 'pagination__pers--current' do %>
                 <%= index_link(current_model_class, url_params: index_params.merge(per: per)) { per.to_s } %>
               <% end %>
             <% end %>

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

@@ -1,11 +1,4 @@
-<%
-query_classes = proc do
-  classes = %w(query)
-  classes.push 'query--filtered' if index_params.present?
-  classes
-end
-%>
-<%= content_tag :div, class: query_classes.call do %>
+<%= content_tag :div, class: index_params.present? ? %w(query query--filtered) : %w(query) do %>
   <nav class="query__actions">
     <%= index_link(current_model_class, html_classes('query__clear')) {} if index_params.present? %>
     <%= new_link(current_model_class, html_classes('query__create')) {} %>
@@ -16,6 +9,7 @@ end
   </nav>
   <%= form_tag index_path(current_model_class), method: :get, class: 'query__search' do %>
     <%= hidden_field_tag :sort, index_params[:sort] %>
+    <%= hidden_field_tag :filter, index_params[:filter] %>
     <label for="q">
       <%= text_field_tag :q, index_params[:q], placeholder: t('search.hint') %>
     </label>

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

@@ -1,26 +1,15 @@
 <%
   headers = current_model_decorator.index_field_names.map do |field_name|
-    current_model_decorator.index_metadata_of(field_name)[:label]
+    current_model_decorator.index_label_of(field_name)
   end
   decorated_collection = decorate collection
 %>
 <%= ::CSV.generate_line(headers).strip.html_safe %>
 <%
-  decorated_collection.each do |decorated|
-    data = current_model_decorator.index_field_names.map do |field_name|
-      value = decorated.public_send(field_name)
-      if value.respond_to?(:map) && !value.is_a?(Range)
-        value.map do |v|
-          if model_decorator(v.class).present?
-            decorate(v).to_label
-          else
-            v
-          end
-        end.to_sentence
-      else
-        value
-      end
-    end
+decorated_collection.each do |decorated|
+  data = current_model_decorator.index_field_names.map do |field_name|
+    type_partial_render decorated.index_type_of(field_name), object: decorated, field_name: field_name
+  end
 %>
 <%= ::CSV.generate_line(data).strip.html_safe %>
 <% end %>

data/app/views/wallaby/resources/index/_belongs_to.csv.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 %>
+<%= raw value.present? && decorate(value).to_label || nil %>

data/app/views/wallaby/resources/index/_bigint.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_bigserial.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_binary.csv.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 %>
+<%= raw value.present? && '<binary>' || nil %>

data/app/views/wallaby/resources/index/_bit.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_bit_varying.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_blob.csv.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 %>
+<%= raw value.present? && '<blob>' || nil %>

data/app/views/wallaby/resources/index/_boolean.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_box.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_cidr.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_circle.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_citext.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_color.csv.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 %>
+<%= raw value %>

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

@@ -0,0 +1,8 @@
+<%# @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.present? %>
+<% value = Time.zone.parse value if value.is_a? String %>
+<% value = value.to_date if value.is_a? Time %>
+<%= I18n.l value %><% end %>

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

@@ -0,0 +1,6 @@
+<%# @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.present? %>
+<%= I18n.l value.first %>...<%= I18n.l value.last %><% end %>

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

@@ -0,0 +1,7 @@
+<%# @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.present? %>
+<% value = Time.zone.parse value if value.is_a? String %>
+<%= I18n.l value %><% end %>

data/app/views/wallaby/resources/index/_decimal.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_email.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_float.csv.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 %>
+<%= raw value.try(:to_f) %>

data/app/views/wallaby/resources/index/_has_and_belongs_to_many.csv.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 %>
+<%= raw((value || []).uniq.map { |item| decorate(item).to_label }.to_sentence) %>

data/app/views/wallaby/resources/index/_has_many.csv.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 %>
+<%= raw((value || []).uniq.map { |item| decorate(item).to_label }.to_sentence) %>

data/app/views/wallaby/resources/index/_has_one.csv.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 %>
+<%= raw value.present? && decorate(value).to_label || nil %>

data/app/views/wallaby/resources/index/_hstore.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_inet.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_int4range.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_int8range.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_integer.csv.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 %>
+<%= raw value.try(:to_i) %>

data/app/views/wallaby/resources/index/_json.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_jsonb.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_line.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_longblob.csv.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 %>
+<%= raw value.present? && '<longblob>' || nil %>

data/app/views/wallaby/resources/index/_longtext.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_lseg.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_ltree.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_macaddr.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_mediumblob.csv.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 %>
+<%= raw value.present? && '<mediumblob>' || nil %>

data/app/views/wallaby/resources/index/_mediumtext.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_money.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_numrange.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_password.csv.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 %>
+********

data/app/views/wallaby/resources/index/_path.csv.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 %>
+<%= raw value %>

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

@@ -0,0 +1,6 @@
+<%# @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.present? %>
+(<%= raw value[0] %>, <%= raw value[1] %>)<% end %>

data/app/views/wallaby/resources/index/_polygon.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_raw.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_serial.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_sti.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_string.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_text.csv.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 %>
+<%= raw value %>

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

@@ -0,0 +1,7 @@
+<%# @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.present? %>
+<% value = Time.zone.parse value if value.is_a? String %>
+<%= I18n.l value, format: '%H:%M:%S' %><% end %>

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

@@ -6,5 +6,5 @@
   <%= null %>
 <% else %>
   <% value = Time.zone.parse value if value.is_a? String %>
-  <%= value.strftime '%H:%M:%S' %>
+  <%= I18n.l value, format: '%H:%M:%S' %>
 <% end %>

data/app/views/wallaby/resources/index/_tinyblob.csv.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 %>
+<%= raw value.present? && '<tinyblob>' || nil %>

data/app/views/wallaby/resources/index/_tinytext.csv.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 %>
+<%= raw value %>

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

@@ -0,0 +1,6 @@
+<%# @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.present? %>
+<%= I18n.l value.first %>...<%= I18n.l value.last %><% end %>

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

@@ -0,0 +1,6 @@
+<%# @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.present? %>
+<%= I18n.l value.first %>...<%= I18n.l value.last %><% end %>

data/app/views/wallaby/resources/index/_tsvector.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_unsigned_bigint.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_unsigned_decimal.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_unsigned_float.csv.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 %>
+<%= raw value.try(:to_f) %>

data/app/views/wallaby/resources/index/_unsigned_integer.csv.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 %>
+<%= raw value.try(:to_i) %>

data/app/views/wallaby/resources/index/_uuid.csv.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 %>
+<%= raw value %>

data/app/views/wallaby/resources/index/_xml.csv.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 %>
+<%= raw value %>

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

@@ -6,5 +6,5 @@
   <%= null %>
 <% else %>
   <% value = Time.zone.parse value if value.is_a? String %>
-  <%= value.strftime '%H:%M:%S' %>
+  <%= I18n.l value, format: '%H:%M:%S' %>
 <% end %>

data/lib/helpers/wallaby/index_helper.rb

@@ -26,9 +26,11 @@ module Wallaby
 
     # Export link for a given model_class
     # @param model_class [Class]
+    # @param url_params [Hash, ActionController::Parameters]
     # @return [String] HTML anchor link
-    def export_link(model_class)
-      url_params = index_params.except(:page, :per).merge(format: 'csv')
+    def export_link(model_class, url_params: {})
+      url_params =
+        index_params.except(:page, :per).merge(format: 'csv').merge(url_params)
       index_link model_class, url_params: url_params do
         t 'links.export', ext: 'CSV'
       end
@@ -38,14 +40,16 @@ module Wallaby
     # @param model_class [Class]
     # @param filter_name [String, Symbol]
     # @param filters [Hash]
+    # @param url_params [Hash, ActionController::Parameters]
     # @return [String] HTML anchor link
-    def filter_link(model_class, filter_name, filters)
+    def filter_link(model_class, filter_name, filters: {}, url_params: {})
       is_all = filter_name == :all
       config = filters[filter_name] || {}
       label = is_all ? all_label : filter_label(filter_name, filters)
-      url_params = if config[:default] then index_params.except(:filter)
-                   else index_params.merge(filter: filter_name)
-                   end
+      url_params =
+        if config[:default] then index_params.except(:filter).merge(url_params)
+        else index_params.merge(filter: filter_name).merge(url_params)
+        end
       index_link(model_class, url_params: url_params) { label }
     end
 

data/lib/servicers/wallaby/abstract_model_servicer.rb

@@ -3,7 +3,7 @@ module Wallaby
   class AbstractModelServicer
     # @return [Class] model class that comes from its class name
     def self.model_class
-      return unless self < ::Wallaby::ModelServicer
+      return unless self < ::Wallaby.configuration.mapping.model_servicer
       Map.model_class_map name.gsub('Servicer', EMPTY_STRING)
     end
 

data/lib/wallaby/version.rb

@@ -1,3 +1,3 @@
 module Wallaby
-  VERSION = '5.1.7'.freeze
+  VERSION = '5.1.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wallaby
 version: !ruby/object:Gem::Version
-  version: 5.1.7
+  version: 5.1.8
 platform: ruby
 authors:
 - Tianwen Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-13 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
@@ -365,65 +365,125 @@ files:
 - app/views/wallaby/resources/index.csv.erb
 - app/views/wallaby/resources/index.html.erb
 - app/views/wallaby/resources/index.json.jbuilder
+- app/views/wallaby/resources/index/_belongs_to.csv.erb
 - app/views/wallaby/resources/index/_belongs_to.html.erb
+- app/views/wallaby/resources/index/_bigint.csv.erb
 - app/views/wallaby/resources/index/_bigint.html.erb
+- app/views/wallaby/resources/index/_bigserial.csv.erb
 - app/views/wallaby/resources/index/_bigserial.html.erb
+- app/views/wallaby/resources/index/_binary.csv.erb
 - app/views/wallaby/resources/index/_binary.html.erb
+- app/views/wallaby/resources/index/_bit.csv.erb
 - app/views/wallaby/resources/index/_bit.html.erb
+- app/views/wallaby/resources/index/_bit_varying.csv.erb
 - app/views/wallaby/resources/index/_bit_varying.html.erb
+- app/views/wallaby/resources/index/_blob.csv.erb
 - app/views/wallaby/resources/index/_blob.html.erb
+- app/views/wallaby/resources/index/_boolean.csv.erb
 - app/views/wallaby/resources/index/_boolean.html.erb
+- app/views/wallaby/resources/index/_box.csv.erb
 - app/views/wallaby/resources/index/_box.html.erb
+- app/views/wallaby/resources/index/_cidr.csv.erb
 - app/views/wallaby/resources/index/_cidr.html.erb
+- app/views/wallaby/resources/index/_circle.csv.erb
 - app/views/wallaby/resources/index/_circle.html.erb
+- app/views/wallaby/resources/index/_citext.csv.erb
 - app/views/wallaby/resources/index/_citext.html.erb
+- app/views/wallaby/resources/index/_color.csv.erb
 - app/views/wallaby/resources/index/_color.html.erb
+- app/views/wallaby/resources/index/_date.csv.erb
 - app/views/wallaby/resources/index/_date.html.erb
+- app/views/wallaby/resources/index/_daterange.csv.erb
 - app/views/wallaby/resources/index/_daterange.html.erb
+- app/views/wallaby/resources/index/_datetime.csv.erb
 - app/views/wallaby/resources/index/_datetime.html.erb
+- app/views/wallaby/resources/index/_decimal.csv.erb
 - app/views/wallaby/resources/index/_decimal.html.erb
+- app/views/wallaby/resources/index/_email.csv.erb
 - app/views/wallaby/resources/index/_email.html.erb
+- app/views/wallaby/resources/index/_float.csv.erb
 - app/views/wallaby/resources/index/_float.html.erb
+- app/views/wallaby/resources/index/_has_and_belongs_to_many.csv.erb
 - app/views/wallaby/resources/index/_has_and_belongs_to_many.html.erb
+- app/views/wallaby/resources/index/_has_many.csv.erb
 - app/views/wallaby/resources/index/_has_many.html.erb
+- app/views/wallaby/resources/index/_has_one.csv.erb
 - app/views/wallaby/resources/index/_has_one.html.erb
+- app/views/wallaby/resources/index/_hstore.csv.erb
 - app/views/wallaby/resources/index/_hstore.html.erb
+- app/views/wallaby/resources/index/_inet.csv.erb
 - app/views/wallaby/resources/index/_inet.html.erb
+- app/views/wallaby/resources/index/_int4range.csv.erb
 - app/views/wallaby/resources/index/_int4range.html.erb
+- app/views/wallaby/resources/index/_int8range.csv.erb
 - app/views/wallaby/resources/index/_int8range.html.erb
+- app/views/wallaby/resources/index/_integer.csv.erb
 - app/views/wallaby/resources/index/_integer.html.erb
+- app/views/wallaby/resources/index/_json.csv.erb
 - app/views/wallaby/resources/index/_json.html.erb
+- app/views/wallaby/resources/index/_jsonb.csv.erb
 - app/views/wallaby/resources/index/_jsonb.html.erb
+- app/views/wallaby/resources/index/_line.csv.erb
 - app/views/wallaby/resources/index/_line.html.erb
+- app/views/wallaby/resources/index/_longblob.csv.erb
 - app/views/wallaby/resources/index/_longblob.html.erb
+- app/views/wallaby/resources/index/_longtext.csv.erb
 - app/views/wallaby/resources/index/_longtext.html.erb
+- app/views/wallaby/resources/index/_lseg.csv.erb
 - app/views/wallaby/resources/index/_lseg.html.erb
+- app/views/wallaby/resources/index/_ltree.csv.erb
 - app/views/wallaby/resources/index/_ltree.html.erb
+- app/views/wallaby/resources/index/_macaddr.csv.erb
 - app/views/wallaby/resources/index/_macaddr.html.erb
+- app/views/wallaby/resources/index/_mediumblob.csv.erb
 - app/views/wallaby/resources/index/_mediumblob.html.erb
+- app/views/wallaby/resources/index/_mediumtext.csv.erb
 - app/views/wallaby/resources/index/_mediumtext.html.erb
+- app/views/wallaby/resources/index/_money.csv.erb
 - app/views/wallaby/resources/index/_money.html.erb
+- app/views/wallaby/resources/index/_numrange.csv.erb
 - app/views/wallaby/resources/index/_numrange.html.erb
+- app/views/wallaby/resources/index/_password.csv.erb
 - app/views/wallaby/resources/index/_password.html.erb
+- app/views/wallaby/resources/index/_path.csv.erb
 - app/views/wallaby/resources/index/_path.html.erb
+- app/views/wallaby/resources/index/_point.csv.erb
 - app/views/wallaby/resources/index/_point.html.erb
+- app/views/wallaby/resources/index/_polygon.csv.erb
 - app/views/wallaby/resources/index/_polygon.html.erb
+- app/views/wallaby/resources/index/_raw.csv.erb
 - app/views/wallaby/resources/index/_raw.html.erb
+- app/views/wallaby/resources/index/_serial.csv.erb
 - app/views/wallaby/resources/index/_serial.html.erb
+- app/views/wallaby/resources/index/_sti.csv.erb
 - app/views/wallaby/resources/index/_sti.html.erb
+- app/views/wallaby/resources/index/_string.csv.erb
 - app/views/wallaby/resources/index/_string.html.erb
+- app/views/wallaby/resources/index/_text.csv.erb
 - app/views/wallaby/resources/index/_text.html.erb
+- app/views/wallaby/resources/index/_time.csv.erb
 - app/views/wallaby/resources/index/_time.html.erb
+- app/views/wallaby/resources/index/_tinyblob.csv.erb
 - app/views/wallaby/resources/index/_tinyblob.html.erb
+- app/views/wallaby/resources/index/_tinytext.csv.erb
 - app/views/wallaby/resources/index/_tinytext.html.erb
+- app/views/wallaby/resources/index/_tsrange.csv.erb
 - app/views/wallaby/resources/index/_tsrange.html.erb
+- app/views/wallaby/resources/index/_tstzrange.csv.erb
 - app/views/wallaby/resources/index/_tstzrange.html.erb
+- app/views/wallaby/resources/index/_tsvector.csv.erb
 - app/views/wallaby/resources/index/_tsvector.html.erb
+- app/views/wallaby/resources/index/_unsigned_bigint.csv.erb
 - app/views/wallaby/resources/index/_unsigned_bigint.html.erb
+- app/views/wallaby/resources/index/_unsigned_decimal.csv.erb
 - app/views/wallaby/resources/index/_unsigned_decimal.html.erb
+- app/views/wallaby/resources/index/_unsigned_float.csv.erb
 - app/views/wallaby/resources/index/_unsigned_float.html.erb
+- app/views/wallaby/resources/index/_unsigned_integer.csv.erb
 - app/views/wallaby/resources/index/_unsigned_integer.html.erb
+- app/views/wallaby/resources/index/_uuid.csv.erb
 - app/views/wallaby/resources/index/_uuid.html.erb
+- app/views/wallaby/resources/index/_xml.csv.erb
 - app/views/wallaby/resources/index/_xml.html.erb
 - app/views/wallaby/resources/new.html.erb
 - app/views/wallaby/resources/show.html.erb