udongo 7.7.2 → 7.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90cb5755b0df3482d5d074d11028e0576c96e541
-  data.tar.gz: fe5fb945dd8102abe82ebbce12bf0c4f17339a41
+  metadata.gz: e97f435ff6a84446f7ff5826ace9409c173a7cf2
+  data.tar.gz: 9e6c8e8ab81d2a9f9bd8a8341f8a8eeaaced1c17
 SHA512:
-  metadata.gz: e850585aaf1552acfdb975c7b3a494654e36b555be5c26455e154ee06ee70b26bec28f1716f597bce6e2c2f550f2e7c09366734fcf064cd3225a20221c778b82
-  data.tar.gz: c663649cdffc9efe5369944cbf7ebf48703f381d81cc66ffaf459907ef371517181a2258558363b29fe5e12427c44ce997a92b934de2d883227827245263d7f2
+  metadata.gz: b64db4f43f38e0add637f3242966e148f41479f6b6ccab7fa58af211caf703255f1e98b8998a04ee46195eccd5d01df0725eb01ddd9d587ac561eee02d86b44f
+  data.tar.gz: cf9bfe2b2b2c77c9a34ab67d8a23b90cb6955acea8594a07d7c9baffd4385a6d615d39d4f07c25d9cf75332c6a32f854f2ead954330831a486a40ad76c723e59

data/app/assets/javascripts/backend/general.js

@@ -3,6 +3,14 @@ var general = general || {
     $('form:not(.no-focus) input:visible:not(.no-focus):first').focus();
     $('[data-toggle="tooltip"]').tooltip();
     $('[href="#lity-close"]').on('click', this.lity_close_click_listener);
+    this.bind_remote_content_for_bootstrap_modals();
+  },
+
+  bind_remote_content_for_bootstrap_modals: function() {
+    $('[data-toggle="modal"]').on('click', function() {
+      var anchor = $(this);
+      $(anchor.data('target') + ' .modal-body').load(anchor.data('remote'));
+    });
   },
 
   lity_close_click_listener: function(e) {

data/app/assets/javascripts/backend/redirects.js

@@ -0,0 +1,61 @@
+var redirects = redirects || {
+  trigger_button: null,
+  containers: null,
+
+  init: function() {
+    redirects.bind_test_button();
+    $('#test-redirect-modal').on('shown.bs.modal', redirects.bind_test_button);
+  },
+
+  bind_test_button: function() {
+    redirects.trigger_button = $('#test-redirects');
+    redirects.prepare_containers();
+    redirects.trigger_button.off('click').on('click', redirects.trigger_button_click_listener);
+  },
+
+  mark_card_as_processing: function(card) {
+    card.removeClass('alert-danger');
+    card.removeClass('alert-success');
+    card.removeClass('alert-info');
+    card.addClass('alert-warning');
+    card.find('.card-icon').attr('hidden', true);
+    card.find('.spinner-icon').attr('hidden', false);
+  },
+
+  prepare_containers: function() {
+    redirects.containers = $('article.redirect').toArray();
+    redirects.trigger_button.removeClass('disabled');
+    $('[data-toggle="tooltip"]').tooltip();
+  },
+
+  process_next_container: function() {
+    var container = redirects.containers.shift();
+    redirects.run_for_container($(container));
+  },
+
+  run_for_container: function(container) {
+    var card = container.find('.card');
+    redirects.mark_card_as_processing(card);
+
+    // This fixes an issue with code somehow calling this method a fourth time
+    // when there are only 3 items in this.containers.
+    if(container.length == 0) return;
+
+    $.ajax({
+      url: container.data('path'),
+      type: 'POST'
+    }).done(function(data){
+      redirects.process_next_container(container);
+    });
+  },
+
+  trigger_button_click_listener: function(e) {
+    e.preventDefault();
+    var anchor = $(this);
+    anchor.addClass('disabled');
+
+    redirects.process_next_container();
+  }
+};
+
+$(function(){ redirects.init(); });

data/app/assets/stylesheets/backend/components/_form.scss

@@ -26,3 +26,7 @@ label.collection_check_boxes {
     cursor: pointer;
   }
 }
+
+button.btn, input.btn {
+  cursor: pointer;
+}

data/app/controllers/backend/redirects/test_controller.rb

