agilibox 1.9.0 → 1.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1f9e1e1f46c5f26fe0edd774de3846728c97da48f5c8775c545af68d3006229
-  data.tar.gz: 3e899b4b070824794a6f4aee29f505ed8526b0efe40f444742db8ddb039f8c15
+  metadata.gz: 910653d569b2435173e10da0415be0a35356421d5e6fcd112b8653c0b39f2854
+  data.tar.gz: 2d67a98fe71852d8746be01fe140826183eaf12d42a6099ce5175bfac15e296d
 SHA512:
-  metadata.gz: 267b793e760c52549bdae5a0d2f47a1570ad29414caf73ee07764840bfb90b1869e0b7be58c002cbdc2d4e3641ff5c099fdd549f1fb01d7a811e0d3c487b125c
-  data.tar.gz: c8bc95032ce6266d6ec0cc6edb8b61ba052261e9817fa6e9422c5fcbf7bcc96ba4c7ce65e205da181dd585a14d9dc64997caf7926f57b9a849e1ce8a5fb78ba8
+  metadata.gz: 2b5db5518d98aa662b3bef973bce64adb438beff835276b02d679aa9cba8714f71178fa3510792589b602439fd162f26f161679b2c5063ebd375b3b72a2618ce
+  data.tar.gz: 37e954d5f9c4e1a767c91e999327ac32b64f9a984153c1cccf4273423d6b1818e89b3dcab08a056889decd6e72abd84672bfd94bb05c1b2207cc7a640efa44de

data/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 ## Next version
 
+## v1.9.6
+- Fix info helper with false
+- Update Rubocop + fix offences
+
+## 1.9.5
+- Fix warnings on Rails 6
+
+## 1.9.4
+- Cucumber : disable Zonebie
+
+## 1.9.3
+- No change
+
+## 1.9.2
+- ErrorsMiddleware improvements
+
+## 1.9.1
+- Add ErrorsMiddleware
+
 ## 1.9.0
 - Remove phantomjs/poltergeist support
 - BackUrlConcern transforms absolute URLs to relative

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

@@ -37,7 +37,7 @@ module Agilibox::ApiControllerConcern
   end
 
   def json_error_string_for_model(object)
-    json_errors_hash_for_model(object).values.map { |e| e[:full_message] }.join(", ")
+    json_errors_hash_for_model(object).values.pluck(:full_message).join(", ")
   end
 
   def render_not_found

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

@@ -13,7 +13,7 @@ module Agilibox::BackUrlConcern
       default_back_url,
       main_app.try(:root_path),
       "/",
-    ].select(&:present?).first
+    ].find(&:present?)
 
     uri = URI.parse(url)
     uri.host = nil

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

@@ -43,7 +43,7 @@ class Agilibox::SmallData::Filter
   end
 
   def respond_to_missing?(method, *)
-    strategies.key?(method.to_s) || strategies.key?(method.to_s.chomp("="))
+    super || strategies.key?(method.to_s) || strategies.key?(method.to_s.chomp("="))
   end
 
   def read

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

@@ -2,6 +2,7 @@ class Agilibox::SmallData::FilterStrategyByKeyValue < ::Agilibox::SmallData::Fil
   attr_reader :key
 
   def initialize(key = nil)
+    super()
     @key = key
   end
 

data/app/helpers/agilibox/bootstrap_helper.rb

@@ -13,8 +13,8 @@ module Agilibox::BootstrapHelper
   end
 
   def bs_progress_bar(percentage)
-    content_tag(:div, class: "progress") do
-      content_tag(:div, class: "progress-bar", style: "width:#{percentage}%") do
+    tag.div(class: "progress") do
+      tag.div(class: "progress-bar", style: "width:#{percentage}%") do
         "#{percentage}%"
       end
     end

data/app/helpers/agilibox/filters_helper.rb

@@ -7,7 +7,7 @@ module Agilibox::FiltersHelper
     text = options.delete(:text) || t("actions.filter")
     icon = options.delete(:icon) || :filter
 
-    content_tag(:button, options) do
+    tag.button(options) do
       icon(icon) + " " + text
     end
   end
