agilibox 1.9.17 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d915e06c7f404c90124074fbd3d6cd670b6a518f7e9bf770be57b3ff8578016c
-  data.tar.gz: 4296515fd57d0d3d184dfb0907f32e4924afbc95e023cf210b6f2c4d3b87e08a
+  metadata.gz: b79eff8bab58fe3ca456bb0f4ed5eb18de97fd7a82dc247751a094a4fb91a961
+  data.tar.gz: b13ee9bd49da7ceccee0f20737706ab1a9a3d4762688902bc773be94950af6cd
 SHA512:
-  metadata.gz: 15a09252e2808322e8b764b0c48c2baf25574818af6d149dd35d7ab83c00ebc7738e8a4fada25bee183534fdeae3d5b01acc85bdc0673b56fe4f8bbd807beda7
-  data.tar.gz: 5e2827c129f389a9a43ece6ec345784f589d0b609270a5f8730c85c89107c2d267c9aa2184f5e4d8f1b1ecae5865443ecb5a1438c6eac67679fb6d48bc8b63ae
+  metadata.gz: 599316ad810f15843e060a9cc5034cc76b505cde1bda4066deccd8bad1470986ad5bf3fecaa1e4712ede494904a06851a5df1a8852beeb0a087e5677bf118bb8
+  data.tar.gz: 92a2e1834215bfd50c322163cb59dfa22ea025aa4e52ee345815b5cebadb4cc3f45f376d8205e934e8aba4c8cf7cfe71813e367d4dd06e53cbbe1cf6cf329c3f

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 ## Next version
 
+## 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/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_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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agilibox
 version: !ruby/object:Gem::Version
-  version: 1.9.17
+  version: 1.10.0
 platform: ruby
 authors:
 - agilidée
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-13 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
@@ -163,7 +163,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 +178,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 +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

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