@@ -0,0 +1,38 @@
+class Backend::Redirects::TestController < Backend::BaseController
+  before_action :find_model
+
+  # The follow_location param determines the difference between a redirect trace
+  # that runs through every nested redirect and one that stops at the first
+  # redirect in the trace.
+  # (A nested redirect meaning that the destination of one redirect is the
+  # source of another)
+  def resolve
+    respond_to do |format|
+      format.js do
+        # The last redirect in a chain should always follow its location through,
+        # because that's the only way afaik to retrieve 404/500 and other faulty
+        # status codes, instead of the default 301.
+        vars = { base_url: request.base_url, follow_location: @redirect.next_in_chain.blank? }
+
+        if @redirect.resolves?(vars)
+          @redirect.working!
+        else
+          @redirect.broken!
+        end
+      end
+    end
+  end
+
+  private
+
+  def find_model
+    @redirect ||= Redirect.find(params[:id]).decorate
+  end
+
+  def test_notice(key)
+    t("b.msg.redirects.#{key}",
+      source: @redirect.source_uri,
+      destination: @redirect.destination_uri
+     )
+  end
+end

data/app/controllers/backend/redirects_controller.rb

@@ -2,11 +2,12 @@ class Backend::RedirectsController < Backend::BaseController
   include Concerns::PaginationController
 
   before_action -> { breadcrumb.add t('b.redirects'), backend_redirects_path }
-  before_action :find_model, only: [:edit, :update, :destroy]
+  before_action :find_model, except: [:index, :new, :create]
 
   def index
     @search = Redirect.ransack params[:q]
-    @redirects = @search.result(distinct: true).order('times_used DESC').page(page_number).per_page(per_page)
+    results = @search.result(distinct: true).order('times_used DESC')
+    @redirects = paginate(results).decorate
   end
 
   def new
@@ -17,6 +18,7 @@ class Backend::RedirectsController < Backend::BaseController
     @redirect = Redirect.new(allowed_params).decorate
 
     if @redirect.save
+      @redirect.jumps_cacher.cache!
       redirect_to backend_redirects_path, notice: translate_notice(:added, :redirect)
     else
       render :new
@@ -25,17 +27,35 @@ class Backend::RedirectsController < Backend::BaseController
 
   def destroy
     @redirect.destroy
-    redirect_to backend_redirects_path, notice: translate_notice(:deleted, :redirect)
+    @redirect.jumps_cacher.cache! unless @redirect.jumps_cacher.already_on_top?
+    redirect_to backend_redirects_path(search_params), notice: translate_notice(:deleted, :redirect)
+  end
+
+  def show
+    render layout: false
+  end
+
+  def edit
+    session['redirect_search_params'] = search_params
   end
 
   def update
     if @redirect.update_attributes allowed_params
-      redirect_to backend_redirects_path, notice: translate_notice(:edited, :redirect)
+      @redirect.jumps_cacher.cache!
+      redirect_to backend_redirects_path(session[:redirect_search_params]), notice: translate_notice(:edited, :redirect)
     else
       render :edit
     end
   end
 
+  def search_params
+    hash = { q: nil }
+    hash[:q] = params[:q].to_hash if params[:q]
+    hash[:page] = params[:page] if params[:page]
+    hash
+  end
+  helper_method :search_params
+
   private
 
   def allowed_params
@@ -45,6 +65,6 @@ class Backend::RedirectsController < Backend::BaseController
   end
 
   def find_model
-    @redirect = Redirect.find(params[:id]).decorate
+    @redirect ||= Redirect.find(params[:id]).decorate
   end
 end

data/app/controllers/redirects_controller.rb

@@ -4,6 +4,7 @@ class RedirectsController < ActionController::Base
 
     if redirect && redirect.enabled?
       redirect.used!
+      redirect.working!
       redirect_to redirect.destination_uri, status: redirect.status_code
     else
       render plain: 'No such redirect or disabled.', status: 404

data/app/decorators/redirect_decorator.rb

@@ -1,6 +1,10 @@
 class RedirectDecorator < ApplicationDecorator
   delegate_all
 
+  def status_badge
+    @status_badge ||= Udongo::Redirects::StatusBadge.new(h, object)
+  end
+
   def status_code_collection
     %w(301 303 307).map do |code|
       [I18n.t("b.msg.status_codes.#{code}"), code]
@@ -10,4 +14,23 @@ class RedirectDecorator < ApplicationDecorator
   def summary
     "#{I18n.t('b.from')} #{object.source_uri} #{I18n.t('b.to').downcase} #{object.destination_uri}"
   end
+
+  def tooltip_identifier
+    return :untested if working.nil?
+    return :working if working?
+    :broken
+  end
+
+  def tooltip_text
+    h.t("b.msg.redirects.tooltips.#{tooltip_identifier}")
+  end
+
+  def truncated_uri(type, length: 50)
+    value = object.send(type)
+
+    return value if value.length <= length
+    h.content_tag :span, data: { toggle: 'tooltip' }, title: value do
+      h.truncate(value, length: length)
+    end
+  end
 end

