trusty-cms 3.1.11 → 3.2.0

data/app/assets/stylesheets/admin/assets.scss

@@ -0,0 +1,283 @@
+@import "compass";
+
+p.asset {
+  img.preview {
+    border: 5px solid white;
+    @include box-shadow;
+}
+}
+
+.asset_filters {
+  float: left;
+  padding: 2px 0;
+  a {
+    @include border-radius(100px);
+    color: #555555;
+    padding: 3px 8px;
+    text-decoration: none;
+    font-size: 12px;
+    &:hover {
+      background: #cccccc;
+  }
+    &.pressed {
+      background: #888888;
+      @include box-shadow(0, 1px, 1px, #333333, inset);
+      color: white;
+      text-shadow: 0 1px 0 #333333;
+      &:hover {
+        background: #888888;
+        @include box-shadow(0, 1px, 1px, #333333, inset);
+        color: white;
+        text-shadow: 0 1px 0 #333333;
+    }
+  }
+}
+}
+
+.popup {
+  div.toolbar {
+    background: white;
+    @include background-image(linear-gradient(white, #dddddd));
+    border-bottom: 1px solid #cccccc;
+    @include single-box-shadow(white, 0, 1px, 0);
+    margin: -20px -20px 0;
+    padding: 6px 10px 3px 10px;
+    font-size: 95%;
+    height: 30px;
+    @include clearfix;
+    .right {
+      float: right;
+  }
+    form.search {
+      padding: 4px 2px 0;
+      input[type=search] {
+        font-size: 12px;
+        @include border-radius(100px);
+        border: 1px solid #cccccc;
+        border-top-color: #999999;
+        border-left-color: #b0b0b0;
+        border-right-color: #bbbbbb;
+        background: white url("/assets/admin/search.png") 4px center no-repeat;
+        @include box-shadow(rgba(black, 0.2), 0, 1px, 0, inset);
+        width: 180px;
+        padding: 2px 8px 2px 20px;
+    }
+  }
+}
+  #assets_table.assets {
+    overflow: auto;
+}
+}
+
+#upload_holders {
+  display: none;
+}
+
+#attach_asset {
+  .viewport {
+    overflow-x: hidden;
+    width: 610px;
+    height: 310px;
+}
+}
+
+.attachment_actions {
+  text-align: right;
+  margin-bottom: -1em;
+  ul {
+    @include inline-list;
+}
+  li {
+    padding-left: 1em;
+}
+  a {
+    color: white !important;
+    text-shadow: 1px 1px 0 #888888;
+}
+}
+
+.assets {
+  height: 150px;
+  padding-left: 5px;
+  padding-right: 5px;
+  ul {
+    li.asset {
+      display: block;
+      float: left;
+      margin: 1em;
+      width: 110px;
+      height: 110px;
+      position: relative;
+      line-height: 1.2em;
+      .front, .back {
+        display: block;
+        background: #e6eaed;
+        border: 5px solid white;
+        position: absolute;
+        width: 100px;
+        height: 100px;
+        text-align: center;
+    }
+      .front {
+        @include box-shadow;
+        text-align: center;
+    }
+      .back {
+        color: #333333;
+        overflow: hidden;
+        @include opacity(0);
+    }
+      .title {
+        color: #333333;
+        font-size: 10px;
+        overflow: hidden;
+        margin: 10px 4px;
+        height: 15px;
+        line-height: 15px;
+        text-overflow: ellipsis;
+    }
+      .icon {
+        height: 63px;
+        line-height: 63px;
+        img {
+          vertical-align: bottom;
+      }
+    }
+      ul.actions {
+        li {
+          margin: 5px 0;
+          padding: 0 10px;
+          font-size: 10px;
+      }
+        a {
+          background: #666666;
+          background: rgba(black, 0.8);
+          @include border-radius;
+          color: #dddddd;
+          display: block;
+          padding: 2px 10px;
+          text-decoration: none;
+          &:hover {
+            background: #999999;
+            background: rgba(black, 0.6);
+            color: white;
+        }
+      }
+    }
+      &.unsaved {
+        .front {
+          opacity: 0.4;
+      }
+    }
+      &:hover {
+        .back {
+          @include opacity(1);
+          background: rgba(white, 0.6);
+      }
+    }
+      &.waiting {
+        background-color: #e6eaed;
+        .back {
+          display: none;
+      }
+        .front {
+          background: transparent url(/assets/admin/spinner.gif) no-repeat center center;
+          img {
+            opacity: 0.2;
+        }
+      }
+    }
+  }
+}
+}
+
+#attachment_list.assets {
+  @include border-bottom-radius;
+  margin: -1em 0.5em 1em 0.5em;
+  overflow-y: hidden;
+  overflow-x: auto;
+  ul.empty {
+    display: none;
+}
+  p.note {
+    margin: 0;
+    padding: 8px;
+    clear: left;
+    span.message {
+      float: right;
+      color: #aaaaaa;
+      &.important {
+        color: #dd9999;
+    }
+  }
+}
+  ul.sortable {
+    li.asset {
+      div.back {
+        cursor: move;
+    }
+  }
+}
+}
+
+#assets_table.assets {
+  position: relative;
+  font-size: 75%;
+  p {
+    padding: 40px {
+      top: 45px;
+  };
+    color: silver;
+    text-align: center;
+    font-style: oblique;
+}
+  ul {
+    clear: both;
+    li.asset {
+      input {
+        display: none;
+    }
+  }
+}
+  div.pagination {
+    position: relative;
+    overflow: hidden;
+    clear: left;
+    width: 100%;
+    height: 3em;
+    padding: 0.5em 0;
+    span, a, em {
+      display: block;
+      float: left;
+      padding: 0.25em;
+      margin: 1em 2px 1em 0;
+      @include border-radius(2px);
+      text-decoration: none;
+  }
+    span.current {
+      color: black;
+      font-weight: bold;
+  }
+    span.disabled {
+      background-color: #eeeeee;
+      color: #cccccc;
+  }
+    a {
+      background-color: #eeeeee;
+      color: #444444;
+      &:hover {
+        background-color: #BC045C;
+        color: white;
+    }
+  }
+    span {
+      color: #888888;
+  }
+    span, a {
+      display: block;
+      float: left;
+      padding: 2px 6px;
+      line-height: 1.5em;
+  }
+}
+}

