trusty-cms 4.1.1 → 4.1.6

data/app/helpers/application_helper.rb

@@ -22,26 +22,26 @@ module ApplicationHelper
   end
 
   def onsubmit_status(model)
-    model.new_record? ? t('creating_status', :model => t(model.class.name.downcase)) : "#{I18n.t('saving_changes')}…"
+    model.new_record? ? t('creating_status', model: t(model.class.name.downcase)) : "#{I18n.t('saving_changes')}…"
   end
 
   def save_model_button(model, options = {})
     model_name = model.class.name.underscore
     human_model_name = model_name.humanize.titlecase
     options[:label] ||= model.new_record? ?
-      t('buttons.create', :name => t(model_name, :default => human_model_name), :default => 'Create ' + human_model_name) :
-      t('buttons.save_changes', :default => 'Save Changes')
-    options[:class] ||= "button"
+      t('buttons.create', name: t(model_name, default: human_model_name), default: 'Create ' + human_model_name) :
+      t('buttons.save_changes', default: 'Save Changes')
+    options[:class] ||= 'button'
     options[:accesskey] ||= 'S'
     submit_tag options.delete(:label), options
   end
 
-  def save_model_and_continue_editing_button(model)
-    submit_tag t('buttons.save_and_continue'), :name => 'continue', :class => 'button', :accesskey => "s"
+  def save_model_and_continue_editing_button(_model)
+    submit_tag t('buttons.save_and_continue'), name: 'continue', class: 'button', accesskey: 's'
   end
 
   def current_item?(item)
-    if item.tab && item.tab.many? {|i| current_url?(i.relative_url) }
+    if item.tab&.many? { |i| current_url?(i.relative_url) }
       # Accept only stricter URL matches if more than one matches
       current_page?(item.url)
     else
@@ -50,7 +50,7 @@ module ApplicationHelper
   end
 
   def current_tab?(tab)
-    @current_tab ||= tab if tab.any? {|item| current_url?(item.relative_url) }
+    @current_tab ||= tab if tab.any? { |item| current_url?(item.relative_url) }
     @current_tab == tab
   end
 
@@ -70,7 +70,7 @@ module ApplicationHelper
   end
 
   def admin?
-    current_user and current_user.admin?
+    current_user&.admin?
   end
 
   def designer?
@@ -82,7 +82,7 @@ module ApplicationHelper
       updated_by = (model.updated_by || model.created_by)
       name = updated_by ? updated_by.name : nil
       time = (model.updated_at || model.created_at)
