plug 0.1.19 → 0.1.24

data/app/controllers/plug/site_notices_controller.rb

@@ -1,12 +1,10 @@
+# frozen_string_literal: true
+
 require_dependency 'plug/application_controller'
 
 module Plug
   class SiteNoticesController < ApplicationController
-    if Rails.version.to_i < 5
-      before_filter :set_site_notice, only: [:edit, :update, :destroy]
-    else
-      before_action :set_site_notice, only: [:edit, :update, :destroy]
-    end
+    before_action :set_site_notice, only: %i[edit update destroy]
 
     # GET /site_notices
     def index
@@ -37,7 +35,7 @@ module Plug
 
     # PATCH/PUT /site_notices/1
     def update
-      if @site_notice.update_attributes(site_notice_params)
+      if @site_notice.update(site_notice_params)
         redirect_to site_notices_path, notice: 'Site Notice was successfully updated.'
       else
         render :edit
@@ -51,19 +49,15 @@ module Plug
     end
 
     private
-      # Use callbacks to share common setup or constraints between actions.
-      def set_site_notice
-        @site_notice = SiteNotice.find(params[:id])
-      end
 
-      # Only allow a trusted parameter "white list" through.
-      # TODO: Strong params not available for older Rails
-      def site_notice_params
-        if Rails.version.to_i < 5
-          ActiveSupport::HashWithIndifferentAccess.new(params[:site_notice])
-        else
-          params.require(:site_notice).permit(:name, :notice, :state, :theme)
-        end
-      end
+    # Use callbacks to share common setup or constraints between actions.
+    def set_site_notice
+      @site_notice = SiteNotice.find(params[:id])
+    end
+
+    # Only allow a trusted parameter "white list" through.
+    def site_notice_params
+      params.require(:site_notice).permit(:name, :notice, :state, :theme)
+    end
   end
 end

data/app/helpers/plug/application_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Plug
   module ApplicationHelper
   end

data/app/mailers/plug/application_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Plug
   class ApplicationMailer < ActionMailer::Base
     default from: 'from@example.com'

data/app/models/plug/application_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Plug
   class ApplicationRecord < ActiveRecord::Base
     self.abstract_class = true

data/app/models/plug/concerns/model_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/concern'
 
 module Plug
@@ -9,9 +11,9 @@ module Plug
         include AASM
 
         # Validations
-        validates :name, presence: { message: "#{self.humanized_class_name} name is required" },
-                         uniqueness: { message: "#{self.humanized_class_name} name must be unique", case_sensitive: false }
-        validates :state, presence: { message: "#{self.humanized_class_name} state is required" }
+        validates :name, presence: { message: "#{humanized_class_name} name is required" },
+                         uniqueness: { message: "#{humanized_class_name} name must be unique", case_sensitive: false }
+        validates :state, presence: { message: "#{humanized_class_name} state is required" }
 
         # Callbacks
         before_save { self.slug = name.parameterize }
@@ -32,12 +34,11 @@ module Plug
             transitions from: :enabled, to: :disabled
           end
         end
-
       end
 
       module ClassMethods
         def humanized_class_name
-          self.name.demodulize.underscore.humanize.capitalize
+          name.demodulize.underscore.humanize.capitalize
         end
       end
     end

data/app/models/plug/feature.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Plug
   class Feature < ApplicationRecord
     include AASM

data/app/models/plug/resources/feature.rb

@@ -0,0 +1,15 @@
+module Plug
+  module Resources
+    class Feature < ActiveResource::Base
+      self.site = Plug.api_path
+
+      def enabled?
+        state == 'enabled'
+      end
+
+      def disabled?
+        state == 'disabled'
+      end
+    end
+  end
+end

data/app/models/plug/resources/site_notice.rb

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
+
 module Plug
   module Resources
     class SiteNotice < ActiveResource::Base
-      include Plug::Concerns::Themeable
-
       self.site = Plug.api_path
 
       def enabled?

data/app/models/plug/site_notice.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module Plug
   class SiteNotice < ApplicationRecord
     include AASM
     include Plug::Concerns::ModelHelpers
-    include Plug::Concerns::Themeable
   end
 end

data/app/services/plug/task_execution_service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake'
 
 module Plug

data/app/views/plug/features/index.html.haml

@@ -19,10 +19,10 @@
     %table
       %thead
         %tr