data/app/controllers/admin/assets_controller.rb

@@ -0,0 +1,88 @@
+class Admin::AssetsController < Admin::ResourceController
+  paginate_models(:per_page => 50)
+  COMPRESS_FILE_TYPE = ["image/jpeg", "image/png", "image/gif", "image/svg+xml"]
+
+  def index
+    assets = Asset.order("created_at DESC")
+    @page = Page.find(params[:page_id]) if params[:page_id]
+
+    @term = params[:search] || ''
+    assets = assets.matching(@term) if @term && !@term.blank?
+
+    @types = params[:filter] ? params[:filter].split(",") : []
+    if @types.include?('all')
+      params[:filter] = nil
+    elsif @types.any?
+      assets = assets.of_types(@types)
+    end
+
+    @assets = paginated? ? assets.paginate(pagination_parameters) : assets.all
+    respond_to do |format|
+
+      format.js {
+        @page = Page.find_by_id(params[:page_id])
+        render :partial => 'asset_table', :locals => {:with_pagination => true}
+      }
+      format.html {
+        render
+      }
+    end
+  end
+
+  def create
+    @assets, @page_attachments = [], []
+    compress = current_site.try(:compress) ? current_site.compress : true
+    binding.pry
+    asset_params[:asset][:asset].to_a.each do |uploaded_asset|
+      if uploaded_asset.content_type == "application/octet-stream"
+        flash[:notice] = "Please only upload assets that have a valid extension in the name."
+      else
+        uploaded_asset = compress(uploaded_asset) if $kraken.api_key.present? && COMPRESS_FILE_TYPE.include?(uploaded_asset.content_type) && compress
+        @asset = Asset.create(:asset => uploaded_asset, :caption => asset_params[:asset][:caption])
+        if params[:for_attachment]
+          @page = Page.find_by_id(params[:page_id]) || Page.new
+          @page_attachments << @page_attachment = @asset.page_attachments.build(:page => @page)
+        end
+        @assets << @asset
+      end
+    end
+    if asset_params[:for_attachment]
+      render :partial => 'admin/page_attachments/attachment', :collection => @page_attachments
+    else
+      response_for :create
+    end
+  end
+
+  def refresh
+    if asset_params[:id]
+      @asset = Asset.find(params[:id])
+      @asset.asset.reprocess!
+      flash[:notice] = t('clipped_extension.thumbnails_refreshed')
+      redirect_to edit_admin_asset_path(@asset)
+    else
+      render
+    end
+  end
+
+  only_allow_access_to :regenerate,
+    :when => [:admin],
+    :denied_url => { :controller => 'admin/assets', :action => 'index' },
+    :denied_message => 'You must have admin privileges to refresh the whole asset set.'
+
+  def regenerate
+    Asset.all.each { |asset| asset.asset.reprocess! }
+    flash[:notice] = t('clipped_extension.all_thumbnails_refreshed')
+    redirect_to admin_assets_path
+  end
+
+private
+  def compress(uploaded_asset)
+    data = $kraken.upload(uploaded_asset.tempfile.path, 'lossy' => true)
+    File.write(uploaded_asset.tempfile, open(data.kraked_url).read, { :mode => 'wb' })
+    uploaded_asset
+  end
+
+  def asset_params
+    params.permit(:id, :for_attachment, :asset => [:caption, :for_attachment, :asset => []])
+  end
+end

