agilibox 1.9.17 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d915e06c7f404c90124074fbd3d6cd670b6a518f7e9bf770be57b3ff8578016c
-  data.tar.gz: 4296515fd57d0d3d184dfb0907f32e4924afbc95e023cf210b6f2c4d3b87e08a
+  metadata.gz: 73e2e45e1fed7a2e0cec02d337dc0afa3bf0112e4b26ec3168d8b62e0f64c961
+  data.tar.gz: 9a79efe0583a84370cc71d57468e6083b77032053c59ae702c9c557a3cac3dd4
 SHA512:
-  metadata.gz: 15a09252e2808322e8b764b0c48c2baf25574818af6d149dd35d7ab83c00ebc7738e8a4fada25bee183534fdeae3d5b01acc85bdc0673b56fe4f8bbd807beda7
-  data.tar.gz: 5e2827c129f389a9a43ece6ec345784f589d0b609270a5f8730c85c89107c2d267c9aa2184f5e4d8f1b1ecae5865443ecb5a1438c6eac67679fb6d48bc8b63ae
+  metadata.gz: 80764451b386701e1e0033ed885589c1e95bff2bd973cc022dc706ce828fc86f1ac8c947c8bbe5b6f394e395fa5c1e9f933b45fb0173fe03d7ef3c088bc2eed2
+  data.tar.gz: 727f23e415b4aa280e2d96bc91d3016636e2e8f76a8a197218b9a8ef93797e638fb9637f880603293476c0ad6960fcd6d1974f74a1669184f20624f4b8169222

data/CHANGELOG.md

@@ -2,6 +2,38 @@
 
 ## Next version
 
+## v1.11.0
+- Add ActionDispatch::Http::MimeNegotiation::InvalidType to errors middleware
+- Fix inverted forbidden/unauthorized
+
+## v1.10.5
+- Fix hidden_inputs_for_get_form again
+
+## v1.10.4
+- Fix hidden_inputs_for_get_form
+
+## v1.10.3
+- Fix search forms to preserve GET params
+
+## v1.10.2
+- Filters improvements
+
+## v1.10.1
+- Fix date filters
+
+## v1.10.0
+- Add date support to XLSX serializer
+- Remove AXLSX serializer
+
+## 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
 

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

@@ -54,7 +54,7 @@ module Agilibox::ApiControllerConcern
   end
 
   def render_forbidden_or_unauthorized
-    current_user ? render_unauthorized : render_forbidden
+    current_user ? render_forbidden : render_unauthorized
   end
 
   included do |controller|

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

@@ -1,4 +1,6 @@
 class Agilibox::SmallData::Filter
+  include ActiveModel::Model
+
   STRATEGIES = {}
 
   attr_reader :jar
@@ -60,8 +62,12 @@ class Agilibox::SmallData::Filter
     write read.merge(new_filters)
   end
 
+  def actives_count
+    read.count { |k, v| strategies.key?(k.to_s) && v.present? }
+  end
+
   def any?
-    read.select { |k, v| strategies.key?(k.to_s) && v.present? }.any?
+    actives_count.positive?
   end
 
   def empty?

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

@@ -1,6 +1,6 @@
 class Agilibox::SmallData::FilterStrategyByDateBegin < ::Agilibox::SmallData::FilterStrategyByKeyValue
   def apply(query, value)
-    value = Time.zone.parse(value).beginning_of_day
+    value = Date.parse(value)
     column = column_for(query)
     query.where("#{column} >= ?", value)
   end

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

@@ -1,6 +1,6 @@
 class Agilibox::SmallData::FilterStrategyByDateEnd < ::Agilibox::SmallData::FilterStrategyByKeyValue
   def apply(query, value)
-    value = Time.zone.parse(value).end_of_day
+    value = Date.parse(value)
     column = column_for(query)
     query.where("#{column} <= ?", value)
   end

data/app/helpers/agilibox/form_helper.rb

@@ -59,4 +59,14 @@ module Agilibox::FormHelper
       :label      => label,
     )
   end
+
+  def hidden_inputs_for_get_form(url, except: [])
+    query_values = Addressable::URI.parse(url).query_values.to_h
+      .with_indifferent_access
+      .except(*except)
+
+    return if query_values.empty?
+
+    query_values.sum { |k, v| tag.input(type: "hidden", name: k, value: v) }
+  end
 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/serializers/agilibox/serializers/base.rb

@@ -39,8 +39,8 @@ class Agilibox::Serializers::Base
       I18n.t(value.to_s)
     end
 
-    def format_datetime(value)
-      Agilibox::AllHelpers.date(value)
+    def format_date_or_time(value)
+      value
     end
 
     def format_default(value)
@@ -48,10 +48,10 @@ class Agilibox::Serializers::Base
     end
 
     def formatter_for(value)
-      return :integer  if value.is_a?(Integer)
-      return :decimal  if value.is_a?(Numeric)
-      return :boolean  if value.is_a?(TrueClass) || value.is_a?(FalseClass)
-      return :datetime if value.is_a?(Date) || value.is_a?(Time)
+      return :integer if value.is_a?(Integer)
+      return :decimal if value.is_a?(Numeric)
+      return :boolean if value.is_a?(TrueClass) || value.is_a?(FalseClass)
+      return :date_or_time if value.is_a?(Date) || value.is_a?(Time)
       return :default
     end
 

data/app/serializers/agilibox/serializers/xlsx.rb

