radiant 1.0.0.rc1 → 1.0.0.rc2

data/vendor/extensions/{assets/lib/assets_admin_ui.rb → clipped/lib/clipped_admin_ui.rb}

@@ -1,4 +1,4 @@
-module AssetsAdminUI
+module ClippedAdminUI
 
  def self.included(base)
    base.class_eval do

data/vendor/extensions/{assets → clipped}/lib/page_asset_associations.rb

@@ -5,7 +5,7 @@ module PageAssetAssociations
   def self.included(base)
     base.class_eval {
       has_many :page_attachments, :order => "position ASC"
-      has_many :assets, :through => :page_attachments, :order => "page_attachments.position ASC", :uniq => true
+      has_many :assets, :through => :page_attachments, :order => "page_attachments.position ASC"
       accepts_nested_attributes_for :page_attachments, :allow_destroy => true
     }
   end

data/vendor/extensions/clipped/lib/radiant-clipped-extension.rb

@@ -0,0 +1,2 @@
+module RadiantClippedExtension
+end

data/vendor/extensions/clipped/lib/radiant-clipped-extension/version.rb

@@ -0,0 +1,3 @@
+module RadiantClippedExtension
+  VERSION = '1.0.0.rc3'
+end

data/vendor/extensions/{assets/lib/tasks/assets_extension_tasks.rake → clipped/lib/tasks/clipped_extension_tasks.rake}

@@ -1,37 +1,43 @@
 namespace :radiant do
   namespace :extensions do
-    namespace :assets do
+    namespace :clipped do
       
-      desc "Runs the migration of the Assets extension"
+      desc "Runs the migration of the Clipped extension"
       task :migrate => :environment do
         require 'radiant/extension_migrator'
-        last_pc_migration = ActiveRecord::Base.connection.select_values("SELECT version FROM #{ActiveRecord::Migrator.schema_migrations_table_name} WHERE version LIKE 'Paperclipped-%'").map{|v| v.sub(/^Paperclipped\-/, '').to_i}.max
-        AssetsExtension.migrator.new(:up, AssetsExtension.migrations_path).send(:assume_migrated_upto_version, last_pc_migration) if last_pc_migration
+        if ActiveRecord::Base.connection.select_values("SELECT version FROM #{ActiveRecord::Migrator.schema_migrations_table_name} WHERE version = 'Assets-20110513205050'").any?
+          puts "Assimilating Assets extension migration 20110513205050"
+          ClippedExtension.migrator.new(:up, ClippedExtension.migrations_path).send(:assume_migrated_upto_version, '20110513205050')
+        elsif last_pc_migration = ActiveRecord::Base.connection.select_values("SELECT version FROM #{ActiveRecord::Migrator.schema_migrations_table_name} WHERE version LIKE 'Paperclipped-%'").map{|v| v.sub(/^Paperclipped\-/, '').to_i}.max
+          puts "Assimilating Paperclipped extension migrations up to #{last_pc_migration}"
+          ClippedExtension.migrator.new(:up, ClippedExtension.migrations_path).send(:assume_migrated_upto_version, last_pc_migration)
+        end
+        
         if ENV["VERSION"]
-          AssetsExtension.migrator.migrate(ENV["VERSION"].to_i)
+          ClippedExtension.migrator.migrate(ENV["VERSION"].to_i)
           Rake::Task['db:schema:dump'].invoke
         else
-          AssetsExtension.migrator.migrate
+          ClippedExtension.migrator.migrate
           Rake::Task['db:schema:dump'].invoke
         end
       end
       
-      desc "Copies public assets of the Assets to the instance public/ directory."
+      desc "Copies public assets of the Clipped extension to the instance public/ directory."
       task :update => :environment do
         is_svn_or_dir = proc {|path| path =~ /\.svn/ || File.directory?(path) }
-        puts "Copying assets from AssetsExtension"
-        Dir[AssetsExtension.root + "/public/**/*"].reject(&is_svn_or_dir).each do |file|
-          path = file.sub(AssetsExtension.root, '')
+        puts "Copying assets from ClippedExtension"
+        Dir[ClippedExtension.root + "/public/**/*"].reject(&is_svn_or_dir).each do |file|
+          path = file.sub(ClippedExtension.root, '')
           directory = File.dirname(path)
           mkdir_p RAILS_ROOT + directory, :verbose => false
           cp_r file, RAILS_ROOT + path, :verbose => false
         end
         
-        # unless AssetsExtension.starts_with? RAILS_ROOT # don't need to copy vendored tasks
-        #   puts "Copying rake tasks from AssetsExtension"
+        # unless ClippedExtension.starts_with? RAILS_ROOT # don't need to copy vendored tasks
+        #   puts "Copying rake tasks from ClippedExtension"
         #   local_tasks_path = File.join(RAILS_ROOT, %w(lib tasks))
         #   mkdir_p local_tasks_path, :verbose => false
-        #   Dir[File.join AssetsExtension.root, %w(lib tasks *.rake)].each do |file|
+        #   Dir[File.join ClippedExtension.root, %w(lib tasks *.rake)].each do |file|
         #     cp file, local_tasks_path, :verbose => false
         #   end
         # end
