trusty-cms 4.1.2 → 4.1.3

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

data/app/models/asset_type.rb

@@ -1,5 +1,4 @@
 class AssetType
-
   # The Asset Type encapsulates a type of attachment.
   # Conventionally this would a sensible category like 'image' or 'video'
   # that should be processed and presented in a particular way.
@@ -34,10 +33,10 @@ class AssetType
     Asset.send :define_method, "#{name}?".intern do this.mime_types.include?(asset_content_type) end
     Asset.send :define_class_method, "#{name}_condition".intern do this.condition; end
     Asset.send :define_class_method, "not_#{name}_condition".intern do this.non_condition; end
-    Asset.send :scope, plural.to_sym, -> {where(:conditions => condition)}
-    Asset.send :scope, "not_#{plural}".to_sym, -> {where(:conditions => non_condition)}
+    Asset.send :scope, plural.to_sym, -> { where(conditions: condition) }
+    Asset.send :scope, "not_#{plural}".to_sym, -> { where(conditions: non_condition) }
 
-    self.define_radius_tags
+    define_radius_tags
     @@types.push self
     @@type_lookup[@name] = self
   end
@@ -46,21 +45,21 @@ class AssetType
     name.to_s.pluralize
   end
 
-  def icon(style_name='icon')
-    if File.exist?(Rails.root + "public/images/admin/assets/#{icon_name}_#{style_name.to_s}.png")
-      return "/assets/admin/#{icon_name}_#{style_name.to_s}.png"
+  def icon(style_name = 'icon')
+    if File.exist?(Rails.root + "public/images/admin/assets/#{icon_name}_#{style_name}.png")
+      "/assets/admin/#{icon_name}_#{style_name}.png"
     else
-      return "/assets/admin/#{icon_name}_icon.png"
+      "/assets/admin/#{icon_name}_icon.png"
     end
   end
 
-  def icon_path(style_name='icon')
+  def icon_path(style_name = 'icon')
     Rails.root + "public#{icon(style_name)}"
   end
 
   def condition
     if @mimes.any?
-      ["asset_content_type IN (#{@mimes.map{'?'}.join(',')})", *@mimes]
+      ["asset_content_type IN (#{@mimes.map { '?' }.join(',')})", *@mimes]
     else
       self.class.other_condition
     end
@@ -72,7 +71,7 @@ class AssetType
 
   def non_condition
     if @mimes.any?
-      ["NOT asset_content_type IN (#{@mimes.map{'?'}.join(',')})", *@mimes]
+      ["NOT asset_content_type IN (#{@mimes.map { '?' }.join(',')})", *@mimes]
     else
       self.class.non_other_condition
     end
@@ -98,23 +97,23 @@ class AssetType
   def paperclip_styles
     # Styles are not relevant if processors are not defined.
     @paperclip_styles ||= if paperclip_processors.any?
-      normalize_style_rules(configured_styles.merge(styles))
-    else
-      {}
+                            normalize_style_rules(configured_styles.merge(styles))
+                          else
+                            {}
     end
     @paperclip_styles
   end
 
   # Takes a motley collection of differently-defined styles and renders them into the standard hash-of-hashes format.
   # Solitary strings are assumed to be  #
-  def normalize_style_rules(styles={})
+  def normalize_style_rules(styles = {})
     styles.each_pair do |name, rule|
       unless rule.is_a? Hash
         if rule =~ /\=/
-          parameters = rule.split(',').collect{ |parameter| parameter.split('=') }              # array of pairs
-          rule = Hash[parameters].symbolize_keys                                     # into hash of :first => last
+          parameters = rule.split(',').collect { |parameter| parameter.split('=') } # array of pairs
+          rule = Hash[parameters].symbolize_keys # into hash of :first => last
         else
-          rule = {:geometry => rule}                                                 # simplest case: name:geom|name:geom
+          rule = { geometry: rule } # simplest case: name:geom|name:geom
         end
       end
       rule[:geometry] ||= rule.delete(:size)
