sail 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94b1de6bcfc5b63dd7f8c70f41f8ea6ba1854c1c2450ec4af96ada1dbbb7d7ad
-  data.tar.gz: 763a33aeeb99d60e3e39738c18cd69ce412f25d361172429b0290a1889987435
+  metadata.gz: 1f50a3ffd08ce3319b7c12965a4ada7954e9be63c98904480cb82fc9ca94876e
+  data.tar.gz: caf14276d020f847b8b7fd3d5959e028d300289cd7e996622cd4c00505dc820e
 SHA512:
-  metadata.gz: bae9a9c7e57178919310c0346753334be151de60f40f30880285c39757d290a518b6a6a3d9c7d52d8daa4086246fb3633398a798db20bf2a38dd5e474e88ca6f
-  data.tar.gz: d5bdabbe9a741573cfa830c772a7a0bb1725c62b493dff6414f93a49806e78e511691dbcd38f9d9b00a06a91371cbf75e995142aa978b45642934e79cc21b69a
+  metadata.gz: 34a45a3c9879a9317d60f43df33ad48f1391b7a44861eabefbe187cb221d9029c5bf98d4ce6bd8770059a8c535a9023fe0627b9dc458d5b2d82df67d4730667d
+  data.tar.gz: 034f78ae3a617031c3861b0777dc165dbf48ca3b5325e23758ac1d97cb53e684f06f8dfee05756a6eeb0dea0c04b6239fd75f0a29762839ad64c530578fee960

data/README.md