data/app/helpers/icon_helper.rb

@@ -17,4 +17,8 @@ module IconHelper
     markup = content_tag :i, nil, options
     lbl ? "#{markup} #{lbl}".html_safe : markup
   end
+
+  def spinner_icon
+    icon :spinner, '', class: 'fa-spin'
+  end
 end

data/app/helpers/link_helper.rb

@@ -13,15 +13,15 @@ module LinkHelper
   def link_to_edit_with_label(value, locale)
     link_to(
       object_label(value, locale),
-      path_from_string_or_object(value, 'edit_'),
+      path_from_string_or_object(value, prefix: 'edit_'),
       title: t('b.edit')
     )
   end
 
-  def link_to_edit(value)
+  def link_to_edit(value, parameters = {})
     link_to(
       icon(:pencil_square_o),
-      path_from_string_or_object(value, 'edit_'),
+      path_from_string_or_object(value, prefix: 'edit_', parameters: parameters),
       title: t('b.edit')
     )
   end
@@ -33,21 +33,21 @@ module LinkHelper
     link_to_edit(url)
   end
 
-  def link_to_delete(value)
+  def link_to_delete(value, parameters = {})
     link_to(
       icon(:trash),
-      path_from_string_or_object(value),
+      path_from_string_or_object(value, parameters: parameters),
       method: :delete,
       data: { confirm: t('b.msg.confirm') },
       title: t('b.delete')
     )
   end
 
-  def path_from_string_or_object(value, prefix = nil)
+  def path_from_string_or_object(value, prefix: nil, parameters: {})
     return value if value.is_a?(String)
 
     str = "#{prefix}#{Udongo::ObjectPath.find(value)}"
-    send(str, *Udongo::ObjectPath.remove_symbols(value))
+    send(str, *Udongo::ObjectPath.remove_symbols(value), parameters)
   end
 
   def object_label(value, locale)

data/app/models/redirect.rb

@@ -1,16 +1,97 @@
 class Redirect < ApplicationRecord
+  scope :working, -> { where(working: true) }
+  scope :broken, -> { where('working IS NULL or working = 0') }
   scope :disabled, -> { where(disabled: true) }
   scope :enabled, -> { where('disabled IS NULL or disabled = 0') }
 
   validates :source_uri, :destination_uri, :status_code, presence: true
   validates :source_uri, uniqueness: { case_sensitive: false }
 
+  # Sanitizing at this point makes sure the uniqueness validation keeps working.
+  before_validation do
+    self.source_uri = convert_to_uri_path(sanitize_uri(source_uri))
+    self.destination_uri = sanitize_uri(destination_uri)
+  end
+
+  def broken?
+    !working?
+  end
+
+  def broken!
+    update_attribute(:working, false)
+  end
+
+  def cache_jumps!
+    update_attribute(:jumps, calculate_jumps)
+  end
+
+  def calculate_jumps(total = 0)
+    total += 1
+    return next_in_chain.calculate_jumps(total) if next_in_chain.present?
+    total
+  end
+
+  def jumps_cacher
+    @jumps_cacher ||= Udongo::Redirects::JumpsCacher.new(self)
+  end
+
   def enabled?
     !disabled?
   end
 
+  def next_in_chain
+    self.class.enabled.find_by(source_uri: destination_uri)
+  end
+
+  def previous_in_chain
+    self.class.enabled.find_by(destination_uri: source_uri)
+  end
+
+  # Tests the redirect including any redirects following this one.
+  def resolves?(base_url: Udongo.config.base.host, follow_location: true)
+    response = Udongo::Redirects::Test.new(self).perform!(
+      base_url: base_url,
+      follow_location: follow_location
+    )
+
+    response.success? && response.endpoint_matches?(base_url + destination_uri)
+  end
+
+  # This builds a list of all redirects following the current one in its
+  # progression path. Includes the current redirect as the first item.
+  # See #next_in_chain for the trace conditions.
+  def trace_down(stack = [])
+    stack << self
+    return next_in_chain.trace_down(stack) if next_in_chain.present?
+    stack
+  end
+
+  # This builds a list of all redirects prior to the current one in its
+  # progression path. Includes the current redirect as the first item.
+  # See #previous_in_chain for the trace conditions.
+  def trace_up(stack = [])
+    stack << self
+    return previous_in_chain.trace_up(stack) if previous_in_chain.present?
+    stack.reverse # Reversing because the top most one will be at the end.
+  end
+
   def used!
     count = self.times_used.nil? ? 1 : times_used + 1
     update_attribute :times_used, count
   end
