radiant 1.0.0.rc1 → 1.0.0.rc2

data/radiant.gemspec

@@ -7,7 +7,6 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Radiant CMS dev team"]
-  s.date = %q{2010-06-27}
   s.default_executable = %q{radiant}
   s.description = %q{Radiant is a simple and powerful publishing system designed for small teams.
 It is built with Rails and is similar to Textpattern or MovableType, but is
@@ -16,7 +15,7 @@ a general purpose content managment system--not merely a blogging engine.}
   s.executables = ["radiant"]
   s.extra_rdoc_files = ["README", "CONTRIBUTORS", "CHANGELOG", "INSTALL", "LICENSE"]
   ignores = File.read('.gitignore').split("\n").inject([]) {|a,p| a + Dir[p] }
-  s.files = Dir['**/*','.gitignore', 'public/.htaccess'] - ignores
+  s.files = Dir['**/*','.gitignore', 'public/.htaccess', 'log/.keep'] - ignores
   s.homepage = %q{http://radiantcms.org}
   s.rdoc_options = ["--title", "Radiant -- Publishing for Small Teams", "--line-numbers", "--main", "README", "--exclude", "app", "--exclude", "bin", "--exclude", "config", "--exclude", "db", "--exclude", "features", "--exclude", "lib", "--exclude", "log", "--exclude", "pkg", "--exclude", "public", "--exclude", "script", "--exclude", "spec", "--exclude", "test", "--exclude", "tmp", "--exclude", "vendor"]
   s.require_paths = ["lib"]
@@ -24,6 +23,7 @@ a general purpose content managment system--not merely a blogging engine.}
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{A no-fluff content management system designed for small teams.}
 
+  s.add_dependency "acts_as_list", "~> 0.1.2"
   s.add_dependency 'haml', '~>3.0.25'
   s.add_dependency 'compass', '~> 0.10.6'
   s.add_dependency 'delocalize', '~>0.2.3'
@@ -32,6 +32,7 @@ a general purpose content managment system--not merely a blogging engine.}
   s.add_dependency 'rack', '~> 1.1.1'
   s.add_dependency 'will_paginate', '~> 2.3.11'
   s.add_dependency 'RedCloth', '>= 4.0.0'
+  s.add_dependency "uuidtools", "~> 2.1.2"
   
   s.add_development_dependency 'cucumber', '> 0.3.9'
   s.add_development_dependency 'cucumber-rails', '~> 0.3.2'

data/script/console

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/console'
+require File.expand_path('../../config/boot',  __FILE__)
+require 'commands/console'

data/spec/controllers/admin/pages_controller_spec.rb

@@ -222,7 +222,7 @@ describe Admin::PagesController do
         post :preview, preview_params
         non_updated_page = Page.find(preview_page.id)
         non_updated_page.title.should_not equal('BOGUS')
-        non_updated_page.updated_at.to_i.should equal(original_date)
+        non_updated_page.updated_at.to_i.should == original_date
       end
     end
   end

data/spec/lib/radiant/taggable_spec.rb

@@ -149,6 +149,59 @@ describe Radiant::Taggable, "when included in a module with defined tags which i
     end
 end
 