-      if name or time
+      if name || time
         html = %{<div class="updated_line">#{t('timestamp.last_updated')} }
         html << %{#{t('timestamp.by')} <strong>#{name}</strong> } if name
         html << %{#{t('timestamp.at')} #{timestamp(time)}} if time
@@ -94,7 +94,7 @@ module ApplicationHelper
 
   def timestamp(time)
     # time.strftime("%I:%M %p on %B %e, %Y").sub("AM", 'am').sub("PM", 'pm')
-    I18n.localize(time, :format => :timestamp)
+    I18n.localize(time, format: :timestamp)
   end
 
   def meta_errors?
@@ -122,11 +122,11 @@ module ApplicationHelper
   end
 
   def translate_with_default(name)
-    t(name.underscore.downcase, :default => name)
+    t(name.underscore.downcase, default: name)
   end
 
   def available_locales_select
-    [[t('select.default'),'']] + TrustyCms::AvailableLocales.locales
+    [[t('select.default'), '']] + TrustyCms::AvailableLocales.locales
   end
 
   def stylesheet_overrides
@@ -147,12 +147,12 @@ module ApplicationHelper
 
   # Returns a Gravatar URL associated with the email parameter.
   # See: http://douglasfshearer.com/blog/gravatar-for-ruby-and-ruby-on-rails
-  def gravatar_url(email, options={})
+  def gravatar_url(email, options = {})
     # Default to highest rating. Rating can be one of G, PG, R X.
-    options[:rating] ||= "G"
+    options[:rating] ||= 'G'
 
     # Default size of the image.
-    options[:size] ||= "32px"
+    options[:size] ||= '32px'
 
     # Default image url to be used when no gravatar is found
     # or when an image exceeds the rating parameter.
@@ -160,7 +160,9 @@ module ApplicationHelper
     default_avatar_url = "#{request.protocol}#{request.host_with_port}#{ActionController::Base.relative_url_root}#{local_avatar_url}"
     options[:default] ||= default_avatar_url
 
-    unless email.blank?
+    if email.blank?
+      local_avatar_url
+    else
       # Build the Gravatar url.
       url = '//gravatar.com/avatar/'
       url << "#{Digest::MD5.new.update(email)}?"
@@ -169,31 +171,29 @@ module ApplicationHelper
       url << "&default=#{options[:default]}" if options[:default]
       # Test the Gravatar url
       require 'open-uri'
-      begin; open "http:#{url}", :proxy => true
-      rescue; local_avatar_url
+      begin; open "http:#{url}", proxy: true
+      rescue StandardError; local_avatar_url
       else; url
       end
-    else
-      local_avatar_url
     end
   end
 
   # returns the usual set of pagination links.
   # options are passed through to will_paginate
   # and a 'show all' depagination link is added if relevant.
-  def pagination_for(list, options={})
+  def pagination_for(list, options = {})
     if list.respond_to? :total_pages
       options = {
-        :max_per_page => @trusty_config['pagination.max_per_page'] || 500,
-        :depaginate => true
+        max_per_page: @trusty_config['pagination.max_per_page'] || 500,
+        depaginate: true,
       }.merge(options.symbolize_keys)
       depaginate = options.delete(:depaginate)                                     # supply :depaginate => false to omit the 'show all' link
       depagination_limit = options.delete(:max_per_page)                           # supply :max_per_page => false to include the 'show all' link no matter how large the collection
       html = will_paginate(list, will_paginate_options.merge(options))
       if depaginate && list.total_pages > 1 && (!depagination_limit.blank? || list.total_entries <= depagination_limit.to_i)
-        html << content_tag(:div, link_to(t('show_all'), :pp => 'all'), :class => 'depaginate')
+        html << content_tag(:div, link_to(t('show_all'), pp: 'all'), class: 'depaginate')
       elsif depaginate && list.total_entries > depagination_limit.to_i
-        html = content_tag(:div, link_to("paginate", :p => 1), :class => 'pagination')
+        html = content_tag(:div, link_to('paginate', p: 1), class: 'pagination')
       end
       html
     end
@@ -201,12 +201,11 @@ module ApplicationHelper
 
   private
 
-    def append_image_extension(name)
-      unless name =~ /\.(.*?)$/
-        name + '.png'
-      else
-        name
+  def append_image_extension(name)
+    if name =~ /\.(.*?)$/
+      name
+    else
+      name + '.png'
       end
-    end
-
+  end
 end

data/app/helpers/rad_social_helper.rb

@@ -1,7 +1,6 @@
 module RadSocialHelper
-
   def rad_test_method
-    "SURPRISE SURPRISE SURPRISE"
+    'SURPRISE SURPRISE SURPRISE'
   end
 
   def rad_share_widget(options)
@@ -9,15 +8,13 @@ module RadSocialHelper
     message = options[:message].nil? ? "Check out #{options[:title]}." : options[:message]
     email_subject = options[:email_subject].nil? ? options[:title] : options[:email_subject]
     email_message = options[:email_message].nil? ? "I thought you might be interested in this: #{url}" : "#{options[:email_message]} #{url}"
-    email_action_url = options[:email_action_url].nil? ? "/rad_social/mail" : options[:email_action_url]
+    email_action_url = options[:email_action_url].nil? ? '/rad_social/mail' : options[:email_action_url]
 
-    render :partial => "widget/horizontal_widget",
-                             :locals => { :url => url,
-                                          :message => message,
-                                          :email_subject => email_subject,
-                                          :email_message => email_message,
-                                          :email_action_url => email_action_url
-                             }
+    render partial: 'widget/horizontal_widget',
+           locals: { url: url,
+                     message: message,
+                     email_subject: email_subject,
+                     email_message: email_message,
+                     email_action_url: email_action_url }
   end
-
 end

data/app/helpers/scoped_helper.rb

@@ -1,9 +1,8 @@
 module ScopedHelper
   def self.included(base)
-
     base.module_eval do
       def title
-        t = current_site.name 
+        t = current_site.name
         t = TrustyCms::Config['admin.title'] || 'TrustyCMS' if t.blank?
         t
       end
@@ -13,7 +12,6 @@ module ScopedHelper
         st = TrustyCms::Config['admin.subtitle'] || 'publishing for small teams' if st.blank?
         st
       end
-
     end
   end
 end

data/app/helpers/sites_helper.rb

@@ -1,10 +1,10 @@
 module SitesHelper
   def order_links(site)
     String.new.tap do |output|
-      output << link_to(image("move_to_top.png", :alt => "Move to top"), move_to_top_admin_site_path(site), :method => :put)
-      output << link_to(image("move_higher.png", :alt => "Move up"), move_higher_admin_site_path(site), :method => :post)
-      output << link_to(image("move_lower.png", :alt => "Move down"), move_lower_admin_site_path(site), :method => :post)
-      output << link_to(image("move_to_bottom.png", :alt => "Move to bottom"), move_to_bottom_admin_site_path(site), :method => :put)
+      output << link_to(image('move_to_top.png', alt: 'Move to top'), move_to_top_admin_site_path(site), method: :put)
+      output << link_to(image('move_higher.png', alt: 'Move up'), move_higher_admin_site_path(site), method: :post)
+      output << link_to(image('move_lower.png', alt: 'Move down'), move_lower_admin_site_path(site), method: :post)
+      output << link_to(image('move_to_bottom.png', alt: 'Move to bottom'), move_to_bottom_admin_site_path(site), method: :put)
     end
   end
 end

data/app/mailers/devise_mailer.rb

@@ -1,8 +1,7 @@
 class DeviseMailer < Devise::Mailer
-
-  def reset_password_instructions(record, token, opts={})
+  def reset_password_instructions(record, token, opts = {})
     mail = super
-    mail.subject = "Reset Password for TrustyCMS"
+    mail.subject = 'Reset Password for TrustyCMS'
     mail
-  end  
+  end
 end

data/app/mailers/rad_social_mailer.rb

@@ -3,7 +3,7 @@ require 'roadie-rails'
 class RadSocialMailer < ApplicationMailer
   include Roadie::Rails::Automatic
 
-  def social_mail options
+  def social_mail(options)
     from_address = Mail::Address.new options[:from] # ex: "john@example.com"
     from_address.display_name = options[:from_name] # ex: "John Doe"
 
@@ -14,12 +14,12 @@ class RadSocialMailer < ApplicationMailer
     @actual_from = from_address if @actual_from.nil?
 
     mail({
-      to: options[:to],
-      from: @actual_from,
-      reply_to: @from_email,
-      subject: options[:subject],
-      text: @message,
-      content_type: "text/html"
-     })
+           to: options[:to],
+           from: @actual_from,
+           reply_to: @from_email,
+           subject: options[:subject],
+           text: @message,
+           content_type: 'text/html',
+         })
   end
 end

data/app/models/asset.rb

@@ -1,17 +1,17 @@
 class Asset < ActiveRecord::Base
   include Paperclip::Glue
 
-  has_many :page_attachments, :dependent => :destroy
-  has_many :pages, :through => :page_attachments
+  has_many :page_attachments, dependent: :destroy
+  has_many :pages, through: :page_attachments
   has_site if respond_to? :has_site
 
-  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'
 
-  default_scope {order("created_at DESC")}
+  default_scope { order('created_at DESC') }
 
   scope :latest, lambda { |limit|
-    order("created_at DESC").limit(limit)
+    order('created_at DESC').limit(limit)
   }
 
   scope :of_types, lambda { |types|
@@ -20,81 +20,81 @@ class Asset < ActiveRecord::Base
   }
 
   scope :matching, lambda { |term|
-    where(["LOWER(assets.asset_file_name) LIKE (:term) OR LOWER(title) LIKE (:term) OR LOWER(caption) LIKE (:term)", {:term => "%#{term.downcase}%" }])
+    where(['LOWER(assets.asset_file_name) LIKE (:term) OR LOWER(title) LIKE (:term) OR LOWER(caption) LIKE (:term)', { term: "%#{term.downcase}%" }])
   }
 
   scope :excepting, lambda { |assets|
     if assets.any?
       assets = assets.split(',') if assets.is_a?(String)
       asset_ids = assets.first.is_a?(Asset) ? assets.map(&:id) : assets
-      where(["assets.id NOT IN(#{asset_ids.map{ '?' }.join(',')})", *asset_ids])
+      where(["assets.id NOT IN(#{asset_ids.map { '?' }.join(',')})", *asset_ids])
     else
       {}
     end
   }
 
   has_attached_file :asset,
-                    :styles => lambda { |attachment|
+                    styles: lambda { |attachment|
                       AssetType.for(attachment).paperclip_styles
                     },
-                    :processors => lambda { |asset|
+                    processors: lambda { |asset|
                       asset.paperclip_processors
                     },
-                    :whiny => false,
-                    :storage => TrustyCms.config["paperclip.storage"],
-                    :path => TrustyCms.config["paperclip.path"],
-                    :url => TrustyCms.config["paperclip.url"],
-                    :fog_credentials =>
-                        TrustyCmsClippedExtension::Cloud.credentials,
-                    :fog_directory => TrustyCms.config["paperclip.fog.directory"],
-                    :fog_public => TrustyCms.config["paperclip.fog.public?"] || true,
-                    :fog_host => TrustyCmsClippedExtension::Cloud.host,
-                    :fog_file => {
-                        'Cache-Control' => 'max-age=31536000'
+                    whiny: false,
+                    storage: TrustyCms.config['paperclip.storage'],
+                    path: TrustyCms.config['paperclip.path'],
+                    url: TrustyCms.config['paperclip.url'],
+                    fog_credentials: TrustyCmsClippedExtension::Cloud.credentials,
+                    fog_directory: TrustyCms.config['paperclip.fog.directory'],
+                    fog_public: TrustyCms.config['paperclip.fog.public?'] || true,
+                    fog_host: TrustyCmsClippedExtension::Cloud.host,
+                    fog_file: {
+                      'Cache-Control' => 'max-age=31536000',
                     }
 
-  validates_attachment_content_type :asset, :content_type => ["application/zip", "image/jpg", "image/jpeg", "image/png", "image/gif", "application/pdf", "application/javascript", "text/javascript", "text/css"]
+  validates_attachment_content_type :asset, content_type: ['application/zip', 'image/jpg', 'image/jpeg', 'image/png', 'image/gif', 'application/pdf', 'application/javascript', 'text/javascript', 'text/css']
 
   before_save :assign_title
   before_save :assign_uuid
 
   after_post_process :read_dimensions
 
-  validates_attachment_presence :asset, :message => "You must choose a file to upload!"
-  if TrustyCms.config["paperclip.skip_filetype_validation"] != "true" && TrustyCms.config['paperclip.content_types']
-    validates_attachment_content_type :asset, :content_type => TrustyCms.config["paperclip.content_types"].gsub(' ','').split(',')
+  validates_attachment_presence :asset, message: 'You must choose a file to upload!'
+  if TrustyCms.config['paperclip.skip_filetype_validation'] != 'true' && TrustyCms.config['paperclip.content_types']
+    validates_attachment_content_type :asset, content_type: TrustyCms.config['paperclip.content_types'].gsub(' ', '').split(',')
   else
-    validates_attachment_presence :asset, :message => "Your uploaded file must have an extension in its name!"
+    validates_attachment_presence :asset, message: 'Your uploaded file must have an extension in its name!'
   end
-  validates_attachment_size :asset, :less_than => ( TrustyCms.config["assets.max_asset_size"] || 5 ).to_i.megabytes
+  validates_attachment_size :asset, less_than: (TrustyCms.config['assets.max_asset_size'] || 5).to_i.megabytes
 
   def asset_type
     AssetType.for(asset)
   end
-  delegate :paperclip_processors, :paperclip_styles, :style_dimensions, :style_format, :to => :asset_type
+  delegate :paperclip_processors, :paperclip_styles, :style_dimensions, :style_format, to: :asset_type
 
-  def thumbnail(style_name='original')
+  def thumbnail(style_name = 'original')
     return asset.url if style_name.to_sym == :original
     return asset.url(style_name.to_sym) if has_style?(style_name)
-    return asset_type.icon(style_name)
+
+    asset_type.icon(style_name)
   end
 
-  def has_style?(style_name='original')
+  def has_style?(style_name = 'original')
     style_name == 'original' || paperclip_styles.keys.include?(style_name.to_sym)
   end
 
   def basename
-    File.basename(asset_file_name, ".*") if asset_file_name
+    File.basename(asset_file_name, '.*') if asset_file_name
   end
 
-  def extension(style_name='original')
-     if style_name == 'original'
-       return original_extension
-     elsif style = paperclip_styles[style_name.to_sym]
-       return style.format
-     else
-       return original_extension
-     end
+  def extension(style_name = 'original')
+    if style_name == 'original'
+      original_extension
+    elsif style = paperclip_styles[style_name.to_sym]
+      style.format
+    else
+      original_extension
+    end
   end
 
   def original_extension
@@ -109,57 +109,57 @@ class Asset < ActiveRecord::Base
     @original_geometry ||= Paperclip::Geometry.new(original_width, original_height)
   end
 
-  def geometry(style_name='original')
+  def geometry(style_name = 'original')
     raise Paperclip::StyleError, "Requested style #{style_name} is not defined for this asset." unless has_style?(style_name)
+
     @geometry ||= {}
     begin
       @geometry[style_name] ||= if style_name.to_s == 'original'
-        original_geometry
-      else
-        style = self.asset.styles[style_name.to_sym]
-        original_geometry.transformed_by(style.geometry)    # this can return dimensions for fully specified style sizes but not for relative sizes when there are no original dimensions
+                                  original_geometry
+                                else
+                                  style = asset.styles[style_name.to_sym]
+                                  original_geometry.transformed_by(style.geometry) # this can return dimensions for fully specified style sizes but not for relative sizes when there are no original dimensions
       end
     rescue Paperclip::TransformationError => e
       Rails.logger.warn "geometry transformation error: #{e}"
-      original_geometry                                     # returns a blank geometry if the real geometry cannot be calculated
+      original_geometry # returns a blank geometry if the real geometry cannot be calculated
     end
   end
 
-  def aspect(style_name='original')
+  def aspect(style_name = 'original')
     geometry(style_name).aspect
   end
 
-  def orientation(style_name='original')
+  def orientation(style_name = 'original')
     a = aspect(style_name)
-    case
-    when a == nil?
+    if a == nil?
       'unknown'
-    when a < 1.0
+    elsif a < 1.0
       'vertical'
-    when a > 1.0
+    elsif a > 1.0
       'horizontal'
     else
       'square'
     end
   end
 
-  def width(style_name='original')
+  def width(style_name = 'original')
     geometry(style_name).width.to_i
   end
 
-  def height(style_name='original')
+  def height(style_name = 'original')
     geometry(style_name).height.to_i
   end
 
-  def square?(style_name='original')
+  def square?(style_name = 'original')
     geometry(style_name).square?
   end
 
-  def vertical?(style_name='original')
+  def vertical?(style_name = 'original')
     geometry(style_name).vertical?
   end
 
-  def horizontal?(style_name='original')
+  def horizontal?(style_name = 'original')
     geometry(style_name).horizontal?
   end
 
@@ -167,7 +167,7 @@ class Asset < ActiveRecord::Base
     original_width? && original_height?
   end
 
-private
+  private
 
   # at this point the file queue will not have been written
   # but the upload should be in place. We read dimensions from the
@@ -186,7 +186,7 @@ private
   end
 
   def assign_title
-    self.title = self.asset_file_name.downcase.sub(self.original_extension, "").sub(".", "")
+    self.title = asset_file_name.downcase.sub(original_extension, '').sub('.', '')
   end
 
   def assign_uuid
@@ -210,7 +210,7 @@ private
 
     def with_asset_types(asset_types, &block)
       w_asset_types = AssetType.conditions_for(asset_types)
-      with_scope(where(:conditions => ["#{w_asset_types} = ?", block]))
+      with_scope(where(conditions: ["#{w_asset_types} = ?", block]))
     end
   end
 
@@ -235,14 +235,13 @@ private
 
   # this is a convenience for image-pickers
   def self.thumbnail_options
-    asset_sizes = thumbnail_sizes.collect{|k,v|
+    asset_sizes = thumbnail_sizes.collect do |k, v|
       size_id = k
       size_description = "#{k}: "
       size_description << (v.is_a?(Array) ? v.join(' as ') : v)
       [size_description, size_id]
-    }.sort_by{|pair| pair.last.to_s}
+    end.sort_by { |pair| pair.last.to_s }
     asset_sizes.unshift ['Original (as uploaded)', 'original']
     asset_sizes
   end
-
 end