sail 3.5.1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8099f602b777299cf808179f65707d3ca0775ab984a1d2951d46b31a832919b
-  data.tar.gz: '059f2f1fa4c53ed9d51aa74f75043cb718f615b0c39a234cb01c8ae536c148db'
+  metadata.gz: 7ed99e4dc6a1bed5c7a9589ab92f2c6f949a3edd4736f51d8cc9a7d9db3371b5
+  data.tar.gz: f022be75af316c34c01921332e29ebdaf458e4d3bb479bc6d64e57922b26e0a1
 SHA512:
-  metadata.gz: d0db559a3d7269c2da637cede11cabb6a1af367cc146efc81a7d7361b93c25792787444d7e756945cda043bd42327496ced9fac31490371509529cb4f04fa8d3
-  data.tar.gz: 9cab8875585e0c1697cbbe4af5d6199767d820cab33dc1afedc678d6bd5efae820bcf6f6f12fc734cd6997d7de5670a33f5928d46de1262f420a4ed95cddc8f6
+  metadata.gz: 947727892ed9b5b32b627e9a09e6c4de4d0834e49cd6103eddafe562b4746dae304cdce768655bd20584238c8121e1f0f35f27a7539ee9ad7d9d6529e2ab28d5
+  data.tar.gz: 23f380a2e8a21b36b84f468e6828bd189a3d91f12cca6f1e43985e10573d24cd419d72ebb8545689f271953938c62167382723fa458486f3c51ef8f5bd006dc7

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2017-2019 Vinicius Stock
+Copyright (c) 2017-2021 Vinicius Stock
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

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

@@ -4,7 +4,9 @@
 Search related functions
 */
 
-let submitTimer, submitInterval, intervals = 1;
+let submitTimer,
+    submitInterval,
+    intervals = 1;
 let queryElement = document.getElementById("query");
 let autoSearchEnabled = document.getElementById("auto_search_enabled").value;
 let progress = document.getElementById("search-submit-progress");
@@ -17,6 +19,8 @@ let guideButton = document.getElementById("btn-guide");
 let guide = document.getElementById("guide-modal");
 let guideSections = guide.getElementsByTagName("summary");
 let cardTitles = document.getElementsByClassName("card-title");