+describe Radiant::Taggable, "when included in a module with deprecated tags" do
+
+  class OldTestObject
+    include Radiant::Taggable
+    
+    desc %{This is an exciting new tag}
+    tag "new_hotness" do "Dreadful film."; end
+
+    desc %{This tag is deprecated but still renders the text "just an old test".}
+    deprecated_tag "old_testy" do "just an old test"; end
+
+    desc %{This tag deprecated in favour of the tag 'new_hotness'.}    
+    deprecated_tag "old_busted", :substitute => 'new_hotness', :version => '9.0'
+  end
+
+  before :each do
+    @object = OldTestObject.new
+    @tag_binding = mock('tag_binding')
+    @tag_binding.stub!(:attr).and_return({:name => 'testy'})
+    @tag_binding.stub!(:block).and_return(nil)
+  end
+
+  it "should have a collection of defined tags" do
+    OldTestObject.should respond_to(:tags)
+    OldTestObject.tags.should =~ ['new_hotness', 'old_testy', 'old_busted']
+  end
+  
+  describe 'rendering a deprecated tag with no substitute' do
+    it "should warn and render" do
+      ActiveSupport::Deprecation.should_receive(:warn).and_return(true)
+      @object.render_tag(:old_testy, @tag_binding).should == "just an old test"
+    end
+  end
+
+  describe 'rendering a deprecated tag with substitution' do
+    it "should warn and substitute" do
+      ActiveSupport::Deprecation.should_receive(:warn).and_return(true)
+      @tag_binding.should_receive(:render).with("new_hotness", {:name => 'testy'}).and_return("stubbed tag")
+      @object.render_tag(:old_busted, @tag_binding).should == "stubbed tag"
+    end
+  end
+
+  describe 'rendering a deprecated tag with an expiry deadline' do
+    it "should warn with deadline" do
+      ActiveSupport::Deprecation.should_receive(:warn) { |*args|
+        args.first =~ /will be removed in radiant 9\.0/
+      }
+      @tag_binding.stub!(:render)
+      @object.render_tag(:old_busted, @tag_binding)
+    end
+  end
+end
+
 describe Radiant::Taggable::Util do
   it "should normalize leading whitespace" do
         markup = %{  

data/vendor/extensions/archive/Rakefile

@@ -26,7 +26,7 @@ Object.send(:remove_const, :RADIANT_ROOT)
 
 extension_root = File.expand_path(File.dirname(__FILE__))
 
-task :default => :spec
+task :default => [:spec, :features]
 task :stats => "spec:statsetup"
 
 desc "Run all specs in spec directory"
@@ -36,7 +36,6 @@ Spec::Rake::SpecTask.new(:spec) do |t|
 end
 
 task :features => 'spec:integration'
-task :spec => :features
 
 namespace :spec do
   desc "Run all specs in spec directory with RCov"
@@ -64,7 +63,8 @@ namespace :spec do
   desc "Run the Cucumber features"
   Cucumber::Rake::Task.new(:integration) do |t|
     t.fork = true
-    t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
+    t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
+    # t.feature_pattern = "#{extension_root}/features/**/*.feature"
     t.profile = "default"
   end
 

data/vendor/extensions/archive/features/support/env.rb

@@ -4,4 +4,8 @@ ENV["RAILS_ENV"] = "test"
 extension_env = File.expand_path(File.dirname(__FILE__) + '/../../../../../config/environment')
 require extension_env+'.rb'
 
-Dir.glob(File.join(RADIANT_ROOT, "features", "**", "*.rb")).each {|step| require step unless step =~ /datasets_loader\.rb$/ }
+Dir.glob(File.join(RADIANT_ROOT, "features", "**", "*.rb")).each {|step| require step unless step =~ /datasets_loader\.rb$/}
+ 
+Cucumber::Rails::World.class_eval do
+  dataset :archive
+end

data/vendor/extensions/archive/features/support/paths.rb

@@ -1,14 +1,22 @@
-def path_to(page_name)
-  case page_name
+module NavigationHelpers
   
-  when /the homepage/i
-    root_path
+  # Extend the standard PathMatchers with your own paths
+  # to be used in your features.
+  # 
+  # The keys and values here may be used in your standard web steps
+  # Using:
+  #
+  #   When I go to the "archive" admin page
+  # 
+  # would direct the request to the path you provide in the value:
+  # 
+  #   admin_archive_path
+  # 
+  PathMatchers = {} unless defined?(PathMatchers)
+  PathMatchers.merge!({
+    # /archive/i => 'admin_archive_path'
+  })
   
-  when /login/i
-    login_path
-  # Add more page name => path mappings here
-  
-  else
-    raise "Can't find mapping from \"#{page_name}\" to a path."
-  end
-end
+end
+
+World(NavigationHelpers)

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

@@ -11,14 +11,19 @@ Gem::Specification.new do |s|
   s.homepage    = "http://radiantcms.org"
   s.summary     = %q{Archive for Radiant CMS}
   s.description = %q{Provides page types for news or blog archives.}
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  
+  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-archive-extension', :version => '#{RadiantArchiveExtension::VERSION}'
+    config.gem 'radiant-archive-extension', :version => '~>#{RadiantArchiveExtension::VERSION}'
   }
 end

data/vendor/extensions/{assets → clipped}/README.md

@@ -1,15 +1,13 @@
-Radiant Assets Extension
+Radiant Clipped Extension
 ------------------------
 
-Warning: work in progress!
-
 This is a new core extension intended for use with Radiant version 1.0 or higher. 
 It is based on Keith Bingman's excellent Paperclipped extension, for which it is a drop-in replacement. 
 It should also be an easy upgrade from `page_attachments`, but I haven't tested that yet.
 
 ## Changes
 
-* video files frame-grabbed
+* video files frame-grabbed (automatically disabled if FFmpeg is not found)
 * pdfs thumbnailed
 * new asset-retrieval and page-attachment interface (by John Long)
 * new inline upload mechanism that allows several concurrent uploads and attachment to new pages