@@ -39,7 +45,7 @@ namespace :radiant do
         desc "Syncs all available translations for this ext to the English ext master"
         task :sync => :environment do
           # The main translation root, basically where English is kept
-          language_root = AssetsExtension.get_translation_keys(language_root)
+          language_root = ClippedExtension.get_translation_keys(language_root)
 
           Dir["#{language_root}/*.yml"].each do |filename|
             next if filename.match('_available_tags')
@@ -115,8 +121,8 @@ If you would like to use this mode type \"yes\", type \"no\" or just hit enter t
           c.remove_column :assets, :thumbnail
         end
 
-        AssetsExtension.migrator.new(:up, AssetsExtension.migrations_path).send(:assume_migrated_upto_version, 3)
-        AssetsExtension.migrator.migrate
+        ClippedExtension.migrator.new(:up, ClippedExtension.migrations_path).send(:assume_migrated_upto_version, 3)
+        ClippedExtension.migrator.migrate
       end
     end
   end

data/vendor/extensions/{assets → clipped}/public/javascripts/admin/assets.js

@@ -25,11 +25,39 @@ Asset.Upload = Behavior.create({
     
     form.submit();
     $('upload_asset').closePopup();
-    // form.down('input.textbox').clear();
-    // form.down('input.file').clear();
+
+    // Small delay is required here to let safari assemble the payload
+    form.down('input.textbox').clear().defer();
+    form.down('input.file').clear().defer();
   }
 });
 