@@ -1,7 +1,13 @@
 class Agilibox::Serializers::XLSX < Agilibox::Serializers::Base
   def render_inline
     headers, *data = formatted_data
-    SpreadsheetArchitect.to_xlsx(headers: headers, data: data, freeze_headers: true)
+
+    SpreadsheetArchitect.to_xlsx(
+      headers: headers,
+      data: data,
+      freeze_headers: true,
+      range_styles: range_styles(data[0]),
+    )
   end
 
   def render_file(file_path)
@@ -9,4 +15,24 @@ class Agilibox::Serializers::XLSX < Agilibox::Serializers::Base
       f.write(render_inline)
     end
   end
+
+  private
+
+  def range_styles(row)
+    return [] if row.nil?
+
+    date_range_styles(row) + time_range_styles(row)
+  end
+
+  def date_range_styles(row)
+    row.each_index.select { row[_1].is_a?(Date) }.map do
+      {range: {rows: :all, columns: _1}, styles: {format_code: "dd/mm/yyyy"}}
+    end
+  end
+
+  def time_range_styles(row)
+    row.each_index.select { row[_1].is_a?(Time) }.map do
+      {range: {rows: :all, columns: _1}, styles: {format_code: "dd/mm/yyyy hh:mm:ss"}}
+    end
+  end
 end

data/app/views/agilibox/search/_form_bs3.html.slim

@@ -1,4 +1,5 @@
 form.search.bs3 method="get" action=action
+  = hidden_inputs_for_get_form(action, except: [:q])
   = form_hidden_submit
 
   p.input-group.search

data/app/views/agilibox/search/_form_bs4.html.slim

@@ -1,4 +1,5 @@
 form.search.bs4 method="get" action=action
+  = hidden_inputs_for_get_form(action, except: [:q])
   = form_hidden_submit
 
   .input-group.search

data/app/views/agilibox/search/_form_bs5.html.slim

@@ -0,0 +1,8 @@
+form.search.bs5.mb-3 method="get" action=action
+  = hidden_inputs_for_get_form(action, except: [:q])
+  = 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.rb

@@ -1,5 +1,6 @@
 Capybara.register_driver :agilibox_no_driver do |_app|
-  raise "You need to add Agilibox::CucumberConfig.require_cuprite! or "\
+  raise \
+    "You need to add Agilibox::CucumberConfig.require_cuprite! or " \
     "Agilibox::CucumberConfig.require_chrome_headless! " \
     "to your features/support/env.rb"
 end

data/lib/agilibox/errors_middleware.rb

@@ -9,6 +9,8 @@ class Agilibox::ErrorsMiddleware
     "ActionController::BadRequest",
     "ActionController::UnknownFormat",
     "ActionController::UnknownHttpMethod",
+    "ActionDispatch::Cookies::CookieOverflow",
+    "ActionDispatch::Http::MimeNegotiation::InvalidType",
     "ActionView::MissingTemplate",
     "Mime::Type::InvalidMimeType",
   ]

data/lib/agilibox/version.rb

@@ -1,3 +1,3 @@
 module Agilibox
-  VERSION = "1.9.17"
+  VERSION = "1.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agilibox
 version: !ruby/object:Gem::Version
-  version: 1.9.17
+  version: 1.11.0
 platform: ruby
 authors:
 - agilidée
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-13 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Agilibox
 email:
 - contact@agilidee.com
@@ -125,7 +139,6 @@ files:
 - app/filters/agilibox/small_data/filter_strategy_by_key_value.rb
 - app/filters/agilibox/small_data/filter_strategy_by_key_values.rb
 - app/filters/agilibox/small_data/filter_strategy_by_tags.rb
-- app/filters/agilibox/small_data/filter_strategy_by_time_period.rb
 - app/forms/agilibox/mini_form_object.rb
 - app/helpers/agilibox/all_helpers.rb
 - app/helpers/agilibox/bootstrap_helper.rb
@@ -163,7 +176,6 @@ files:
 - app/models/concerns/agilibox/search.rb
 - app/models/concerns/agilibox/timestamp_helpers.rb
 - app/serializers/agilibox/serializers.rb
-- app/serializers/agilibox/serializers/axlsx.rb
 - app/serializers/agilibox/serializers/base.rb
 - app/serializers/agilibox/serializers/xlsx.rb
 - app/services/agilibox/service.rb
@@ -179,6 +191,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 +264,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

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

@@ -1,6 +0,0 @@
-class Agilibox::SmallData::FilterStrategyByTimePeriod
-  def initialize(*)
-    raise "FilterStrategyByTimePeriod is deprecated, please use " \
-      "FilterStrategyByDatePeriod or FilterStrategyByDatetimePeriod"
-  end
-end

data/app/serializers/agilibox/serializers/axlsx.rb

@@ -1,21 +0,0 @@
-class Agilibox::Serializers::AXLSX < Agilibox::Serializers::Base
-  def render_inline
-    xlsx.to_stream.read.force_encoding("BINARY")
-  end
-
-  def render_file(file_path)
-    xlsx.serialize(file_path)
-  end
-
-  def xlsx
-    @xlsx ||= Axlsx::Package.new do |p|
-      p.workbook.add_worksheet do |sheet|
-        formatted_data.each do |line|
-          sheet.add_row(line)
-        end
-      end
-
-      p.use_shared_strings = true
-    end
-  end
-end