trusty-cms 4.0.1 → 4.1.3

data/app/models/status.rb

@@ -3,7 +3,8 @@ class Status
 
   def initialize(options = {})
     options = options.symbolize_keys
-    @id, @name = options[:id], options[:name]
+    @id = options[:id]
+    @name = options[:name]
   end
 
   def symbol
@@ -27,15 +28,14 @@ class Status
   end
 
   def self.selectable_values
-    self.selectable.map(&:name)
+    selectable.map(&:name)
   end
 
   @@statuses = [
-    Status.new(:id => 1,   :name => 'Draft'    ),
-    Status.new(:id => 50,  :name => 'Reviewed' ),
-    Status.new(:id => 90,  :name => 'Scheduled'),
-    Status.new(:id => 100, :name => 'Published'),
-    Status.new(:id => 101, :name => 'Hidden'   )
+    Status.new(id: 1,   name: 'Draft'),
+    Status.new(id: 50,  name: 'Reviewed'),
+    Status.new(id: 90,  name: 'Scheduled'),
+    Status.new(id: 100, name: 'Published'),
+    Status.new(id: 101, name: 'Hidden'),
   ]
-
 end

data/app/models/trusty_cms/config.rb

@@ -1,5 +1,4 @@
 module TrustyCms
-
   class << self
     def config_definitions
       @config_definitions ||= {}
@@ -67,7 +66,7 @@ module TrustyCms
     #   edit_setting('admin.name)
     #
 
-    self.table_name = "config"
+    self.table_name = 'config'
     after_save :update_cache
     attr_reader :definition
 
@@ -105,12 +104,12 @@ module TrustyCms
       end
 
       def to_hash
-        Hash[ *all.map { |pair| [pair.key, pair.value] }.flatten ]
+        Hash[*all.map { |pair| [pair.key, pair.value] }.flatten]
       end
 
       def initialize_cache
         TrustyCms::Config.ensure_cache_file
-        Rails.cache.write('TrustyCms::Config',TrustyCms::Config.to_hash)
+        Rails.cache.write('TrustyCms::Config', TrustyCms::Config.to_hash)
         Rails.cache.write('TrustyCms.cache_mtime', File.mtime(cache_file))
         Rails.cache.silence!
       end
@@ -121,6 +120,7 @@ module TrustyCms
 
       def stale_cache?
         return true unless TrustyCms::Config.cache_file_exists?
+
         Rails.cache.read('TrustyCms.cache_mtime') != File.mtime(cache_file)
       end
 
@@ -134,15 +134,15 @@ module TrustyCms
       end
 
       def cache_file
-        File.join(cache_path,'trusty_config_cache.txt')
+        File.join(cache_path, 'trusty_config_cache.txt')
       end
 
       def site_settings
-        @site_settings ||= %w{ site.title site.host dev.host local.timezone }
+        @site_settings ||= %w{site.title site.host dev.host local.timezone}
       end
 
       def default_settings
-        @default_settings ||= %w{ defaults.locale defaults.page.filter defaults.page.parts defaults.page.fields defaults.page.status }
+        @default_settings ||= %w{defaults.locale defaults.page.filter defaults.page.parts defaults.page.fields defaults.page.status}
       end
 
       def user_settings
@@ -161,7 +161,7 @@ module TrustyCms
       #
       def namespace(prefix, options = {}, &block)
         prefix = [options[:prefix], prefix].join('.') if options[:prefix]
-        with_options(options.merge(:prefix => prefix), &block)
+        with_options(options.merge(prefix: prefix), &block)
       end
 
       # Declares a setting definition that will constrain and support the use of a particular config entry.
@@ -176,7 +176,7 @@ module TrustyCms
       # * :allow_blank should be false if the config item must not be blank or nil
       # * :allow_change should be false if the config item can only be set, not changed. Add a default to specify an unchanging config entry.
       # * :allow_display should be false if the config item should not be showable in radius tags
-      #    
+      #
       #   TrustyCms.config do |config|
       #     config.define 'defaults.locale', :select_from => lambda { TrustyCms::AvailableLocales.locales }, :allow_blank => true
       #     config.define 'defaults.page.parts', :default => "Body,Extended"
@@ -191,7 +191,7 @@ module TrustyCms
       #
       # but at the moment that's only done in testing.
       #