+let inputs = document.getElementsByName("value");
+const initialSettingValues = {};
 let i;
 
 function submitSearch() {
@@ -64,12 +68,23 @@ function toggleModal(modal) {
 function handleGenericClick(event) {
     let target = event.target;
 
-    if (orderButton !== null && (target === sortMenu || sortMenu.contains(target) || target === orderButton || orderButton.contains(target))) {
+    if (
+        orderButton !== null &&
+        (target === sortMenu ||
+            sortMenu.contains(target) ||
+            target === orderButton ||
+            orderButton.contains(target))
+    ) {
         return;
     }
 
-    if (profilesButton !== null && (target === profilesMenu || profilesMenu.contains(target) || target === profilesButton ||
-        profilesButton.contains(target))) {
+    if (
+        profilesButton !== null &&
+        (target === profilesMenu ||
+            profilesMenu.contains(target) ||
+            target === profilesButton ||
+            profilesButton.contains(target))
+    ) {
         return;
     }
 
@@ -99,10 +114,14 @@ if (queryElement !== null) {
     }
 
     orderButton.addEventListener("click", toggleSortMenu);
-    profilesButton.addEventListener("click", function () { toggleModal(profilesMenu) });
+    profilesButton.addEventListener("click", function () {
+        toggleModal(profilesMenu);
+    });
 }
 
-guideButton.addEventListener("click", function () { toggleModal(guide) });
+guideButton.addEventListener("click", function () {
+    toggleModal(guide);
+});
 document.body.addEventListener("click", handleGenericClick);
 document.addEventListener("keydown", closeAllModals);
 
@@ -117,18 +136,21 @@ function refreshClick() {
 
     if (!button.className.includes("active")) {
         button.classList.add("active");
-        setTimeout(function() { button.classList.remove("active"); }, 500);
+        setTimeout(function () {
+            button.classList.remove("active");
+        }, 500);
     }
 }
 
-for(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++) {
+    for (i = 0; i < guideSections.length; i++) {
         if (this.parentElement.open) {
             guideSections[i].parentElement.style.display = "block";
         } else if (this !== guideSections[i]) {
@@ -137,7 +159,8 @@ function sectionClick() {
     }
 }
 
-for(i = 0; i < guideSections.length; i++) guideSections[i].addEventListener("click", sectionClick);
+for (i = 0; i < guideSections.length; i++)
+    guideSections[i].addEventListener("click", sectionClick);
 
 /*
 Cards related functions
@@ -147,4 +170,36 @@ function flipCard() {
     this.parentElement.parentElement.classList.toggle("flipped");
 }
 
-for(i = 0; i < cardTitles.length; i++) cardTitles[i].addEventListener("click", flipCard);
+for (i = 0; i < cardTitles.length; i++)
+    cardTitles[i].addEventListener("click", flipCard);
+
+function enableSubmitButton() {
+    const name = this.id.replace("input_for_", "");
+    const submitId = this.id.replace("input_for_", "btn-submit-");
+    const submit = document.getElementById(submitId);
+    const value = this.type === "checkbox" ? this.checked : this.value;
+
+    if (value === initialSettingValues[name]) {
+        submit.classList.remove("orange");
+        submit.disabled = true;
+    } else {
+        submit.classList.add("orange");
+        submit.disabled = false;
+    }
+}
+
+for (i = 0; i < inputs.length; i++) {
+    if (inputs[i].type === "text") {
+        inputs[i].addEventListener("input", enableSubmitButton);
+    } else {
+        inputs[i].addEventListener("change", enableSubmitButton);
+    }
+
+    if (inputs[i].type === "checkbox") {
+        initialSettingValues[inputs[i].id.replace("input_for_", "")] =
+            inputs[i].checked;
+    } else {
+        initialSettingValues[inputs[i].id.replace("input_for_", "")] =
+            inputs[i].value;
+    }
+}

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

@@ -534,7 +534,7 @@
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
-    background-color: var(--tangerine);
+    background-color: var(--aluminium);
     border: none;
     outline: none;
     -webkit-transition: background-color 0.5s;
@@ -545,11 +545,15 @@
     box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
 }
 
+.btn-sail, #settings-dashboard .card .btn-value-submit.orange {
+    background-color: var(--tangerine);
+}
+
 .btn-sail:active {
     color: var(--main-black);
     opacity: .8;
 }
 
-.btn-sail :hover {
+.btn-sail:hover, #settings-dashboard .card .btn-value-submit.orange:hover {
     background-color: var(--dark-tangerine);
 }

data/app/controllers/sail/profiles_controller.rb

@@ -34,7 +34,7 @@ module Sail
     private
 
     def s_params
-      params.permit(:name)
+      params.permit(:name, :locale)
     end
   end
 end

data/app/controllers/sail/settings_controller.rb

@@ -20,7 +20,7 @@ module Sail
     def update
       respond_to do |format|
         @setting, @successful_update = Setting.set(s_params[:name], s_params[:value])
-        format.js {}
+        format.js
         format.json { @successful_update ? head(:ok) : head(:conflict) }
       end
     end
@@ -65,7 +65,8 @@ module Sail
     def s_params
       params.permit(:page, :query, :name,
                     :value, :positive, :negative,
-                    :throttled_by, :order_field)
+                    :throttled_by, :order_field,
+                    :_method, :locale, :authenticity_token)
     end
 
     def log_update

data/app/models/sail/entry.rb

@@ -12,7 +12,7 @@ module Sail
     belongs_to :profile
     validates :value, :setting, :profile, presence: true
 
-    scope :by_profile_name, ->(name) { joins(:profile).where("sail_profiles.name = ?", name) }
+    scope :by_profile_name, ->(name) { joins(:profile).where(sail_profiles: { name: name }) }
 
     delegate :name, to: :setting
 

data/app/models/sail/setting.rb

@@ -151,7 +151,7 @@ module Sail
     end
 
     def relevancy
-      (Sail.instrumenter.relative_usage_of(name) / Sail::Setting.count).round(1)
+      Sail.instrumenter.relevancy_of(name)
     end
 
     def should_not_cache?

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

@@ -62,7 +62,7 @@
               <% end %>
 
               <div class="submit-container">
-                <button id="btn-submit-<%= setting.name %>" type="submit" class="btn-value-submit"><%= I18n.t("sail.save") %></button>
+                <button id="btn-submit-<%= setting.name %>" type="submit" class="btn-value-submit" disabled><%= I18n.t("sail.save") %></button>
 
                 <span id="success-<%= setting.name %>" class="notice success">
                   <%= image_tag("sail/checkmark.svg") %>

data/app/views/sail/settings/update.js.erb

@@ -11,10 +11,16 @@ setTimeout(function () {
 
 if ("<%= @successful_update %>" === "true") {
     var input = document.getElementById("<%= "input_for_#{@setting.name}" %>");
+    var submitButton = document.getElementById("<%= "btn-submit-#{@setting.name}" %>");
 
     if ("<%= @setting.boolean? %>" === "true") {
         input.checked = "<%= @setting.value %>" === "true";
+        initialSettingValues["<%= @setting.name %>"] = "<%= @setting.value %>" === "true";
     } else {
         input.value = "<%= @setting.date? ? formatted_date(@setting) : @setting.value %>";
+        initialSettingValues["<%= @setting.name %>"] = "<%= @setting.date? ? formatted_date(@setting) : @setting.value %>";
     }
+
+    submitButton.classList.remove("orange");
+    submitButton.disabled = true;
 }

data/lib/sail/engine.rb

@@ -14,7 +14,6 @@ module Sail
 
     config.middleware.use ActionDispatch::Flash
     config.middleware.use ActionDispatch::Cookies
-    config.middleware.use ActionDispatch::Session::CookieStore
     config.middleware.use ActionDispatch::ContentSecurityPolicy::Middleware if defined?(ActionDispatch::ContentSecurityPolicy)
     config.middleware.use Rack::MethodOverride
     config.middleware.use Rails::Rack::Logger
@@ -40,6 +39,8 @@ module Sail
       errors = [ActiveRecord::NoDatabaseError]
       errors << PG::ConnectionBad if defined?(PG)
 
+      config.middleware.use Rails.application.config.session_store || ActionDispatch::Session::CookieStore
+
       begin
         Sail::Setting.load_defaults unless Rails.env.test?
       rescue *errors
@@ -49,9 +50,9 @@ module Sail
 
     private
 
-    def to_prepare
+    def to_prepare(&block)
       klass = defined?(ActiveSupport::Reloader) ? ActiveSupport::Reloader : ActionDispatch::Reloader
-      klass.to_prepare(&Proc.new)
+      klass.to_prepare(&block)
     end
   end
 end

data/lib/sail/instrumenter.rb

@@ -15,6 +15,7 @@ module Sail
     # statistics
     def initialize
       @statistics = { settings: {}, profiles: {} }.with_indifferent_access
+      @number_of_settings = Setting.count
     end
 
     # []
@@ -59,7 +60,7 @@ module Sail
     def relative_usage_of(setting_name)
       return 0.0 if @statistics[:settings].empty?
 
-      (100.0 * self[setting_name][:usages]) / @statistics[:settings].map { |_, entry| entry[:usages] }.sum
+      (100.0 * self[setting_name][:usages]) / @statistics[:settings].sum { |_, entry| entry[:usages] }
     end
 
     # increment_failure_of
@@ -76,6 +77,10 @@ module Sail
       Sail.reset(setting_name) if self[setting_name][:failures] > Sail.configuration.failures_until_reset
     end
 
+    def relevancy_of(setting_name)
+      (relative_usage_of(setting_name) / @number_of_settings).round(1)
+    end
+
     private
 
     def expire_cache_fragment(setting_name)

data/lib/sail/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sail
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.6.0
 platform: ruby
 authors:
 - Vinicius Stock
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fugit
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -347,7 +347,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.11
 signing_key:
 specification_version: 4
 summary: Sail is a lightweight Rails engine that brings an admin panel for managing