sail 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f50a3ffd08ce3319b7c12965a4ada7954e9be63c98904480cb82fc9ca94876e
-  data.tar.gz: caf14276d020f847b8b7fd3d5959e028d300289cd7e996622cd4c00505dc820e
+  metadata.gz: f081b9724cf8e7ee4e932c22f1d8dcfc1d7f32156d826f18180377523d243225
+  data.tar.gz: ccbe270becea33e68416423060f3e21c147534fb79bb996d7545f73e06187c22
 SHA512:
-  metadata.gz: 34a45a3c9879a9317d60f43df33ad48f1391b7a44861eabefbe187cb221d9029c5bf98d4ce6bd8770059a8c535a9023fe0627b9dc458d5b2d82df67d4730667d
-  data.tar.gz: 034f78ae3a617031c3861b0777dc165dbf48ca3b5325e23758ac1d97cb53e684f06f8dfee05756a6eeb0dea0c04b6239fd75f0a29762839ad64c530578fee960
+  metadata.gz: 1bd0d3def56886d0d240ee4ee1e0d21490af030144f4fc0e724b13a6d11e479ab7ee8bb0bce74c1baefd7fa6b4b6476ea41bf42a691d246be5531f3e30a2f70e
+  data.tar.gz: a79930a890281251ae8919e8fd44b2d282642463d8bea0f991b11375484dc16e2f54a56266dc21dbd530ff845eba7797c7f4fa45847a1cfc8dffad5864d0c0be

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

@@ -228,6 +228,15 @@ html, body {
         color: $light_green;
       }
     }
+
+    .errors-indicator {
+      float: left;
+      position: relative;
+      top: 9px;
+      left: 15px;
+      font-style: italic;
+      color: darken($aluminium, 30%);
+    }
   }
 
   #new-profile-input {

data/app/models/sail/profile.rb

@@ -11,6 +11,7 @@ module Sail
     has_many :entries, dependent: :destroy
     has_many :settings, through: :entries
     validates :name, presence: true, uniqueness: { case_sensitive: false }
+    validate :only_one_active_profile
 
     # create_or_update_self
     #
@@ -55,6 +56,13 @@ module Sail
     end
     # rubocop:enable Rails/SkipsModelValidations
 
+    # current
+    #
+    # Returns the currently activated profile
+    def self.current
+      find_by(active: true)
+    end
+
     private_class_method :handle_profile_activation
 
     # dirty?
@@ -65,5 +73,13 @@ module Sail
     def dirty?
       @dirty ||= entries.any?(&:dirty?)
     end
+
+    private
+
+    def only_one_active_profile
+      if active? && Profile.where(active: true).where.not(id: id).count.positive?
+        errors.add(:single_active_profile, "Cannot have two active profiles at once")
+      end
+    end
   end
 end

data/app/models/sail/setting.rb

@@ -59,16 +59,23 @@ module Sail
 
     def self.get(name)
       Sail.instrumenter.increment_usage_of(name)
+
+      cached_setting = Rails.cache.read("setting_get_#{name}")
+      return cached_setting unless cached_setting.nil?
+
       setting = Setting.for_value_by_name(name).first
       return if setting.nil?
 
-      if setting.should_not_cache?
-        setting.safe_cast
-      else
-        Rails.cache.fetch("setting_get_#{name}", expires_in: Sail.configuration.cache_life_span) do
-          setting.safe_cast
-        end
+      setting_value = setting.safe_cast
+
+      unless setting.should_not_cache?
+        Rails.cache.write(
+          "setting_get_#{name}", setting_value,
+          expires_in: Sail.configuration.cache_life_span
+        )
       end
+
+      setting_value
     end
 
     def self.set(name, value)

data/app/views/sail/profiles/_profile.html.erb

@@ -4,6 +4,12 @@
           title="<%= profile.dirty? ? I18n.t("sail.dirty_profile_tooltip") : I18n.t("sail.clean_profile_tooltip") %>">
       ⬤
     </span>
+
+    <% unless Sail.instrumenter.profile(profile.name).zero? %>
+      <span class="errors-indicator" title="<%= I18n.t("sail.profile_error_tooltip") %>">
+        <%= I18n.t("sail.profile_errors", count: Sail.instrumenter.profile(profile.name)) %>
+      </span>
+    <% end %>
   <% end %>
 
   <span class="entry-name"><%= profile.name.titleize %></span>

data/config/locales/en.yml

@@ -46,3 +46,7 @@ en:
     how_to_profiles: How to organize your settings in profiles
     how_to_relevancy_score: What is the relevancy score and how to use it
     how_to_groups_and_types: List of available groups and types
+    profile_errors:
+      one: 1 error
+      other: "%{count} errors"
+    profile_error_tooltip: This is the number of unexpected errors raised for all settings while this profile was active

data/lib/sail/instrumenter.rb

@@ -14,16 +14,32 @@ module Sail
     # Declare basic hash containing setting
     # statistics
     def initialize
-      @statistics = {}.with_indifferent_access
+      @statistics = { settings: {}, profiles: {} }.with_indifferent_access
     end
 
     # []
     #
-    # Accessor method for the statistics to guarantee
+    # Accessor method for setting statistics to guarantee
     # proper initialization of hashes.
     def [](name)
-      @statistics[name] = { usages: 0, failures: 0 }.with_indifferent_access if @statistics[name].blank?
-      @statistics[name]
+      @statistics[:settings][name] = { usages: 0, failures: 0 }.with_indifferent_access if @statistics[:settings][name].blank?
+      @statistics[:settings][name]
+    end
+
+    # increment_profile_failure_of
+    #
+    # Increments the number of failures
+    # for settings while a profile is active
+    def increment_profile_failure_of(name)
+      @statistics[:profiles][name] ||= 0
+      @statistics[:profiles][name] += 1
+    end
+
+    # profile
+    #
+    # Profile statistics accessor
+    def profile(name)
+      @statistics[:profiles][name] ||= 0
     end
 
     # increment_usage
@@ -41,9 +57,9 @@ module Sail
     # a setting compared to all others
     # in percentage
     def relative_usage_of(setting_name)
-      return 0.0 if @statistics.empty?
+      return 0.0 if @statistics[:settings].empty?
 
-      (100.0 * self[setting_name][:usages]) / @statistics.map { |_, entry| entry[:usages] }.reduce(:+)
+      (100.0 * self[setting_name][:usages]) / @statistics[:settings].map { |_, entry| entry[:usages] }.reduce(:+)
     end
 
     # increment_failure_of
@@ -53,6 +69,10 @@ module Sail
     # exceeds the amount configured, resets the setting value
     def increment_failure_of(setting_name)
       self[setting_name][:failures] += 1
+
+      current_profile = Profile.current
+      increment_profile_failure_of(current_profile.name) if current_profile
+
       Sail.reset(setting_name) if self[setting_name][:failures] > Sail.configuration.failures_until_reset
     end
 

data/lib/sail/version.rb

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

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: sail
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Vinicius Stock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-03 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fugit
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: fugit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -220,6 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-retry
+  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: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -268,28 +282,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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: webdrivers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
 description: Sail is a lightweight Rails engine that brings an admin panel for managing
   configuration settings on a live Rails app.
 email:
@@ -373,7 +401,7 @@ licenses:
 metadata: {}
 post_install_message: |
   **************************************************************************
-  Sail 3.2.2!
+  Sail 3.2.3!
 
   For major version upgrades, check the CHANGELOG and run the updater to
   create necessary migrations.
@@ -395,7 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Sail is a lightweight Rails engine that brings an admin panel for managing