radiant-clipped-extension 1.0.6 → 1.0.7

data/Rakefile

@@ -12,7 +12,7 @@ unless defined? RADIANT_ROOT
 end
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rake/testtask'
 
 rspec_base = File.expand_path(RADIANT_ROOT + '/vendor/plugins/rspec/lib')
@@ -97,7 +97,7 @@ namespace :spec do
 end
 
 desc 'Generate documentation for the clipped extension.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
+RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'ClippedExtension'
   rdoc.options << '--line-numbers' << '--inline-source'

data/app/models/asset.rb

@@ -1,14 +1,13 @@
 class Asset < ActiveRecord::Base
-
   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"
-  
+
   named_scope :latest, lambda { |limit|
     { :order => "created_at DESC", :limit => limit }
   }
@@ -103,10 +102,13 @@ class Asset < ActiveRecord::Base
   end
   
   def geometry(style_name='original')
-    if style_name == 'original'
+    @geometry ||= {}
+    @geometry[style_name] ||= if style_name.to_s == 'original'
       original_geometry
-    elsif style = asset.styles[style_name.to_sym]   # asset.styles is normalised, but self.paperclip_styles is not
+    elsif style = self.asset.styles[style_name.to_sym]   # self.asset.styles holds Style objects, where self.paperclip_styles is still just rule hashes
       original_geometry.transformed_by(style.geometry)
+    else
+      raise PaperclipError, "Requested style #{style_name} is not defined."
     end
   end
 
@@ -146,7 +148,7 @@ class Asset < ActiveRecord::Base
   end
   
   def dimensions_known?
-    !original_width.blank? && !original_height.blank?
+    original_width? && original_height?
   end
   
 private
@@ -168,11 +170,11 @@ private
   end
 
   def assign_title
-    self.title = basename if title.blank?
+    self.title = basename unless title?
   end
   
   def assign_uuid
-    self.uuid = UUIDTools::UUID.timestamp_create.to_s if uuid.blank?
+    self.uuid = UUIDTools::UUID.timestamp_create.to_s unless uuid?
   end
   
   class << self

data/app/models/asset_type.rb

@@ -23,6 +23,7 @@ class AssetType
     @icon_name = options[:icon] || name
     @processors = options[:processors] || []
     @styles = options[:styles] || {}
+    @styles = standard_styles if @styles == :standard
     @default_radius_tag = options[:default_radius_tag] || 'link'
     @extensions = options[:extensions] || []
     @extensions.each { |ext| @@extension_lookup[ext] ||= self }
@@ -46,7 +47,7 @@ class AssetType
   end
 
   def icon(style_name='icon')
-    if File.exist?("#{RAILS_ROOT}/public/images/admin/assets/#{icon_name}_#{style_name.to_s}.png")
+    if File.exist?(Rails.root + "public/images/admin/assets/#{icon_name}_#{style_name.to_s}.png")
       return "/images/admin/assets/#{icon_name}_#{style_name.to_s}.png"
     else
       return "/images/admin/assets/#{icon_name}_icon.png"
@@ -54,7 +55,7 @@ class AssetType
   end
   
   def icon_path(style_name='icon')
-    "#{RAILS_ROOT}/public#{icon(style_name)}"
+    Rails.root + "public#{icon(style_name)}"
   end
   
   def condition
@@ -89,24 +90,68 @@ class AssetType
     Radiant.config["assets.create_#{name}_thumbnails?"] ? processors : []
   end
   
+  # Parses and combines the various ways in which paperclip styles can be defined, and normalises them into
+  # the format that paperclip expects. Note that :styles => :standard has already been replaced with the 
+  # results of a call to standard_styles.
+  # Styles are passed to paperclip as a hash and arbitrary keys can be passed through from configuration.
+  #
   def paperclip_styles