@@ -20,7 +20,7 @@ module Agilibox::FiltersHelper
     text = options.delete(:text) || t("actions.reset")
     icon = options.delete(:icon) || :undo
 
-    content_tag(:button, options) do
+    tag.button(options) do
       icon(icon) + " " + text
     end
   end

data/app/helpers/agilibox/font_awesome_helper.rb

@@ -15,7 +15,7 @@ module Agilibox::FontAwesomeHelper
 
     attributes = options.merge(class: css_classes.sort.join(" ")).sort.to_h
 
-    content_tag(:span, attributes) {}
+    tag.span(attributes) {}
   end
 
   class << self

data/app/helpers/agilibox/form_helper.rb

@@ -21,13 +21,13 @@ module Agilibox::FormHelper
       submit_action = :save
     end
 
-    content_tag("div", class: "actions form-actions") do
-      submit = content_tag(:button, type: :submit, class: "btn btn-sm btn-success form-submit") do
-        content_tag(:span, class: "fa fa-save") {} + " " + ta(submit_action)
+    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)
       end
 
-      cancel = content_tag("a", href: back_url, class: "btn btn-primary btn-sm form-cancel") do
-        content_tag(:span, class: "fa fa-times") {} + " " + ta(:cancel)
+      cancel = tag.a(href: back_url, class: "btn btn-primary btn-sm form-cancel") do
+        tag.span(class: "fa fa-times") {} + " " + ta(:cancel)
       end
 
       cancel = "" if back_url == false

data/app/helpers/agilibox/pagination_helper.rb

@@ -5,7 +5,7 @@ module Agilibox::PaginationHelper
   end
 
   def pagination_infos(collection)
-    content_tag(:p, class: "pagination-infos") { page_entries_info(collection) }
+    tag.p(class: "pagination-infos") { page_entries_info(collection) }
   end
 
   def pagination_and_infos(collection)

data/app/helpers/agilibox/routes_helper.rb

@@ -1,6 +1,10 @@
 module Agilibox::RoutesHelper
   def engine_polymorphic_path(obj, opts = {})
-    engine = obj.class.parents[-2]
+    if Rails::VERSION::STRING >= "6.0.0"
+      engine = obj.class.module_parents[-2]
+    else
+      engine = obj.class.parents[-2]
+    end
 
     if engine.nil?
       routes = main_app

data/app/helpers/agilibox/sorting_helper.rb

@@ -38,7 +38,7 @@ module Agilibox::SortingHelper
 
     if sort_param.present?
       if sort_param.start_with?("-")
-        column     = sort_param[1..-1].to_sym
+        column     = sort_param[1..].to_sym
         direction  = :desc
       else
         column     = sort_param.to_sym

data/app/helpers/agilibox/text_helper.rb

@@ -93,13 +93,16 @@ module Agilibox::TextHelper
       value = value_or_options
     end
 
+    value = t("yes") if value == true
+    value = t("no")  if value == false
+
     if value.blank?
       value = options[:default]
       return if value == :hide
     end
 
     label       = options[:label]     || object.t(attribute)
-    tag         = options[:tag]       || :div
+    info_tag    = options[:tag]       || :div
     separator   = options[:separator] || " : "
     separator   = " :<br/>".html_safe if separator == :br
     helper      = options[:helper]
@@ -108,8 +111,6 @@ module Agilibox::TextHelper
     klass       = object.is_a?(Module) ? object : object.class
     object_type = klass.to_s.split("::").last.underscore
 
-    value = t("yes")             if value == true
-    value = t("no")              if value == false
     value = object.tv(attribute) if nested
     value = send(helper, value)  if helper
     value = number(value)        if value.is_a?(Numeric)
@@ -117,10 +118,10 @@ module Agilibox::TextHelper
     value = l(value)             if value.is_a?(Date)
     value = value.to_s
 
-    html_label     = content_tag(:strong, class: "info-label") { label }
+    html_label     = tag.strong(class: "info-label") { label }
     span_css_class = "info-value #{object_type}-#{attribute}"