-      def define(key, options={})
+      def define(key, options = {})
         called_from = caller.grep(/\/initializers\//).first
         if options.is_a? TrustyCms::Config::Definition
           definition = options
@@ -199,7 +199,7 @@ module TrustyCms
           key = [options[:prefix], key].join('.') if options[:prefix]
         end
 
-        definition ||= TrustyCms::Config::Definition.new(options.merge(:definer => called_from))
+        definition ||= TrustyCms::Config::Definition.new(options.merge(definer: called_from))
         definitions[key] = definition
 
         if self[key].nil? && !definition.default.nil?
@@ -216,9 +216,8 @@ module TrustyCms
       end
 
       def definition_for(key)
-        definitions[key] ||= TrustyCms::Config::Definition.new(:empty => true)
+        definitions[key] ||= TrustyCms::Config::Definition.new(empty: true)
       end
-
     end
 
     # The usual way to use a config item:
@@ -236,13 +235,14 @@ module TrustyCms
     def value=(param)
       newvalue = param.to_s
       if newvalue != self[:value]
-        raise ConfigError, "#{self.key} cannot be changed" unless settable? || self[:value].blank?
-        if boolean?
-          self[:value] = (newvalue == "1" || newvalue == "true") ? "true" : "false"
-        else
-          self[:value] = newvalue
-        end
-        self.save!
+        raise ConfigError, "#{key} cannot be changed" unless settable? || self[:value].blank?
+
+        self[:value] = if boolean?
+                         newvalue == '1' || newvalue == 'true' ? 'true' : 'false'
+                       else
+                         newvalue
+                       end
+        save!
       end
       self[:value]
     end
@@ -270,20 +270,21 @@ module TrustyCms
     # that does not restrict use.
     #
     def definition
-      @definition ||= self.class.definition_for(self.key)
+      @definition ||= self.class.definition_for(key)
     end
 
     # Returns true if the item key ends with '?' or the definition specifies :type => :boolean.
     #
     def boolean?
-      definition.boolean? || self.key.ends_with?("?")
+      definition.boolean? || key.ends_with?('?')
     end
 
     # Returns true if the item is boolean and true.
     #
     def checked?
       return nil if self[:value].nil?
-      boolean? && self[:value] == "true"
+
+      boolean? && self[:value] == 'true'
     end
 
     # Returns true if the item defintion includes a :select_from parameter that limits the range of permissible options.
@@ -302,11 +303,10 @@ module TrustyCms
       TrustyCms::Config.initialize_cache
     end
 
-    delegate :default, :type, :allow_blank?, :hidden?, :visible?, :settable?, :selection, :notes, :units, :to => :definition
+    delegate :default, :type, :allow_blank?, :hidden?, :visible?, :settable?, :selection, :notes, :units, to: :definition
 
     def validate
       definition.validate(self)
     end
-
   end
 end

data/app/models/trusty_cms/page_response_cache_director.rb

@@ -22,7 +22,7 @@ module TrustyCms
     private
 
     def non_cacheable_response
-      @listener.set_expiry nil, :private => true, "no-cache" => true
+      @listener.set_expiry nil, :private => true, 'no-cache' => true
       @listener.set_etag('')
     end
 
@@ -32,12 +32,11 @@ module TrustyCms
         timeout = @page.cache_timeout
       end
 
-      @listener.set_expiry timeout, :public => true, :private => false
+      @listener.set_expiry timeout, public: true, private: false
     end
 
     def cacheable?
       @listener.cacheable_request? && @page.cache?
     end
-
   end
 end

data/app/models/user.rb

@@ -1,10 +1,10 @@
 class User < ActiveRecord::Base
-  has_many :pages, :foreign_key => :created_by_id
+  has_many :pages, foreign_key: :created_by_id
   self.table_name = 'admins'
 
   # :confirmable, :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, :registerable,
-    :recoverable, :rememberable, :trackable, :validatable
+         :recoverable, :rememberable, :trackable, :validatable
 
   alias_attribute :created_by_id, :id
 
@@ -13,53 +13,54 @@ class User < ActiveRecord::Base
   validate :password_complexity
 
   # Default Order
-  default_scope {order('last_name')}
+  default_scope { order('last_name') }
 
   # Associations
-  belongs_to :created_by, :class_name => 'User'
-  belongs_to :updated_by, :class_name => 'User'
+  belongs_to :created_by, class_name: 'User'
+  belongs_to :updated_by, class_name: 'User'
 
   def has_role?(role)
     case role
     when :admin
-      self.admin?
+      admin?
     when :designer
-      self.designer?
+      designer?
     when :content_editor
-      self.content_editor?  
+      content_editor?
     else
       false
     end
   end
 
   def admin?
-    self.admin
+    admin
   end
 
   def designer?
-    self.designer
+    designer
   end
 
   def content_editor?
-    self.content_editor
+    content_editor
   end
 
-  def locale 
+  def locale
     'en'
   end
 
   def name
-    "#{self.first_name} #{self.last_name}"
+    "#{first_name} #{last_name}"
   end
 
   def password_required?
     return false if skip_password_validation
+
     super
   end
 
   def password_complexity
     return false if password.blank? || password =~ /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,70}$/