+
+  def working!
+    update_attribute(:working, true)
+  end
+
+  private
+
+  def convert_to_uri_path(value)
+    URI::parse(value.to_s).path
+  end
+
+  def sanitize_uri(value)
+    return if value.blank?
+    Udongo::Redirects::UriSanitizer.new(value).sanitize!
+  end
 end

data/app/views/backend/redirects/_card.html.erb

@@ -0,0 +1,41 @@
+<div class="card p-3 alert-<%= r.status_badge.css_class %>">
+  <div class="card-body">
+    <div class="card-text">
+
+      <div class="row">
+        <div class="col-1">
+          <span class="card-icon">
+            <%= r.status_badge.icon %>
+          </span>
+          <span class="spinner-icon" hidden>
+            <%= spinner_icon %>
+          </span>
+        </div>
+
+        <div class="col-md-7 col-sm-11">
+          <p class="text-center">
+            <strong><%= r.source_uri %></strong><br>
+            <large><%= icon :long_arrow_down %></large><br>
+            <strong><%= r.destination_uri %></strong>
+          </p>
+        </div>
+
+        <div class="col-md-4 col-sm-11">
+          <ul class="list-unstyled m-0 text-sm-left text-md-right">
+            <li>
+              <%= link_to backend_redirect_path(r), class: 'btn btn-secondary btn-sm', method: 'DELETE', data: { confirm: t('b.msg.confirm') } do %>
+                <%= icon(:trash) %>
+                <%= t('b.delete') %>
+              <% end %>
+
+              <%= link_to edit_backend_redirect_path(r), class: 'btn btn-primary btn-sm' do %>
+                <%= icon(:edit) %>
+                <%= t('b.edit') %>
+              <% end %>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/backend/redirects/_filter.html.erb

@@ -2,18 +2,23 @@
   <div class="card-block">
     <%= search_form_for [:backend, @search] do |f| %>
       <div class="row">
-        <div class="col-md-6 form-group">
+        <div class="col-md-4 form-group">
           <%= f.search_field :source_uri_cont, placeholder: t('b.source'), class: 'form-control' %>
         </div>
 
-        <div class="col-md-6 form-group">
+        <div class="col-md-4 form-group">
           <%= f.search_field :destination_uri_cont, placeholder: t('b.destination'), class: 'form-control' %>
         </div>
+
+        <div class="col-md-4 form-group">
+          <%= f.select :working_eq, options_for_collection(:working, [true, false]), { include_blank: t('b.status') }, class: 'form-control'  %>
+        </div>
       </div>
 
       <div class="row">
         <div class="col-md-6">
           <%= f.submit class: 'btn btn-primary btn-sm' %>
+          <%= link_to t('b.reset'), backend_redirects_path, class: 'btn btn-link btn-sm' %>
         </div>
       </div>
     <% end %>

data/app/views/backend/redirects/_form.html.erb

@@ -1,5 +1,29 @@
+<% javascript 'backend/redirects' %>
+
 <%= render 'backend/general_form_error', object: model %>
 
+<% unless @redirect.new_record? %>
+  <div class="card">
+    <div class="card-header">
+      <%= t('b.msg.redirects.test_header', source: @redirect.source_uri) %>
+    </div>
+    <div class="card-body p-3">
+      <p>
+        <%= link_to '#', class: 'btn btn-primary', id: 'test-redirects', role: 'button' do %>
+          <%= icon :sitemap %>
+          <%= t('b.msg.redirects.test') %>
+        <% end %>
+      </p>
+
+      <% @redirect.trace_down.each do |r| %>
+        <article class="redirect" data-id="<%= r.id %>" data-path="<%= resolve_backend_test_redirect_path(r) %>">
+          <%= render 'backend/redirects/card', r: r.decorate %>
+        </article>
+      <% end %>
+    </div>
+  </div>
+<% end %>
+
 <%= simple_form_for [:backend, model] do |f| %>
   <div class="row">
     <div class="col-md-6">
@@ -34,5 +58,11 @@
     </div>
   </div>
 
