agilibox 1.9.14 → 1.9.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39ba603c31035133392e8960223805f62875d2c073bab3c92c740ee64587cc6f
-  data.tar.gz: 9f029239b10af613e1cb62c0f11a2c1e17037bb4f2178a81a9c3c7f4afebad1c
+  metadata.gz: 6ec9c151ffb8cfeac78339974ae35f77124730d8e5a0f4103489c65c03738cff
+  data.tar.gz: cf1862277f5a5fefff00dc06b356902d05ecb1b6e8b9b1bad12e973f4cbfe8fb
 SHA512:
-  metadata.gz: aafbd06be7c481159a1f86060f7712b6f0d82dd9f3e4d28dc66b7fa5c08200649c9ff3029c8975c76f1bd40159988b92186e01e10b67429a11687e8e796e4874
-  data.tar.gz: c3f1221380f43921074b6b4ba2eb4c4f70681636c0fbba4784f3553f3f0a3b595286f38db1cf6ba3161c03f14b814eecf2e86bf61e29dca3c4bd62abfc8cf131
+  metadata.gz: df5df7fe6e3016d1740a684f8dbdcb44a85c37d299f02cabb2b056137a3745f6ef968f0f5f018d7f540286e9a51ef0a78f518aeaf824063dea2897e81c858db2
+  data.tar.gz: 10a96821c98427c56b24d16e90b904038e7d2a4b60a38c495946ae3ff3d0c81adab668280103e68925e57124d072cc78a085d13c32f58351c97055aae1035098

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## Next version
 
+## v1.9.19
+- Add bootstrap 4/5 pagination support
+
+## v1.9.18
+- Rails 6.1 compatibility
+
+## v1.9.17
+- Fix capybara selector
+
+## v1.9.16
+- Fix Rails 6.1 warnings
+
+## v1.9.15
+- Add `modal:before-close` event
+
 ## v1.9.14
 - Fix syntax error on Ruby < 2.7
 

data/app/assets/javascripts/agilibox/modals.coffee

@@ -34,6 +34,7 @@ window.modal =
 
   close: (event) ->
     event.preventDefault() if event
+    $(document).trigger("modal:before-close")
     $("body").removeClass("modal-open")
     $("#modal").remove()
     $(document).trigger("modal:close")

data/app/controllers/concerns/agilibox/api_controller_concern.rb

@@ -31,7 +31,8 @@ module Agilibox::ApiControllerConcern
 
   def json_errors_hash_for_model(object)
     object.errors
-      .map { |a, m| [a, message: m, full_message: object.errors.full_message(a, m)] }
+      .to_hash
+      .map { |a, m| [a, message: m.first, full_message: object.errors.full_message(a, m.first)] }
       .uniq(&:first)
       .to_h
   end

data/app/filters/agilibox/small_data/filter_strategy_by_date_or_datetime_period.rb

@@ -1,6 +1,6 @@
 class Agilibox::SmallData::FilterStrategyByDateOrDatetimePeriod < ::Agilibox::SmallData::FilterStrategyByKeyValue
   def initialize(*)
-    if self.class == Agilibox::SmallData::FilterStrategyByDateOrDatetimePeriod
+    if instance_of?(Agilibox::SmallData::FilterStrategyByDateOrDatetimePeriod)
       raise "please use FilterStrategyByDatePeriod or FilterStrategyByDatetimePeriod"
     end
 

data/app/filters/agilibox/small_data/filter_strategy_by_key_values.rb

@@ -1,6 +1,6 @@
 class Agilibox::SmallData::FilterStrategyByKeyValues < ::Agilibox::SmallData::FilterStrategyByKeyValue
   def apply(query, value)
-    value = value.split(" ") if value.is_a?(String)
+    value = value.split if value.is_a?(String)
     value = value.select(&:present?)
     column = column_for(query)
 

data/app/helpers/agilibox/bootstrap_helper.rb

