agilibox 1.9.1 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13838c6239bbcb5c4638ea7ae6b0c941bb9f534f8d4d0a80d42e7032bc8101f8
-  data.tar.gz: 5a5574853314ad1f5eb4cb59da239dab07f42d65adc2226d344e1eacd1687cbb
+  metadata.gz: 43edc1602674c41d34d28ab05565875acdcd8205875be814b807e8d6030fd606
+  data.tar.gz: 91c4ffe2a7a61e7b49ed725259bc458b3b1d2ae0777c1dfd51020152957f568d
 SHA512:
-  metadata.gz: d9f95ad166c9bb997141683ac6cdd34633d002bf0859e967b0ed2fe9eff090d8b3b994c3f21e5e72843b82cd0aa94ba5ae62a30535b17fa15a3f7f2620c93b65
-  data.tar.gz: 26df1371c8c6aa014790618229d63807bfc472662b0b955bcd68e579d17fac805e7668b8d2aac9cab5e58b38b62405582526d1615b96b6cf96d3e0c0525c3836
+  metadata.gz: bd7b588581d44d6f0b46be007712bd3cdffd8bd6bdc4d1e4435248b3b6424c892dd57cea9ea8192a3a1d9dec2dffcb706ce0f86f94f2a1a272010e5333dbbe35
+  data.tar.gz: 7dd38de913db48ff9e96781889debf3024d7e1e6e33dd4ffced130963acfea2266c9a87818e10b988c89e8182be42db50d8539990c03c16cba6942429c092b06

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Next version
 
+## 1.9.3
+- No change
+
+## 1.9.2
+- ErrorsMiddleware improvements
+
 ## 1.9.1
 - Add ErrorsMiddleware
 

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/lib/agilibox/active_model_custom_error_messages.rb

@@ -5,4 +5,4 @@ module Agilibox::ActiveModelCustomErrorMessages
   end
 end
 
-ActiveModel::Errors.send(:prepend, Agilibox::ActiveModelCustomErrorMessages)
+ActiveModel::Errors.prepend(Agilibox::ActiveModelCustomErrorMessages)

data/lib/agilibox/active_model_type_cast.rb

@@ -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/errors_middleware.rb

@@ -1,13 +1,15 @@
 class Agilibox::ErrorsMiddleware
   MAINTENANCE_ERRORS = [
-    PG::ConnectionBad,
-    PG::UnableToSend,
+    "ActiveRecord::ConnectionTimeoutError",
+    "connections on port 5432",
+    "PG::UnableToSend",
   ]
 
   NOT_ACCEPTABLE_ERRORS = [
-    ActionController::UnknownFormat,
-    ActionController::UnknownHttpMethod,
-    ActionView::MissingTemplate,
+    "ActionController::BadRequest",
+    "ActionController::UnknownFormat",
+    "ActionController::UnknownHttpMethod",
+    "ActionView::MissingTemplate",
   ]
 
   def initialize(app)
@@ -16,10 +18,18 @@ class Agilibox::ErrorsMiddleware
 
   def call(env)
     @app.call(env)
-  rescue *MAINTENANCE_ERRORS
-    respond_with 503, "Maintenance en cours."
-  rescue *NOT_ACCEPTABLE_ERRORS
-    respond_with 406, "Not acceptable."
+  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

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.1"
+  VERSION = "1.9.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agilibox
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.3
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n