@@ -122,10 +121,10 @@ class AssetType
     end
     styles
   end
-  
+
   def standard_styles
     {
-      :thumbnail => { :geometry => '100x100#', :format => :png }
+      thumbnail: { geometry: '100x100#', format: :png },
     }
   end
 
@@ -140,17 +139,17 @@ class AssetType
   #
   def configured_styles
     @configured_styles ||= if style_definitions = TrustyCms.config["assets.thumbnails.#{name}"]
-      style_definitions.split('|').each_with_object({}) do |definition, styles|
-        name, rule = definition.split(':')
-        styles[name.strip.to_sym] = rule.to_s.strip
-      end
-    else
-      {}
+                             style_definitions.split('|').each_with_object({}) do |definition, styles|
+                               name, rule = definition.split(':')
+                               styles[name.strip.to_sym] = rule.to_s.strip
+                             end
+                           else
+                             {}
     end
   end
 
   def legacy_styles
-    TrustyCms::config["assets.additional_thumbnails"].to_s.gsub(' ','').split(',').collect{|s| s.split('=')}.inject({}) {|ha, (k, v)| ha[k.to_sym] = v; ha}
+    TrustyCms::config['assets.additional_thumbnails'].to_s.gsub(' ', '').split(',').collect { |s| s.split('=') }.inject({}) { |ha, (k, v)| ha[k.to_sym] = v; ha }
   end
 
   def style_dimensions(style_name)
@@ -160,21 +159,21 @@ class AssetType
   end
 
   def define_radius_tags
-    type = self.name
-    Page.class_eval {
+    type = name
+    Page.class_eval do
       tag "asset:if_#{type}" do |tag|
         tag.expand if find_asset(tag, tag.attr.dup).send("#{type}?".to_sym)
       end
       tag "asset:unless_#{type}" do |tag|
         tag.expand unless find_asset(tag, tag.attr.dup).send("#{type}?".to_sym)
       end
-    }
+    end
   end
 
   # class methods
 
   def self.for(attachment)
-    extension = File.extname(attachment.original_filename).sub(/^\.+/, "")
+    extension = File.extname(attachment.original_filename).sub(/^\.+/, '')
     from_extension(extension) || from_mimetype(attachment.instance_read(:content_type)) || catchall
   end
 
@@ -187,20 +186,21 @@ class AssetType
   end
 
   def self.catchall
-    @@default_type ||= self.find(:other)
+    @@default_type ||= find(:other)
   end
 
   def self.known?(name)
-    !self.find(name).nil?
+    !find(name).nil?
   end
 
   def self.slice(*types)
-    @@type_lookup.slice(*types.map(&:to_sym)).values if types   # Hash#slice is provided by will_paginate
+    @@type_lookup.slice(*types.map(&:to_sym)).values if types # Hash#slice is provided by will_paginate
   end
 
   def self.find(type)
     @@type_lookup[type] if type
   end
+
   def self.[](type)
     find(type)
   end
@@ -218,19 +218,18 @@ class AssetType
   end
 
   def self.mime_types_for(*names)
-    names.collect{ |name| find(name).mime_types }.flatten
+    names.collect { |name| find(name).mime_types }.flatten
   end
 
   def self.conditions_for(*names)
-    names.collect{ |name| self.find(name).sanitized_condition }.join(' OR ')
+    names.collect { |name| find(name).sanitized_condition }.join(' OR ')
   end
 
   def self.non_other_condition
-    ["asset_content_type IN (#{known_mimetypes.map{'?'}.join(',')})", *known_mimetypes]
+    ["asset_content_type IN (#{known_mimetypes.map { '?' }.join(',')})", *known_mimetypes]
   end
 
   def self.other_condition
-    ["NOT asset_content_type IN (#{known_mimetypes.map{'?'}.join(',')})", *known_mimetypes]
+    ["NOT asset_content_type IN (#{known_mimetypes.map { '?' }.join(',')})", *known_mimetypes]
   end
-
 end