-  <%= render 'backend/form_actions', cancel_url: backend_redirects_path %>
+  <div class="form-actions">
+    <button type="submit" class="btn btn-primary"><%= t 'b.save' %></button>
+    <% if model.id %>
+      <%= link_to t('b.delete'), backend_redirect_path(model), class: 'btn btn-secondary', method: 'DELETE', data: { confirm: t('b.msg.confirm') } %>
+    <% end %>
+    <%= link_to t('b.cancel'), backend_redirects_path, class: 'btn btn-link' %>
+  </div>
 <% end %>

data/app/views/backend/redirects/_test_modal.html.erb

@@ -0,0 +1,20 @@
+<div class="modal fade" id="test-redirect-modal" tabindex="-1" role="dialog">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('b.close') %></button>
+        <%= link_to '#', class: 'btn btn-primary', id: 'test-redirects', role: 'button' do %>
+          <%= icon :sitemap %>
+          <%= t('b.msg.redirects.test') %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/backend/redirects/index.html.erb

@@ -1,34 +1,52 @@
+<% javascript 'backend/redirects' %>
+
 <%= render 'backend/breadcrumbs' %>
-<%= render 'filter' %>
+<%= render 'backend/redirects/filter' %>
 
 <p class="text-right">
   <%= link_to icon(:plus, t('b.add')), new_backend_redirect_path, class: 'btn btn-primary btn-sm' %>
 </p>
 
 <% if @redirects.any? %>
-  <table class="table table-striped table-hover">
+  <table class="table table-hover">
     <thead class="thead-inverse">
       <tr>
+        <th><%= t 'b.status' %></th>
+        <th><%= t 'b.jumps' %></th>
         <th><%= t 'b.source' %></th>
         <th><%= t 'b.destination' %></th>
-        <th><%= t 'b.status_code' %></th>
-        <th><%= t 'b.enabled' %></th>
+        <th><%= t 'b.active' %></th>
         <th><%= t 'b.used' %></th>
         <th>&nbsp;</th>
       </tr>
     </thead>
 
+    <tfoot>
+      <tr>
+        <td colspan="7">
+          <%= t('b.msg.possible_statuses') %>:
+          <span class="badge badge-success">Werkend</span>
+          <span class="badge badge-danger">Stuk</span>
+          <span class="badge badge-info">Ongetest</span>
+        </td>
+      </tr>
+    </tfoot>
+
     <tbody>
       <% @redirects.each do |r| %>
         <tr>
-          <td><%= r.source_uri %></td>
-          <td><%= r.destination_uri %></td>
-          <td><%= r.status_code %></td>
+          <td><%= r.status_badge.html(data: { toggle: 'tooltip' }, title: r.tooltip_text) %></td>
+          <td><%= r.jumps %></td>
+          <td><%= r.truncated_uri(:source_uri) %></td>
+          <td><%= r.truncated_uri(:destination_uri) %></td>
           <td><%= t r.enabled?.to_s %></td>
-          <td><%= r.times_used.to_i %></td>
+          <td data-toggle="tooltip" title="<%= t('b.last_used_at', timestamp: l(r.updated_at, format: :short)) %>">
+            <%= r.times_used.to_i %>
+          </td>
           <td class="text-right">
-            <%= link_to_edit [:backend, r] %>
-            <%= link_to_delete [:backend, r] %>
+            <%= link_to icon(:sitemap), '#', data: { toggle: 'modal', backdrop: 'static', target: '#test-redirect-modal', remote: backend_redirect_path(r) }, title: t('b.msg.redirects.title_tag') %>
+            <%= link_to_edit [:backend, r], request.query_parameters %>
+            <%= link_to_delete [:backend, r], request.query_parameters %>
           </td>
         </tr>
       <% end %>
@@ -39,3 +57,5 @@
 <% else %>
   <p><%= t 'b.msg.no_items' %></p>
 <% end %>
+
+<%= render 'backend/redirects/test_modal' %>

data/app/views/backend/redirects/show.html.erb

@@ -0,0 +1,16 @@
+<% javascript 'backend/redirects' %>
+
+<h5 class="mb-3"><%= t('b.msg.redirects.test_header', source: @redirect.source_uri) %>:</h5>
+
+<% @redirect.trace_down.each_with_index do |r, index| %>
+  <div class="row">
+    <div class="col-1">
+      <%= index + 1 %>.
+    </div>
+    <div class="col-11">
+      <article class="redirect" data-id="<%= r.id %>" data-path="<%= resolve_backend_test_redirect_path(r) %>">
+        <%= render 'backend/redirects/card', r: r.decorate %>
+      </article>
+    </div>
+  </div>
+<% end %>

data/app/views/backend/redirects/test/resolve.js.erb