+
+// this local attachment method works and is much quicker, but it's fragile and doesn't notice radiant configuration changes
+// better to bounce off the server, provided it can be made responsive enough.
+
+// Asset.Attach = Behavior.create({
+//   onclick: function (e) {
+//     if (e) e.stop();
+//     var container = this.element.up('li.asset');
+//     container.addClassName('waiting');
+//     var title = container.down('div.title').innerHTML;
+//     var image = container.down('img');
+//     var uuid = Asset.GenerateUUID();
+//     var asset_id = this.element.getAttribute('rel').split('_').last();
+//     var attachment_field = document.createElement('input');
+//     attachment_field.setAttribute('type', 'hidden');
+//     attachment_field.setAttribute('id', 'page_page_attachments_attributes_' + uuid + '_asset_id');
+//     attachment_field.setAttribute('name', 'page[page_attachments_attributes][' + uuid + '][asset_id]');
+//     attachment_field.value = asset_id;
+//     var placeholder = Asset.AddPlaceholder(title, image, attachment_field);
+//     container.removeClassName('waiting');
+//     placeholder.removeClassName('waiting');
+//   }
+// });
+
+// ajax-based page attachment is a slightly slower but probably more robust option
+//
 Asset.Attach = Behavior.create({
   onclick: function (e) {
     if (e) e.stop();
@@ -74,6 +102,12 @@ Asset.Insert = Behavior.create({
   }
 });
 
+Asset.Sortable = Behavior.create({
+  initialize: function (e) {
+    this.sorter = Asset.MakeSortable(this.element);
+  }
+});
+
 // Asset-filter and search functions are available wherever the asset_table partial is displayed
 
 Asset.DeselectFileTypes = Behavior.create({
@@ -129,6 +163,27 @@ Asset.Pagination = Behavior.create({
   }
 });
 
+Asset.MakeSortable = function (element) {
+  var sorter = Sortable.create(element, {
+    overlap: 'horizontal',
+    constraint: false,
+    handle: 'title',
+    onChange: function (e) { 
+      Asset.SetPositions();
+      Asset.Notify('Assets reordered. Save page to commit changes.'); 
+    }
+  });
+  element.addClassName('sortable');
+  Asset.SetPositions();
+  return sorter;
+}
+
+Asset.SetPositions = function () {
+  $('attachment_fields').select('input.pos').each(function (input, index) {
+    input.value = index;
+  });
+}
+
 // originally taken from phpMyAdmin
 Asset.InsertAtCursor = function(field, insertion) {
   if (document.selection) {  // ie
@@ -173,24 +228,27 @@ Asset.AddToList = function (html) {
   list.insert(html);
   Asset.ShowListIfHidden();
   Asset.Notify('Save page to commit changes');
-  Event.addBehavior.reload();
+  Event.addBehavior.reload();   // #TODO something a bit more specific would be nice here
+  Asset.MakeSortable(list);
 }
 
 Asset.RemoveFromList = function (container) {
   var el = null;
   if (!!(el = container.down('input.attacher'))) el.remove();
+  if (!!(el = container.down('input.pos'))) el.remove();
   if (!!(el = container.down('input.destroyer'))) el.value = 1;
   container.dropOut({afterFinish: Asset.HideListIfEmpty});
   container.addClassName('detached');
 }
 
-Asset.AddPlaceholder = function (title, image) {
+Asset.AddPlaceholder = function (title, image, contents) {
   var placeholder = document.createElement('li').addClassName('asset').addClassName('waiting');
+  if (contents) placeholder.insert(contents);
   var front = document.createElement('div').addClassName('front');
-  if (image) front.insert(image.clone());
+  if (image) front.insert(document.createElement('div').addClassName('thumbnail').insert(image.clone()));
   placeholder.insert(front);
-  var back = document.createElement('div').addClassName('back').insert(document.createElement('div').addClassName('title').update('please wait'));
-  if (title) back.update(title);
+  if (!title) title = 'please wait';
+  var back = document.createElement('div').addClassName('back').insert(document.createElement('div').addClassName('title').update(title));
   placeholder.insert(back);
   $('attachment_fields').insert(placeholder);
   Asset.ShowListIfHidden();
@@ -226,11 +284,11 @@ Asset.HideListIfEmpty = function () {
 }
 
 Event.addBehavior({
+  'ul#attachment_fields': Asset.Sortable,
   'form.upload_asset': Asset.Upload,
   'a.attach_asset': Asset.Attach,
   'a.detach_asset': Asset.Detach,
   'a.insert_asset': Asset.Insert,
-  'a.copy_asset': Asset.Copy,
   'a.deselective': Asset.DeselectFileTypes,
   'a.selective': Asset.SelectFileType,
   'form.search': Asset.SearchForm,

data/vendor/extensions/{assets → clipped}/public/stylesheets/sass/admin/assets.sass

@@ -137,8 +137,6 @@ p.asset
       &:hover
         .back
           +opacity(1)
-      &.image:hover
-        .back
           background: rgba(white, 0.6)
       &.waiting
         background-color: #E6EAED
@@ -167,15 +165,23 @@ p.asset
       color: #aaa
       &.important
         color: #d99
-      
+  ul.sortable
+    li.asset
+      div.title
+        cursor: move
+        &:hover
+          font-weight: bold
+     
 #assets_table.assets
   position: relative
-  background: #7e7e7e
   p
     padding: 40px
-    color: #d99
+      top: 45px
+    color: silver
     text-align: center
-    font-size: 80%
+    font:
+      size: 75%
+      style: oblique
   ul
     clear: both
     li.asset

data/vendor/extensions/clipped/radiant-clipped-extension.gemspec

@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "radiant-clipped-extension/version"
+
+Gem::Specification.new do |s|
+  s.name        = "radiant-clipped-extension"
+  s.version     = RadiantClippedExtension::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Keith Bingman", "Benny Degezelle", "William Ross", "John W. Long"]
+  s.email       = ["radiant@radiantcms.org"]
+  s.homepage    = "http://radiantcms.org"
+  s.summary     = %q{Assets for Radiant CMS}
+  s.description = %q{Assets extension on based Keith Bingman's excellent Paperclipped extension.}
+
+  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"]
+
+  s.post_install_message = %{
+  Add this to your radiant project with:
+    config.gem 'radiant-clipped-extension', :version => '~>#{RadiantClippedExtension::VERSION}'
+  }
+
+  s.add_dependency 'acts_as_list'
+  s.add_dependency 'paperclip', "~> 2.3.3"
+  s.add_dependency 'uuidtools'
+end

data/vendor/extensions/clipped/spec/controllers/admin/page_attachments_controller_spec.rb

@@ -0,0 +1,50 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+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/vendor/extensions/{assets → clipped}/spec/datasets/assets_dataset.rb

@@ -17,7 +17,8 @@ class AssetsDataset < Dataset::Base
         :title => name,
         :asset_file_name =>  'asset.jpg',
         :asset_content_type =>  'image/jpeg',
-        :asset_file_size => '46248'
+        :asset_file_size => '46248',
+        :uuid => UUIDTools::UUID.timestamp_create.to_s
       }.merge(attributes)
       if @current_page_id
         create_record :page_attachment, "#{name}_attachment".symbolize, {

data/vendor/extensions/{assets/spec/lib/tag_deprecation_spec.rb → clipped/spec/lib/asset_tags_spec.rb}

@@ -1,10 +1,8 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe Page do
+describe AssetTags do
   dataset :assets
   let(:page) { pages(:pictured) }
-
-  # This isn't really a proper test of the deprecation mechanism, but perhaps it's right for the assets extensions
   
   context "Asset tags" do
     %w{top_padding width height caption asset_file_name asset_content_type asset_file_size id filename image flash thumbnail url link extension if_content_type page:title page:url}.each do |name|
@@ -23,7 +21,7 @@ describe Page do
   context "substituting new tags for old" do
     it "should call the right substitute tag" do
       AssetTags.deprecated_tag 'mither', :substitute => 'assets:filename', :deadline => '3.0.0'
-      Rails.logger.should_receive(:warn).at_least(:once)
+      ActiveSupport::Deprecation.should_receive(:warn).at_least(:once)
       page.should render("<r:assets:first><r:mither /></r:assets:first>").as( 'asset.jpg' )
     end    
   end
@@ -34,16 +32,6 @@ describe Page do
         page.should render("<r:assets:first><r:assets:id /></r:assets:first>").as( asset_id(:tester).to_s )
       }.should_not raise_error
     end
-    
-    it "should log a warning"
-    
-    context "in development" do
-      it "should render a visible warning"
-    end
-    
-    context "in production" do
-      it "should not render a visible warning"
-    end
-  
   end
+  
 end