RubyGems - radiant-clipped-extension-add-group - Versions diffs - 1.1.2 - Mend

radiant-clipped-extension-add-group 1.1.2

Files changed (131) hide show

data/LICENSE +22 -0
data/README.md +184 -0
data/Rakefile +109 -0
data/app/controllers/admin/assets_controller.rb +66 -0
data/app/controllers/admin/page_attachments_controller.rb +18 -0
data/app/helpers/admin/assets_helper.rb +16 -0
data/app/helpers/admin/page_attachments_helper.rb +2 -0
data/app/models/asset.rb +237 -0
data/app/models/asset_type.rb +241 -0
data/app/models/old_page_attachment.rb +26 -0
data/app/models/page_attachment.rb +20 -0
data/app/views/admin/assets/_asset.html.haml +12 -0
data/app/views/admin/assets/_asset_table.html.haml +33 -0
data/app/views/admin/assets/_errors.html.haml +3 -0
data/app/views/admin/assets/_form.html.haml +25 -0
data/app/views/admin/assets/_page_assets.html.haml +12 -0
data/app/views/admin/assets/_search.html.haml +17 -0
data/app/views/admin/assets/_search_results.html.haml +17 -0
data/app/views/admin/assets/edit.html.haml +41 -0
data/app/views/admin/assets/index.html.haml +19 -0
data/app/views/admin/assets/new.html.haml +24 -0
data/app/views/admin/assets/refresh.html.haml +14 -0
data/app/views/admin/assets/remove.html.haml +16 -0
data/app/views/admin/configuration/_clipped_edit.html.haml +8 -0
data/app/views/admin/configuration/_clipped_show.html.haml +12 -0
data/app/views/admin/page_attachments/_attachment.html.haml +25 -0
data/app/views/admin/page_parts/_page_part.html.haml +21 -0
data/app/views/admin/pages/_asset_popups.html.haml +42 -0
data/app/views/admin/pages/_assets.html.haml +11 -0
data/app/views/admin/removed/_assets_bucket.html.haml +8 -0
data/app/views/admin/removed/_assets_container.html.haml +58 -0
data/app/views/admin/removed/_bucket.html.haml +11 -0
data/app/views/admin/removed/_bucket_asset.html.haml +9 -0
data/app/views/admin/removed/_show_bucket_link.html.haml +4 -0
data/app/views/admin/removed/_upload_to_page.html.haml +12 -0
data/app/views/admin/removed/bucket/_iframe.html.haml +1 -0
data/artwork/icons.png +0 -0
data/clipped_extension.rb +52 -0
data/config/initializers/interpolation.rb +6 -0
data/config/initializers/processors.rb +43 -0
data/config/initializers/radiant_config.rb +65 -0
data/config/locales/de.yml +109 -0
data/config/locales/en.yml +110 -0
data/config/locales/nl.yml +107 -0
data/config/locales/ru.yml +110 -0
data/config/routes.rb +8 -0
data/cucumber.yml +1 -0
data/db/migrate/001_create_assets.rb +12 -0
data/db/migrate/002_create_paperclip_attributes.rb +13 -0
data/db/migrate/003_create_user_observer.rb +13 -0
data/db/migrate/004_create_page_attachments.rb +19 -0
data/db/migrate/005_rename_users.rb +13 -0
data/db/migrate/20110513205050_asset_uuid.rb +11 -0
data/db/migrate/20110606111250_update_configuration.rb +34 -0
data/db/migrate/20110609101438_dimensions.rb +13 -0
data/db/migrate/20121024064452_add_group_to_assets.rb +9 -0
data/features/support/env.rb +11 -0
data/features/support/paths.rb +22 -0
data/lib/asset_tags.rb +350 -0
data/lib/clipped_admin_ui.rb +32 -0
data/lib/cloud.rb +41 -0
data/lib/generators/templates/clipped_config.rb +53 -0
data/lib/page_asset_associations.rb +13 -0
data/lib/paperclip/frame_grab.rb +73 -0
data/lib/paperclip/geometry_transformation.rb +80 -0
data/lib/radiant-clipped-extension.rb +8 -0
data/lib/tasks/clipped_extension_tasks.rake +124 -0
data/lib/tasks/paperclip_tasks.rake +79 -0
data/public/flash/ZeroClipboard.swf +0 -0
data/public/images/admin/assets/add.png +0 -0
data/public/images/admin/assets/archive_icon.png +0 -0
data/public/images/admin/assets/audio_icon.png +0 -0
data/public/images/admin/assets/audio_thumbnail.png +0 -0
data/public/images/admin/assets/c_icon.png +0 -0
data/public/images/admin/assets/copy.png +0 -0
data/public/images/admin/assets/css_icon.png +0 -0
data/public/images/admin/assets/database_icon.png +0 -0
data/public/images/admin/assets/delete.png +0 -0
data/public/images/admin/assets/document_icon.png +0 -0
data/public/images/admin/assets/document_thumbnail.png +0 -0
data/public/images/admin/assets/flash_icon.png +0 -0
data/public/images/admin/assets/flash_thumbnail.png +0 -0
data/public/images/admin/assets/font_icon.png +0 -0
data/public/images/admin/assets/gzip_icon.png +0 -0
data/public/images/admin/assets/html_icon.png +0 -0
data/public/images/admin/assets/image_icon.png +0 -0
data/public/images/admin/assets/image_thumbnail.png +0 -0
data/public/images/admin/assets/java_icon.png +0 -0
data/public/images/admin/assets/page_edit.png +0 -0
data/public/images/admin/assets/perl_icon.png +0 -0
data/public/images/admin/assets/php_icon.png +0 -0
data/public/images/admin/assets/presentation_icon.png +0 -0
data/public/images/admin/assets/python_icon.png +0 -0
data/public/images/admin/assets/reorder_assets.png +0 -0
data/public/images/admin/assets/ruby_icon.png +0 -0
data/public/images/admin/assets/script_icon.png +0 -0
data/public/images/admin/assets/spreadsheet_icon.png +0 -0
data/public/images/admin/assets/tar_icon.png +0 -0
data/public/images/admin/assets/unknown_icon.png +0 -0
data/public/images/admin/assets/unknown_thumbnail.png +0 -0
data/public/images/admin/assets/video_icon.png +0 -0
data/public/images/admin/assets/video_thumbnail.png +0 -0
data/public/images/admin/assets/xml_icon.png +0 -0
data/public/images/admin/assets/zip_icon.png +0 -0
data/public/javascripts/admin/assets.js +297 -0
data/public/stylesheets/sass/admin/assets.sass +224 -0
data/radiant-clipped-extension.gemspec +29 -0
data/spec/ci/before_script +23 -0
data/spec/ci/script +2 -0
data/spec/controllers/admin/assets_controller_spec.rb +50 -0
data/spec/controllers/admin/page_attachments_controller_spec.rb +50 -0
data/spec/datasets/assets_dataset.rb +36 -0
data/spec/fixtures/5k.png +0 -0
data/spec/fixtures/test.flv +0 -0
data/spec/lib/asset_tags_spec.rb +107 -0
data/spec/lib/frame_grab_spec.rb +17 -0
data/spec/lib/geometry_transformation_spec.rb +63 -0
data/spec/models/asset_spec.rb +72 -0
data/spec/models/asset_type_spec.rb +70 -0
data/spec/models/post_processing_spec.rb +62 -0
data/spec/spec.opts +7 -0
data/spec/spec_helper.rb +36 -0
data/wireframes/edit-page-assets-2.bmml +453 -0
data/wireframes/edit-page-assets-2.png +0 -0
data/wireframes/edit-page-assets-3.bmml +454 -0
data/wireframes/edit-page-assets-3.png +0 -0
data/wireframes/edit-page-assets.bmml +433 -0
data/wireframes/edit-page-assets.png +0 -0
data/wireframes/edit-page.bmml +174 -0
data/wireframes/edit-page.png +0 -0
metadata +281 -0

