administrate_ransack 0.1.14 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03cd63f65e6f42ec034fa6452a68effb67323fbe935036a643c4f17f6013adfa
-  data.tar.gz: d7bb0e58c6a9a0cd8791a8d4faf130361a9bfc823e6c006ac581213ad874fc3b
+  metadata.gz: 4d5b6b6df33ceb539a8c0abfead4d35fc568deec8019fbe4357fa4e7c49a7ec4
+  data.tar.gz: cd1434bf426ffe46b9ee4d8ec34c92aa6c12b2f973dcf1088e81d63568af1240
 SHA512:
-  metadata.gz: 31d0540c3ed2218c72fe49e1f8ce25c9cfcd2b8e45e716fde2343a75ef72af886120b555f27821e6412a33c76bd51cd6238d29f37e037f5a4b2be63114ce581f
-  data.tar.gz: 288e6c8a0ec50670583e4a5fc5b9e65bf4238a01538e57308bdfa20d3ab5d626262aca02d90508a924ffa41a775ff4b8c1e1a20630dd5d2973e8c18e6cf8ba47
+  metadata.gz: c04a5d614096bd32d044440a55f6f76738525f5ffa88b020d6745cf89328242823154b6d77e356c981b7f9ce7093d55711a77eac72bc42a6a6bc3f844d2d47e3
+  data.tar.gz: 8de7bda5e911657aeb149c251038078164a4632b8dc2163a4ac08736770bb50b63a5ce1f9f8b37d6f6d60e0ce94000375b0a7baec487a414ae02a9662c2551f2

data/app/views/administrate_ransack/_filters.html.erb

@@ -29,61 +29,34 @@
     <% attribute_types.each do |field, type| %>
       <% next if field == :id %>
 
-      <div class="filter">
-        <% input_type = type.is_a?(Administrate::Field::Deferred) ? type.deferred_class.to_s : type.to_s %>
+      <% label = attribute_labels.include?(field) ? attribute_labels[field] : field %>
+      <% input_type = type.is_a?(Administrate::Field::Deferred) ? type.deferred_class.to_s : type.to_s %>
+      <div class="filter <%= input_type.parameterize %>">
         <% case input_type %>
         <% when 'Administrate::Field::BelongsTo' %>
           <% association = @ransack_results.klass.reflections[field.to_s] %>
-          <% if association %>
-            <% label = association.klass.method_defined?(:admin_label) ? :admin_label : :to_s %>
-            <% collection = association.klass.send(association.klass.respond_to?(:admin_scope) ? :admin_scope : :all) %>
-            <%= f.label(attribute_labels.include?(field) ? attribute_labels[field] : field) %>
-            <%= f.collection_select "#{field}_id_eq", collection, :id, label, include_blank: true %>
-          <% end %>
+          <%= render 'administrate_ransack/components/field_belongs_to', form: f, field: field, label: label, association: association %>
         <% when 'Administrate::Field::Boolean' %>
-          <%= f.label(attribute_labels.include?(field) ? attribute_labels[field] : field) %>
-          <%= f.select "#{field}_eq", [[t('administrate_ransack.filters.no'), false], [t('administrate_ransack.filters.yes'), true]], include_blank: true %>
+          <%= render 'administrate_ransack/components/field_boolean', form: f, field: field, label: label %>
         <% when 'Administrate::Field::Date' %>
-          <%= f.label(attribute_labels.include?(field) ? attribute_labels[field] : field) %>
-          <%= f.date_field "#{field}_gteq" %>
-          <%= f.date_field "#{field}_lteq" %>
+          <%= render 'administrate_ransack/components/field_date', form: f, field: field, label: label %>
         <% when 'Administrate::Field::DateTime' %>
-          <%= f.label(attribute_labels.include?(field) ? attribute_labels[field] : field) %>
-          <%= f.datetime_field "#{field}_gteq" %>
-          <%= f.datetime_field "#{field}_lteq" %>
+          <%= render 'administrate_ransack/components/field_datetime', form: f, field: field, label: label %>
         <% when 'Administrate::Field::Email', 'Administrate::Field::String', 'Administrate::Field::Text' %>
-          <%= f.label(attribute_labels.include?(field) ? attribute_labels[field] : field) %>
-          <%= f.search_field "#{field}_cont" %>
+          <%= render 'administrate_ransack/components/field_string', form: f, field: field, label: label %>
         <% when 'Administrate::Field::Number' %>
-          <%= f.label(attribute_labels.include?(field) ? attribute_labels[field] : field) %>
-          <%= f.number_field "#{field}_eq" %>
+          <%= render 'administrate_ransack/components/field_number', form: f, field: field, label: label %>
         <% when 'Administrate::Field::HasMany' %>
           <% association = @ransack_results.klass.reflections[field.to_s] %>
-          <% if association %>
-            <% label = association.klass.method_defined?(:admin_label) ? :admin_label : :to_s %>
-            <% collection = association.klass.send(association.klass.respond_to?(:admin_scope) ? :admin_scope : :all) %>
-            <%= f.label(attribute_labels.include?(field) ? attribute_labels[field] : field) %>
-            <%= f.collection_check_boxes "#{field}_id_in", collection, :id, label do |b| %>
-              <%= b.label do %>
-                <%= b.check_box %>
-                <span><%= b.object.send(label) %></span>
-              <% end %>
-            <% end %>
-          <% end %>
+          <%= render 'administrate_ransack/components/field_has_many', form: f, field: field, label: label, association: association %>
         <% when 'Administrate::Field::Select' %>