-          %th Name
+          %th{ width: 200 } Name
           %th Description
-          %th Slug
-          %th State
+          %th{ width: 200 } Slug
+          %th{ width: 150, align: 'center' } State
           
           - if Plug.allow_delete
             %th Actions
@@ -33,11 +33,11 @@
             %td= link_to feature.name, edit_feature_path(feature), class: 'strong'
             %td= feature.description
             %td= feature.slug
-            %td
+            %td{ width: 150, align: 'center' }
               - if feature.state == 'enabled'
-                %i.fas.fa-check-circle.fa-2x.state__enabled
+                %i.fas.fa-check-circle.fa-2x.state.state--enabled
               - else
-                %i.fas.fa-times-circle.fa-2x.state__disabled
+                %i.fas.fa-times-circle.fa-2x.state.state--disabled
 
             - if Plug.allow_delete
               %td= link_to 'Destroy', feature, method: :delete, data: { confirm: 'Are you sure?' }

data/app/views/plug/shared/_head.html.haml

@@ -7,4 +7,4 @@
   = javascript_include_tag  'plug/application'
   = csrf_meta_tags
 
-  %script{ defer: '', src: 'https://use.fontawesome.com/releases/v5.0.4/js/all.js' }
+  %script{ defer: '', src: 'https://use.fontawesome.com/releases/v5.13.0/js/all.js' }

data/app/views/plug/shared/_nav.html.haml

@@ -1,7 +1,7 @@
 %nav.clearfix.nav
   .float-left
     %h3
-      = link_to 'Plug', plug.root_path, class: 'nav__logo'
+      = link_to 'plug', plug.root_path, class: 'nav__logo'
       %small /unplug features
   .float-right
     %ul.menu

data/app/views/plug/site_notices/_form.html.haml

@@ -11,13 +11,14 @@
     = f.text_field :name
   .field
     = f.label :notice
-    = f.text_area :notice, rows: 10
+    = f.hidden_field :notice
+    %trix-editor{ input: 'site_notice_notice' }
   .field
     = f.label :state
     = f.select :state, ['enabled', 'disabled']
   .field
     = f.label :theme
-    = f.select :theme, Plug.themes.map { |theme| [theme[:name], "#{theme[:style].to_a.map { |s| s.join(':') }.join(';')}"] }
+    = f.select :theme, Plug.themes
   .actions.clearfix
     .float-left
       = link_to 'Back', site_notices_path, class: 'button'

data/app/views/plug/site_notices/index.html.haml

@@ -15,10 +15,10 @@
     %table
       %thead
         %tr
-          %th Name
+          %th{ width: 200 } Name
           %th Notice
-          %th Slug
-          %th State
+          %th{ width: 200 } Slug
+          %th{ width: 150, align: 'center' } State
           
           - if Plug.allow_delete
             %th Actions
@@ -27,13 +27,13 @@
         - @site_notices.each do |site_notice|
           %tr
             %td= link_to site_notice.name, edit_site_notice_path(site_notice), class: 'strong'
-            %td= site_notice.notice
+            %td= site_notice.notice.html_safe
             %td= site_notice.slug
-            %td
+            %td{ width: 150, align: 'center' }
               - if site_notice.state == 'enabled'
-                %i.fas.fa-check-circle.fa-2x.state__enabled
+                %i.fas.fa-check-circle.fa-2x.state.state--enabled
               - else
-                %i.fas.fa-times-circle.fa-2x.state__disabled
+                %i.fas.fa-times-circle.fa-2x.state.state--disabled
 
             - if Plug.allow_delete
               %td= link_to 'Destroy', site_notice, method: :delete, data: { confirm: 'Are you sure?' }

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Plug::Engine.routes.draw do
   root to: 'features#index'
 
@@ -10,6 +12,8 @@ Plug::Engine.routes.draw do
   namespace :api, defaults: { format: :json } do
     get '/site_notices/:slug', to: 'site_notices#show'
     get '/site_notices', to: 'site_notices#index'
+    get '/features/:slug', to: 'features#show'
+    get '/features', to: 'features#index'
   end
 
   post '/task', to: 'features#task_execution', as: :task_execution

data/db/migrate/20171207020316_create_plug_features.rb

@@ -1,4 +1,4 @@
-class CreatePlugFeatures < ActiveRecord::Migration
+class CreatePlugFeatures < ActiveRecord::Migration[5.1]
   def change
     create_table :plug_features do |t|
       t.string :name