@@ -1,6 +1,6 @@
 ![dashboard](https://raw.githubusercontent.com/vinistock/sail/master/app/assets/images/sail/sail.png)
 
-[![Maintainability](https://api.codeclimate.com/v1/badges/00ed468acd8b93f66478/maintainability)](https://codeclimate.com/github/vinistock/sail/maintainability) [![Build Status](https://travis-ci.org/vinistock/sail.svg?branch=master)](https://travis-ci.org/vinistock/sail) [![Test Coverage](https://codeclimate.com/github/vinistock/sail/badges/coverage.svg)](https://codeclimate.com/github/vinistock/sail/coverage) [![Gem Version](https://badge.fury.io/rb/sail.svg)](https://badge.fury.io/rb/sail) ![](http://ruby-gem-downloads-badge.herokuapp.com/sail?color=brightgreen&type=total)
+[![Maintainability](https://api.codeclimate.com/v1/badges/00ed468acd8b93f66478/maintainability)](https://codeclimate.com/github/vinistock/sail/maintainability) [![Build Status](https://travis-ci.org/vinistock/sail.svg?branch=master)](https://travis-ci.org/vinistock/sail) [![Test Coverage](https://codeclimate.com/github/vinistock/sail/badges/coverage.svg)](https://codeclimate.com/github/vinistock/sail/coverage) [![Gem Version](https://badge.fury.io/rb/sail.svg)](https://badge.fury.io/rb/sail) ![](http://ruby-gem-downloads-badge.herokuapp.com/sail?color=brightgreen&type=total) [![Mentioned in Awesome Ruby](https://awesome.re/mentioned-badge.svg)](https://github.com/markets/awesome-ruby)
 
 # Sail
 
@@ -213,6 +213,8 @@ Response
 
 Sail's few strings are all localized for English in [en.yml], making it easy to create translations for the desired languages.
 
+Make sure to pass in the desired locale as a parameter.
+
 ## Contributing
 
 Contributions are very welcome! Don't hesitate to ask if you wish to contribute, but don't yet know how.

data/app/assets/javascripts/settings.js.erb

@@ -15,6 +15,8 @@ let profilesButton = document.getElementById("btn-profiles");
 let dashboardBody = document.getElementById("settings-dashboard");
 let guideButton = document.getElementById("btn-guide");
 let guide = document.getElementById("guide-modal");
+let guideSections = guide.getElementsByTagName("summary");
+var i;
 
 function submitSearch() {
     document.getElementById("search-form").submit();
@@ -118,4 +120,18 @@ function refreshClick() {
     }
 }
 
-for(var i = 0; i < refreshButtons.length; i++) refreshButtons[i].addEventListener("click", refreshClick);
+for(i = 0; i < refreshButtons.length; i++) refreshButtons[i].addEventListener("click", refreshClick);
+
+// Guide related functions
+
+function sectionClick() {
+    for(i = 0; i < guideSections.length; i++) {
+        if (this.parentElement.open) {
+            guideSections[i].parentElement.style.display = "block";
+        } else if (this !== guideSections[i]) {
+            guideSections[i].parentElement.style.display = "none";
+        }
+    }
+}
+
+for(i = 0; i < guideSections.length; i++) guideSections[i].addEventListener("click", sectionClick);

data/app/assets/stylesheets/sail/_colors.scss

@@ -6,4 +6,4 @@ $aluminium: #D9D9D9;
 $light_yellow: #F9CF00;
 $tangerine: #F19F4D;
 $lead: #003049;
-$bright_red: #D00000;
+$bright_red: #E63946;

data/app/assets/stylesheets/sail/application.scss

@@ -17,20 +17,35 @@
 @import "colors";
 @import "shared";
 
+* {
+  font-family: 'Open Sans', sans-serif;
+}
+
+.title {
+  font-family: 'Montserrat', sans-serif;
+}
+
 html, body {
   height: 100vh;
   margin: 0;
   padding: 0;
   background-color: $cerulean;
-  font-family: 'Raleway', sans-serif;
 }
 
 .clearfix {
   clear: both;
 }
 
+.clear-xs {
+  @media (max-width: 413px) {
+    clear: both;
+    margin-top: 8px;
+  }
+}
+
 #nav-bar {
   background-color: $lead;
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.15), 0 5px 12px rgba(0, 0, 0, 0.1);
 
   .home-link {
     @extend .color-transition;
@@ -48,7 +63,6 @@ html, body {
     position: relative;
     bottom: 50px;
     font-size: 20px;
-    font-family: "Raleway", sans-serif;
     outline: none;
     background: transparent;
     border: none;
@@ -63,7 +77,8 @@ html, body {
 
   #btn-guide {
     right: 70px;
-
+    padding: 0;
+    margin: 0;
     @media (min-width: 1200px) { right: 110px; }
   }
 
@@ -116,10 +131,10 @@ html, body {
 
 .modal {
   position: fixed;
-  height: 50%;
-  width: 50%;
-  top: 25%;
-  left: 25%;
+  height: 70%;
+  width: 70%;
+  top: 15%;
+  left: 15%;
   background-color: white;
   z-index: 1;
   box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23);
@@ -220,7 +235,6 @@ html, body {
     border: none;
     font-size: 20px;
     width: 90%;
-    font-family: 'Raleway', sans-serif;
     position: relative;
     top: 10px;
     text-overflow: ellipsis;
@@ -260,6 +274,10 @@ html, body {
         float: right;
       }
 
+      img {
+        display: none;
+      }
+
       &::-webkit-details-marker {
         display: none;
       }
@@ -299,6 +317,15 @@ html, body {
       label {
         display: none;
       }
+
+      img {
+        display: block;
+        height: 20px;
+        width: 20px;
+        float: left;
+        position: relative;
+        top: 10px;
+      }
     }
 
     p, p ~ * {

data/app/assets/stylesheets/sail/settings.scss

@@ -15,7 +15,7 @@
     background-color: white;
     margin: 1rem .75rem;
     display: inline-block;
-    box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23);
+    box-shadow: 0 19px 38px rgba(0, 0, 0, 0.15), 0 15px 12px rgba(0, 0, 0, 0.1);
     padding: 10px;
     z-index: 2;
     width: 90%;
@@ -32,7 +32,7 @@
 
       .relevancy-score {
         float: right;
-        color: darken($aluminium, 5%);
+        color: darken($aluminium, 30%);
       }
     }
 
@@ -91,6 +91,10 @@
       text-align: center;
       border: none;
       border-bottom: 2px solid $aluminium;
+      -webkit-border-radius: 0;
+      -moz-border-radius: 0;
+      border-radius: 0;
+      padding: 0;
       @extend .border-transition;
     }
 
@@ -99,9 +103,13 @@
       bottom: 10px;
       border: none;
       border-bottom: 2px solid $aluminium;
+      -webkit-border-radius: 0;
+      -moz-border-radius: 0;
+      border-radius: 0;
       width: 100%;
       text-align: center;
       font-size: 22px;
+      padding: 0;
       @extend .border-transition;
     }
 
@@ -317,7 +325,6 @@
         border: none;
         width: 100%;
         font-size: 20px;
-        font-family: 'Raleway', sans-serif;
         background: transparent;
         padding: 5px;
         @extend .rounded;

data/app/controllers/sail/application_controller.rb

@@ -9,5 +9,13 @@ module Sail
     def current_user
       main_app.scope.request.env["warden"]&.user
     end
+
+    def default_url_options
+      { locale: I18n.locale }
+    end
+
+    def set_locale
+      I18n.locale = params[:locale].presence || I18n.default_locale
+    end
   end
 end

data/app/controllers/sail/settings_controller.rb

@@ -8,6 +8,7 @@ module Sail
   # Implements all actions for the dashboard
   # and for the JSON API
   class SettingsController < ApplicationController
+    before_action :set_locale, only: :index
     after_action :log_update, only: %i[update reset], if: -> { Sail.configuration.enable_logging && @successful_update }
 
     # rubocop:disable AbcSize

data/app/views/layouts/sail/application.html.erb

@@ -6,7 +6,7 @@
   <meta name="theme-color" content="#4484CE">
   <meta name="description" content="Sail is a lightweight Rails engine that brings an admin panel for managing configuration settings on a live Rails app">
   <title><%= I18n.t('sail.page_title') %></title>
-  <link href="https://fonts.googleapis.com/css?family=Raleway" rel="stylesheet">
+  <link href="https://fonts.googleapis.com/css?family=Montserrat|Open+Sans&display=swap" rel="preload" as="style" onload="this.onload=null;this.rel='stylesheet'">
   <%= stylesheet_link_tag    "sail/application", media: "all" %>
   <%= javascript_include_tag "sail/application", async: true %>
   <%= csrf_meta_tags %>

data/app/views/sail/settings/_guide_modal.html.erb

@@ -4,6 +4,8 @@
 
   <details>
     <summary>
+      <%= image_tag("sail/angle-left.svg") %>
+
       <div>
         <%= I18n.t("sail.searching") %>
         <label><%= I18n.t("sail.how_to_find_settings") %></label>
@@ -26,6 +28,8 @@
 
   <details>
     <summary>
+      <%= image_tag("sail/angle-left.svg") %>
+
       <div>
         <%= I18n.t("sail.profiles") %>
         <label><%= I18n.t("sail.how_to_profiles") %></label>
@@ -39,6 +43,8 @@
 
   <details>
     <summary>
+      <%= image_tag("sail/angle-left.svg") %>
+
       <div>
         <%= I18n.t("sail.relevancy_score") %>
         <label><%= I18n.t("sail.how_to_relevancy_score") %></label>
@@ -51,6 +57,8 @@
 
   <details>
     <summary>
+      <%= image_tag("sail/angle-left.svg") %>
+
       <div>
         <%= I18n.t("sail.available_groups_and_types") %>
         <label><%= I18n.t("sail.how_to_groups_and_types") %></label>

data/app/views/sail/settings/_setting.html.erb

@@ -1,6 +1,6 @@
 <% cache setting, expires_in: Sail.configuration.cache_life_span do %>
   <div class="card">
-    <h3>
+    <h3 class="title">
       <%= setting.display_name %>
 
       <span class="relevancy-score" title="<%= I18n.t("sail.relevancy_tooltip") %>"><%= setting.relevancy %></span>
@@ -24,13 +24,17 @@
       </div>
     <% end %>
 
+    <div class="clear-xs"></div>
+
     <% if setting.stale? %>
       <div class="label-container">
         <%= link_to(I18n.t("sail.stale"), settings_path(query: Sail::ConstantCollection::STALE), method: :get, class: "tag stale-label", title: I18n.t("sail.stale_tooltip", days: Sail.configuration.days_until_stale)) %>
       </div>
     <% end %>
 
-    <p class="setting-description" title="<%= setting.description %>"><%= setting.description %></p>
+    <p class="setting-description" title="<%= setting.description %>">
+      <label for="<%= "input_for_#{setting.name}" %>"><%= setting.description %></label>
+    </p>
 
     <%= form_tag(setting_path(name: setting.name), method: :put, remote: true) do %>
       <div class="card-body-container">

data/config/locales/en.yml

@@ -32,7 +32,7 @@ en:
     by_group_html: "<b>By group:</b> will find all settings in the same group (must be exact match)"
     by_cast_type_html: "<b>By cast type:</b> will find all settings with the same type (must be exact match)"
     by_stale_html: "<b>By stale:</b> will find settings that are stale (haven't been updated recently)"
-    by_recent_html: "<b>By recent:</b> will find settings updated in the last X hours (.e.g: recent 50)"
+    by_recent_html: "<b>By recent:</b> will find settings updated in the last X hours (e.g.: recent 50)"
     profiles_can_be_used: Profiles can be used to configure many states of settings. They save the values of all settings in a given moment.
     profile_configuring: Configure settings as desired and create a new profile. Activate profiles to change the value of all settings at once.
     relevancy_score: Relevancy Score

data/lib/sail/engine.rb

@@ -40,13 +40,11 @@ module Sail
       errors = [ActiveRecord::NoDatabaseError]
       errors << PG::ConnectionBad if defined?(PG)
 
-      # rubocop:disable Naming/RescuedExceptionsVariableName
       begin
         Sail::Setting.load_defaults unless Rails.env.test?
       rescue *errors
         warn "Skipping setting creation because database doesn't exist"
       end
-      # rubocop:enable Naming/RescuedExceptionsVariableName
     end
 
     private

data/lib/sail/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sail
-  VERSION = "3.2.1"
+  VERSION = "3.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sail
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Vinicius Stock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-08 00:00:00.000000000 Z
+date: 2019-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fugit
@@ -248,6 +248,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -359,7 +373,7 @@ licenses:
 metadata: {}
 post_install_message: |
   **************************************************************************
-  Sail 3.2.1!
+  Sail 3.2.2!
 
   For major version upgrades, check the CHANGELOG and run the updater to
   create necessary migrations.
@@ -381,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Sail is a lightweight Rails engine that brings an admin panel for managing