+
     errors.add :password, 'Complexity requirement not met. Length should be 12 characters and include: 1 uppercase, 1 lowercase, 1 digit and 1 special character.'
   end
-
 end

data/app/models/user_action_observer.rb

@@ -4,7 +4,7 @@ class UserActionObserver < ActiveRecord::Observer
   def current_user=(user)
     self.class.current_user = user
   end
-  
+
   def self.current_user=(user)
     Thread.current[:current_user] = user
   end
@@ -18,10 +18,10 @@ class UserActionObserver < ActiveRecord::Observer
   end
 
   def before_create(model)
-    #model.created_by = self.current_user
+    # model.created_by = self.current_user
   end
 
   def before_update(model)
-    #model.updated_by = self.current_user
+    # model.updated_by = self.current_user
   end
 end

data/app/users/_choose_site.html.haml

@@ -1,8 +1,4 @@
 - unless current_user.site
-  %tr
-    %th.label
-      %label{:for=>"user_admin"} Can edit site
-    %td.field{:style => 'text-align: left;'}
-      = select :user, :site_id, [['<any>', '']] + Site.all.map { |s| [s.name, s.id] }
-    %td.help
-      A user with no site is able to act (to whatever extent their status allows) on any site.
+    %label{:for=>"user_admin"} Can edit site
+    = select :user, :site_id, [['<any>', '']] + Site.all.map { |s| [s.name, s.id] }
+    .caption A user with no site is able to act (to whatever extent their status allows) on any site.

data/app/views/admin/assets/_form.html.haml

@@ -1,7 +1,7 @@
 = render_region :form_top
 - render_region :form do |form|
   - form.edit_title do
-    %fieldset.title
+    .title
   - form.edit_metadata do
     .drawer
       .drawer_contents#attributes
@@ -16,3 +16,4 @@
       .drawer_handle
         %a.toggle.more{:href=>'#attributes', :rel=>"toggle[attributes]"}
           = t('more')
+          %i.fas.fa-angle-down

data/app/views/admin/assets/_search.html.haml

@@ -9,7 +9,8 @@
     - AssetType.all.each do |type|
       - unless type.name == :other
         = link_to t("asset_types.#{type.plural}"), admin_assets_url(:filter => type.name), :rel => type.name.to_s, :class => params[:filter] == type.name.to_s ? "selective pressed" : "selective"
-  .right
+  .asset_search
+    %i.fas.fa-search
     %input{:type=>"search", :id => 'filesearchforminput', :class=>"search", :name=>"search", :value=>h(params[:search]), :placeholder=>"Search", :results=>0, :size=>30}
   
   #type_boxes{:style => "display: none"}

data/app/views/admin/assets/edit.html.haml

@@ -21,20 +21,12 @@
           = updated_stamp @asset
         
         %fieldset.upload
-          %label.upload
+          %label.custom-file-upload.upload
             = t("clipped_extension.replace_file")
-          = f.file_field :asset, :class => "", :style => "width: 100%"
+            = f.file_field :asset, :class => "", :style => "width: 100%"
         
         .buttons
           = save_model_button(@asset)
           = save_model_and_continue_editing_button(@asset)
           = t("or")
           = link_to t("cancel"), admin_assets_path