@@ -0,0 +1,9 @@
+var container = $('[data-id=<%= @redirect.id %>]');
+container.html('<%= j render('backend/redirects/card', r: @redirect) %>');
+if(redirects.containers.length == 0) {
+  // Using plenty of timeout or the JS will refill the containers too quick,
+  // causing an infinite loop of redirect tests.
+  setTimeout(function(){
+    redirects.prepare_containers();
+  }, 2000);
+}

data/changelog.md

@@ -1,3 +1,10 @@
+7.8.0 - 2018-10-26
+--
+* Fixes issue with blank search terms giving an unwanted AR exception.
+* Redesigned the Redirects module, with a way to test and resolve redirects.
+* Adjusted ```LinkHelper#link_to_{edit,destroy}``` to use named parameters.
+
+
 7.7.2 - 2018-10-04
 --
 * Fixes issue with blank search terms giving an unwanted AR exception.

data/config/locales/en_backend.yml

@@ -20,6 +20,7 @@ en:
     custom_title: Custom title
     custom_url: Custom URL
     delete: Delete
+    depth: Depth
     description: Description
     destination: Destination
     down: Down
@@ -50,7 +51,9 @@ en:
     html_content: HTML content
     image: Image
     images: Images
+    jumps: Jumps
     last_changed_at: Last changed at
+    last_used_at: Last used at %{timestamp}
     last_name: Last name
     locale: Locale
     login: Login
@@ -73,6 +76,7 @@ en:
     recipient: Recipient
     redirect: Redirect
     redirects: Redirects
+    reset: Reset
     save: Save
     search: Search
     search_term: Search term
@@ -95,6 +99,7 @@ en:
     tag: Tag
     tags: Tags
     telephone: Telephone
+    test_redirect: Test redirect
     times_used: Times used
     title: Title
     to: To
@@ -176,6 +181,17 @@ en:
       pages:
         invisible: Deze pagina is niet zichtbaar op de website.
       please_select_a_valid_image: Please select a valid image and try again.
+      possible_statuses: Possible statuses
+      redirects:
+        test: Test these redirects
+        test_header: All redirects starting from %{source}
+        broken: The redirect from %{source} to %{destination} does not work.
+        title_tag: Test this redirect
+        tooltips:
+          untested: This redirect is untested.
+          broken: This redirect does not work.
+          working: This redirect works.
+        works: The redirect from %{source} to %{destination} works.
       saved: '%{actor} was saved.'
       search_terms:
         deleted: The list with used search terms was cleared.

data/config/locales/en_general.yml

@@ -0,0 +1,15 @@
+en:
+  g:
+    collections:
+      working:
+        'true': Working
+        'false': Broken
+      form_field_type:
+        collection: Collection
+        email: E-mailaddress
+        integer: Number
+        string: String
+        tel: Telephone
+        text: Text
+
+    type: Type

data/config/locales/nl_backend.yml

@@ -20,6 +20,7 @@ nl:
     custom_title: Aangepaste titel
     custom_url: Aangepaste URL
     delete: Verwijder
+    depth: Diepte
     description: Beschrijving
     destination: Bestemming
     down: Omlaag
@@ -52,7 +53,9 @@ nl:
     image_collections: Afbeeldingsgroepen
     image: Afbeelding
     images: Afbeeldingen
+    jumps: Sprongen
     last_changed_at: Laatst gewijzigd op
+    last_used_at: Laatst gebruikt op %{timestamp}
     last_name: Achternaam
     locale: Taal
     login: Inloggen
@@ -75,6 +78,7 @@ nl:
     recipient: Bestemmeling
     redirect: Redirect
     redirects: Redirects
+    reset: Resetten
     save: Opslaan
     search: Zoeken
     search_term: Zoekterm
@@ -97,6 +101,7 @@ nl:
     tag: Tag
     tags: Tags
     telephone: Telefoonnummer
+    test_redirect: Redirect testen
     times_used: Aantal keer gebruikt
     title: Titel
     to: Naar
@@ -178,6 +183,17 @@ nl:
       pages:
         invisible: Deze pagina is niet zichtbaar op de website.
       please_select_a_valid_image: Gelieve een geldige afbeelding te selecteren en opnieuw te proberen.
+      possible_statuses: Mogelijke statussen
+      redirects:
+        test: Test deze redirects
+        test_header: Alle redirect sprongen vertrekkende van %{source}
+        broken: De redirect van %{source} naar %{destination} werkt niet.
+        title_tag: Test deze redirect
+        tooltips:
+          untested: Deze redirect is nog niet getest.
+          broken: Deze redirect werkt niet.
+          working: Deze redirect werkt.
+        works: De redirect van %{source} naar %{destination} werkt.
       saved: '%{actor} werd bewaard.'
       search_terms:
         deleted: De lijst met gebruikte zoektermen werd gewist