-    if paperclip_processors.any?
-      #TODO: define permitted options for each asset type and pass through that subset of the style-definition hash
-      @paperclip_styles ||= styles.reverse_merge(configured_styles.inject({}) {|h, (k, v)| h[k] =  v[:format].blank? ? v[:size] : [v[:size], v[:format].to_sym]; h})
+    # Styles are not relevant if processors are not defined.
+    # TODO: should this default to an icon set?
+    @paperclip_styles ||= if paperclip_processors.any?
+      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 
+  #TODO: define permitted and/or expected options for the asset type and pass through that subset of the style-definition hash
+  #
+  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
+        else
+          rule = {:geometry => rule}                                                 # simplest case: name:geom|name:geom
+        end
+      end
+      rule[:geometry] ||= rule.delete(:size)
+      styles[name.to_sym] = rule
+    end
+    styles
+  end
+  
+  def standard_styles
+    {
+      :native => { :geometry => "", :format => :jpg },
+      :icon => { :geometry => '42x42#', :format => :png },
+      :thumbnail => { :geometry => '100x100#', :format => :png }
+    }
   end
   
+  # Paperclip styles are defined in the config entry `assets.thumbnails.asset_type`, with the format:
+  # foo:key-x,key=y,key=z|bar:key-x,key=y,key=z
+  # where 'key' can be any parameter understood by your paperclip processors. Usually they include :geometry and :format.
+  # A typical entry would be:
+  #
+  #   standard:geometry=640x640>,format=jpg
+  #
+  # This method parses that string and returns the defined styles as a hash of style-defining strings that will later be normalized into hashes.
+  #
   def configured_styles
-    styles = {}
-    if style_definitions = Radiant.config["assets.thumbnails.#{name}"]
-      style_definitions.to_s.gsub(' ','').split('|').each do |definition|
+    @configured_styles ||= if style_definitions = Radiant.config["assets.thumbnails.#{name}"]
+      style_definitions.gsub(/\s/,'').split('|').each_with_object({}) do |definition, styles|
         name, rule = definition.split(':')
-        styles[name.to_sym] = rule.split(',').collect{|option| option.split('=')}.inject({}) {|h, (k, v)| h[k.to_sym] = v; h}
+        styles[name.to_sym] = rule
       end
+    else
+      {}
     end
-    styles
   end
   
   def legacy_styles
@@ -115,7 +160,7 @@ class AssetType
   
   def style_dimensions(style_name)
     if style = paperclip_styles[style_name.to_sym]
-      style.is_a?(Array) ? style.first : style
+      style[:size]
     end
   end
   

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

@@ -6,7 +6,7 @@
   %p
     = t("clipped_extension.no_assets")
 - else
-  - if with_pagination && assets.respond_to?(:previous_page) && assets.previous_page
+  - if with_pagination && assets.respond_to?(:total_pages) && assets.total_pages > 1
     = pagination_for(assets, pagination_parameters.merge(:depaginate => false, :params => {:controller => 'admin/assets', :action => 'index', :id => nil, :format => 'js'}))
 
   %ul
@@ -26,5 +26,5 @@
               %li= link_to t('clipped_extension.edit'), admin_asset_path(asset), :class => 'edit'
               %li= link_to t("clipped_extension.remove"), remove_admin_asset_path(asset), :class => "delete"
             
-  - if with_pagination && assets.respond_to?(:next_page) && assets.next_page
+  - if with_pagination && assets.respond_to?(:total_pages) && assets.total_pages > 1
     = pagination_for(assets, pagination_parameters.merge(:depaginate => false, :param_name => 'p', :params => {:controller => 'admin/assets', :action => 'index', :id => nil, :format => 'js', :page_id => (page && page.id), :pp => assets.per_page }))

data/clipped_extension.rb

@@ -18,12 +18,12 @@ class ClippedExtension < Radiant::Extension
       Page.send :include, AssetTags                                                      # radius tags for selecting sets of assets and presenting each one
       UserActionObserver.instance.send :add_observer!, Asset                             # the usual creator- and updater-stamping
 