data/radiant-clipped-extension.gemspec ADDED Viewed

@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "radiant-clipped-extension"
+Gem::Specification.new do |s|
+  s.name        = "radiant-clipped-extension-add-group"
+  s.version     = RadiantClippedExtension::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = RadiantClippedExtension::AUTHORS
+  s.email       = RadiantClippedExtension::EMAIL
+  s.homepage    = RadiantClippedExtension::URL
+  s.summary     = RadiantClippedExtension::SUMMARY
+  s.description = RadiantClippedExtension::DESCRIPTION
+  s.add_dependency "acts_as_list", "0.1.4"
+  s.add_dependency "paperclip",    "~> 2.7.0"
+  s.add_dependency "uuidtools",    "~> 2.1.2"
+  s.add_dependency "cocaine",      "~> 0.3.2"
+  ignores = if File.exist?('.gitignore')
+    File.read('.gitignore').split("\n").inject([]) {|a,p| a + Dir[p] }
+  else
+    []
+  end
+  s.files         = Dir['**/*'] - ignores
+  s.test_files    = Dir['test/**/*','spec/**/*','features/**/*'] - ignores
+  # s.executables   = Dir['bin/*'] - ignores
+  s.require_paths = ["lib"]
+end

data/spec/ci/before_script ADDED Viewed

