@@ -131,4 +131,5 @@ These people have contributed patches that have been added to the extension: [jm]: http://github.com/johnmuhl [djcp]: http://www.kookdujour.com/ [jb]: http://github.com/jjburka -[ihoka]: http://github.com/ihoka \ No newline at end of file +[ihoka]: http://github.com/ihoka + README.md @@ -22,4 +22,4 @@ Rake::RDocTask.new(:rdoc) do |rdoc| end # Load any custom rakefiles for extension -Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f } \ No newline at end of file +Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f } Rakefile @@ -1,26 +1,32 @@ class PageAttachmentsController < ApplicationController - def move_higher - if request.post? - @attachment = PageAttachment.find(params[:id]) - @attachment.move_higher - render :partial => 'admin/pages/attachment', :layout => false, :collection => @attachment.page.attachments - end - end + def move_higher + if request.post? + @attachment = PageAttachment.find(params[:id]) + @attachment.move_higher + render :partial => 'admin/pages/attachment', + :layout => false, + :collection => @attachment.page.attachments + end + end - def move_lower - if request.post? - @attachment = PageAttachment.find(params[:id]) - @attachment.move_lower - render :partial => 'admin/pages/attachment', :layout => false, :collection => @attachment.page.attachments - end - end - - def destroy - if request.post? - @attachment = PageAttachment.find(params[:id]) - page = @attachment.page - @attachment.destroy - render :partial => 'admin/pages/attachment', :layout => false, :collection => page.attachments - end - end + def move_lower + if request.post? + @attachment = PageAttachment.find(params[:id]) + @attachment.move_lower + render :partial => 'admin/pages/attachment', + :layout => false, + :collection => @attachment.page.attachments + end + end + + def destroy + if request.post? + @attachment = PageAttachment.find(params[:id]) + page = @attachment.page + @attachment.destroy + render :partial => 'admin/pages/attachment', + :layout => false, + :collection => page.attachments + end + end end app/controllers/page_attachments_controller.rb @@ -1,5 +1,5 @@ -module ObservePageAttachments - def self.included(base) - base.send :observe, User, Page, Layout, Snippet, PageAttachment - end -end \ No newline at end of file +module ObservePageAttachments + def self.included(base) + base.send :observe, User, Page, Layout, Snippet, PageAttachment + end +end app/models/observe_page_attachments.rb @@ -1,27 +1,28 @@ -class PageAttachment < ActiveRecord::Base - acts_as_list :scope => :page_id - has_attachment :storage => :file_system, - :thumbnails => defined?(PAGE_ATTACHMENT_SIZES) && PAGE_ATTACHMENT_SIZES || {:icon => '50x50>'}, - :max_size => 10.megabytes - validates_as_attachment - - belongs_to :created_by, :class_name => 'User', - :foreign_key => 'created_by' - belongs_to :updated_by, :class_name => 'User', - :foreign_key => 'updated_by' - - belongs_to :page - - def short_filename(wanted_length = 15, suffix = ' ...') - (self.filename.length > wanted_length) ? (self.filename[0,(wanted_length - suffix.length)] + suffix) : self.filename - end - - def short_title(wanted_length = 15, suffix = ' ...') - (self.title.length > wanted_length) ? (self.title[0,(wanted_length - suffix.length)] + suffix) : self.title - end - - def short_description(wanted_length = 15, suffix = ' ...') - (self.description.length > wanted_length) ? (self.description[0,(wanted_length - suffix.length)] + suffix) : self.description - end - -end +class PageAttachment < ActiveRecord::Base + acts_as_list :scope => :page_id + has_attachment :storage => :file_system, + :thumbnails => defined?(PAGE_ATTACHMENT_SIZES) && PAGE_ATTACHMENT_SIZES || {:icon => '50x50>'}, + :max_size => 10.megabytes + validates_as_attachment + + belongs_to :created_by, + :class_name => 'User', + :foreign_key => 'created_by' + belongs_to :updated_by, + :class_name => 'User', + :foreign_key => 'updated_by' + belongs_to :page + + def short_filename(wanted_length = 15, suffix = ' ...') + (self.filename.length > wanted_length) ? (self.filename[0,(wanted_length - suffix.length)] + suffix) : self.filename + end + + def short_title(wanted_length = 15, suffix = ' ...') + (self.title.length > wanted_length) ? (self.title[0,(wanted_length - suffix.length)] + suffix) : self.title + end + + def short_description(wanted_length = 15, suffix = ' ...') + (self.description.length > wanted_length) ? (self.description[0,(wanted_length - suffix.length)] + suffix) : self.description + end + +end app/models/page_attachment.rb @@ -1,14 +1,17 @@ module PageAttachmentAssociations def self.included(base) base.class_eval { - has_many :attachments, :class_name => "PageAttachment", :dependent => :destroy, :order => 'position' + has_many :attachments, + :class_name => "PageAttachment", + :dependent => :destroy, + :order => 'position' attr_accessor :add_attachments after_save :save_attachments include InstanceMethods } end - - module InstanceMethods + + module InstanceMethods # Currently recursive, but could be simplified with some SQL def attachment(name) att = attachments.find(:first, :conditions => ["filename LIKE ?", name.to_s]) @@ -17,16 +20,16 @@ module PageAttachmentAssociations def save_attachments if @add_attachments && ! @add_attachments['file'].blank? - i = 0 + i = 0 @add_attachments['file'].each do |page_attach| attachments << PageAttachment.new( - :uploaded_data => page_attach, - :title => @add_attachments['title'][i], - :description => @add_attachments['description'][i]) - i += 1 - end + :uploaded_data => page_attach, + :title => @add_attachments['title'][i], + :description => @add_attachments['description'][i]) + i += 1 + end end @add_attachments = nil - end + end end end app/models/page_attachment_associations.rb @@ -2,14 +2,14 @@ module PageAttachmentTags include Radiant::Taggable class TagError < StandardError; end - + desc %{ The namespace for referencing page attachments/files. You may specify the 'name' - attribute (for the filename) on this tag for all contained tags to refer to that attachment. + attribute (for the filename) on this tag for all contained tags to refer to that attachment. Attachments can be inherited from parent pages. - + *Usage*: - + <pre><code><r:attachment name="file.txt">...</r:attachment></code></pre> } tag "attachment" do |tag| @@ -17,14 +17,14 @@ module PageAttachmentTags tag.locals.attachment = page.attachment(tag.attr['name']) rescue nil if tag.attr['name'] tag.expand end - + desc %{ Renders the url or public filename of the attachment for use in links, stylesheets, etc. The 'name' attribute is required on this tag or the parent tag. The optional 'size' attribute applies only to images. - + *Usage*: - + <pre><code><r:attachment:url name="file.jpg" [size="icon"]/></code></pre> } tag "attachment:url" do |tag| @@ -34,24 +34,24 @@ module PageAttachmentTags attachment = tag.locals.attachment || page.attachment(name) attachment.public_filename(size) end - + [:short_title,:short_description,:short_filename].each do |key| desc %{ Renders the '#{key}' attribute of the attachment. - The 'name' attribute is required on this tag or the parent tag. + The 'name' attribute is required on this tag or the parent tag. The optional 'length' attribute defines how many characters of the attribute to display. It defaults to 15 total characters, including the 'suffix'. If the attribute exceeds 'length', 'suffix' says what to tag onto the back to show truncation. It defaults to ' ...' - - *Usage*: - + + *Usage*: + <pre><code><r:attachment:#{key} name="file.jpg" [length="number of characters"] [suffix="More . . ."]/></code></pre> } tag "attachment:#{key}" do |tag| raise TagError, "'name' attribute required" unless name = tag.attr['name'] or tag.locals.attachment page = tag.locals.page attachment = tag.locals.attachment || page.attachment(name) - tlength = (tag.attr['length']) ? tag.attr['length'].to_i : 15 - suffix = (tag.attr['suffix']) ? tag.attr['suffix'].to_s : ' ...' + tlength = (tag.attr['length']) ? tag.attr['length'].to_i : 15 + suffix = (tag.attr['suffix']) ? tag.attr['suffix'].to_s : ' ...' attachment.send("#{key}",tlength,suffix) end end @@ -59,31 +59,31 @@ module PageAttachmentTags desc %{ Renders the 'size' attribute of the attachment. The 'name' attribute is required on this tag or the parent tag. Returns bytes by default. Use the optional 'units' parameter to change the units this tag returns. - - *Usage*: - + + *Usage*: + <pre><code><r:attachment:size name="file.jpg" [units="bytes|kilobytes|megabytes|gigabytes"] /></code></pre> } tag "attachment:size" do |tag| raise TagError, "'name' attribute required" unless name = tag.attr['name'] or tag.locals.attachment page = tag.locals.page attachment = tag.locals.attachment || page.attachment(name) - units = tag.attr['units'] || 'bytes' - valid_units = ['bytes','byte','kilobytes','kilobyte','megabytes','megabyte','gigabytes','gigabyte'] - units = (valid_units.include?(units)) ? units : 'bytes' - return attachment.size if units == 'bytes' + units = tag.attr['units'] || 'bytes' + valid_units = ['bytes','byte','kilobytes','kilobyte','megabytes','megabyte','gigabytes','gigabyte'] + units = (valid_units.include?(units)) ? units : 'bytes' + return attachment.size if units == 'bytes' sprintf('%.2f',(attachment.size.to_f / 1.send(units))) end - + [:content_type, :width, :height, :title, :description, :position, :filename].each do |key| desc %{ - Renders the '#{key}' attribute of the attachment. + Renders the '#{key}' attribute of the attachment. The 'name' attribute is required on this tag or the parent tag. The optional 'size' attributes applies only to images. - + *Usage*: - + <pre><code><r:attachment:#{key} name="file.jpg" [size="icon"]/></code></pre> } tag "attachment:#{key}" do |tag| @@ -93,7 +93,7 @@ module PageAttachmentTags attachment.attributes["#{key}"] end end - + desc %{ Renders the date the attachment was uploaded using the specified 'format' (Ruby's strftime syntax). The 'name' attribute is required on this tag or the parent tag. @@ -102,10 +102,10 @@ module PageAttachmentTags raise TagError, "'name' attribute required" unless name = tag.attr['name'] or tag.locals.attachment page = tag.locals.page attachment = tag.locals.attachment || page.attachment(name) - format = tag.attr['format'] || "%F" + format = tag.attr['format'] || "%F" attachment.created_at.strftime(format) end - + desc %{ Renders an image tag for the attachment (assuming it's an image). The 'name' attribute is required on this tag or the parent tag. @@ -113,7 +113,7 @@ module PageAttachmentTags The optional 'size' attribute allows you to show the icon size of the image. *Usage*: - + <pre><code><r:attachment:image name="file.jpg" [size="icon"]/></code></pre> } @@ -127,15 +127,15 @@ module PageAttachmentTags attributes = tag.attr.inject([]){ |a,(k,v)| a << %{#{k}="#{v}"} }.join(" ").strip %{<img src="#{filename}" #{attributes + " " unless attributes.empty?}/>} end - + desc %{ Renders a hyperlink to the attachment. The 'name' attribute is required on this tag or the parent tag. - You can use the 'label' attribute to specify the textual contents of the tag. Any other attributes + You can use the 'label' attribute to specify the textual contents of the tag. Any other attributes will be added as HTML attributes to the rendered tag. This tag works as both a singleton and a container. Any contained content will be rendered inside the resulting link. The optional 'size' attribute applies only to images. *Usage*: - + <pre><code><r:attachment:link name="file.jpg" [size="thumbnail"]/></code></pre> <pre><code><r:attachment:link name="file.jpg" [size="thumbnail"]> Some text in the link </r:attachment:link></code></pre> } @@ -151,36 +151,36 @@ module PageAttachmentTags output << (tag.double? ? tag.expand : label) output << "</a>" end - + desc %{ Renders the name of who uploaded the attachment. The 'name' attribute is required on this tag or the parent tag. - + *Usage*: - + <pre><code><r:attachment:author name="file.jpg" /></code></pre> } tag "attachment:author" do |tag| raise TagError, "'name' attribute required" unless name = tag.attr.delete('name') or tag.locals.attachment page = tag.locals.page - attachment = tag.locals.attachment || page.attachment(name) + attachment = tag.locals.attachment || page.attachment(name) if attachment and author = attachment.created_by author.name end end - + desc %{ Iterates through all the attachments in the current page. The 'name' attribute is not required on any nested attachment tags. - + *Usage*: - + <pre><code><r:attachment:each [order="asc|desc"] [by="filename|size|created_at|..."] [limit=0] [offset=0] [extensions="png|pdf|doc"]> <r:link /> - <r:date> </r:attachment:each></code></pre> } tag "attachment:each" do |tag| page = tag.locals.page - + returning String.new do |output| page.attachments.find(:all, attachments_find_options(tag)).each do |att| tag.locals.attachment = att @@ -188,12 +188,12 @@ module PageAttachmentTags end end end - + desc %{ Renders the contained elements only if the current contextual page has one or more attachments. The @min_count@ attribute specifies the minimum number of required attachments. You can also filter by extensions with the @extensions@ attribute. - + *Usage:* <pre><code><r:if_attachments [min_count="n"] [extensions="doc|pdf"]>...</r:if_attachments></code></pre> } @@ -202,12 +202,12 @@ module PageAttachmentTags attachments = tag.locals.page.attachments.count(:conditions => attachments_find_options(tag)[:conditions]) tag.expand if attachments >= count end - + desc %{ Renders the 'extension' virtual attribute of the attachment, extracted from filename. - + *Usage*: - + <pre><code> <ul> <r:attachment:each extensions="doc|pdf"> @@ -223,22 +223,22 @@ module PageAttachmentTags attachment = tag.locals.attachment attachment.filename[/\.(\w+)$/, 1] end - + private def attachments_find_options(tag) attr = tag.attr.symbolize_keys - + extensions = attr[:extensions] && attr[:extensions].split('|') || [] conditions = unless extensions.blank? - [ extensions.map { |ext| "page_attachments.filename LIKE ?"}.join(' OR '), + [ extensions.map { |ext| "page_attachments.filename LIKE ?"}.join(' OR '), *extensions.map { |ext| "%.#{ext}" } ] else nil end - + by = attr[:by] || "position" order = attr[:order] || "asc" - + options = { :order => "#{by} #{order}", :limit => attr[:limit] || nil, app/models/page_attachment_tags.rb @@ -1,17 +1,18 @@ -module PageAttachmentsInterface - def self.included(base) - base.class_eval { - before_filter :add_page_attachment_partials, :only => [:edit, :new] - include InstanceMethods - } - end - - module InstanceMethods - def add_page_attachment_partials - @buttons_partials ||= [] - @buttons_partials << "attachments_box" - include_javascript 'page_attachments' - include_stylesheet 'admin/page_attachments' - end - end -end \ No newline at end of file +module PageAttachmentsInterface + def self.included(base) + base.class_eval { + before_filter :add_page_attachment_partials, + :only => [:edit, :new] + include InstanceMethods + } + end + + module InstanceMethods + def add_page_attachment_partials + @buttons_partials ||= [] + @buttons_partials << "attachments_box" + include_javascript 'page_attachments' + include_stylesheet 'admin/page_attachments' + end + end +end app/models/page_attachments_interface.rb @@ -1,19 +1,19 @@ <li id="attachment_<%= attachment.id %>" class="attachment clearfix"> <div> - <%= image_tag "admin/minus.png", :alt => "Delete", :class => 'delete' %> - <% unless attachment.first? %> - <%= image_tag "admin/move_higher.png", :alt => "Move Higher", :class => 'higher' %> - <% end %> - <% unless attachment.last? %> - <%= image_tag "admin/move_lower.png", :alt => "Move Lower", :class => 'lower' %> - <% end %> + <%= image_tag "admin/minus.png", :alt => "Delete", :class => 'delete' %> + <% unless attachment.first? %> + <%= image_tag "admin/move_higher.png", :alt => "Move Higher", :class => 'higher' %> + <% end %> + <% unless attachment.last? %> + <%= image_tag "admin/move_lower.png", :alt => "Move Lower", :class => 'lower' %> + <% end %> </div> - <% unless attachment.thumbnails.empty? %> - <%= link_to image_tag(attachment.public_filename("icon")), - attachment.public_filename, :class => 'thumbnail' %> - <% end %> - <% unless attachment.title.blank? %> - <p><%= h attachment.short_title %></p> - <% end %> - <%= link_to attachment.short_filename, attachment.public_filename %> +<% unless attachment.thumbnails.empty? %> +<%= link_to image_tag(attachment.public_filename("icon")), +attachment.public_filename, :class => 'thumbnail' %> +<% end %> +<% unless attachment.title.blank? %> +<p><%= h attachment.short_title %></p> +<% end %> +<%= link_to attachment.short_filename, attachment.public_filename %> </li> app/views/admin/pages/_attachment.html.erb @@ -6,10 +6,10 @@ <%= javascript_tag "var auth_token = '#{form_authenticity_token}';" %> <% unless @page.attachments.count.zero? %> - <ol id="attachment_list"> - <%= render :partial => 'attachment', :collection => @page.attachments %> - </ol> - <div style="clear:both;"></div> + <ol id="attachment_list"> + <%= render :partial => 'attachment', :collection => @page.attachments %> + </ol> + <div style="clear:both;"></div> <% end %> <p id="reorder_notice" style="display:none;">Page attachments order will appear on site only when cache is cleared (on save or after 5min).</p> </div> app/views/admin/pages/_attachments_box.html.erb @@ -15,8 +15,8 @@ class CreatePageAttachmentsExtensionSchema < ActiveRecord::Migration t.column "page_id", :integer end end - + def self.down drop_table "page_attachments" end -end \ No newline at end of file +end db/migrate/001_create_page_attachments_extension_schema.rb @@ -1,20 +1,20 @@ -module DifferenceTestHelper - # http://project.ioni.st/post/217#post-217 - # - # def test_new_publication - # assert_difference(Publication, :count) do - # post :create, :publication => {...} - # # ... - # end - # end - # - def assert_difference(object, method = nil, difference = 1) - initial_value = object.send(method) - yield - assert_equal initial_value + difference, object.send(method), "#{object}##{method}" - end - - def assert_no_difference(object, method, &block) - assert_difference object, method, 0, &block - end -end \ No newline at end of file +module DifferenceTestHelper + # http://project.ioni.st/post/217#post-217 + # + # def test_new_publication + # assert_difference(Publication, :count) do + # post :create, :publication => {...} + # # ... + # end + # end + # + def assert_difference(object, method = nil, difference = 1) + initial_value = object.send(method) + yield + assert_equal initial_value + difference, object.send(method), "#{object}##{method}" + end + + def assert_no_difference(object, method, &block) + assert_difference object, method, 0, &block + end +end lib/difference_test_helper.rb @@ -1,7 +1,7 @@ namespace :radiant do namespace :extensions do namespace :page_attachments do - + desc "Runs the migration of the Page Attachments extension" task :migrate => :environment do require 'radiant/extension_migrator' @@ -12,7 +12,7 @@ namespace :radiant do end end - desc "Installs files relevant to Page Attachments into public/" + desc "Installs files relevant to Page Attachments into public/" task :update => :environment do FileUtils.cp PageAttachmentsExtension.root + "/public/stylesheets/page_attachments.css", RAILS_ROOT + "/public/stylesheets/admin" FileUtils.cp PageAttachmentsExtension.root + "/public/javascripts/page_attachments.js", RAILS_ROOT + "/public/javascripts" lib/tasks/page_attachments_extension_tasks.rake @@ -10,7 +10,7 @@ class PageAttachmentsExtension < Radiant::Extension define_routes do |map| map.connect 'page_attachments/:action/:id', :controller => 'page_attachments' end - + def activate # Regular page attachments stuff Page.class_eval { page_attachments_extension.rb @@ -1,9 +1,9 @@ -document.observe("dom:loaded", function() { +Document.observe("dom:loaded", function() { when('attachments', function(container) { var upload = '<div class="attachment-upload"><p class="title">Upload file</p><table><tr><th><label for="title_input">Title:</label></th><td><input id="title_input" size="60" name="page[add_attachments][title][]"></td></tr><tr><th><label for="description_input">Description:</label></th><td><input id="description_input" type="text" size="60" name="page[add_attachments][description][]"></td></tr><tr><th><label for="file_input">File:</label></th><td><input id="file_input" type="file" size="60" name="page[add_attachments][file][]" /><img src="/images/admin/minus.png" alt="cancel" /></td></tr></table></div>' container.observe('click', function(e) { var target = $(e.target) - + if (target.match('img[alt=Add]')) { container.insert(upload) } @@ -16,18 +16,18 @@ document.observe("dom:loaded", function() { var attachment = e.findElement('.attachment') var id = attachment.id.split('_').last() new Ajax.Updater('attachment_list','/page_attachments/destroy/', {method:'post', parameters:{id: id, authenticity_token: auth_token}}) - var attach_count = $('attachment_count') - attach_count.update(parseInt(attach_count.innerHTML) - 1) + var attach_count = $('attachment_count') + attach_count.update(parseInt(attach_count.innerHTML) - 1) } } else if(target.match('img.higher')) { var attachment = e.findElement('.attachment') var id = attachment.id.split('_').last() new Ajax.Updater('attachment_list','/page_attachments/move_higher/', {method:'post', parameters:{id: id, authenticity_token: auth_token}}) - } else if(target.match('img.lower')) { + } else if(target.match('img.lower')) { var attachment = e.findElement('.attachment') var id = attachment.id.split('_').last() new Ajax.Updater('attachment_list','/page_attachments/move_lower/', {method:'post', parameters:{id: id, authenticity_token: auth_token}}) - } + } }) }) }) public/javascripts/page_attachments.js @@ -4,7 +4,7 @@ background: white; margin: 10px 0; } -#attachments .toolbar { +#attachments .toolbar { float: right; padding: 10px; width: 50px; @@ -49,7 +49,7 @@ { margin-left:20px; } -#attachments ol li div +#attachments ol li div { float:left;width:25px; } @@ -57,11 +57,11 @@ { float:left;margin:0 10px 0 10px; } -#attachments ol li p +#attachments ol li p { margin:0 0 5px 0; } -#attachments ol li +#attachments ol li { margin-bottom:10px;border-bottom:1px dashed #cccccc;width:66%;padding-bottom:3px; } @@ -72,7 +72,7 @@ #attachments p.title { - border-bottom:1px #EAE3C5 solid;width:66%;font-size:17px;font-weight:bold; + border-bottom:1px #EAE3C5 solid;width:66%;font-size:17px;font-weight:bold; } #attachments table th { @@ -80,7 +80,7 @@ } #attachments table td { - padding-bottom:5px; + padding-bottom:5px; } #attachments p#reorder_notice { public/stylesheets/page_attachments.css @@ -4,23 +4,23 @@ class PageAttachmentsExtensionTest < Test::Unit::TestCase fixtures :page_attachments, :pages, :users test_helper :pages, :render - + # Replace this with your real tests. def setup @page = pages(:homepage) end - + def test_initialization assert_equal RAILS_ROOT + '/vendor/extensions/page_attachments', PageAttachmentsExtension.root assert_equal 'Page Attachments', PageAttachmentsExtension.extension_name end - + def test_module_inclusion assert Page.included_modules.include?(PageAttachmentTags) assert Page.included_modules.include?(PageAttachmentAssociations) assert UserActionObserver.included_modules.include?(ObservePageAttachments) - assert ActiveRecord::Base.included_modules.include?(ActiveRecord::Acts::List) - assert Technoweenie::AttachmentFu + assert ActiveRecord::Base.included_modules.include?(ActiveRecord::Acts::List) + assert Technoweenie::AttachmentFu assert UserActionObserver.methods.include?('observed_class') #assert_equal UserActionObserver.instance.observed_class, [User, Page, Layout, Snippet, Asset] @@ -28,18 +28,18 @@ class PageAttachmentsExtensionTest < Test::Unit::TestCase def test_page_instance_methods assert Page.instance_methods.include?("attachments") - assert Page.instance_methods.include?("attachments=") - assert Page.instance_methods.include?("attachment") - assert Page.instance_methods.include?("add_attachments") + assert Page.instance_methods.include?("attachments=") + assert Page.instance_methods.include?("attachment") + assert Page.instance_methods.include?("add_attachments") assert Page.instance_methods.include?("add_attachments=") assert Page.instance_methods.include?("save_attachments") - + assert Page.instance_methods.include?("tag:attachment") [:content_type, :size, :width, :height, :date, :image, :link, :author, :title, :short_title, :short_description, :short_filename, :description, :position].each do |key| assert Page.instance_methods.include?("tag:attachment:#{key}") end end - + def test_global_tags img = page_attachments(:rails_png) txt = page_attachments(:foo_txt) @@ -47,7 +47,7 @@ class PageAttachmentsExtensionTest < Test::Unit::TestCase [:url, :content_type, :size, :width, :height, :date, :image, :link, :author, :title].each do |key| assert_render_error "'name' attribute required", "<r:attachment:#{key} />", '/' end - + assert_renders "", "<r:attachment></r:attachment>", "/" assert_renders img.public_filename, '<r:attachment:url name="rails.png" />', '/' assert_renders img.title, '<r:attachment:title name="rails.png" />', '/' @@ -57,48 +57,48 @@ class PageAttachmentsExtensionTest < Test::Unit::TestCase assert_renders img.size.to_s, '<r:attachment:size name="rails.png" units="blargobytes" />', '/' assert_renders "1.75", '<r:attachment:size name="rails.png" units="kilobytes" />', '/' - assert_renders img.width.to_s, '<r:attachment:width name="rails.png" />', '/' + assert_renders img.width.to_s, '<r:attachment:width name="rails.png" />', '/' assert_renders img.height.to_s, '<r:attachment:height name="rails.png" />', '/' assert_renders img.content_type, '<r:attachment:content_type name="rails.png" />', '/' assert_renders img.created_at.strftime("%Y-%m-%d"), '<r:attachment:date name="rails.png" format="%Y-%m-%d" />', '/' assert_renders img.created_by.name, '<r:attachment:author name="rails.png" />', '/' - assert_renders "", '<r:attachment:height name="foo.txt"/>','/' - assert_renders "", '<r:attachment:width name="foo.txt"/>','/' + assert_renders "", '<r:attachment:height name="foo.txt"/>','/' + assert_renders "", '<r:attachment:width name="foo.txt"/>','/' assert_renders %{<img src="#{img.public_filename}" />}, '<r:attachment:image name="rails.png" />', '/' assert_renders %{<img src="#{img.public_filename}" style="float: right;" />}, '<r:attachment:image name="rails.png" style="float: right;"/>', '/' - + assert_renders %{<a href="#{img.public_filename}">rails.png</a>}, '<r:attachment:link name="rails.png" />', '/' assert_renders %{<a href="#{img.public_filename}" id="mylink">rails.png</a>}, '<r:attachment:link name="rails.png" id="mylink" />', '/' assert_renders %{<a href="#{img.public_filename}">Rails</a>}, '<r:attachment:link name="rails.png">Rails</r:attachment:link>', '/' assert_renders %{<a href="#{img.public_filename}">Rails</a>}, '<r:attachment:link name="rails.png" label="Rails"/>', '/' - - assert_renders %{Rails logo},'<r:attachment:title name="rails.png"/>','/' - assert_renders %{Rails logo},'<r:attachment:short_title name="rails.png"/>','/' - assert_renders %{The awesome Rails logo.},'<r:attachment:description name="rails.png"/>','/' - assert_renders %{The awesome ...},'<r:attachment:short_description name="rails.png"/>','/' - assert_renders %{The aweso ...},'<r:attachment:short_description name="rails.png" length="13" />','/' - assert_renders %{The awesome Rails logo.}, '<r:attachment:short_description name="rails.png" length="35" />','/' + assert_renders %{Rails logo},'<r:attachment:title name="rails.png"/>','/' + assert_renders %{Rails logo},'<r:attachment:short_title name="rails.png"/>','/' + assert_renders %{The awesome Rails logo.},'<r:attachment:description name="rails.png"/>','/' - assert_renders %{The awesome....}, '<r:attachment:short_description name="rails.png" length="15" suffix="...." />','/' + assert_renders %{The awesome ...},'<r:attachment:short_description name="rails.png"/>','/' + assert_renders %{The aweso ...},'<r:attachment:short_description name="rails.png" length="13" />','/' + assert_renders %{The awesome Rails logo.}, '<r:attachment:short_description name="rails.png" length="35" />','/' - assert_renders %{rails.png},'<r:attachment:filename name="rails.png"/>','/' - assert_renders %{rails.png},'<r:attachment:short_filename name="rails.png"/>','/' - assert_renders %{rails...},'<r:attachment:short_filename name="rails.png" suffix="..." length="8" />','/' + assert_renders %{The awesome....}, '<r:attachment:short_description name="rails.png" length="15" suffix="...." />','/' + + assert_renders %{rails.png},'<r:attachment:filename name="rails.png"/>','/' + assert_renders %{rails.png},'<r:attachment:short_filename name="rails.png"/>','/' + assert_renders %{rails...},'<r:attachment:short_filename name="rails.png" suffix="..." length="8" />','/' assert_render_error "attachment is not an image.", '<r:attachment:image name="foo.txt" />', '/' end - + def test_positions - img = page_attachments(:rails_png) - txt = page_attachments(:foo_txt) - assert_equal 1, img.position - assert_equal 2, txt.position - img.move_lower - txt.reload - assert_equal 2, img.position - assert_equal 1, txt.position + img = page_attachments(:rails_png) + txt = page_attachments(:foo_txt) + assert_equal 1, img.position + assert_equal 2, txt.position + img.move_lower + txt.reload + assert_equal 2, img.position + assert_equal 1, txt.position end def test_iteration @@ -109,17 +109,17 @@ class PageAttachmentsExtensionTest < Test::Unit::TestCase assert_renders %{<a href="#{txt.public_filename}">foo.txt</a><a href="#{img.public_filename}">rails.png</a>}, %{<r:attachment:each by="filename"><r:link/></r:attachment:each>}, '/' end - + def test_limit_offset img = page_attachments(:rails_png) txt = page_attachments(:foo_txt) - + assert_renders %{<a href="#{img.public_filename}">rails.png</a>}, %{<r:attachment:each limit="1" offset="1" by="filename"><r:link/></r:attachment:each>}, '/' assert_renders %{<a href="#{txt.public_filename}">foo.txt</a>}, %{<r:attachment:each limit="1" offset="0" by="filename"><r:link/></r:attachment:each>}, '/' end - + def test_attachment_inheritance @page = pages(:documentation) img = page_attachments(:rails_png) @@ -127,12 +127,12 @@ class PageAttachmentsExtensionTest < Test::Unit::TestCase assert_renders img.public_filename, '<r:attachment:url name="rails.png" />', '/documentation' assert_renders txt.public_filename, '<r:attachment:url name="foo.txt" />', '/documentation' end - + def test_filter_by_extension assert_renders "rails.png", %{<r:attachment:each extensions="png"><r:filename/></r:attachment:each>} assert_renders "rails.pngfoo.txt", %{<r:attachment:each extensions="png|txt"><r:filename/></r:attachment:each>} end - + def test_if_attachment_tag assert_renders "content", %{<r:if_attachments>content</r:if_attachments>} assert_renders "", %{<r:if_attachments min_count="3">content</r:if_attachments>} test/functional/page_attachments_extension_test.rb @@ -14,13 +14,13 @@ end require "#{RADIANT_ROOT}/test/test_helper" class Test::Unit::TestCase - + # Include a helper to make testing Radius tags easier test_helper :extension_tags - + # Add the fixture directory to the fixture path self.fixture_path << File.dirname(__FILE__) + "/fixtures" - + # Add more helper methods to be used by all extension tests here... - + end test/test_helper.rb b7e64f11037ccd0a0d07eb1a70fc90240ab6ec6e john git@johnmuhl.com http://github.com/radiant/radiant-page-attachments-extension/commit/c512e290c84c158c832e900bccd11e023d3de098 c512e290c84c158c832e900bccd11e023d3de098 2009-04-26T11:11:54-07:00 2009-04-26T11:11:54-07:00 cleanup messy whitespace and change DOS to Unix LF 85359389e8525ee76a9c49442593d833d6cf8c50 john git@johnmuhl.com