-      AssetType.new :image, :icon => 'image', :default_radius_tag => 'image', :processors => [:thumbnail], :styles => {:icon => ['42x42#', :png], :thumbnail => ['100x100#', :png]}, :extensions => %w[jpg jpeg png gif], :mime_types => %w[image/png image/x-png image/jpeg image/pjpeg image/jpg image/gif]
-      AssetType.new :video, :icon => 'video', :processors => [:frame_grab], :styles => {:native => ['', :jpg], :icon => ['42x42#', :png], :thumbnail => ['100x100#', :png]}, :mime_types => %w[application/x-mp4 video/mpeg video/quicktime video/x-la-asf video/x-ms-asf video/x-msvideo video/x-sgi-movie video/x-flv flv-application/octet-stream video/3gpp video/3gpp2 video/3gpp-tt video/BMPEG video/BT656 video/CelB video/DV video/H261 video/H263 video/H263-1998 video/H263-2000 video/H264 video/JPEG video/MJ2 video/MP1S video/MP2P video/MP2T video/mp4 video/MP4V-ES video/MPV video/mpeg4 video/mpeg4-generic video/nv video/parityfec video/pointer video/raw video/rtx video/ogg video/webm]
+      AssetType.new :image, :icon => 'image', :default_radius_tag => 'image', :processors => [:thumbnail], :styles => :standard, :extensions => %w[jpg jpeg png gif], :mime_types => %w[image/png image/x-png image/jpeg image/pjpeg image/jpg image/gif]
+      AssetType.new :video, :icon => 'video', :processors => [:frame_grab], :styles => :standard, :mime_types => %w[application/x-mp4 video/mpeg video/quicktime video/x-la-asf video/x-ms-asf video/x-msvideo video/x-sgi-movie video/x-flv flv-application/octet-stream video/3gpp video/3gpp2 video/3gpp-tt video/BMPEG video/BT656 video/CelB video/DV video/H261 video/H263 video/H263-1998 video/H263-2000 video/H264 video/JPEG video/MJ2 video/MP1S video/MP2P video/MP2T video/mp4 video/MP4V-ES video/MPV video/mpeg4 video/mpeg4-generic video/nv video/parityfec video/pointer video/raw video/rtx video/ogg video/webm]
       AssetType.new :audio, :icon => 'audio', :mime_types => %w[audio/mpeg audio/mpg audio/ogg application/ogg audio/x-ms-wma audio/vnd.rn-realaudio audio/x-wav]
       AssetType.new :font, :icon => 'font', :extensions => %w[ttf otf eot woff]
       AssetType.new :flash, :icon => 'flash', :default_radius_tag => 'flash', :extensions => %w{swf}, :mime_types => %w[application/x-shockwave-flash]
-      AssetType.new :pdf, :icon => 'pdf', :processors => [:thumbnail], :extensions => %w{pdf}, :mime_types => %w[application/pdf application/x-pdf], :styles => {:icon => ['42x42#', :png], :thumbnail => ['100x100#', :png]}
+      AssetType.new :pdf, :icon => 'pdf', :processors => [:thumbnail], :extensions => %w{pdf}, :mime_types => %w[application/pdf application/x-pdf], :styles => :standard
       AssetType.new :document, :icon => 'document', :mime_types => %w[application/msword application/rtf application/vnd.ms-excel application/vnd.ms-powerpoint application/vnd.ms-project application/vnd.ms-works text/plain text/html]
       AssetType.new :other, :icon => 'unknown'
 

data/config/initializers/radiant_config.rb

@@ -22,7 +22,7 @@ Radiant.config do |config|
     assets.define 'create_pdf_thumbnails?', :default => 'true'
 
     assets.namespace 'thumbnails' do |thumbs| # NB :icon and :thumbnail are already defined as fixed formats for use in the admin interface and can't be changed
-      thumbs.define 'image', :default => 'normal:size=640x640>,format=original|small:size=320x320>,format=original'
+      thumbs.define 'image', :default => 'normal:size=640x640>|small:size=320x320>'
       thumbs.define 'video', :default => 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg'
       thumbs.define 'pdf', :default => 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg'
     end

data/lib/asset_tags.rb

@@ -136,7 +136,7 @@ module AssetTags
     raise TagError, "'container' attribute required" unless options['container']
     size = options['size'] ? options.delete('size') : 'icon'
     container = options.delete('container')
-    (container.to_i - asset.height(size).to_i)/2
+    ((container.to_i - asset.height(size).to_i)/2).to_s
   end
     
   ['height','width'].each do |dimension|

data/lib/radiant-clipped-extension.rb

@@ -1,8 +1,8 @@
 module RadiantClippedExtension