data/config/locales/nl_general.yml

@@ -1,6 +1,9 @@
 nl:
   g:
     collections:
+      working:
+        'true': Werkend
+        'false': Stuk
       form_field_type:
         collection: Collectie
         email: E-mailadres

data/config/routes.rb

@@ -23,7 +23,13 @@ Rails.application.routes.draw do
       collection { delete '/', action: 'destroy_all' }
     end
     resources :users
-    resources :redirects, except: :show
+    resources :redirects do
+      member do
+        scope 'test', controller: 'redirects/test', as: :test do
+          post 'resolve'
+        end
+      end
+    end
     resources :search_synonyms, except: :show
     resources :tags do
       concerns :translatable

data/db/migrate/20181019161330_add_working_to_redirects.rb

@@ -0,0 +1,5 @@
+class AddWorkingToRedirects < ActiveRecord::Migration[5.0]
+  def change
+    add_column :redirects, :working, :boolean, after: :times_used
+  end
+end

data/db/migrate/20181129141539_add_depth_to_redirects.rb

@@ -0,0 +1,5 @@
+class AddDepthToRedirects < ActiveRecord::Migration[5.0]
+  def change
+    add_column :redirects, :depth, :integer, after: :times_used
+  end
+end

data/db/migrate/20181130093908_rename_depth_to_jumps_for_redirects.rb

@@ -0,0 +1,5 @@
+class RenameDepthToJumpsForRedirects < ActiveRecord::Migration[5.0]
+  def change
+    rename_column :redirects, :depth, :jumps
+  end
+end

data/lib/udongo/redirects/jumps_cacher.rb

@@ -0,0 +1,19 @@
+module Udongo::Redirects
+  class JumpsCacher
+    def initialize(redirect)
+      @redirect = redirect
+    end
+
+    def cache!
+      top_most_redirect.trace_down.each(&:cache_jumps!)
+    end
+
+    def top_most_redirect
+      @redirect.trace_up.first
+    end
+
+    def already_on_top?
+      @redirect == top_most_redirect
+    end
+  end
+end

data/lib/udongo/redirects/response.rb

@@ -0,0 +1,33 @@
+module Udongo::Redirects
+  class Response
+    def initialize(response)
+      @response = response
+    end
+
+    def endpoint_matches?(destination)
+      sanitize_destination(destination) == headers['Location']
+    end
+
+    # Apparently Curb does not provide parsed headers... A bit sad.
+    # TODO: Handle multiple location headers so #endpoint_matches? can succeed.
+    # For now, the last location header is returned as a value.
+    def headers
+      list = @response.header_str.split(/[\r\n]+/).map(&:strip)
+      Hash[list.flat_map{ |s| s.scan(/^(\S+): (.+)/) }]
+    end
+
+    def raw
+      @response
+    end
+
+    def sanitize_destination(destination)
+      destination.to_s
+                 .gsub('/?', '?')
+                 .chomp('/')
+    end
+
+    def success?
+      ['200 OK', '301 Moved Permanently'].include?(@response.status)
+    end
+  end
+end

data/lib/udongo/redirects/status_badge.rb

@@ -0,0 +1,33 @@
+module Udongo::Redirects
+  class StatusBadge
+    attr_reader :view
+
+    # TODO: find out why Module.takes does not override in an engine env.
+    def initialize(view, redirect)
+      @view = view
+      @redirect = redirect
+    end
+
+    def css_class
+      return 'success' if @redirect.working?
+      return 'info' if @redirect.working.nil?
+      'danger'
+    end
+
+    def html(attributes = {})
+      attributes.reverse_merge!(class: "badge badge-#{css_class}")
+      @view.content_tag(:span, @redirect.status_code, attributes)
+    end
+
+    def icon
+      return '' unless icon_identifier
+      @view.icon(icon_identifier)
+    end
+
+    def icon_identifier
+      return :question_circle if @redirect.working.nil?
+      return :check_circle if @redirect.working?
+      :times_circle
+    end
+  end
+end

data/lib/udongo/redirects/test.rb

