app/views/admin/pages/_attachment.html.haml app/views/admin/pages/_attachments_box.html.haml features/attachments.feature features/step_definitions/attachment_steps.rb features/support/env.rb features/support/paths.rb public/images/admin/drag_order.png public/javascripts/admin/page_attachments.js public/stylesheets/admin/page_attachments.css spec/controllers/pages_controller_spec.rb spec/fixtures/foo.txt spec/fixtures/rails.png @@ -11,15 +11,6 @@ Installation If you want `page_attachments` to generate and display thumbnails of your uploaded images you'll first need to install one of, [`image_science`][is], [`mini-magick`][mm] or [`rmagick`][rm] on your server. This is completely optional, `page_attachments` will still function in every other way without any of these packages installed. -Next, you need to install the `attachment_fu` plugin. - - cd /path/to/radiant - git clone git://github.com/technoweenie/attachment_fu.git vendor/plugins/attachment_fu - -If you don't have `git` installed you can simply [download a tarball][af] of `attachment_fu`, upload and unpack it to your `vendor/plugins` directory. - -**Failing to install the `attachment_fu` plugin before proceeding will result in an "`uninitialized constant Technoweenie::AttachmentFu`" error when you try to install `page_attachments`.** - Now you're ready to install `page_attachments`. cd /path/to/radiant @@ -29,8 +20,6 @@ Now you're ready to install `page_attachments`. If you don't have `git` you can [download a tarball][pa]. -During the `migrate` task you may encounter an "`uninitialized constant Technoweenie::AttachmentFu::Backends`". If this happens try `git clone git://github.com/technoweenie/attachment_fu.git vendor/extensions/page_attachments/vendor/plugins/attachment_fu` and re-run the `migrate` task. - Attachment thumbnails for images default to `:icon => '50x50>'`. You can customize that by setting `PAGE_ATTACHMENT_SIZES` to whatever you need in your `config/environment.rb` file @@ -38,6 +27,10 @@ Attachment thumbnails for images default to `:icon => '50x50>'`. You can customi Restart your server and refresh the admin interface. +Running features and specs +--- +The Cucumber features use Webrat and Selenium. You'll need the webrat 0.5.1 and selenium-client 1.2.16 gems installed and you'll need to change the version of webrat specified in environments/test.rb. + Managing Attachments --- README.md @@ -26,12 +26,15 @@ $LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base) require 'spec/rake/spectask' # require 'spec/translator' +$:.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib') +require 'cucumber/rake/task' + # Cleanup the RADIANT_ROOT constant so specs will load the environment Object.send(:remove_const, :RADIANT_ROOT) extension_root = File.expand_path(File.dirname(__FILE__)) -task :default => :spec +task :default => [:features, :spec] task :stats => "spec:statsetup" desc "Run all specs in spec directory" @@ -40,6 +43,10 @@ Spec::Rake::SpecTask.new(:spec) do |t| t.spec_files = FileList['spec/**/*_spec.rb'] end +Cucumber::Rake::Task.new(:features) do |t| + t.cucumber_opts = "--format progress" +end + namespace :spec do desc "Run all specs in spec directory with RCov" Spec::Rake::SpecTask.new(:rcov) do |t| Rakefile @@ -5,9 +5,8 @@ module PageAttachmentAssociations :class_name => "PageAttachment", :dependent => :destroy, :order => 'position' - attr_accessor :add_attachments - after_save :save_attachments include InstanceMethods + accepts_nested_attributes_for :attachments, :allow_destroy => true } end @@ -17,19 +16,5 @@ module PageAttachmentAssociations att = attachments.find(:first, :conditions => ["filename LIKE ?", name.to_s]) att.blank? ? ((parent.attachment(name) if parent) or nil) : att end - - def save_attachments - if @add_attachments && ! @add_attachments['file'].blank? - i = 0 - @add_attachments['file'].each do |page_attach| - attach = PageAttachment.new(:uploaded_data => page_attach) - attach.title = @add_attachments['title'][i] - attach.description = @add_attachments['description'][i] - attachments << attach - i += 1 - end - end - @add_attachments = nil - end end end app/models/page_attachment_associations.rb @@ -11,7 +11,8 @@ module PageAttachmentsInterface def add_page_attachment_partials @buttons_partials ||= [] @buttons_partials << "attachments_box" - include_javascript 'page_attachments' + include_javascript 'admin/page_attachments' + include_javascript 'dragdrop' include_stylesheet 'admin/page_attachments' end end app/models/page_attachments_interface.rb @@ -19,8 +19,8 @@ namespace :radiant do Dir[PageAttachmentsExtension.root + "/public/**/*"].reject(&is_svn_or_dir).each do |file| path = file.sub(PageAttachmentsExtension.root, '') directory = File.dirname(path) - mkdir_p RAILS_ROOT + directory, :verbose => false - cp file, RAILS_ROOT + path, :verbose => false + mkdir_p RAILS_ROOT + directory + cp file, RAILS_ROOT + path end end end lib/tasks/page_attachments_extension_tasks.rake @@ -14,7 +14,7 @@ class PageAttachmentsDataset < Dataset::Base def page_attachment_params(attributes={}) page = pages(:home) { - :size => File.join(File.dirname(__FILE__), '/files/', attributes[:filename]).size, + :size => File.join(File.dirname(__FILE__), '/../fixtures/', attributes[:filename]).size, :page => page, :position => next_position(page), :created_by => users(:admin) spec/datasets/page_attachments_dataset.rb @@ -12,9 +12,6 @@ describe Page, 'page attachments' do Page.instance_methods.should include("attachments") Page.instance_methods.should include("attachments=") Page.instance_methods.should include("attachment") - Page.instance_methods.should include("add_attachments") - Page.instance_methods.should include("add_attachments=") - Page.instance_methods.should include("save_attachments") Page.instance_methods.should include("tag:attachment") [:content_type, :size, :width, :height, :date, :image, :link, :author, :title, :short_title, :short_description, :short_filename, :description, :position].each do |key| @@ -22,4 +19,14 @@ describe Page, 'page attachments' do end end + it "should receive nested attributes for attachments" do + page = pages(:home) + page.attachments.length.should == 2 + file = + + page.attachments_attributes = [{:uploaded_data => fixture_file_upload("#{PageAttachmentsExtension.root}/spec/fixtures/rails.png", 'image/png')}] + page.save! + page.reload.attachments.length.should == 1 + end + end spec/models/page_spec.rb @@ -11,6 +11,8 @@ unless defined? RADIANT_ROOT end require "#{RADIANT_ROOT}/spec/spec_helper" +require 'webrat' + Dataset::Resolver.default << (File.dirname(__FILE__) + "/datasets") if File.directory?(File.dirname(__FILE__) + "/matchers") @@ -33,4 +35,5 @@ Spec::Runner.configure do |config| # # If you declare global fixtures, be aware that they will be declared # for all of your examples, even those that don't use them. + config.include Webrat::Matchers, :type => [:views] end \ No newline at end of file spec/spec_helper.rb app/controllers/page_attachments_controller.rb app/views/admin/pages/_attachment.html.erb app/views/admin/pages/_attachments_box.html.erb public/images/admin/move_higher.png public/images/admin/move_lower.png public/javascripts/page_attachments.js public/stylesheets/page_attachments.css spec/datasets/files/foo.txt spec/datasets/files/rails.png a6bd78a95ca0fca7c13c46a4da9006a84ad484c4 Jason Garber jg@jasongarber.com http://github.com/radiant/radiant-page-attachments-extension/commit/8105853c35071712ab130e668d14e813a95f5ebe 8105853c35071712ab130e668d14e813a95f5ebe 2009-09-01T11:28:34-07:00 2009-08-23T03:34:39-07:00 Use nested attributes to save, reorder attachments. Test with cucumber + webrat + selenium 24c50da557a4f2f2f4af35294f491bfe975b92aa Jason Garber jg@jasongarber.com