data/app/controllers/admin/page_attachments_controller.rb

@@ -0,0 +1,23 @@
+class Admin::PageAttachmentsController < Admin::ResourceController
+  helper 'admin/assets'
+
+  def new
+    render :partial => 'attachment', :object => model
+  end
+
+  def load_model
+    begin
+      @asset = Asset.find(params[:asset_id])
+      @page = page_attachment_params[:page_id].blank? ? Page.new : Page.find_by_id(page_attachment_params[:page_id])
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :layout => false
+    end
+    self.model = PageAttachment.new(:asset => @asset, :page => @page)
+  end
+
+private
+  def page_attachment_params
+    params.permit(:asset_id, :page_id)
+  end
+
+end

data/app/helpers/admin/assets_helper.rb

@@ -0,0 +1,16 @@
+module Admin::AssetsHelper
+  
+  def automatic_size_descriptions
+    Asset.thumbnail_sizes.collect{|k,v| "#{k} (#{(v.to_s).match(/\d+x\d+/)})"}.join(', ')
+  end
+  
+  def asset_insertion_link(asset)
+    radius_tag = asset.asset_type.default_radius_tag || 'link';
+    link_to t('clipped_extension.insert'), '#', :class => 'insert_asset', :rel => "#{radius_tag}_#{TrustyCms.config['assets.insertion_size']}_#{asset.id}"
+  end
+  
+  def asset_attachment_link(asset)
+    link_to t("clipped_extension.attach"), new_admin_page_attachment_path(:asset_id => asset.id), :class => 'attach_asset', :rel => "attach_#{asset.id}"
+  end
+  
+end

data/app/helpers/admin/page_attachments_helper.rb

@@ -0,0 +1,2 @@
+module Admin::PageAttachmentsHelper
+end

data/app/models/asset.rb

