sail 3.2.3 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f081b9724cf8e7ee4e932c22f1d8dcfc1d7f32156d826f18180377523d243225
-  data.tar.gz: ccbe270becea33e68416423060f3e21c147534fb79bb996d7545f73e06187c22
+  metadata.gz: 40fb8e4bc4918c09d226baa2e97666dc61cf6734967538bb62f61d12391c5024
+  data.tar.gz: 53903455199dbf9fd1d310c50dd538856880cb2a740e11576c929609312099ae
 SHA512:
-  metadata.gz: 1bd0d3def56886d0d240ee4ee1e0d21490af030144f4fc0e724b13a6d11e479ab7ee8bb0bce74c1baefd7fa6b4b6476ea41bf42a691d246be5531f3e30a2f70e
-  data.tar.gz: a79930a890281251ae8919e8fd44b2d282642463d8bea0f991b11375484dc16e2f54a56266dc21dbd530ff845eba7797c7f4fa45847a1cfc8dffad5864d0c0be
+  metadata.gz: bb1365f1162a6b41ef8a57cc54b15f25e37dfa4dde08eb1a556dde193f0bf33600740c72f4e69e652ca4a2c6666bedc564d15af320f010cde018a73cf0d530c4
+  data.tar.gz: 6002b3b8f33133fd9b0181b9cc52b174e3533f9e28aa493a70ab52194415e44877f017a003a3488641cd673b20d06fce4ca7c8bb04db2be9288a4c5f7ececa39

data/Rakefile

@@ -21,7 +21,7 @@ RSpec::Core::RakeTask.new(spec: "app:db:test:prepare")
 task default: :spec
 
 task :all do
-  system("brakeman --no-pager && rake && rubocop --parallel && rails_best_practices")
+  system("brakeman --no-pager && rake && rubocop --auto-correct && rails_best_practices")
 end
 
 system("cd ./spec/dummy; RAILS_ENV=test rails db:environment:set; cd ../..") if Rails::VERSION::MAJOR >= 5

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

@@ -19,6 +19,7 @@
 
 * {
   font-family: 'Open Sans', sans-serif;
+  -webkit-font-smoothing: antialiased;
 }
 
 .title {
@@ -101,7 +102,7 @@ html, body {
     background-color: white;
     padding: 20px;
     @extend .rounded;
-    box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23);
+    box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
     font-weight: bold;
 
     &.active {
@@ -124,6 +125,7 @@ html, body {
   
     #angle-right-link {
       background: white image-url("sail/angle-right.svg") center no-repeat;
+      margin-left: 6px;
       padding: 20px 24px 20px 24px;
     }
   }

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

@@ -15,7 +15,7 @@
     background-color: white;
     margin: 1rem .75rem;
     display: inline-block;
-    box-shadow: 0 19px 38px rgba(0, 0, 0, 0.15), 0 15px 12px rgba(0, 0, 0, 0.1);
+    box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
     padding: 10px;
     z-index: 2;
     width: 90%;
@@ -49,13 +49,14 @@
     }
 
     .tag {
-      font-weight: bold;
       @extend .rounded;
       padding: 10px;
       color: $main_black;
       font-size: 14px;
       margin-left: 5px;
       text-decoration: none;
+      font-weight: bold;
+      box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
 
       &.type-label {
         background-color: $light_yellow;
@@ -67,6 +68,11 @@
 
       &.stale-label {
         background-color: $bright_red;
+
+        @media (max-width: 413px) {
+          position: relative;
+          top: 8px;
+        }
       }
     }
 
@@ -81,6 +87,7 @@
       text-overflow: ellipsis;
       white-space: nowrap;
       overflow: hidden;
+      @extend .fade-in;
       color: darken($aluminium, 45%);
     }
 
@@ -347,17 +354,14 @@
   }
 
   .notice {
-    background-color: white;
-    font-size: 24px;
-    position: fixed;
-    left: 50px;
-    top: 85px;
-    padding: 25px;
-    width: 150px;
-    text-align: center;
-    box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23);
     display: none;
-    @extend .rounded;
+    clear: both;
+    padding: 25px 15px 15px 15px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    font-weight: bolder;
+    text-align: center;
     @extend .fade-in;
 
     &.success {
@@ -367,11 +371,6 @@
     &.alert {
       color: $bright_red;
     }
-
-    @media (max-width: 767px) {
-      width: 85%;
-      left: 1.5%;
-    }
   }
 
   #progress-container {