@@ -72,9 +70,9 @@ and can be deleted. See below for some radius tag changes that won't affect you
 
 ## Upgrading from page_attachments
 
-This is supposed to be straightforward too. In theory once the assets extension has been migrated all you need is:
+This is supposed to be straightforward too. In theory once the clipped extension has been migrated all you need is:
 
-    rake radiant:extensions:assets:migrate_from_page_attachments
+    rake radiant:extensions:clipped:migrate_from_page_attachments
 
 But I haven't tested that theory recently.
 
@@ -97,36 +95,38 @@ forms still work but they are deprecated and (as the log messages will keep tell
 
 ## Configuration
 
-The assets extension is configured in the usual way, but only its minor settings are exposed in the admin interface. The
+The clipped extension is configured in the usual way, but only its minor settings are exposed in the admin interface. The
 more architectural settings shouldn't be changed at runtime and some of them will require a lot of sorting out if they're 
 changed at all, so those are only accessible through the console or by editing the database. Eventually they will be made 
 part of the initial radiant installation process.
 
 ### Structural settings
 
-* `assets.url` sets the url scheme for attached files. Paperclip interpolations are applied. You probably don't want to change this.
-* `assets.path` sets the path scheme for attached files. Paperclip interpolations are applied. You might conceivably want to change this.
-* `assets.additional_thumbnails` is a string of comma-separated style definitions that is passed to paperclip for any asset type that has a post-processor (that is, currently, images, pdfs and video clips). The definitions are in the format name=geometry and when assembled the string will look something like `preview=640x640>,square=#260x260`. Thumbnail and icon styles are already defined and don't need to be configured this way.
-* `assets.storage` can be 'filesystem' (the default) or 's3' for amazon's cloud service.
-* `assets.skip_filetype_validation` is true by default and allows uploads of any mime type.
+* `clipped.url` sets the url scheme for attached files. Paperclip interpolations are applied. You probably don't want to change this.
+* `clipped.path` sets the path scheme for attached files. Paperclip interpolations are applied. You might conceivably want to change this.
+* `clipped.additional_thumbnails` is a string of comma-separated style definitions that is passed to paperclip for any asset type that has a post-processor (that is, currently, images, pdfs and video clips). The definitions are in the format name=geometry and when assembled the string will look something like `preview=640x640>,square=#260x260`. Thumbnail and icon styles are already defined and don't need to be configured this way.
+* `clipped.storage` can be 'filesystem' (the default) or 's3' for amazon's cloud service.
+* `clipped.skip_filetype_validation` is true by default and allows uploads of any mime type.
 
 If the storage option is set to 's3' then these settings are also required:
 
-* `assets.s3.bucket`
-* `assets.s3.key`
-* `assets.s3.secret`
+* `clipped.s3.bucket`
+* `clipped.s3.key`
+* `clipped.s3.secret`
 
 And optionally:
 
-* `assets.s3.host_alias`
+* `clipped.s3.host_alias`
 
 ### Configurable settings
 
 If you want to disable a whole category of post-processing, set one of these options to false:
 
-* `assets.create_image_thumbnails?`
-* `assets.create_video_thumbnails?`
-* `assets.create_pdf_thumbnails?`
+* `clipped.create_image_thumbnails?`
+* `clipped.create_video_thumbnails?`
+* `clipped.create_pdf_thumbnails?`
+
+If we can't find ffmpeg on initialization, video thumbnailing will be disabled automatically by setting `clipped.create_video_thumbnails?` to false.
 
 To set a threshold for the size of uploads permitted:
 
@@ -204,7 +204,7 @@ Working example:
 This extension is a work in progress. If you would like to
 contribute, please fork the project and submit a pull request:
 
-<https://github.com/radiant/radiant-assets-extension>
+<https://github.com/radiant/radiant-clipped-extension>
 
 Pull requests with working tests are preferred and have a greater chance of
 being merged.
@@ -219,7 +219,7 @@ Radiant-Dev mailing list:
 If you would like to file a bug report or feature request, please create a
 GitHub issue here:
 
-<https://github.com/radiant/radiant-assets-extension/issues>
+<https://github.com/radiant/radiant-clipped-extension/issues>
 
 ## Authors
 

data/vendor/extensions/{assets → clipped}/Rakefile

@@ -1,36 +1,32 @@
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "radiant-assets-extension"
-    gem.summary = %Q{Assets extension for Radiant CMS}
-    gem.description = %Q{Assets extension based Keith Bingman's excellent Paperclipped extension.}
-    gem.email = "me@johnwlong.com"
-    gem.homepage = "https://github.com/radiant/radiant-assets-extension"
-    gem.authors = ["Keith Bingman", "Benny Degezelle", "William Ross", "John W. Long"]
-    gem.add_dependency 'radiant', ">= 0.9.1"
-    gem.add_dependency 'paperclip', "~> 2.3.3"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+# Determine where the RSpec plugin is by loading the boot
+unless defined? RADIANT_ROOT
+  ENV["RAILS_ENV"] = "test"
+  case
+  when ENV["RADIANT_ENV_FILE"]
+    require File.dirname(ENV["RADIANT_ENV_FILE"]) + "/boot"
+  when File.dirname(__FILE__) =~ %r{vendor/radiant/vendor/extensions}
+    require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../")}/config/boot"
+  else
+    require "#{File.expand_path(File.dirname(__FILE__) + "/../../../")}/config/boot"
   end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. This is only required if you plan to package copy_move as a gem."
 end
-# I think this is the one that should be moved to the extension Rakefile template
 
-# In rails 1.2, plugins aren't available in the path until they're loaded.
-# Check to see if the rspec plugin is installed first and require
-# it if it is.  If not, use the gem version.
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'config', 'boot')
 require 'rake'
 require 'rake/rdoctask'
+require 'rake/testtask'
 
-rspec_base = File.expand_path(File.dirname(__FILE__) + '/../../radiant/vendor/plugins/rspec/lib')
+rspec_base = File.expand_path(RADIANT_ROOT + '/vendor/plugins/rspec/lib')
 $LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
 require 'spec/rake/spectask'
-# require 'spec/translator'
+require 'cucumber'
+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 => [:spec, :features]
 task :stats => "spec:statsetup"
 
 desc "Run all specs in spec directory"
@@ -39,6 +35,8 @@ Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
 end
 
+task :features => 'spec:integration'
+
 namespace :spec do
   desc "Run all specs in spec directory with RCov"
   Spec::Rake::SpecTask.new(:rcov) do |t|
@@ -62,13 +60,13 @@ namespace :spec do
     end
   end
   
-  # Hopefully no one has written their extensions in pre-0.9 style
-  # desc "Translate specs from pre-0.9 to 0.9 style"
-  # task :translate do
-  #   translator = ::Spec::Translator.new
-  #   dir = RAILS_ROOT + '/spec'
-  #   translator.translate(dir, dir)
-  # end
+  desc "Run the Cucumber features"
+  Cucumber::Rake::Task.new(:integration) do |t|
+    t.fork = true
+    t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
+    # t.feature_pattern = "#{extension_root}/features/**/*.feature"
+    t.profile = "default"
+  end
 
   # Setup specs for stats
   task :statsetup do
@@ -98,10 +96,10 @@ namespace :spec do
   end
 end
 
-desc 'Generate documentation for the assets extension.'
+desc 'Generate documentation for the clipped extension.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'PaperclippedExtension'
+  rdoc.title    = 'ClippedExtension'
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')

data/vendor/extensions/{assets → clipped}/app/controllers/admin/assets_controller.rb

@@ -28,27 +28,32 @@ class Admin::AssetsController < Admin::ResourceController
     @asset.update_attributes!(params[:asset])
     if params[:for_attachment]
       @page_attachment = @asset.page_attachments.build(:page_id => params[:page_id])
-      render :partial => 'admin/page_attachments/new_attachment'
+      render :partial => 'admin/page_attachments/attachment'
     else 
       response_for :create
     end
   end
   
-  # Refreshes the paperclip thumbnails
   def refresh
-    unless params[:id]
-      @assets = Asset.find(:all)
-      @assets.each do |asset|
-        asset.asset.reprocess!
-      end
-      flash[:notice] = t('assets_extension.thumbnails_refreshed')
-      redirect_to admin_assets_path
-    else
+    if params[:id]
       @asset = Asset.find(params[:id])
       @asset.asset.reprocess!
-      flash[:notice] = t('assets_extension.thumbnails_refreshed')
+      flash[:notice] = t('clipped_extension.thumbnails_refreshed')
       redirect_to edit_admin_asset_path(@asset)
+    else
+      render
     end
   end
   
+  only_allow_access_to :regenerate,
+    :when => [:admin],
+    :denied_url => { :controller => 'admin/assets', :action => 'index' },
+    :denied_message => 'You must have admin privileges to refresh the whole asset set.'
+
+  def regenerate
+    Asset.all.each { |asset| asset.asset.reprocess! }
+    flash[:notice] = t('clipped_extension.all_thumbnails_refreshed')
+    redirect_to admin_assets_path
+  end
+  
 end