@@ -0,0 +1,23 @@
+cd ~
+git clone git://github.com/radiant/radiant.git
+cd ~/radiant
+if [[ $RADIANT_VERSION != "master" ]]
+then
+  git checkout -b $RADIANT_VERSION $RADIANT_VERSION
+fi
+cp -r ~/builds/*/radiant-clipped-extension vendor/extensions/clipped
+gem install bundler --pre
+echo 'gem "radiant-clipped-extension", :path => "vendor/extensions/clipped"' >> Gemfile
+bundle install
+case $DB in
+  "mysql" )
+    mysql -e 'create database radiant_test;'
+    cp spec/ci/database.mysql.yml config/database.yml;;
+  "postgres" )
+    psql -c 'create database radiant_test;' -U postgres
+    cp spec/ci/database.postgresql.yml config/database.yml;;
+esac
+bundle exec rake db:migrate
+bundle exec rake db:migrate:extensions

data/spec/ci/script ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ cd ~/radiant
2	+ bundle exec rake spec:extensions EXT=clipped

data/spec/controllers/admin/assets_controller_spec.rb ADDED Viewed

@@ -0,0 +1,50 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+describe Admin::AssetsController do
+  dataset :users, :assets
+  before :each do
+    ActionController::Routing::Routes.reload
+    login_as :designer
+  end
+  it "should be a ResourceController" do
+    controller.should be_kind_of(Admin::ResourceController)
+  end
+  it "should handle Assets" do
+    controller.class.model_class.should == Asset
+  end
+  describe "index" do
+    describe "before filtration" do
+      before do
+        get :index
+      end
+      it "should render the index view" do
+        response.should be_success
+        response.should render_template('index')
+      end
+    end
+    describe "on ajax filtration" do
+      before do
+        xml_http_request :get, :index, :filter => ['video']
+      end
+      it "should render the table partial" do
+        response.body.should_not have_text('<head>')
+        response.content_type.should == 'text/javascript'
+        response.should_not render_template('index')
+        response.should render_template('admin/assets/_asset_table')
+        assigns(:assets).should include(assets(:video))
+      end
+    end
+  end
+end

data/spec/controllers/admin/page_attachments_controller_spec.rb ADDED Viewed

@@ -0,0 +1,50 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+describe Admin::PageAttachmentsController do
+  dataset :users, :home_page, :assets
+  integrate_views
+  it "should be a ResourceController" do
+    controller.should be_kind_of(Admin::ResourceController)
+  end
+  it "should handle PageAttachments" do
+    controller.class.model_class.should == PageAttachment
+    controller.send(:model_symbol).should == :page_attachment
+  end
+  describe "on call to new" do
+    before :each do
+      login_as :existing
+      @asset = assets(:video)
+    end
+    describe "with valid asset id" do
+      it "should return a nested form for asset-attachment" do
+        xhr :get, :new, :page_id => page_id(:home), :asset_id => @asset.id
+        response.should be_success
+        response.should render_template('admin/page_attachments/_attachment')
+        response.body.should =~ /attachment_#{@asset.uuid}/
+        response.body.should =~ /page_page_attachments_attributes_#{@asset.uuid}/
+        response.body.should =~ /<input class="attacher"/
+      end
+    end
+    describe "without asset id" do
+      it "should respond blankly" do
+        get :new, :format => :js
+        response.should be_success
+        response.body.should be_blank
+      end
+    end
+    describe "with invalid asset id" do
+      it "should respond blankly" do
+        get :new, :asset_id => 'foo', :format => :js
+        response.should be_success
+        response.body.should be_blank
+      end
+    end
+  end
+end

data/spec/datasets/assets_dataset.rb ADDED Viewed

@@ -0,0 +1,36 @@
+class AssetsDataset < Dataset::Base
+  uses :home_page
+  def load
+    create_page "pictured", :slug => 'pictured' do
+      create_asset "test1", :caption => "testing", :position => 1
+      create_asset "test2", :caption => "also testing", :position => 2
+    end
+    create_asset "video", :asset_content_type => 'video/mpeg', :asset_file_name => 'asset.mpg'
+    create_asset "audio", :asset_content_type => 'audio/mp3', :asset_file_name => 'asset.mp3'
+    create_asset "document", :asset_content_type => 'application/msword', :asset_file_name => 'asset.doc'
+  end
+  helpers do
+    def create_asset(name, attributes={})
+      pos = attributes.delete(:position)
+      create_record :asset, name.symbolize, {
+        :title => name,
+        :asset_file_name =>  'asset.jpg',
+        :asset_content_type =>  'image/jpeg',
+        :asset_file_size => '46248',
+        :original_height => 200,
+        :original_width => 400,
+        :uuid => UUIDTools::UUID.timestamp_create.to_s
+      }.merge(attributes)
+      if @current_page_id
+        create_record :page_attachment, "#{name}_attachment".symbolize, {
+          :page_id => @current_page_id,
+          :asset_id => asset_id(name.symbolize),
+          :position => pos
+        }
+      end
+    end
+  end
+end

data/spec/fixtures/5k.png ADDED Viewed

Binary file

data/spec/fixtures/test.flv ADDED Viewed

Binary file

data/spec/lib/asset_tags_spec.rb ADDED Viewed

@@ -0,0 +1,107 @@
+require File.expand_path('../../spec_helper', __FILE__)
+describe AssetTags do
+  dataset :assets
+  let(:page) { pages(:pictured) }
+  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|
+      it "should have the new singular 'asset:#{name}' tag and method" do
+        page.tags.include?("asset:#{name}").should be_true
+        page.respond_to?("tag:asset:#{name}".to_sym).should be_true
+      end
+      it "should have the old plural 'assets:#{name}' tag and method" do
+        page.tags.include?("assets:#{name}").should be_true
+        page.respond_to?("tag:assets:#{name}".to_sym).should be_true
+      end
+      it "should deprecate the old plural 'assets:#{name}' tag" do
+        ActiveSupport::Deprecation.should_receive(:warn).at_least(:once)
+        page.should render("<r:assets:first><r:assets:#{name} /></r:assets:first>")
+      end
+    end
+  end
+  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(:test1)},#{asset_id(:test2)}," )
+    end
+    it "assets:first" do
+      page.should render('<r:assets:first><r:asset:id /></r:assets:first>').as( asset.id.to_s )
+    end
+    it "should retrieve an asset by name" do
+      page.should render('<r:asset:id name="video" />').as( "#{asset_id(:video)}" )
+    end
+    it "asset:name" do
+      page.should render(%{<r:asset:name id="#{asset_id(:test1)}" />}).as( asset.title )
+    end
+    it "asset:filename" do
+      page.should render(%{<r:asset:filename id="#{asset_id(:test1)}" />}).as( asset.asset_file_name )
+    end
+    it "asset:url" do
+      page.should render(%{<r:asset:url id="#{asset_id(:test1)}" />}).as( asset.thumbnail )
+      page.should render(%{<r:asset:url size="icon" id="#{asset_id(:test1)}" />}).as( asset.thumbnail('icon') )
+    end
+    it "asset:link" do
+      page.should render(%{<r:asset:link id="#{asset_id(:test1)}" />}).as( %{<a href="#{asset.thumbnail}">#{asset.title}</a>} )
+      page.should render(%{<r:asset:link size="icon" id="#{asset_id(:test1)}" />}).as( %{<a href="#{asset.thumbnail('icon')}">#{asset.title}</a>} )
+    end
+    it "asset:image" do
+      page.should render(%{<r:asset:image id="#{asset_id(:test1)}" />}).as( %{<img src="#{asset.thumbnail}" alt="#{asset.title}" />} )
+      page.should render(%{<r:asset:image size="icon" id="#{asset_id(:test1)}" />}).as( %{<img src="#{asset.thumbnail('icon')}" alt="#{asset.title}" />} )
+    end
+    it "asset:caption" do
+      page.should render(%{<r:asset:caption id="#{asset_id(:test1)}" />}).as( asset.caption )
+    end
+    it "asset:top_padding" do
+      page.should render(%{<r:asset:top_padding id="#{asset_id(:test1)}" container="500" />}).as( "229" )
+    end
+    it "asset:top_padding for a specified style" do
+      page.should render(%{<r:asset:top_padding id="#{asset_id(:test1)}" container="500" size="thumbnail" />}).as( "200" )
+    end
+    it "asset:width" do
+      page.should render(%{<r:asset:width id="#{asset_id(:test1)}" />}).as( "400" )
+      page.should render(%{<r:asset:width id="#{asset_id(:test1)}" size="icon" />}).as( "42" )
+    end
+    it "asset:height" do
+      page.should render(%{<r:asset:height id="#{asset_id(:test1)}" container="500" />}).as( "200" )
+      page.should render(%{<r:asset:height id="#{asset_id(:test1)}" size="icon" />}).as( "42" )
+    end
+    it "asset:orientation" do
+      page.should render(%{<r:asset:orientation id="#{asset_id(:test1)}" />}).as( "horizontal" )
+      page.should render(%{<r:asset:orientation id="#{asset_id(:test1)}" size="icon" />}).as( "square" )
+    end
+    it "asset:aspect" do
+      page.should render(%{<r:asset:aspect id="#{asset_id(:test1)}" />}).as( 2.to_f.to_s )
+      page.should render(%{<r:asset:aspect id="#{asset_id(:test1)}" size="icon" />}).as( 1.to_f.to_s )
+    end
+    it "asset:if_image" do
+      page.should render(%{<r:asset:if_image name="test1">foo</r:asset:if_image>}).as( "foo" )
+      page.should render(%{<r:asset:if_image name="video">foo</r:asset:if_image>}).as( "" )
+    end
+  end
+end

data/spec/lib/frame_grab_spec.rb ADDED Viewed

@@ -0,0 +1,17 @@
+require File.expand_path('../../spec_helper', __FILE__)
+describe Paperclip::FrameGrab do
+  dataset :assets
+  let(:file) { File.new(File.join( File.dirname(__FILE__), "..", "fixtures", "test.flv")) }
+  let(:asset) { assets(:video) }
+  if Radiant.config['assets.create_video_thumbnails?']
+    context "processing video attachment" do
+      it "should create png icon and thumbnail"
+      it "should create jpeg file at configured size"
+      it "should squish if configured size is specific"
+      it "should preserve aspect ratio if configured size is >"
+      it "should resize then crop if configured size is #"
+    end
+  end
+end

data/spec/lib/geometry_transformation_spec.rb ADDED Viewed

@@ -0,0 +1,63 @@
+require File.expand_path('../../spec_helper', __FILE__)
+describe Paperclip::Geometry do
+  let(:original) { Paperclip::Geometry.new(1200,600) }
+  let(:small) { Paperclip::Geometry.new(100, 50) }
+  let(:scaled) {Paperclip::Geometry.new(300, 150) }
+  let(:incomplete) { Paperclip::Geometry.parse("300x") }
+  let(:simple) { Paperclip::Geometry.parse("300x200") }
+  let(:cropper) { Paperclip::Geometry.parse("300x200#") }
+  let(:if_bigger) { Paperclip::Geometry.parse("300x200>") }
+  let(:if_smaller) { Paperclip::Geometry.parse("300x200<") }
+  let(:percentage) { Paperclip::Geometry.parse("25%") }
+  let(:area) { Paperclip::Geometry.parse("180000@") }
+  context "=~" do
+    it "should compare sizes" do
+      (original =~ small).should be_false
+      (original =~ Paperclip::Geometry.new(1200,600)).should be_true
+    end
+    it "should ignore modifiers" do
+      (simple =~ cropper).should be_true
+    end
+  end
+  context "==" do
+    it "should compare sizes and modifiers" do
+      (original == Paperclip::Geometry.new(1200,600)).should be_true
+      (simple == cropper).should be_false
+    end
+  end
+  context "stripping modifier" do
+    it "should return the same geometry with no modifier" do
+      cropper.without_modifier.should == simple
+      if_bigger.without_modifier.should == simple
+    end
+  end
+  context "calculating thumbnail dimensions" do
+    it "should raise an exception if called on a partial geometry" do
+      lambda{incomplete * simple}.should raise_error(Paperclip::TransformationError)
+    end
+    it "should not raise an exception if called on a complete geometry" do
+      lambda{original * simple}.should_not raise_error
+    end
+    it "should calculate the result of applying another geometry" do
+      (original * simple).should == scaled
+      (original * cropper).should == cropper.without_modifier
+      (original * if_bigger).should == scaled
+      (original * if_smaller).should == original
+      (small * if_smaller).should == scaled
+      (small * cropper).should == cropper.without_modifier
+      (original * percentage).should == scaled
+      (original * area).should == scaled
+    end
+    it "should cope with a partial-geometry argument" do
+      (original * incomplete).should == scaled
+    end
+    it "should instantiate a non-geometry argument" do
+      (original * "300x200").should == scaled
+    end
+  end
+end

data/spec/models/asset_spec.rb ADDED Viewed

@@ -0,0 +1,72 @@
+require File.expand_path('../../spec_helper', __FILE__)
+describe Asset do
+  def default_attributes
+    {
+      :asset_file_name =>  'asset.jpg',
+      :asset_content_type =>  'image/jpeg',
+      :asset_file_size => '46248'
+    }
+  end
+  def new_asset(overrides={})
+    Asset.new default_attributes.merge(overrides)
+  end
+  def create_asset(overrides={})
+    Asset.create! default_attributes.merge(overrides)
+  end
+  it 'should be valid when instantiated' do
+    new_asset.should be_valid
+  end
+  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
+        image = new_asset :asset_content_type => 'image/jpeg'
+        image.stub! :asset => mock('asset', :url => '/y/z/e.jpg')
+        image.thumbnail.should == '/y/z/e.jpg'
+      end
+      it 'should return paperclip asset url for non-image' do
+        asset = new_asset :asset_content_type => 'application/pdf'
+        asset.stub! :asset => mock('asset', :url => '/y/z/e.pdf')
+        asset.thumbnail.should == '/y/z/e.pdf'
+      end
+    end
+    describe 'with size=original' do
+      it 'should return paperclip asset url for image' do
+        image = new_asset :asset_content_type => 'image/jpeg'
+        image.stub! :asset => mock('asset', :url => '/y/z/e.jpg')
+        image.thumbnail('original').should == '/y/z/e.jpg'
+      end
+      it 'should return paperclip asset url for non-image' do
+        asset = new_asset :asset_content_type => 'application/pdf'
+        asset.stub! :asset => mock('asset', :url => '/y/z/e.pdf')
+        asset.thumbnail('original').should == '/y/z/e.pdf'
+      end
+    end
+    it 'should return resized image for images when given size' do
+      image = new_asset :asset_content_type => 'image/jpeg'
+      image.stub! :asset => mock('asset')
+      image.stub! :has_style? => true
+      image.asset.stub!(:content_type).and_return('image/jpeg')
+      image.asset.stub!(:url).with(:thumbnail).and_return('/re/sized/image_thumbnail.jpg')
+      image.thumbnail('thumbnail').should == '/re/sized/image_thumbnail.jpg'
+    end
+    it 'should return icon for non-image with a given size' do
+      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
+  end
+end