-  VERSION = '1.0.6'
-  SUMMARY = %q{Assets for Radiant CMS}
+  VERSION     = "1.0.7"
+  SUMMARY     = %q{Assets for Radiant CMS}
   DESCRIPTION = %q{Asset-management derived from Keith Bingman's Paperclipped extension.}
-  URL = "http://radiantcms.org"
-  AUTHORS = ["Keith Bingman", "Benny Degezelle", "William Ross", "John W. Long"]
-  EMAIL = ["radiant@radiantcms.org"]
-end
+  URL         = "http://radiantcms.org"
+  AUTHORS     = ["Keith Bingman", "Benny Degezelle", "William Ross", "John W. Long"]
+  EMAIL       = ["radiant@radiantcms.org"]
+end

data/public/stylesheets/sass/admin/assets.sass

@@ -4,7 +4,7 @@ p.asset
   img.preview
     border: 5px solid white
     +box-shadow
-    
+
 .asset_filters
   float: left
   padding: 2px 0
@@ -27,12 +27,12 @@ p.asset
         color: white
         text-shadow: 0 1px 0 #333
 
-.popup 
+.popup
   div.toolbar
     background: white
-    +linear-gradient(color-stops(white, #ddd))
+    +background-image(linear-gradient(white,#ddd))
     border-bottom: 1px solid #ccc
-    +box-shadow(white, 0, 1px, 0)
+    +single-box-shadow(white, 0, 1px, 0)
     margin: -20px -20px 0
     padding: 6px 10px 3px 10px
     font-size: 95%
@@ -62,7 +62,7 @@ p.asset
     overflow-x: hidden
     width: 610px
     height: 310px
-    
+
 .attachment_actions
   text-align: right
   margin-bottom: -1em
@@ -146,7 +146,7 @@ p.asset
           background: transparent url(/images/admin/spinner.gif) no-repeat center center
           img
             opacity: 0.2
-    
+
 #attachment_list.assets
   background: #7e7e7e
   +border-bottom-radius
@@ -171,9 +171,10 @@ p.asset
         cursor: move
         &:hover
           font-weight: bold
-     
+
 #assets_table.assets
   position: relative
+  overflow: auto
   p
     padding: 40px
       top: 45px
@@ -189,21 +190,36 @@ p.asset
         display: none
   div.pagination
     position: relative
+    overflow: hidden
     clear: left
     width: 100%
-    height: 2.3em
-    font-size: 80%
-    text-align: center
-    a
-      color: white
+    height: 4em
+    margin: 1em 0
+    padding: 0 1em
+    span, a
+      display: block
+      float: left
+      padding: 0.25em
+      margin: 1em 2px 1em 0
+      +border-radius(2px)
       text-decoration: none
+    span.current
+      color: #000
+      font-weight: bold
+    span.disabled
+      background-color: #eee
+      color: #ccc
+    a
+      background-color: #eee
+      color: #c00
       &:hover
-        background-color: #bbb
-        color: #444
+        background-color: #c00
+        color: #fff
+
     span
-      color: #bbb
+      color: #888
     span, a
       display: block
       float: left
-      padding: 5px
+      padding: 2px 6px
       line-height: 1.5em

data/radiant-clipped-extension.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
   s.summary     = RadiantClippedExtension::SUMMARY
   s.description = RadiantClippedExtension::DESCRIPTION
 
-  s.add_dependency 'acts_as_list', "~> 0.1.2"
-  s.add_dependency 'paperclip', "~> 2.3.16"
-  s.add_dependency 'uuidtools', "~> 2.1.2"
+  s.add_dependency "acts_as_list", "~> 0.1.2"
+  s.add_dependency "paperclip",    "~> 2.3.16"
+  s.add_dependency "uuidtools",    "~> 2.1.2"
 
   ignores = if File.exist?('.gitignore')
     File.read('.gitignore').split("\n").inject([]) {|a,p| a + Dir[p] }
@@ -25,9 +25,4 @@ Gem::Specification.new do |s|
   s.test_files    = Dir['test/**/*','spec/**/*','features/**/*'] - ignores
   # s.executables   = Dir['bin/*'] - ignores
   s.require_paths = ["lib"]
-
-  s.post_install_message = %{
-  Add this to your radiant project with:
-    config.gem 'radiant-clipped-extension', :version => '~>#{RadiantClippedExtension::VERSION}'
-  }
-end
+end

data/spec/lib/asset_tags_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe AssetTags do
   dataset :assets
   let(:page) { pages(:pictured) }
-  let(:asset) { assets(:test2) }
+  let(:asset) { assets(:test1) }
   
   context "Asset tags" do
     %w{width height caption asset_file_name asset_content_type asset_file_size id filename image flash url link extension page:title page:url}.each do |name|
@@ -27,17 +27,18 @@ describe AssetTags do
   context "rendering tag" do
     before do
       Radiant.config['assets.create_image_thumbnails?'] = true
+      Radiant.config['assets.thumbnails.image'] = 'normal:size=640x640>|small:size=320x320>'
     end
     
     it "assets:each" do
-      page.should render('<r:assets:each><r:asset:id />,</r:assets:each>').as( "#{asset_id(:test2)},#{asset_id(:test1)}," )
+      page.should render('<r:assets:each><r:asset:id />,</r:assets:each>').as( "#{asset_id(:test1)},#{asset_id(:test2)}," )
     end
 
     it "assets:first" do
-      page.should render('<r:assets:first><r:asset:id /></r:assets:first>').as( "#{asset_id(:test2)}" )
+      page.should render('<r:assets:first><r:asset:id /></r:assets:first>').as( asset.id.to_s )
     end
 
-    it "should retreive an asset by name" do
+    it "should retrieve an asset by name" do
       page.should render('<r:asset:id name="video" />').as( "#{asset_id(:video)}" )
     end
     

data/spec/models/asset_type_spec.rb

@@ -27,7 +27,7 @@ describe AssetType do
     its(:paperclip_processors) { should be_empty}
     its(:paperclip_styles) { should be_empty}
     its(:icon) { should == "/images/admin/assets/simple_icon.png"}
-    its(:icon_path) { should == "#{RAILS_ROOT}/public/images/admin/assets/simple_icon.png"}
+    its(:icon_path) { should == Rails.root + "public/images/admin/assets/simple_icon.png"}
   end
   
   context 'with initialized thumbnail sizes' do
@@ -35,18 +35,21 @@ describe AssetType do
     subject{ AssetType.find(:complex) }
     its(:paperclip_processors) { should == [:dummy] }
     its(:paperclip_styles) { should_not be_empty }
-    its(:paperclip_styles) { should == {:something => "99x99>"} }
+    its(:paperclip_styles) { should == {:something => {:geometry => "99x99>"}} }
     its(:icon) { should == "/images/admin/assets/document_icon.png"}
   end
 
   context 'with configured thumbnail sizes' do
     before { 
       Radiant.config["assets.create_configured_thumbnails?"] = true 
-      Radiant.config["assets.thumbnails.configured"] = "special:size=800x800>,format=jpg|tiny:size=#10x10,format=png"
+      Radiant.config["assets.thumbnails.configured"] = "special:size=800x800>,format=jpg|tiny:size=10x10#,format=png"
     }
     subject{ AssetType.find(:configured) }
     its(:paperclip_processors) { should == [:dummy] }
-    its(:paperclip_styles) { should == {:special => ["800x800>", :jpg], :tiny => ["#10x10", :png]} }
+    its(:paperclip_styles) { should == {
+      :special => {:geometry => "800x800>", :format => 'jpg'},
+      :tiny => {:geometry => "10x10#", :format => 'png'}
+    }}
   end
 
   context 'AssetType class methods' do

data/spec/models/post_processing_spec.rb

@@ -15,6 +15,7 @@ describe Asset do
   describe "on assigning a file to an asset" do
     before do
       Radiant.config["assets.create_image_thumbnails?"] = true
+      Radiant.config["assets.thumbnails.configured"] = "special:size=800x800>,format=jpg|tiny:size=#10x10,format=png"
     end
   
     it "should have saved the asset" do

data/spec/spec.opts

@@ -4,3 +4,4 @@ progress
 --loadby
 mtime
 --reverse
+--backtrace

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-clipped-extension
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Keith Bingman
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 +01:00
+date: 2011-09-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -205,7 +205,7 @@ has_rdoc: true
 homepage: http://radiantcms.org
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-clipped-extension', :version => '~>1.0.6'\n  "
+post_install_message: 
 rdoc_options: []
 
 require_paths: