agilibox 1.9.15 → 1.9.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2ac38c7ce2b93922b8caeb2c8d90301c44836149b1a646426a6966f24772352
-  data.tar.gz: e80e585846ab6380434509048d4d9b88c673c8b307e47b1ac4d7530b77176336
+  metadata.gz: 8e10ef85cda205b913421360ffdd960056fcc37df3e8ffa92e130cb0c09f3310
+  data.tar.gz: d3a4c1af561aa8bc1b4cfb80bf8e3b6202b3a98d73b80b18df0e7c91fdf88825
 SHA512:
-  metadata.gz: a8c2c2b1836986a3f10100a46bccd85982f2bc2dd10ac0361b0aecb16fccf58b6dfc15e811616cdfcdd162cf48407116b3980c79ca88833d1fb5dbc13c362543
-  data.tar.gz: 187ff2cbd4cd530ed94c7f37780b0556ca86db37cce67c959fc6a441e1fbf96ffd60d0653286656bfe9163a04a1dea7c62c4f04a017f49d19d02f0a876fc2f06
+  metadata.gz: ef482cd542ee089625a500352c6808e8638990f6acd5d3f8bf3d46dd92e9df723838d3a1d9b714352b43a742969730b4d866028fcd3e97691e01a5cec3e95b94
+  data.tar.gz: fade774279ccc5f30a67d0b158b7913c153daa8da702932eeba74e8450c4147cef300566a8ee42aeb14eeb068c0c4fe0bdf82e8133e633ffef71a1a5fe5dc54c

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## Next version
 
+## v1.9.20
+- Add bootstrap 5 search form
+
+## 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
 

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/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/agilibox/search/_form_bs5.html.slim

@@ -0,0 +1,7 @@
+form.search.bs5.mb-3 method="get" action=action
+  = form_hidden_submit
+
+  .input-group.search
+    input.form-control.form-control-sm type="text" name="q" placeholder=ta(:search) value=params[:q]
+    button.btn.btn-sm.bg-light.border.search-reset.reset type="submit" = icon(:times)
+    button.btn.btn-sm.bg-light.border.search-submit type="submit" = icon(:search)

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.15"
+  VERSION = "1.9.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agilibox
 version: !ruby/object:Gem::Version
-  version: 1.9.15
+  version: 1.9.20
 platform: ruby
 authors:
 - agilidée
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
@@ -179,6 +179,14 @@ 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/agilibox/search/_form_bs5.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 +252,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