@@ -35,10 +35,10 @@ module Agilibox::BootstrapHelper
     &block
   )
     global_classes = Agilibox::BootstrapHelper.card_classes
-    card_classes   = ([global_classes[:card]]   + card_class.to_s.split(" ")).compact.sort
-    header_classes = ([global_classes[:header]] + header_class.to_s.split(" ")).compact.sort
-    body_classes   = ([global_classes[:body]]   + body_class.to_s.split(" ")).compact.sort
-    footer_classes = ([global_classes[:footer]] + footer_class.to_s.split(" ")).compact.sort
+    card_classes   = ([global_classes[:card]]   + card_class.to_s.split).compact.sort
+    header_classes = ([global_classes[:header]] + header_class.to_s.split).compact.sort
+    body_classes   = ([global_classes[:body]]   + body_class.to_s.split).compact.sort
+    footer_classes = ([global_classes[:footer]] + footer_class.to_s.split).compact.sort
 
     if header
       header_html = content_tag(header_tag, class: header_classes) { header }

data/app/helpers/agilibox/font_awesome_helper.rb

@@ -6,7 +6,7 @@ module Agilibox::FontAwesomeHelper
       fa_style = Agilibox::FontAwesomeHelper.default_fa_style_for_id(id)
     end
 
-    css_classes = options.delete(:class).to_s.split(" ")
+    css_classes = options.delete(:class).to_s.split
     css_classes << "icon"
     css_classes << "fa-#{id}"
     css_classes << "fa#{fa_style.to_s[0]}"
@@ -15,7 +15,7 @@ module Agilibox::FontAwesomeHelper
 
     attributes = options.merge(class: css_classes.sort.join(" ")).sort.to_h
 
-    tag.span(**attributes) {}
+    tag.span(**attributes)
   end
 
   class << self

data/app/helpers/agilibox/form_helper.rb

@@ -23,11 +23,11 @@ module Agilibox::FormHelper
 
     tag.div(class: "actions form-actions") do
       submit = tag.button(type: :submit, class: "btn btn-sm btn-success form-submit") do
-        tag.span(class: "fa fa-save") {} + " " + ta(submit_action)
+        tag.span(class: "fa fa-save") + " " + ta(submit_action)
       end
 
       cancel = tag.a(href: back_url, class: "btn btn-primary btn-sm form-cancel") do
-        tag.span(class: "fa fa-times") {} + " " + ta(:cancel)
+        tag.span(class: "fa fa-times") + " " + ta(:cancel)
       end
 
       cancel = "" if back_url == false

data/app/helpers/agilibox/pagination_helper.rb

@@ -1,6 +1,14 @@
 module Agilibox::PaginationHelper
+  class << self
+    attr_writer :theme
+
+    def theme
+      @theme ||= "twitter-bootstrap-3"
+    end
+  end
+
   def paginate(objects, options = {})
-    options = {theme: "twitter-bootstrap-3"}.merge(options)
+    options = {theme: Agilibox::PaginationHelper.theme}.merge(options)
     super(objects, **options).gsub(/>(\s+)</, "><").html_safe
   end
 

data/app/models/concerns/agilibox/search.rb

@@ -12,6 +12,8 @@ module Agilibox::Search
       words  = q.to_s.parameterize.split("-")
       fields = default_search_fields if fields.empty?
 
