radiant-clipped-extension 1.0.0 → 1.0.1

data/app/controllers/admin/assets_controller.rb

@@ -25,11 +25,17 @@ class Admin::AssetsController < Admin::ResourceController
   end
   
   def create
-    @asset.update_attributes!(params[:asset])
+    @assets, @page_attachments = [], []
+    params[:asset][:asset].to_a.each do |uploaded_asset|
+      @asset = Asset.create(:asset => uploaded_asset, :title => params[:asset][:title], :caption => 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
     if params[:for_attachment]
-      @page = Page.find_by_id(params[:page_id]) || Page.new
-      @page_attachment = @asset.page_attachments.build(:page => @page)
-      render :partial => 'admin/page_attachments/attachment', :object => @page_attachment
+      render :partial => 'admin/page_attachments/attachment', :collection => @page_attachments
     else 
       response_for :create
     end

data/app/models/asset.rb

@@ -34,7 +34,7 @@ class Asset < ActiveRecord::Base
     
   has_attached_file :asset,
                     :styles => lambda { |attachment|
-                      AssetType.from(attachment.instance_read(:content_type)).paperclip_styles
+                      AssetType.for(attachment).paperclip_styles
                     },
                     :processors => lambda { |asset|
                       asset.paperclip_processors
@@ -52,7 +52,8 @@ class Asset < ActiveRecord::Base
 
   before_save :assign_title
   before_save :assign_uuid
-  after_post_process :get_dimensions
+  
+  after_post_process :read_dimensions
 
   validates_attachment_presence :asset, :message => "You must choose a file to upload!"
   if Radiant.config["paperclip.skip_filetype_validation"] != "true" && Radiant.config['paperclip.content_types']
@@ -61,7 +62,7 @@ class Asset < ActiveRecord::Base
   validates_attachment_size :asset, :less_than => ( Radiant.config["assets.max_asset_size"] || 5 ).to_i.megabytes
 
   def asset_type
-    AssetType.from(asset.content_type)
+    AssetType.for(asset)
   end
   delegate :paperclip_processors, :paperclip_styles, :style_dimensions, :style_format, :to => :asset_type
 
@@ -82,7 +83,7 @@ class Asset < ActiveRecord::Base
   def extension(style_name='original')
      if style_name == 'original'
        return original_extension 
-     elsif style = asset.styles[style_name.to_sym]
+     elsif style = paperclip_styles[style_name.to_sym]
        return style.format 
      else
        return original_extension
@@ -104,8 +105,8 @@ class Asset < ActiveRecord::Base
   def geometry(style_name='original')
     if style_name == 'original'
       original_geometry
-    elsif style = asset.styles[style_name.to_sym]
-      original_geometry * style.geometry
+    elsif style = asset.styles[style_name.to_sym]   # asset.styles is normalised, but self.paperclip_styles is not
+      original_geometry.transformed_by(style.geometry)
     end
   end
 
@@ -150,16 +151,20 @@ class Asset < ActiveRecord::Base
   
 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? && !dimensions_known?
-      geometry = Paperclip::Geometry.from_file(asset.path)
-      self.update_attributes(
-        :original_width => geometry.width,
-        :original_height => geometry.height,
-        :original_extension => extension
-      )
-      geometry
+    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

data/app/models/asset_tags.rb

@@ -75,20 +75,6 @@ module AssetTags
     end
   end
 
-  desc %{
-    References the last asset attached to the current page.  
-    
-    *Usage:* 
-    <pre><code><r:assets:last>...</r:assets:last></code></pre>
-  }
-  tag 'assets:last' do |tag|
-    p "tag.locals.page.assets is #{tag.locals.page.assets.join(',')} and tag.locals.page.assets.last is #{tag.locals.page.assets.last}"
-    
-    if tag.locals.asset = tag.locals.page.assets.last
-      tag.expand
-    end
-  end
-    
   desc %{
     Renders the contained elements only if the current contextual page has one or
     more assets. The @min_count@ attribute specifies the minimum number of required

data/app/models/asset_type.rb

@@ -12,6 +12,7 @@ class AssetType
   
   @@types = []
   @@type_lookup = {}
+  @@extension_lookup = {}
   @@mime_lookup = {}
   @@default_type = nil
   attr_reader :name, :processors, :styles, :icon_name, :catchall, :default_radius_tag
@@ -22,11 +23,12 @@ class AssetType
     @icon_name = options[:icon] || name
     @processors = options[:processors] || []
     @styles = options[:styles] || {}
-    @mimes = options[:mime_types] || []
     @default_radius_tag = options[:default_radius_tag] || 'link'
-    if @mimes.any?
-      @mimes.each { |mimetype| @@mime_lookup[mimetype] ||= self }
-    end
+    @extensions = options[:extensions] || []
+    @extensions.each { |ext| @@extension_lookup[ext] ||= self }
+    @mimes = options[:mime_types] || []
+    @mimes.each { |mimetype| @@mime_lookup[mimetype] ||= self }
+
     this = self
     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
@@ -119,8 +121,17 @@ class AssetType
   
   # class methods
   
-  def self.from(mimetype)
-    @@mime_lookup[mimetype] || catchall
+  def self.for(attachment)
+    extension = File.extname(attachment.original_filename).sub(/^\.+/, "")
+    from_extension(extension) || from_mimetype(attachment.instance_read(:content_type)) || catchall
+  end
+
+  def self.from_extension(extension)
+    @@extension_lookup[extension]
+  end
+
+  def self.from_mimetype(mimetype)
+    @@mime_lookup[mimetype]
   end
   
   def self.catchall
@@ -138,6 +149,9 @@ class AssetType
   def self.find(type)
     @@type_lookup[type] if type
   end
+  def self.[](type)
+    find(type)
+  end
   
   def self.all
     @@types

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

@@ -12,7 +12,7 @@
       
       %p
         %label= t("clipped_extension.choose_file")
-        = f.file_field :asset, :style => "width: 100%"
+        = f.file_field :asset, :style => "width: 100%", :multiple => true
       
       .buttons
         = save_model_button(@asset)

data/app/views/admin/pages/_asset_popups.html.haml

@@ -11,7 +11,7 @@
         
         %p
           = f.label :asset, t("clipped_extension.choose_file")
-          = f.file_field :asset, :class => 'file'
+          = f.file_field :asset, :class => 'file', :multiple => true
         
         %p
           = f.label :title, t("clipped_extension.alt_text_or_title")

data/clipped_extension.rb

@@ -22,11 +22,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]}, :mime_types => %w[image/png image/x-png image/jpeg image/pjpeg image/jpg image/gif]
+      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 :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 :flash, :icon => 'flash', :default_radius_tag => 'flash', :mime_types => %w[application/x-shockwave-flash]
-      AssetType.new :pdf, :icon => 'pdf', :processors => [:thumbnail], :mime_types => %w[application/pdf application/x-pdf], :styles => {:icon => ['42x42#', :png], :thumbnail => ['100x100#', :png]}
+      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 :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/lib/radiant-clipped-extension/version.rb

@@ -1,3 +1,3 @@
 module RadiantClippedExtension
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/lib/asset_tags_spec.rb

@@ -33,10 +33,6 @@ describe AssetTags do
       page.should render('<r:assets:first><r:asset:id /></r:assets:first>').as( "#{asset_id(:test2)}" )
     end
 
-    it "assets:last" do
-      page.should render('<r:assets:last><r:asset:id /></r:assets:last>').as( "#{asset_id(:test1)}" )
-    end
-
     it "should retreive an asset by name" do
       page.should render('<r:asset:id name="video" />').as( "#{asset_id(:video)}" )
     end

data/spec/models/asset_spec.rb

@@ -23,7 +23,7 @@ describe Asset do
   it 'should be valid when saved' do
     create_asset.should be_valid
   end
-  
+
   describe '#thumbnail' do
     describe 'without argument' do
       it 'should return paperclip asset url for image' do
@@ -63,7 +63,7 @@ describe Asset do
     end
     
     it 'should return icon for non-image with a given size' do
-      document = new_asset :asset_content_type => 'application/msword'
+      document = new_asset :asset_content_type => 'application/msword', :asset_file_name => "document.doc"
       document.thumbnail('icon').should == "/images/admin/assets/document_icon.png"
       document.thumbnail('anything_but_icon').should == "/images/admin/assets/document_icon.png"
     end

data/spec/models/asset_type_spec.rb

@@ -15,9 +15,9 @@ end
 AssetType.new :simple, :mime_types => %w[test/this test/that]
 AssetType.new :complex, :processors => [:dummy], :styles => {:something => "99x99>"}, :mime_types => %w[test/complex], :icon => 'document'
 AssetType.new :configured, :processors => [:dummy], :mime_types => %w[test/configured]
-    
+AssetType.new :unstandard, :extensions => %w[unstandard nomimetype]
+
 describe AssetType do
-  
   context 'without thumbnails' do
     subject{ AssetType.find(:simple) }
     its(:plural) { should == "simples" }
@@ -54,10 +54,13 @@ describe AssetType do
       AssetType.slice('simple', 'complex').should =~ [AssetType.find(:simple), AssetType.find(:complex)]
     end
 
-    describe '.from' do
-      AssetType.from('test/this').should == AssetType.find(:simple)
-      AssetType.from('test/complex').should == AssetType.find(:complex)
+    describe '.from_extension' do
+      AssetType.from_extension('nomimetype').should == AssetType.find(:unstandard)
+    end
+
+    describe '.from_mimetype' do
+      AssetType.from_mimetype('test/this').should == AssetType.find(:simple)
     end
   end
-  
+
 end

data/spec/models/post_processing_spec.rb

@@ -0,0 +1,61 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Asset do
+  dataset :assets
+
+  # these are here to check that paperclip and our various add-ons are all working together.
+  # most of the components are also tested individually but in more abstract ways.
+
+  let(:asset) {
+    asset = assets(:test1)
+    asset.asset = File.new(File.join(File.dirname(__FILE__), "..", "fixtures", "5k.png"))
+    asset
+  }
+  
+  describe "on assigning a file to an asset" do
+    before do
+      Radiant.config["assets.create_image_thumbnails?"] = true
+    end
+  
+    it "should have saved the asset" do
+      asset.new_record?.should be_false
+    end
+
+    it "should have calculated asset type" do
+      asset.asset_type.should == AssetType[:image]
+    end
+
+    it "should have recorded width and height and original extension" do
+      asset.original_width.should == 434
+      asset.original_height.should == 66
+      asset.original_extension.should == 'png'
+    end
+
+    it "should respond to original geometry" do
+      asset.original_geometry.should == Paperclip::Geometry.new(434,66)
+    end
+
+    it "should calculate thumbnail geometry" do
+      original_geometry = Paperclip::Geometry.new(434,66)
+      asset.geometry.should == original_geometry
+      asset.geometry(:icon).should == original_geometry * Paperclip::Geometry.parse("42x42#")
+    end
+
+    it "should respond to image dimension methods" do
+      asset.width.should == 434
+      asset.height.should == 66
+      asset.width(:icon).should == 42
+      asset.height(:icon).should == 42
+    end
+
+    it "should respond to image shape methods" do
+      asset.horizontal?.should be_true
+      asset.vertical?.should be_false
+      asset.square?.should be_false
+      asset.square?(:icon).should be_true
+      asset.orientation.should == 'horizontal'
+      asset.aspect.should == 434.0/66.0
+    end
+
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-clipped-extension
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Keith Bingman
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 Z
+date: 2011-06-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: acts_as_list
@@ -178,18 +178,21 @@ files:
 - public/images/admin/assets/zip_icon.png
 - public/javascripts/admin/assets.js
 - public/stylesheets/sass/admin/assets.sass
+- radiant-clipped-extension-1.0.0.gem
 - radiant-clipped-extension.gemspec
 - Rakefile
 - README.md
 - spec/controllers/admin/assets_controller_spec.rb
 - spec/controllers/admin/page_attachments_controller_spec.rb
 - spec/datasets/assets_dataset.rb
+- spec/fixtures/5k.png
 - spec/fixtures/test.flv
 - spec/lib/asset_tags_spec.rb
 - spec/lib/frame_grab_spec.rb
 - spec/lib/geometry_transformation_spec.rb
 - spec/models/asset_spec.rb
 - spec/models/asset_type_spec.rb
+- spec/models/post_processing_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - wireframes/edit-page-assets-2.bmml
@@ -203,7 +206,7 @@ files:
 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.0'\n  "
+post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-clipped-extension', :version => '~>1.0.1'\n  "
 rdoc_options: []
 
 require_paths: 
@@ -237,12 +240,14 @@ test_files:
 - spec/controllers/admin/assets_controller_spec.rb
 - spec/controllers/admin/page_attachments_controller_spec.rb
 - spec/datasets/assets_dataset.rb
+- spec/fixtures/5k.png
 - spec/fixtures/test.flv
 - spec/lib/asset_tags_spec.rb
 - spec/lib/frame_grab_spec.rb
 - spec/lib/geometry_transformation_spec.rb
 - spec/models/asset_spec.rb
 - spec/models/asset_type_spec.rb
+- spec/models/post_processing_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - features/support/env.rb