-  
-  - main.edit_regenerate do
-    - if current_user.admin? or current_user.designer?
-      %fieldset= t("clipped_extension.regenerate_thumbnails")
-      
-      - form_tag refresh_admin_asset_path(@asset), :method => :put do
-        %p.asset_buttons
-          %input.button{ :type => "submit", :value => t("clipped_extension.regenerate") }

data/app/views/admin/assets/index.html.haml

@@ -1,5 +1,6 @@
 = stylesheet_link_tag 'admin/assets'
 = javascript_include_tag 'admin/assets_admin'
+- body_classes << 'reversed'
 
 - content_for :toolbar do
   = render 'search'
@@ -11,5 +12,6 @@
   
 - render_region :bottom do |bottom|
   #actions
-    %ul
-      %li= link_to((image('upload') + ' ' + t('clipped_extension.upload_asset')), new_admin_asset_path)
+    = link_to new_admin_asset_path, class: 'button' do
+      %i.fas.fa-upload
+      = t('clipped_extension.upload_asset')

data/app/views/admin/assets/new.html.haml

@@ -1,5 +1,5 @@
 = stylesheet_link_tag 'admin/assets'
-= render_region :top 
+= render_region :top
 
 - render_region :main do |main|
   - main.edit_header do
@@ -7,18 +7,14 @@
 
     - main.edit_form do
       - form_for :asset, :url => admin_assets_path, :html => { :method => "post", :multipart => true } do |f|
-
         = render :partial => "form", :locals => { :f => f }
-
         %fieldset
-          %label= t("clipped_extension.choose_file")
-          = f.file_field :asset, :style => "width: 100%", :multiple => true
+          %label.custom-file-upload
+            = t("clipped_extension.choose_file")
+            = f.file_field :asset, :style => "width: 100%", :multiple => true
 
         .buttons
           = save_model_button(@asset)
           = save_model_and_continue_editing_button(@asset)
           = t("or")
           = link_to t("cancel"), admin_assets_path
-
-    - main.edit_regenerate do
-       

data/app/views/admin/assets/remove.html.haml

@@ -1,7 +1,8 @@
+- body_classes << "reversed"
 = stylesheet_link_tag 'admin/assets'
 
 %h1= t("clipped_extension.remove_asset")
-%p.warning= t("clipped_extension.confirm_remove_asset")
+%h4.warning= t("clipped_extension.confirm_remove_asset").html_safe
 
 %table.index#assets{:cellpadding => "0", :cellspacing => "0", :border => "0"}
   %tbody

data/app/views/admin/configuration/edit.html.haml

@@ -1,4 +1,4 @@
-- body_classes << "reversed"
+- body_classes << 'reversed'
 - @selected = :general
 
 - render_region :main do |main|
@@ -6,26 +6,26 @@
     %h1 Configuration
 
   - main.edit_form do
-    = form_for :trusty_config, :url => admin_configuration_path, :html => {"data-onsubmit_status"=>"Saving changes&#8230;", :method => :put} do |f|
+    = form_for :trusty_config, :url => admin_configuration_path, :html => {'data-onsubmit_status'=>'Saving changes&#8230;', :method => :put} do |f|
       = render_region :form_top
       - render_region :form do |form|
         - form.edit_site do
           %fieldset
-            %h3 Site
+            %h4 Site
             - TrustyCms.config.site_settings.each do |site_setting|
               %p
                 = edit_config site_setting
 
         - form.edit_defaults do
           %fieldset
-            %h3 Defaults
+            %h4 Defaults
             - TrustyCms.config.default_settings.each do |default_setting|
               %p
                 = edit_config default_setting
 
         - form.edit_users do
           %fieldset
-            %h3 Passwords
+            %h4 Passwords
             - TrustyCms.config.user_settings.each do |user_setting|
               %p
                 = edit_config user_setting
@@ -33,6 +33,6 @@
       - render_region :form_bottom do |form_bottom|
         - form_bottom.edit_buttons do
           .buttons
-            %input.button{:type=>"submit", :value=>"Save Changes"}/
+            %input.button{:type=>'submit', :value=>'Save Changes'}/
             or
-            = link_to "Cancel", admin_configuration_path, class: 'alt'
+            = link_to 'Cancel', admin_configuration_path, class: 'alt'