+      return all if words.empty?
+
       sql_query = words.map.with_index { |_word, index|
         fields.map { |field|
           "(UNACCENT(CAST(#{field} AS TEXT)) ILIKE :w#{index})"

data/app/views/kaminari/bootstrap4/_first_page.html.slim

@@ -0,0 +1,2 @@
+li.page-item
+  = link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, remote: remote, class: 'page-link'

data/app/views/kaminari/bootstrap4/_gap.html.slim

@@ -0,0 +1,2 @@
+li.page-item.disabled
+  = link_to raw(t 'views.pagination.truncate'), '#', class: 'page-link'

data/app/views/kaminari/bootstrap4/_last_page.html.slim

@@ -0,0 +1,2 @@
+li.page-item
+  = link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, remote: remote, class: 'page-link'

data/app/views/kaminari/bootstrap4/_next_page.html.slim

@@ -0,0 +1,2 @@
+li.page-item
+  = link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, rel: 'next', remote: remote, class: 'page-link'

data/app/views/kaminari/bootstrap4/_page.html.slim

@@ -0,0 +1,6 @@
+- if page.current?
+  li.page-item.active
+    = content_tag :a, page, data: { remote: remote }, rel: page.rel, class: 'page-link'
+- else
+  li.page-item
+    = link_to page, url, remote: remote, rel: page.rel, class: 'page-link'

data/app/views/kaminari/bootstrap4/_paginator.html.slim

@@ -0,0 +1,12 @@
+= paginator.render do
+  nav
+    ul.pagination
+      == first_page_tag unless current_page.first?
+      == prev_page_tag unless current_page.first?
+      - each_page do |page|
+        - if page.left_outer? || page.right_outer? || page.inside_window?
+          == page_tag page
+        - elsif !page.was_truncated?
+          == gap_tag
+      == next_page_tag unless current_page.last?
+      == last_page_tag unless current_page.last?

data/app/views/kaminari/bootstrap4/_prev_page.html.slim

@@ -0,0 +1,2 @@
+li.page-item
+  = link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, rel: 'prev', remote: remote, class: 'page-link'

data/lib/agilibox/active_model_custom_error_messages.rb

@@ -1,8 +1,23 @@
 module Agilibox::ActiveModelCustomErrorMessages
-  def full_message(attribute, message)
-    return message[1..] if message[0] == "^"
-    super(attribute, message)
+  # Rails <= 6.0
+  module ForErrors
+    def full_message(attribute, message)
+      return message[1..] if message[0] == "^"
+      super
+    end
+  end
+
+  ActiveModel::Errors.prepend(ForErrors)
+
+  # Rails >= 6.1
+  module ForError
+    def full_message
+      return message[1..] if message[0] == "^"
+      super
+    end
   end
-end
 
-ActiveModel::Errors.prepend(Agilibox::ActiveModelCustomErrorMessages)
+  if Module.const_defined?("ActiveModel::Error")
+    ActiveModel::Error.prepend(ForError)
+  end
+end

data/lib/agilibox/cucumber_helpers/capybara_selectors.rb

@@ -1,8 +1,7 @@
 Capybara.add_selector(:agilibox_clickable) do
   xpath do |locator, **options|
-    self.class.all
-      .values_at(:link, :button, :label)
-      .map { |selector| instance_exec(locator, **options, &selector.xpath) }
+    %i(link button label)
+      .map { |selector| expression_for(selector, locator, **options) }
       .reduce(:union)
   end
 end

data/lib/agilibox/version.rb

@@ -1,3 +1,3 @@
 module Agilibox
-  VERSION = "1.9.14"
+  VERSION = "1.9.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agilibox
 version: !ruby/object:Gem::Version
-  version: 1.9.14
+  version: 1.9.19
 platform: ruby
 authors:
 - agilidée
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-08 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
@@ -179,6 +179,13 @@ files:
 - app/views/agilibox/search/_form.html.slim
 - app/views/agilibox/search/_form_bs3.html.slim
 - app/views/agilibox/search/_form_bs4.html.slim
+- app/views/kaminari/bootstrap4/_first_page.html.slim
+- app/views/kaminari/bootstrap4/_gap.html.slim
+- app/views/kaminari/bootstrap4/_last_page.html.slim
+- app/views/kaminari/bootstrap4/_next_page.html.slim
+- app/views/kaminari/bootstrap4/_page.html.slim
+- app/views/kaminari/bootstrap4/_paginator.html.slim
+- app/views/kaminari/bootstrap4/_prev_page.html.slim
 - config/cucumber.yml
 - config/locales/actions.en.yml
 - config/locales/actions.fr.yml
@@ -244,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Agilibox