agilibox 1.8.0 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32ae9547194bc24867f080fd2d519d8c5121f0bd29c5f04a77ef3a0cc73ab193
-  data.tar.gz: b3842b9bcaf9a53cabe3ff70e35397f24486848b5b4b63ba718eeac3197149fc
+  metadata.gz: 70cf28216c3454232717705c0f856cbbcc9c7afe64a64940031e37c244e087ca
+  data.tar.gz: 4b69d768141760b3aa70b2bbecad849a359fe6e5c4e3d312971f5f648a7187b4
 SHA512:
-  metadata.gz: 57219afef63509df9ecef5d62e889f163808acb127634d869b644de4a6510a419880ccbd2bc655e8a892a69cebf29048a0afd2b24efecb72d7cb6f54f2ddf30a
-  data.tar.gz: 74850c8fd415e42e1cd1580ab02f55b5b8b5e2ed557f7b70bb7b036c3b801dfa1c38befe388e78dd8428cf15707ad58591b52ec4b8e698257e1cd83c1d51b671
+  metadata.gz: b895a6a5d99124b9a8fa3e7185e949b426bbe90c134441dbf1ee7e5329f8b10609ab40a3420f2067941158e9821c08a1ea1145fe8394506f7306bd309946c8ed
+  data.tar.gz: fc304783878fcfe3bfaad9d452d299ace65059046244cbe5ec0aa526107b23fe957869d26c1c39dbf306bcc755d8a1d71cea297dd42123d522b8b15b4a56bca9

data/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 ## Next version
 
+## 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
+
 ## 1.8.0
 - SMS improvements
 - Replace TapMethods by Tapenade gem

data/Rakefile

@@ -35,3 +35,7 @@ end
 
 
 task default: :test
+
+task "assets:precompile" do
+  Rake::Task["app:assets:precompile"].invoke
+end

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

@@ -7,12 +7,20 @@ module Agilibox::BackUrlConcern
   end
 
   def back_url
-    [
+    url = [
       params[:back_url],
       request.referer,
       default_back_url,
-      main_app.root_path,
+      main_app.try(:root_path),
       "/",
-    ].select(&:present?).first
+    ].find(&:present?)
+
+    uri = URI.parse(url)
+    uri.host = nil
+    uri.port = nil
+    uri.scheme = nil
+    uri.user = nil
+    uri.password = nil
+    uri.to_s
   end
 end

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/config/cucumber.yml

@@ -1,8 +1,9 @@
 <%
 rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
-rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags ~@wip"
+rerun = rerun.strip.gsub /\s/, ' '
+rerun_opts = rerun.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags 'not @wip'"
 %>
 default: <%= std_opts %> features
 wip: --tags @wip:3 --wip features
-rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip
+rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags 'not @wip'

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

@@ -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_config.rb

@@ -1,12 +1,6 @@
 class << Agilibox::CucumberConfig = Class.new
   undef new
 
-  attr_writer :phantomjs_version
-
-  def phantomjs_version
-    @phantomjs_version ||= "2.1.1"
-  end
-
   attr_writer :cuprite_timeout
 
   def cuprite_timeout
@@ -37,14 +31,10 @@ class << Agilibox::CucumberConfig = Class.new
 
   def require_all_helpers!
     files = Dir.glob Agilibox::Engine.root.join("lib", "agilibox", "cucumber_helpers", "*.rb")
-    files.delete_if { |f| f.match?(/poltergeist|chrome|cuprite|_steps/) }
+    files.delete_if { |f| f.match?(/chrome|cuprite|_steps/) }
     files.each { |file| require file }
   end
 
-  def require_poltergeist!
-    require Agilibox::Engine.root.join("lib", "agilibox", "cucumber_helpers", "poltergeist.rb")
-  end
-
   def require_chrome_headless!
     require Agilibox::Engine.root.join("lib", "agilibox", "cucumber_helpers", "chrome_headless.rb")
   end

data/lib/agilibox/cucumber_helpers/capybara.rb

@@ -1,5 +1,5 @@
 Capybara.register_driver :agilibox_no_driver do |_app|
-  raise "You need to add Agilibox::CucumberConfig.require_poltergeist! 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/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.8.0"
+  VERSION = "1.9.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agilibox
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.5
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2020-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
@@ -206,8 +206,6 @@ files:
 - lib/agilibox/cucumber_helpers/cuprite.rb
 - lib/agilibox/cucumber_helpers/database_cleaner.rb
 - lib/agilibox/cucumber_helpers/factory_bot.rb
-- lib/agilibox/cucumber_helpers/fix_referrer.rb
-- lib/agilibox/cucumber_helpers/poltergeist.rb
 - lib/agilibox/cucumber_helpers/rails.rb
 - lib/agilibox/cucumber_helpers/rspec.rb
 - lib/agilibox/cucumber_helpers/screenshots.rb
@@ -219,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

data/lib/agilibox/cucumber_helpers/fix_referrer.rb

@@ -1,9 +0,0 @@
-# https://github.com/ariya/phantomjs/issues/13677
-
-module RackETagDisable
-  def call(env)
-    @app.call(env)
-  end
-end
-
-Rack::ETag.send(:prepend, RackETagDisable)

data/lib/agilibox/cucumber_helpers/poltergeist.rb

@@ -1,20 +0,0 @@
-require "capybara/poltergeist"
-
-phantomjs_version = Agilibox::CucumberConfig.phantomjs_version
-phantomjs_binary = `which phantomjs-#{phantomjs_version} phantomjs`.split("\n").first
-raise "invalid phantomjs version" if `#{phantomjs_binary} -v`.strip != phantomjs_version
-# You can download phantomjs here : https://bitbucket.org/ariya/phantomjs/downloads/
-# Semaphore setup commmand : change-phantomjs-version 2.1.1
-
-Capybara.register_driver :agilibox_poltergeist do |app|
-  Capybara::Poltergeist::Driver.new(app,
-    :debug       => false,
-    :window_size => Agilibox::CucumberConfig.window_size,
-    :timeout     => 60,
-    :phantomjs   => phantomjs_binary,
-  )
-end
-
-Capybara.default_driver    = :agilibox_poltergeist
-Capybara.javascript_driver = :agilibox_poltergeist
-Capybara.current_driver    = :agilibox_poltergeist