data/db/migrate/20180128202026_add_notice_to_plug_features.rb

@@ -1,4 +1,4 @@
-class AddNoticeToPlugFeatures < ActiveRecord::Migration
+class AddNoticeToPlugFeatures < ActiveRecord::Migration[5.1]
   def change
     add_column :plug_features, :notice, :text
   end

data/db/migrate/20180403024712_create_plug_site_notices.rb

@@ -1,4 +1,4 @@
-class CreatePlugSiteNotices < ActiveRecord::Migration
+class CreatePlugSiteNotices < ActiveRecord::Migration[5.1]
   def change
     create_table :plug_site_notices do |t|
       t.string :name

data/db/migrate/20180424015828_add_theme_to_plug_site_notice.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddThemeToPlugSiteNotice < ActiveRecord::Migration[5.1]
   def change
     add_column :plug_site_notices, :theme, :string

data/lib/generators/plug/install_generator.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Plug
   class InstallGenerator < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     def copy_initializer_file
       copy_file 'plug.rb', 'config/initializers/plug.rb'

data/lib/generators/plug/templates/plug.rb

@@ -3,4 +3,5 @@
 Plug.configure do |config|
   config.auth_user = 'admin'
   config.auth_password = 'password'
+  config.themes = ['default', 'dark']
 end

data/lib/plug.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'plug/engine'
 require 'plug/configuration'
 require 'plug/constraint'
@@ -12,9 +14,9 @@ module Plug
   #
   # @return [Boolean] true - Feature found and enabled | true - Feature not found (We don't want to block) | false - Feature was set to disabled
   def enabled?(arg)
-    return get_feature(arg).enabled?
-  rescue
-    return true
+    get_feature(arg).enabled?
+  rescue StandardError
+    true
   end
 
   #
@@ -27,21 +29,21 @@ module Plug
     feature = get_feature(arg)
 
     render_notice(feature.notice, &block) unless feature.enabled? || feature.notice.blank?
-  rescue
-    return nil
+  rescue StandardError
+    nil
   end
 
   private
 
-    def get_feature(arg)
-      arg = arg.to_s if arg.is_a? Symbol
+  def get_feature(arg)
+    arg = arg.to_s if arg.is_a? Symbol
 
-      return Plug::Feature.slug_and_name(arg).first
-    end
+    return Plug::Feature.slug_and_name(arg).first
+  end
 
-    def render_notice(notice, &block)
-      return notice unless block_given?
+  def render_notice(notice, &block)
+    return notice unless block_given?
 
-      yield(notice)
-    end
+    yield(notice)
+  end
 end

data/lib/plug/configuration.rb

@@ -1,26 +1,28 @@
+# frozen_string_literal: true
+
 module Plug
   module Configuration
     AUTH_USER         = ''
     AUTH_PASSWORD     = ''
     ALLOW_DELETE      = true
 
-    VALID_OPTIONS_KEYS = [
-      :auth_user,
-      :auth_password,
-      :allow_delete,
-      :buttons,
-      :api_path,
-      :themes
+    VALID_OPTIONS_KEYS = %i[
+      auth_user
+      auth_password
+      allow_delete
+      buttons
+      api_path
+      themes
     ].freeze
 
-    attr_accessor *VALID_OPTIONS_KEYS
+    attr_accessor(*VALID_OPTIONS_KEYS)
 
     def configure
       yield self
     end
 
     def options
-      Hash[ * VALID_OPTIONS_KEYS.map { |key| [key, send(key)] }.flatten ]
+      Hash[* VALID_OPTIONS_KEYS.map { |key| [key, send(key)] }.flatten]
     end
   end
 end

data/lib/plug/constraint.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module Plug
   class Constraint
     def initialize(feature)
       @feature = feature
     end
 
-    def matches?(request)
+    def matches?(_request)
       Plug.enabled?(@feature)
-    rescue
+    rescue StandardError
       true
     end
   end

data/lib/plug/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Require engine dependencies
 require 'haml-rails'
 require 'aasm'
@@ -9,6 +11,8 @@ module Plug
 
     config.generators do |g|
       g.test_framework :rspec
+      g.fixture_replacement :factory_bot
+      g.factory_bot dir: 'spec/factories'
     end
   end
 end