@@ -0,0 +1,21 @@
+require 'curb'
+
+module Udongo::Redirects
+  class Test
+    def initialize(redirect)
+      @redirect = redirect
+    end
+
+    # follow_location means curl can find out if the eventual endpoint has
+    # a 200, a 404, a 500, etc,... It's a bit slower, but it's more reliable.
+    # (You don't want to have an OK for a 301 when that 301 leads to a 404)
+    def perform!(base_url: Udongo.config.base.host, follow_location: true)
+      response = Curl::Easy.perform(base_url + @redirect.source_uri) do |curl|
+        curl.head = true
+        curl.follow_location = follow_location
+      end
+
+      Response.new(response)
+    end
+  end
+end

data/lib/udongo/redirects/uri_sanitizer.rb

@@ -0,0 +1,26 @@
+module Udongo::Redirects
+  class UriSanitizer
+    def initialize(uri)
+      @uri = uri
+    end
+
+    def sanitize!
+      result = strip_whitespace(@uri)
+      result = remove_leading_slashes(result)
+      result = remove_trailing_slashes(result)
+      result
+    end
+
+    def strip_whitespace(value)
+      value.strip
+    end
+
+    def remove_leading_slashes(value)
+      value.gsub(/^(?!\/)/, '/')
+    end
+
+    def remove_trailing_slashes(value)
+      value.chomp('/').gsub('/?', '?').gsub('/#', '#')
+    end
+  end
+end

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '7.7.2'
+  VERSION = '7.8.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 7.7.2
+  version: 7.8.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -353,6 +353,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
+- !ruby/object:Gem::Dependency
+  name: curb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.6
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -433,6 +453,7 @@ files:
 - app/assets/javascripts/backend/pages.js
 - app/assets/javascripts/backend/plugins/autocomplete.js
 - app/assets/javascripts/backend/plugins/tagbox.js
+- app/assets/javascripts/backend/redirects.js
 - app/assets/javascripts/backend/search.js
 - app/assets/javascripts/backend/seo.js
 - app/assets/javascripts/backend/sortable.js
@@ -486,6 +507,7 @@ files:
 - app/controllers/backend/pages/base_controller.rb
 - app/controllers/backend/pages/images_controller.rb
 - app/controllers/backend/pages_controller.rb
+- app/controllers/backend/redirects/test_controller.rb
 - app/controllers/backend/redirects_controller.rb
 - app/controllers/backend/search_controller.rb
 - app/controllers/backend/search_synonyms_controller.rb
@@ -707,11 +729,16 @@ files:
 - app/views/backend/pages/images/index.html.erb
 - app/views/backend/pages/index.html.erb
 - app/views/backend/pages/new.html.erb
+- app/views/backend/redirects/_card.html.erb
 - app/views/backend/redirects/_filter.html.erb
 - app/views/backend/redirects/_form.html.erb
+- app/views/backend/redirects/_row_columns.html.erb
+- app/views/backend/redirects/_test_modal.html.erb
 - app/views/backend/redirects/edit.html.erb
 - app/views/backend/redirects/index.html.erb
 - app/views/backend/redirects/new.html.erb
+- app/views/backend/redirects/show.html.erb
+- app/views/backend/redirects/test/resolve.js.erb
 - app/views/backend/search/_page.html.erb
 - app/views/backend/search_synonyms/_form.html.erb
 - app/views/backend/search_synonyms/edit.html.erb
@@ -759,6 +786,7 @@ files:
 - config/locales/en.yml
 - config/locales/en_backend.yml
 - config/locales/en_forms.yml
+- config/locales/en_general.yml
 - config/locales/fr.yml
 - config/locales/nl.yml
 - config/locales/nl_backend.yml
@@ -876,6 +904,9 @@ files:
 - db/migrate/20180719160953_create_searches.rb
 - db/migrate/20180719164016_rename_search_to_search_terms.rb
 - db/migrate/20180821135446_create_attachments.rb
+- db/migrate/20181019161330_add_working_to_redirects.rb
+- db/migrate/20181129141539_add_depth_to_redirects.rb
+- db/migrate/20181130093908_rename_depth_to_jumps_for_redirects.rb
 - lib/tasks/task_extras.rb
 - lib/tasks/udongo_tasks.rake
 - lib/udongo.rb
@@ -914,6 +945,11 @@ files:
 - lib/udongo/object_path.rb
 - lib/udongo/pages/tree.rb
 - lib/udongo/pages/tree_node.rb
+- lib/udongo/redirects/jumps_cacher.rb
+- lib/udongo/redirects/response.rb
+- lib/udongo/redirects/status_badge.rb
+- lib/udongo/redirects/test.rb
+- lib/udongo/redirects/uri_sanitizer.rb
 - lib/udongo/search/backend.rb
 - lib/udongo/search/base.rb
 - lib/udongo/search/frontend.rb