@@ -410,6 +409,7 @@
   -ms-transition: background-color 0.5s;
   -o-transition: background-color 0.5s;
   transition: background-color 0.5s;
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
 
   &:active {
     color: $main_black;

data/app/controllers/sail/settings_controller.rb

@@ -11,14 +11,14 @@ module Sail
     before_action :set_locale, only: :index
     after_action :log_update, only: %i[update reset], if: -> { Sail.configuration.enable_logging && @successful_update }
 
-    # rubocop:disable AbcSize
+    # rubocop:disable Metrics/AbcSize
     def index
       @settings = Setting.by_query(s_params[:query]).ordered_by(s_params[:order_field])
       @number_of_pages = (@settings.count.to_f / settings_per_page).ceil
       @settings = @settings.paginated(s_params[:page], settings_per_page)
       fresh_when(@settings)
     end
-    # rubocop:enable AbcSize
+    # rubocop:enable Metrics/AbcSize
 
     def update
       respond_to do |format|

data/app/models/sail/setting.rb

@@ -21,7 +21,7 @@ module Sail
     validates :name, presence: true, uniqueness: { case_sensitive: false }
     enum cast_type: %i[integer string boolean range array float
                        ab_test cron obj_model date uri throttle
-                       locales].freeze
+                       locales set].freeze
 
     validate :value_is_within_range, if: -> { range? }
     validate :value_is_true_or_false, if: -> { boolean? || ab_test? }

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

@@ -32,7 +32,15 @@
       </div>
     <% end %>
 
-    <p class="setting-description" title="<%= setting.description %>">
+    <p id="success-<%= setting.name %>" class="notice success">
+      <label><%= I18n.t("sail.updated") %></label>
+    </p>
+
+    <p id="alert-<%= setting.name %>" class="notice alert">
+      <label><%= I18n.t("sail.failed") %></label>
+    </p>
+
+    <p id="description-<%= setting.name %>" class="setting-description" title="<%= setting.description %>">
       <label for="<%= "input_for_#{setting.name}" %>"><%= setting.description %></label>
     </p>
 

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

@@ -1,8 +1,5 @@
 <div id="settings-dashboard">
   <% cache [@settings, params[:monitor_mode]] do %>
-    <span id="notice-success" class="notice success"><%= I18n.t("sail.updated") %></span>
-    <span id="notice-alert" class="notice alert"><%= I18n.t("sail.failed") %></span>
-
     <% unless params[:monitor_mode] == Sail::ConstantCollection::TRUE %>
       <%= render(partial: "search") %>
     <% end %>

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

@@ -1,8 +1,12 @@
-var notice = document.getElementById("<%= @successful_update ? "notice-success" : "notice-alert" %>");
+var notice = document.getElementById("<%= @successful_update ? "success-#{@setting.name}" : "alert-#{@setting.name}" %>");
+var description = document.getElementById("description-<%= @setting.name %>");
+
 notice.style.display = "block";
+description.style.display = "none";
 
 setTimeout(function () {
     notice.style.display = "none";
+    description.style.display = "block";
 }, 1500);
 
 if ("<%= @successful_update %>" === "true") {

data/lib/generators/sail/install/install_generator.rb

@@ -34,7 +34,7 @@ module Sail
       end
 
       def migration_version
-        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" if Rails.version.start_with?("5")
+        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" if Rails.version >= "5.0.0"
       end
     end
   end

data/lib/generators/sail/update/update_generator.rb

@@ -46,7 +46,7 @@ module Sail
       end
 
       def migration_version
-        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" if Rails.version.start_with?("5")
+        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" if Rails.version >= "5.0.0"
       end
     end
   end

data/lib/sail.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
 require "sail/engine"
-require "sail/constant_collection"
-require "sail/configuration"
-require "sail/instrumenter"
 require "true_class"
 require "false_class"
 
 module Sail # :nodoc:
+  autoload :ConstantCollection, "sail/constant_collection"
+  autoload :Configuration, "sail/configuration"
   autoload :Instrumenter, "sail/instrumenter"
   autoload :Types, "sail/types"
 

data/lib/sail/types.rb

@@ -20,5 +20,6 @@ module Sail
     autoload :String, "sail/types/string"
     autoload :Throttle, "sail/types/throttle"
     autoload :Uri, "sail/types/uri"
+    autoload :Set, "sail/types/set"
   end
 end

data/lib/sail/types/set.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Sail
+  module Types
+    # Set
+    #
+    # This type allows defining a set
+    #  using a string and a separator
+    # (defined in the configuration).
+    class Set < Type
+      def to_value
+        ::Set[*@setting.value.split(Sail.configuration.array_separator)]
+      end
+
+      def from(value)
+        value.is_a?(::String) ? value : value.join(Sail.configuration.array_separator)
+      end
+    end
+  end
+end

data/lib/sail/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sail
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.4
 platform: ruby
 authors:
 - Vinicius Stock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-06 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sassc-rails
@@ -388,6 +388,7 @@ files:
 - lib/sail/types/locales.rb
 - lib/sail/types/obj_model.rb
 - lib/sail/types/range.rb
+- lib/sail/types/set.rb
 - lib/sail/types/string.rb
 - lib/sail/types/throttle.rb
 - lib/sail/types/type.rb
@@ -401,7 +402,7 @@ licenses:
 metadata: {}
 post_install_message: |
   **************************************************************************
-  Sail 3.2.3!
+  Sail 3.2.4!
 
   For major version upgrades, check the CHANGELOG and run the updater to
   create necessary migrations.