@@ -0,0 +1,251 @@
+class Asset < ActiveRecord::Base
+  include Paperclip::Glue
+
+  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'
+
+  default_scope {order("created_at DESC")}
+
+  attr_accessible :title, :asset, :caption
+
+  scope :latest, lambda { |limit|
+    order("created_at DESC").limit(limit)
+  }
+
+  scope :of_types, lambda { |types|
+    mimes = AssetType.slice(*types).map(&:mime_types).flatten
+    Asset.select { |x| mimes.include?(x.asset_content_type) }
+  }
+
+  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}%" }])
+  }
+
+  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])
+    else
+      {}
+    end
+  }
+
+  has_attached_file :asset,
+                    :styles => lambda { |attachment|
+                      AssetType.for(attachment).paperclip_styles
+                    },
+                    :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=2419200'
+                        #'Expires'       => 1.month.from_now.httpdate
+                    }
+
+  validates_attachment_content_type :asset, :content_type => ["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(',')
+  else
+    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
+
+  def asset_type
+    AssetType.for(asset)
+  end
+  delegate :paperclip_processors, :paperclip_styles, :style_dimensions, :style_format, :to => :asset_type
+
+  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)
+  end
+
+  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
+  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
+  end
+
+  def original_extension
+    return asset_file_name.split('.').last.downcase if asset_file_name
+  end
+
+  def attached_to?(page)
+    pages.include?(page)
+  end
+
+  def original_geometry
+    @original_geometry ||= Paperclip::Geometry.new(original_width, original_height)
+  end
+
+  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
+      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
+    end
+  end
+
+  def aspect(style_name='original')
+    geometry(style_name).aspect
+  end
+
+  def orientation(style_name='original')
+    a = aspect(style_name)
+    case
+    when a == nil?
+      'unknown'
+    when a < 1.0
+      'vertical'
+    when a > 1.0
+      'horizontal'
+    else
+      'square'
+    end
+  end
+
+  def width(style_name='original')
+    geometry(style_name).width.to_i
+  end
+
+  def height(style_name='original')
+    geometry(style_name).height.to_i
+  end
+
+  def square?(style_name='original')
+    geometry(style_name).square?
+  end
+
+  def vertical?(style_name='original')
+    geometry(style_name).vertical?
+  end
+
+  def horizontal?(style_name='original')
+    geometry(style_name).horizontal?
+  end
+
+  def dimensions_known?
+    original_width? && original_height?
+  end
+
+private
+
+  # at this point the file queue will not have been written
+  # but the upload should be in place. We read dimensions from the
+  # original file and calculate thumbnail dimensions later, on demand.
+
+  def read_dimensions
+    if image?
+      if file = asset.queued_for_write[:original]
+        geometry = Paperclip::Geometry.from_file(file)
+        self.original_width = geometry.width
+        self.original_height = geometry.height
+        self.original_extension = File.extname(file.path)
+      end
+    end
+    true
+  end
+
+  def assign_title
+    self.title = self.asset_file_name.sub(self.original_extension, "").sub(".", "")
+  end
+
+  def assign_uuid
+    self.uuid = UUIDTools::UUID.timestamp_create.to_s unless uuid?
+  end
+
+  class << self
+    def known_types
+      AssetType.known_types
+    end
+
+    # searching and pagination moved to the controller
+
+    def find_all_by_asset_types(asset_types, *args)
+      with_asset_types(asset_types) { where *args }
+    end
+
+    def count_with_asset_types(asset_types, *args)
+      with_asset_types(asset_types) { where(*args).count }
+    end
+
+    def with_asset_types(asset_types, &block)
+      w_asset_types = AssetType.conditions_for(asset_types)
+      with_scope(where(:conditions => ["#{w_asset_types} = ?", block]))
+    end
+  end
+
+  # called from AssetType to set type_condition? methods on Asset
+  def self.define_class_method(name, &block)
+    eigenclass.send :define_method, name, &block
+  end
+
+  # returns the return value of class << self block, which is self (as defined within that block)
+  def self.eigenclass
+    class << self; self; end
+  end
+
+  # for backwards compatibility
+  def self.thumbnail_sizes
+    AssetType.find(:image).paperclip_styles
+  end
+
+  def self.thumbnail_names
+    thumbnail_sizes.keys
+  end
+
+  # this is a convenience for image-pickers
+  def self.thumbnail_options
+    asset_sizes = thumbnail_sizes.collect{|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}
+    asset_sizes.unshift ['Original (as uploaded)', 'original']
+    asset_sizes
+  end
+
+end