-    html_value     = content_tag(:span, class: span_css_class) { value }
-    separator_html = content_tag(:span, class: "info-separator") { separator }
+    html_value     = tag.span(class: span_css_class) { value }
+    separator_html = tag.span(class: "info-separator") { separator }
 
     if value.blank?
       container_css_class = "info blank"
@@ -128,7 +129,7 @@ module Agilibox::TextHelper
       container_css_class = "info"
     end
 
-    content_tag(tag, class: container_css_class) do
+    content_tag(info_tag, class: container_css_class) do
       [html_label, separator_html, html_value].join.html_safe
     end
   end # def info
@@ -138,7 +139,7 @@ module Agilibox::TextHelper
     return "" if object.tag_list.empty?
 
     object.tag_list.map { |tag|
-      content_tag(:span, class: "tag label label-primary") {
+      tag.span(class: "tag label label-primary") {
         "#{icon :tag} #{tag}".html_safe
       }
     }.join(" ").html_safe

data/app/libs/agilibox/fcm/notifier.rb

@@ -3,6 +3,7 @@ class Agilibox::FCM::Notifier < Agilibox::Service
 
   # rubocop:disable Metrics/ParameterLists
   def initialize(to:, title: nil, body:, badge: 0, sound: "default", data: {})
+    super()
     @to    = to
     @title = title
     @body  = body

data/app/libs/agilibox/fcm/request.rb

@@ -39,7 +39,7 @@ class Agilibox::FCM::Request < Agilibox::Service
   end
 
   def errors
-    response_json[:results].map { |r| r[:error] }.compact
+    response_json[:results].pluck(:error).compact
   end
 
   def invalid_token?

data/app/libs/agilibox/mini_model_serializer/serializer.rb

@@ -18,6 +18,6 @@ class Agilibox::MiniModelSerializer::Serializer < Agilibox::MiniModelSerializer:
   end
 
   def respond_to_missing?(m, *)
-    object.respond_to?(m, true)
+    super || object.respond_to?(m, true)
   end
 end

data/app/libs/agilibox/phone_number_sanitizer.rb

@@ -6,7 +6,7 @@ class Agilibox::PhoneNumberSanitizer
   end
 
   def call
-    phone_number.to_s.gsub(/[^0-9\+]+/, "").presence
+    phone_number.to_s.gsub(/[^0-9+]+/, "").presence
   end
 
   def self.call(*args)

data/app/sms/agilibox/sms/application_sms.rb

@@ -36,7 +36,7 @@ class Agilibox::SMS::ApplicationSMS
     end
 
     def respond_to_missing?(m, *)
-      public_instance_methods.include?(m)
+      super || public_instance_methods.include?(m)
     end
   end # class << self
 end

data/lib/agilibox/active_model_custom_error_messages.rb

@@ -1,8 +1,8 @@
 module Agilibox::ActiveModelCustomErrorMessages
   def full_message(attribute, message)
-    return message[1..-1] if message[0] == "^"
+    return message[1..] if message[0] == "^"
     super(attribute, message)
   end
 end
 
-ActiveModel::Errors.send(:prepend, Agilibox::ActiveModelCustomErrorMessages)
+ActiveModel::Errors.prepend(Agilibox::ActiveModelCustomErrorMessages)

data/lib/agilibox/active_model_type_cast.rb

@@ -2,7 +2,7 @@ module Agilibox::ActiveModelTypeCast
   module Decimal
     def cast_value(value)
       if value.is_a?(String)
-        super value.tr(",", ".").gsub(/[^-0-9\.]/, "")
+        super value.tr(",", ".").gsub(/[^-0-9.]/, "")
       else
         super value
       end
@@ -46,7 +46,7 @@ module Agilibox::ActiveModelTypeCast
   end
 end
 
-ActiveModel::Type::Date.send(:prepend, Agilibox::ActiveModelTypeCast::Date)
-ActiveModel::Type::Boolean.send(:prepend, Agilibox::ActiveModelTypeCast::Boolean)
-ActiveModel::Type::Decimal.send(:prepend, Agilibox::ActiveModelTypeCast::Decimal)
-ActiveModel::Type::Float.send(:prepend, Agilibox::ActiveModelTypeCast::Decimal)
+ActiveModel::Type::Date.prepend(Agilibox::ActiveModelTypeCast::Date)
+ActiveModel::Type::Boolean.prepend(Agilibox::ActiveModelTypeCast::Boolean)
+ActiveModel::Type::Decimal.prepend(Agilibox::ActiveModelTypeCast::Decimal)
+ActiveModel::Type::Float.prepend(Agilibox::ActiveModelTypeCast::Decimal)

data/lib/agilibox/cucumber_helpers/zonebie.rb

@@ -1 +1,4 @@
-Zonebie.set_random_timezone
+# Temporairement désactiver en attendant de trouver une solution.
+# Zonebie change la TZ sur les steps mais pas sur l'application,
+# du coup on casse des tests alors que l'implémentation est bonne.
+# Zonebie.set_random_timezone

data/lib/agilibox/engine.rb

@@ -12,6 +12,10 @@ module Agilibox
       Mime::Type.register "application/vnd.ms-excel", :xls
       Mime::Type.register "application/vnd.ms-excel", :xlsx
     end
+
+    # initializer "agilibox_errors_middleware" do
+    #   require "agilibox/errors_middleware"
+    # end
   end
 end
 

data/lib/agilibox/errors_middleware.rb

@@ -0,0 +1,47 @@
+class Agilibox::ErrorsMiddleware
+  MAINTENANCE_ERRORS = [
+    "ActiveRecord::ConnectionTimeoutError",
+    "connections on port 5432",
+    "PG::UnableToSend",
+  ]
+
+  NOT_ACCEPTABLE_ERRORS = [
+    "ActionController::BadRequest",
+    "ActionController::UnknownFormat",
+    "ActionController::UnknownHttpMethod",
+    "ActionView::MissingTemplate",
+  ]
+
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    @app.call(env)
+  rescue StandardError => e
+    error = "#{e.class} : #{e.message}"
+
+    if MAINTENANCE_ERRORS.any? { |pattern| error.match?(pattern) }
+      return respond_with 503, "Maintenance en cours."
+    end
+
+    if NOT_ACCEPTABLE_ERRORS.any? { |pattern| error.match?(pattern) }
+      return respond_with 406, "Not acceptable."
+    end
+
+    raise e
+  end
+
+  private
+
+  def respond_with(status, body)
+    [status, {"Content-Type" => "text/plain; charset=UTF-8"}, [body]]
+  end
+end
+
+stack = Rails.configuration.middleware
+mw = Agilibox::ErrorsMiddleware
+stack.unshift(mw)
+stack.insert_after(ActionDispatch::DebugExceptions, mw) if defined?(ActionDispatch::DebugExceptions)
+stack.insert_after(Bugsnag::Rack, mw) if defined?(Bugsnag::Rack)
+stack.use(mw)

data/lib/agilibox/form_back_url.rb

@@ -15,4 +15,4 @@ module Agilibox::FormBackUrl
   end
 end
 
-ActionView::Helpers::FormTagHelper.send(:prepend, Agilibox::FormBackUrl)
+ActionView::Helpers::FormTagHelper.prepend(Agilibox::FormBackUrl)

data/lib/agilibox/version.rb

@@ -1,3 +1,3 @@
 module Agilibox
-  VERSION = "1.9.0"
+  VERSION = "1.9.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agilibox
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.6
 platform: ruby
 authors:
 - agilidée
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
@@ -217,6 +217,7 @@ files:
 - lib/agilibox/cucumber_helpers/zonebie.rb
 - lib/agilibox/engine.rb
 - lib/agilibox/engine_file.rb
+- lib/agilibox/errors_middleware.rb
 - lib/agilibox/form_back_url.rb
 - lib/agilibox/rspec.rb
 - lib/agilibox/test_helpers.rb
@@ -227,7 +228,7 @@ homepage: https://github.com/agilidee/agilibox
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -243,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Agilibox
 test_files: []