-          <%= f.label(attribute_labels.include?(field) ? attribute_labels[field] : field) %>
-          <%= f.select "#{field}_eq", type.options[:collection], include_blank: true %>
+          <%= render 'administrate_ransack/components/field_select', form: f, field: field, label: label, type: type %>
         <% else %>
-          <!-- unsupported Field::HasOne -->
-          <!-- unsupported Field::Polymorphic -->
-          <!-- unsupported Field::Password -->
+          <%= render 'administrate_ransack/components/field_other', form: f, field: field, label: label, type: type %>
         <% end %>
       </div>
     <% end %>
   </div>
 
-  <div class="filters-buttons">
-    <%= f.submit t('administrate_ransack.filters.search'), name: nil %>
-    <%= link_to t('administrate_ransack.filters.clear_filters'), clear_filters_path, class: 'btn-clear-filters' %>
-  </div>
+  <%= render 'administrate_ransack/components/filter_buttons', form: f, clear_filters_path: clear_filters_path %>
 <% end %>

data/app/views/administrate_ransack/components/_field_belongs_to.html.erb

@@ -0,0 +1,6 @@
+<% if association %>
+  <% desc = association.klass.method_defined?(:admin_label) ? :admin_label : :to_s %>
+  <% collection = association.klass.send(association.klass.respond_to?(:admin_scope) ? :admin_scope : :all) %>
+  <%= form.label(label) %>
+  <%= form.collection_select "#{field}_id_eq", collection, :id, desc, include_blank: true %>
+<% end %>

data/app/views/administrate_ransack/components/_field_boolean.html.erb

@@ -0,0 +1,3 @@
+<% values = [[t('administrate_ransack.filters.no'), false], [t('administrate_ransack.filters.yes'), true]] %>
+<%= form.label(label) %>
+<%= form.select "#{field}_eq", values, include_blank: true %>

data/app/views/administrate_ransack/components/_field_date.html.erb

@@ -0,0 +1,3 @@
+<%= form.label(label) %>
+<%= form.date_field "#{field}_gteq" %>
+<%= form.date_field "#{field}_lteq" %>

data/app/views/administrate_ransack/components/_field_datetime.html.erb

@@ -0,0 +1,3 @@
+<%= form.label(label) %>
+<%= form.datetime_field "#{field}_gteq" %>
+<%= form.datetime_field "#{field}_lteq" %>

data/app/views/administrate_ransack/components/_field_has_many.html.erb

@@ -0,0 +1,11 @@
+<% if association %>
+  <% desc = association.klass.method_defined?(:admin_label) ? :admin_label : :to_s %>
+  <% collection = association.klass.send(association.klass.respond_to?(:admin_scope) ? :admin_scope : :all) %>
+  <%= form.label(label) %>
+  <%= form.collection_check_boxes "#{field}_id_in", collection, :id, desc do |b| %>
+    <%= b.label do %>
+      <%= b.check_box %>
+      <span><%= b.object.send(desc) %></span>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/administrate_ransack/components/_field_number.html.erb

@@ -0,0 +1,2 @@
+<%= form.label(label) %>
+<%= form.number_field "#{field}_eq" %>

data/app/views/administrate_ransack/components/_field_other.html.erb

@@ -0,0 +1,6 @@
+<%= form.label(label) %>
+<%= form.search_field(field) %>
+
+<!-- unsupported Field::HasOne -->
+<!-- unsupported Field::Polymorphic -->
+<!-- unsupported Field::Password -->

data/app/views/administrate_ransack/components/_field_select.html.erb

@@ -0,0 +1,2 @@
+<%= form.label(label) %>
+<%= form.select "#{field}_eq", type.options[:collection] || [], include_blank: true %>

data/app/views/administrate_ransack/components/_field_string.html.erb

@@ -0,0 +1,4 @@
+<%= form.label(label) %>
+<%= form.search_field("#{field}_cont") %>
+
+<%#= form.search_field(@ransack_results.klass.respond_to?(field) ? field : "#{field}_cont") %>

data/app/views/administrate_ransack/components/_filter_buttons.html.erb

@@ -0,0 +1,4 @@
+<div class="filters-buttons">
+  <%= form.submit t('administrate_ransack.filters.search'), name: nil %>
+  <%= link_to t('administrate_ransack.filters.clear_filters'), clear_filters_path, class: 'btn-clear-filters' %>
+</div>

data/lib/administrate_ransack/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AdministrateRansack
-  VERSION = '0.1.14'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate_ransack
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.2.0
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-22 00:00:00.000000000 Z
+date: 2021-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate
@@ -203,6 +203,16 @@ files:
 - README.md
 - Rakefile
 - app/views/administrate_ransack/_filters.html.erb
+- app/views/administrate_ransack/components/_field_belongs_to.html.erb
+- app/views/administrate_ransack/components/_field_boolean.html.erb
+- app/views/administrate_ransack/components/_field_date.html.erb
+- app/views/administrate_ransack/components/_field_datetime.html.erb
+- app/views/administrate_ransack/components/_field_has_many.html.erb
+- app/views/administrate_ransack/components/_field_number.html.erb
+- app/views/administrate_ransack/components/_field_other.html.erb
+- app/views/administrate_ransack/components/_field_select.html.erb
+- app/views/administrate_ransack/components/_field_string.html.erb
+- app/views/administrate_ransack/components/_filter_buttons.html.erb
 - config/locales/en.yml
 - lib/administrate_ransack.rb
 - lib/administrate_ransack/engine.rb