radiant 0.6.4 → 0.6.5

data/CHANGELOG

@@ -1,14 +1,167 @@
 == Change Log
 
+=== 0.6.5 Chisel
+* Convert StandardTags specs to nested describe blocks. [Sean Cribbs]
+* Remove test/unit tests - all RSpec now. [Sean Cribbs]
+* Fix radiant:update:javascripts task. [Sean Cribbs]
+* Fix problem in test fixtures. [Adam Keyes]
+* Add <r:meta /> tag and appropriate fields to pages table. [Sean Cribbs]
+* Move admin-related javascripts to admin/. [Bjørn Arild Mæland]
+* Add if_self and if_ancestor_or_self tags. [Marty Haught, Sean Cribbs]
+* Rename created_by and updated_by columns on standard models. [Sean Cribbs]
+* Fix Dir glob for extension rake tasks. [Sean Cribbs]
+* Respect view_paths set by plugins in extensions. [xtoddx]
+* Move extra initialization into after_initialize block. [Sean Cribbs]
+* Notice area now fades away after 3 seconds. [Andrew O'Brien]
+* <r:find /> now accepts paths relative to the current page. [Andrew O'Brien]
+* Update RSpec and RSpec on Rails to r3333. [Josh French]
+* Add autotest support for Radiant and extensions. [Josh French]
+* Add pkg/ ignore to git, correct CSS problems with fieldset tables.
+[Sean Cribbs]
+* Ignore git files when building gem. [Sean Cribbs]
+* Fix generated test and spec harnesses, convert core extensions to specs.
+[Sean Cribbs]
+* Cover edge case in Page spec. [Sean Cribbs]
+* Increase coverage of helper, controller, and model specs. [Sean Cribbs]
+* Correct some view and spec bugs. [Sean Cribbs]
+* Added specs for view helpers. [Sean Cribbs]
+* Use TH for fieldset tables and correct error in CSS. [skrat]
+* Adjust admin links and r:breadcrumbs tag to deal with Rails site prefix.
+[Sean Cribbs]
+* Adjust tags to deal with Rails site prefix (relative_url_root).
+[Sean Cribbs]
+* Resolve issue with undefined method :view_paths in ActionMailer.
+[Sean Cribbs]
+* Fixed incompatibility with RubyGems >= 0.9.5 that broke radiant:freeze:gems
+rake task. [Michael Klett]
+* Fixed problem with the list of templates containing duplicates in the
+db:bootstrap rake task when not running in instance mode. [John Long]
+* Update Subversion URL so rake radiant:freeze:edge works. [John Long]
+* Add AVLUX to list of links in Styled Blog template. [John Long]
+* Fix Ruby 1.8.5 compatibility issue with Dir[]. [Sean Cribbs]
+* Backup old environment.rb when copying new version. [Sean Cribbs]
+* Fill out more controller specs. [Sean Cribbs]
+* Fix Admin::PageController specs. [Sean Cribbs]
+* Make autotest work. [Matthew Elder]
+* Clean up cache files before running site_controller spec. [Matthew Elder]
+* Add r:status tag. [Andrew O'Brien]
+* Add ability to set publication date manually. [Nick Plante, Sean Cribbs]
+* Remove blank nodes in r:navigation tag. [ben]
+* Bubble up parsing exceptions in development mode. [jonleighton]
+* Fix authorization system for controller inheritance [Josh French]
+* Add 'nolinks' attribute to breadcrumbs tag. [abstractioneer]
+* Fix fixtures for RSpec enabled extensions. [andreas]
+* Generate extensions with RSpec support by default, fix rake and script/spec
+in instance mode. [Andrew O'Brien]
+* Support database templates in a Radiant instance. [Benny Degezelle]
+* Make rake test:extensions work in instance mode. [Daniel Sheppard]
+* Fix tests failing in instance mode with config.extensions set.
+[Daniel Sheppard]
+* Finished converting page_controller_test.rb to page_controller_spec.rb
+[John Long]
+* Completed converting user_controller_test.rb to user_controller_spec.rb
+[John Long]
+* Fix failing extension loading tests, remove irrelevant ones. [Sean Cribbs]
+* Fix test:extensions Rake task. [Sean Cribbs]
+* Prevent following the link that toggles visibility of meta items on page
+edit. [Mislav Marohnić]
+* Fix extension loader and previously failing unit tests; update specs.
+[Mislav Marohnić]
+* Fixed problem with response_cached? returning true when perform caching was
+off; fixed failing spec. [John Long]
+* Fixed issues with whitespace in page.rb. [John Long]
+* Fix filtering in tag reference popup. [Mislav Marohnić]
+* Updated rspec and rspec_on_rails. [John Long]
+* Add more controller specs and a matcher for LoginSystem features.
+[Sean Cribbs]
+* Make all extensions loaded by default. [Sean Cribbs]
+* Update extension loader spec. [Sean Cribbs]
+* Work around a nasty issue with extensions + Dependencies unloading in
+development mode. [Mislav Marohnić]
+* Fix the tree expansion issue in admin interface (cookie-related). minor
+cleanup server-side [Mislav Marohnić]
+* Cleanup up the underscore layout hack by using method chain.
+[Mislav Marohnić]
+* Refactored initialization, extension loading, updated plugins. [Sean Cribbs]
+* Fix SiteController#show_page for Rails 2.0. [Mislav Marohnić]
+* Minor optimization for Page; remove the unneccessary 'virtual' accessor.
+[Mislav Marohnić]
+* Fix tests for PostgreSQL: comment out a test that breaks most of the specs
+somehow. [Mislav Marohnić]
+* Failures in initializer_spec.rb fixed [John Long]
+* Failure in site_controller_spec.rb fixed. [John Long]
+* The last test/unit failure is now fixed. [John Long]
+* Failing tests in page_controller_test.rb fixed. [John Long]
+* Error in response cache spec fixed. [Keeran Hawoldar]
+* ActionController::Base.view_paths is now set correctly for extensions.
+[John Long]
+* Changed view extensions to ".html.erb" [John Long]
+* Fixed content type test failures. [John Long]
+* Fix page_test. [John Long]
+* Updated environments. [John Long]
+* Modify ApplicationController spec. [Loren Johnson]
+* Modify SiteController spec. [Loren Johnson]
+* Fix failing unit test for old type of logger. [Daniel Sheppard]
+* Fix problems preventing script/console from running: acts_as_tree is now a
+plugin, view_paths is now a core feature. [Daniel Sheppard]
+* Upgrade to Rails 2.0.2 [Daniel Sheppard]
+* Escape angle brackets to avoid assertion warnings in StandardTags.
+[Sean Cribbs]
+* Remove unused ConsoleUtils module and fix failing specs. [Sean Cribbs]
+* Added standard_tags_spec.rb [John Long]
+* Make sure all scenario pages have at least a body part. [Sean Cribbs]
+* Added render matcher. [John Long]
+* Modify pages scenario. [Loren Johnson]
+* A beginning on the Application and Site controller specs. [Loren Johnson]
+* Fix failing specs - use of before(:all) when before(:each) was needed
+[Daniel Sheppard]
+* Fix failing extension_load_order_test.rb [Daniel Sheppard]
+* Don't load scenarios stuff unless using specs. [Sean Cribbs]
+* Add initializer spec. [Sean Cribbs]
+* Add extension loader spec and refactorings. [Sean Cribbs]
+* Added user_spec.rb [John Long]
+* Upgrade Rails to 1.2.6. [Sean Cribbs]
+* Added user_action_observer_spec.rb [John Long]
+* Removed duplicate load paths from environments/test.rb [John Long]
+* Added text_filter_spec.rb [John Long]
+* Added status_spec.rb [John Long]
+* Added spec/models/snippet_spec.rb [John Long]
+* Added response_cache_spec.rb [John Long]
+* Small improvements to page_part_spec.rb [John Long]
+* Remove duplicate specs and move Radiant::ExtensionMigrator? spec to proper
+location. [Sean Cribbs]
+* Fix admin.js to initialize TabControl even if there are no tabs.
+[Benny Degezelle]
+* Correct RenderTestHelper to better resemble expectations from Rails.
+[Sean Cribbs]
+* Add model specs and scenarios. [John Long]
+* Modify script/spec to work in instance mode. [Andrew O'Brien]
+* Add RSpec to load path in test environment. [Andrew O'Brien]
+* Add specs for Radiant::Extension and Radiant::Taggable. [Sean Cribbs]
+* Fixed admin CSS for IE6 - ugly borders begone! [Bjørn Arild Mæland]
+* Fixed that homepage is no longer cached outside of cache dir, but to
+  "_site-root.data". [Bjørn Arild Mæland]
+* Fix typo in pngfix.js. [Mislav Marohnić]
+* Turn off auto-loading RSpec stuff, even in test environment.
+  [Mislav Marohnić]
+* Add specs for Annotatable, InheritableClassAttributes, LocalTime,
+  MethodObserver, and Simpleton. [Sean Cribbs]
+* Add spec for Radiant::AdminUI and Users scenario. [Sean Cribbs]
+* Import and create boilerplate for RSpec and Scenarios. [Sean Cribbs]
+* Honor config.extensions when running rake test:extensions and also include
+  core extensions. [Daniel Sheppard]
+* Propagate global page when using <r:content /> with inherit attribute.
+  [Sean Cribbs]
+
 === 0.6.4 Gem Shaper
-* Extract Archive pages into a core extension. Add automatic testing of core 
+* Extract Archive pages into a core extension. Add automatic testing of core
   extensions from default test task. [Sean Cribbs]
 * Add <r:if_children /> and <r:unless_children /> tags. [Andrew Neil]
 * Add HTML labels to role checkboxes in user edit template. [zilkey]
-* Cleanup whitespace and line-endings in environment.rb. [Bjorn Maeland]
+* Cleanup whitespace and line-endings in environment.rb. [Bjørn Arild Mæland]
 * Fix various SQL Server issues via Rails ticket #8886. [Mark Gallop]
 * Refactor locals from _node.rhtml into Admin::NodeHelper. [Sean Cribbs]
-* Fix XHTML validation errors in view templates. [Bjorn Maeland]
+* Fix XHTML validation errors in view templates. [Bjørn Arild Mæland]
 * Update Prototype and script.aculo.us to 1.6 and 1.8 releases. [Sean Cribbs]
 * Fix edge case in tabcontrol.js where tab label is incorrect. [Sean Cribbs]
 * Remove duplication in admin.js. [Sean Cribbs]
@@ -18,11 +171,11 @@
   [ana]
 * Allow setting of local timezone via Radiant::Config and auto-adjustment of times
   in admin UI and <r:date /> tag. [Bodhi Philpot]
-* Update to latest Prototype and script.aculo.us and refactor and extract inline 
-  Javascript into external files. [Mislav Marohnic]
-* Narrow scope of exception to only throw on missing fixture files, allowing 
+* Update to latest Prototype and script.aculo.us and refactor and extract inline
+  Javascript into external files. [Mislav Marohnić]
+* Narrow scope of exception to only throw on missing fixture files, allowing
   invalid yaml errors through. [Daniel Sheppard]
-* Added tests to ensure that response_cache stays within the cache dir. 
+* Added tests to ensure that response_cache stays within the cache dir.
   [Daniel Sheppard]
 * Add assert_requires_login to LoginTestHelper. [Sean Cribbs]
 * Make sure tag binding stack is popped when an exception occurs. [jay@jay.fm]
@@ -30,8 +183,8 @@
 * Add logout method to LoginTestHelper. [Sean Cribbs]
 * Run single extension tests with rake test:extensions EXT=<extension_name>
   [Brian Skahan]
-* Update Javascript libraries to Prototype 1.6.0_rc1 and script.aculo.us 
-  1.8.0_pre1. [Mislav Marohnic]
+* Update Javascript libraries to Prototype 1.6.0_rc1 and script.aculo.us
+  1.8.0_pre1. [Mislav Marohnić]
 * Fixed <r:attempted_url /> tag to escape the uri [Daniel Sheppard]
 * Allow parts to be accessed by name from Page#part before they are saved.
   [Sean Cribbs]
@@ -45,7 +198,7 @@
 * Update Rails to 1.2.4. [Sean Cribbs]
 * Add extensions paths to the standard $LOAD_PATH so requires work properly.
   [Sean Cribbs]
-* Fixed some loading issues for plugins that are included in extensions. 
+* Fixed some loading issues for plugins that are included in extensions.
   [Sean Cribbs]
 
 === 0.6.3 Rock Grinder
@@ -54,37 +207,37 @@
 * Added db:remigrate:extensions task. [Sean Cribbs]
 * Show all child pages on remove confirmation, regardless of sitemap expansion.
   [Sean Cribbs]
-* Make LoginSystem store user ids in session rather than whole user objects. 
+* Make LoginSystem store user ids in session rather than whole user objects.
   [Sean Cribbs]
 * Plugins included in an extension's vendor/plugins directory will automatically
   be loaded before the extension is activated. Plugins included in more than one
-  extension will be loaded only once according to the extension load order. 
+  extension will be loaded only once according to the extension load order.
   [Sean Cribbs]
 * Allow subclassing of FileNotFoundPage. [Daniel Sheppard]
 * <r:find/> should not return FileNotFoundPage. [Daniel Sheppard]
-* Change test for tabs to just check dupes and for the requested tab 
-  rather than a specific list (test was breaking if a real extension added 
+* Change test for tabs to just check dupes and for the requested tab
+  rather than a specific list (test was breaking if a real extension added
   a tab). [Daniel Sheppard]
 * Ensure test extensions are loaded in the test environment. [Daniel Sheppard]
-* Prevent ExtensionInitializationTest from unloading real extensions. 
+* Prevent ExtensionInitializationTest from unloading real extensions.
   [Daniel Sheppard]
 * Expire the old URL from the cache when the page slug changes. [Daniel Sheppard]
 * Fix failing tests in instance mode. [Daniel Sheppard]
-* Move difference assertions upstream from forms extension into a test helper. 
+* Move difference assertions upstream from forms extension into a test helper.
   [Sean Cribbs]
 * Update Prototype to 1.5.0 final release. [Sean Cribbs]
-* Allow specification of extension loading order in environment.rb 
+* Allow specification of extension loading order in environment.rb
   [Daniel Sheppard]
-* Fix bugs in assert_global_tag_defined and assert_tag_defined of 
+* Fix bugs in assert_global_tag_defined and assert_tag_defined of
   ExtensionTagTestHelper. [Sean Cribbs]
-* Make sure included stylesheets and javascripts are only linked to once in 
+* Make sure included stylesheets and javascripts are only linked to once in
   <head>. [Sean Cribbs]
 * Fix navigation tag tests. [vitali]
-* Suppress errors about missing default helper by providing a blank helper. 
+* Suppress errors about missing default helper by providing a blank helper.
   [Sean Cribbs]
-* Fix mis-alignment of "Clear cache" button when homepage not present. 
+* Fix mis-alignment of "Clear cache" button when homepage not present.
   [Sean Cribbs]
-* Fix issues with misnesting of modules in fixture loading extension and 
+* Fix issues with misnesting of modules in fixture loading extension and
   test suites running randomly from dispatchers. [Sean Cribbs]
 * Remove invalid image alignment. [tolbrino]
 * Display not_found.rhtml on standard 'not found'-like exceptions. [Sean Cribbs]
@@ -97,7 +250,7 @@
 * Fixed typo in extension model generator documentation
 * Reworked the way the generator extension is loaded (closing #500) [Keita]
 * Fixed failing unit tests in instance mode [Daniel Shephard]
-* Modified the page edit form to use multipart/form-data (useful for an upload 
+* Modified the page edit form to use multipart/form-data (useful for an upload
   extension) [Sean Cribbs]
 
 === 0.6.1 Stone Cutter (May 5, 2007)
@@ -106,7 +259,7 @@
   expanded
 * The find_by_url method has been optimized to improve performance [Daniel
   Sheppard]
-* GET requests are now the only requests that are cached [Daniel Sheppard] 
+* GET requests are now the only requests that are cached [Daniel Sheppard]
 * Added rudimentary support for extension depencency specification through
   directory prefixing [Daniel Sheppard]
 * Fixed syntax error in fixture loading extension [Sean Cribbs]
@@ -129,25 +282,25 @@
 * Added rake tasks for freezing and unfreezing radiant to the edge
 * r:children:each, r:children:first, and r:children:last now all accept the
   same ordering and limit attributes and have the same defaults
-* Snippets are now responsive to global context via the r:page tag. This means 
-  that any tags inside r:page will refer to the page currently being rendered, 
-  i.e. the page requested, not the local contextual page via tags like 
-  r:children:each, etc. This is most relevant to recursive snippets like the 
+* Snippets are now responsive to global context via the r:page tag. This means
+  that any tags inside r:page will refer to the page currently being rendered,
+  i.e. the page requested, not the local contextual page via tags like
+  r:children:each, etc. This is most relevant to recursive snippets like the
   sitemapper example [Sean Cribbs]
-* r:navigation now uses the pipe character ("|") to delimit URLs in the urls 
+* r:navigation now uses the pipe character ("|") to delimit URLs in the urls
   attribute rather than the semi-colon
-* :date now accepts a "for" attribute that specifies which attribute of the 
-  page to render. Valid values of the attribute are published_at, updated_at, 
+* :date now accepts a "for" attribute that specifies which attribute of the
+  page to render. Valid values of the attribute are published_at, updated_at,
   created_at, and now.
 * Created the r:cycle tag to make alternating tables and lists possible
-* Added popups for filter and tag documentation inside the page editing 
+* Added popups for filter and tag documentation inside the page editing
   interface
 * Added support for optimistic locking for all models [Daniel Sheppard]
 * Added support to Radiant::Config for boolean values [Sean Cribbs]
-* Caching no longer stores the headers and body in the same file [Daniel 
+* Caching no longer stores the headers and body in the same file [Daniel
   Sheppard]
-* Added support for the X-Sendfile header that works in conjunction with 
-  caching to speed it up (by default X-Sendfile support is off) [Daniel 
+* Added support for the X-Sendfile header that works in conjunction with
+  caching to speed it up (by default X-Sendfile support is off) [Daniel
   Sheppard]
 * Moved the images and stylesheets into images/admin and stylesheets/admin
   respectively to make it easier for Radiant's assets to coexist easily with

data/CONTRIBUTORS

@@ -4,16 +4,39 @@
 The following people have submitted changes which have been applied to the
 core:
 
+=== 0.6.5 Chisel
+* Adam Keyes
+* Marty Haught
+* xtoddx
+* skrat
+* Michael Klett
+* Matthew Elder
+* Nick Plante
+* ben
+* jonleighton
+* Josh French
+* abstractioneer
+* andreas
+* Keeran Hawoldar
+* Loren Johnson
+* Benny Degezelle
+* John Long
+* Andrew O'Brien
+* Bjørn Arild Mæland
+* Mislav Marohnić
+* Daniel Sheppard
+* Sean Cribbs
+
 === 0.6.4 Gem Shaper
 * Andrew Neil
 * zilkey
 * Mark Gallop
-* Bjorn Maeland
+* Bjørn Arild Mæland
 * ana
 * Bodhi Philpot
 * jay@jay.fm
 * Brian Skahan
-* Mislav Marohnic
+* Mislav Marohnić
 * Daniel Sheppard
 * John Long
 * Peter Berkenbosch

data/INSTALL

@@ -33,4 +33,4 @@ directories with the user that it runs under.
 Once you've installed Radiant on your own Web site, be sure to add your name
 and Web site to the list of radiant users:
 
-http://dev.radiantcms.org/radiant/wiki/RadiantUsers
+http://wiki.radiantcms.org/Radiant_Users

data/app/controllers/admin/abstract_model_controller.rb

@@ -98,20 +98,20 @@ class Admin::AbstractModelController < ApplicationController
     
     def announce_removed
       flash[:notice] = "#{humanized_model_name} has been deleted."
-    end
-    
-    def announce_update_conflict
-      flash[:error] = "#{humanized_model_name} has been modified since it was last loaded. Changes cannot be saved without potentially losing data."
-    end
-    
-    def clear_model_cache
-      cache.clear
+    end
+    
+    def announce_update_conflict
+      flash[:error] = "#{humanized_model_name} has been modified since it was last loaded. Changes cannot be saved without potentially losing data."
+    end
+    
+    def clear_model_cache
+      cache.clear
     end
     
     def handle_new_or_edit_post(options = {})
       options.symbolize_keys
       if request.post?
-        model.attributes = params[model_symbol]
+        model.attributes = params[model_symbol]
         begin
           if save
             clear_model_cache
@@ -120,11 +120,11 @@ class Admin::AbstractModelController < ApplicationController
             return false
           else
             announce_validation_errors
-          end
-        rescue ActiveRecord::StaleObjectError
-          announce_update_conflict
+          end
+        rescue ActiveRecord::StaleObjectError
+          announce_update_conflict
         end
       end
       true
     end
-end
+end

data/app/controllers/admin/export_controller.rb

@@ -1,6 +1,5 @@
 class Admin::ExportController < ApplicationController
   def yaml
-    response.headers['Content-Type'] = "text/yaml"
-    render :text => Radiant::Exporter.export
+    render :text => Radiant::Exporter.export, :content_type => "text/yaml"
   end
 end

data/app/controllers/admin/extension_controller.rb

@@ -2,9 +2,4 @@ class Admin::ExtensionController < ApplicationController
   def index
     @extensions = Radiant::Extension.descendants.sort_by { |e| e.extension_name }
   end
-  
-  def update
-    Radiant::ExtensionLoader.reactivate(params[:enabled_extensions] || [])
-    redirect_to :action => 'index'
-  end
 end

data/app/controllers/admin/page_controller.rb

@@ -91,6 +91,8 @@ class Admin::PageController < Admin::AbstractModelController
       @meta ||= []
       @meta << {:field => "slug", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 100}]}
       @meta << {:field => "breadcrumb", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 160}]}
+      @meta << {:field => "description", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 200}]}
+      @meta << {:field => "keywords", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 200}]}
     end
     
     def save

data/app/controllers/application.rb

@@ -43,6 +43,6 @@ class ApplicationController < ActionController::Base
   
     def set_javascripts_and_stylesheets
       @stylesheets = %w(admin/main)
-      @javascripts = %w(prototype string effects tabcontrol ruledtable admin)
+      @javascripts = %w(prototype string effects admin/tabcontrol admin/ruledtable admin/admin)
     end
 end

data/app/controllers/site_controller.rb

@@ -12,7 +12,14 @@ class SiteController < ApplicationController
   
   def show_page
     response.headers.delete('Cache-Control')
-    url = params[:url].to_s
+    
+    url = params[:url]
+    if Array === url
+      url = url.join('/')
+    else
+      url = url.to_s
+    end
+    
     if (request.get? || request.head?) and live? and (@cache.response_cached?(url))
       @cache.update_response(url, response, request)
       @performed_render = true