radiant 0.8.0 → 0.8.1

data/CHANGELOG

@@ -1,5 +1,37 @@
 == Change Log
 
+=== 0.8.1 Luster
+
+* Move default cache location to tmp. [Sean Cribbs]
+* Upgrade Rails and dataset. [Sean Cribbs]
+* Updated README and INSTALL. [John Long]
+* Don't use Symbol#to_proc in initializer because ActiveSupport hasn't
+  loaded yet.
+* Fix links to Textile reference in the wake of _why's disappearance. 
+  [Jason Garber]
+* Correct bug when submitting a POST to a cached page. [Sean Cribbs]
+* Fix typo in generator for features task. [Jim Gay]
+* Page parts may already be marked for destruction, don't explicitly set
+  false. [Kunal Shah]
+* Merge latest version of Radius [Kunal Shah]
+* Helpers for extension_enabled? [Kunal Shah]
+* Respond to show methods with xml rendering [Jeremy Stephens]
+* Support DB2 [Antonio Cangiano]
+* Properly check for existing page parts when creating a new part. [alexmek]
+* Use the correct variable name so the extension name is part of the output.
+[John Muhl]
+* Generate Cucumber support for extensions [Jim Gay]
+* Require Cucumber version 0.3.9 or greater in cucumber.rake [Jim Gay]
+* Set generated extensions to require 'application_controller' [Jim Gay]
+* Add import/export tasks for Radiant::Config [Jim Gay]
+* Set Radiant::Config to cache info in the Rails.cache [Jim Gay]
+* Markup fixes [Justin Blecher, Alex Wallace]
+* Use Rails for time zone handling [Kunal Shah, Josh French]
+* Allow extensions to declare dependencies [Josh French]
+* Expose Rails configuration to extensions. [Josh French]
+* Set template_name for all resourceful action types [Josh French]
+* Load Metal from Extensions [Jim Gay]
+
 === 0.8.0 Asterism
 
 * Warn about using the RedCloth 3 fallback. [Sean Cribbs, Jason Garber]
@@ -40,7 +72,7 @@ Cribbs]
 Allan]
 * Don't raise exception on unauthenticated request to /admin/logout.
 [Josh French]
-* Reverse view paths order in extension loader. [Sean Cribbs, Brent
+* Reverse view paths order in extension loader. [Sean Cribbs, Brent 
 Kroeker]
 * Remove obviated Ruby 1.8.7 compatibility patch. [Sean Cribbs]
 * Adjust StandardTags#relative_url_for for case when relative_url_root

data/CONTRIBUTORS

@@ -1,16 +1,29 @@
-
 == Contributors
 
 The following people have submitted changes which have been applied to the
 core:
 
+=== 0.8.1 Luster
+
+* John Long
+* Sean Cribbs
+* Antonio Cangiano
+* alexmek
+* Jeremy Stephens
+* John Muhl
+* Alex Wallace
+* Justin Blecher
+* Kunal Shah
+* Jim Gay
+* Josh French
+
 === 0.8.0 Asterism
 
 * Michael Kessler
+* David Cato
 * Kunal Shah
 * Brett McHargue
 * Jim Gay
-* Jason Garber
 * Kunal Shah
 * Matt Henry
 * Rick DeNatale

data/INSTALL

@@ -4,12 +4,13 @@
 Once you have extracted the files into the directory where you would like to
 install Radiant:
 
-1. Create the MySQL/PostgreSQL/SQLite databases for your Web site. You only
-   need to create the "production" database, but you may also want to create
-   the "development" and "test" databases if you are developing extensions
-   or running tests.
+1. Create the MySQL/PostgreSQL/SQLite/SQL Server/DB2 databases for your Web
+   site. You only need to create the "production" database, but you may also
+   want to create the "development" and "test" databases if you are developing
+   extensions or running tests.
 
-2. Edit config/database.yml to taste.  There are example files available for various databases in the config directory.
+2. Edit config/database.yml to taste.  There are example files available for
+   various databases in the config directory.
 
 3. Run the database bootstrap rake task:
    
@@ -18,7 +19,8 @@ install Radiant:
    (If you would like bootstrap your development database run `rake
    development db:bootstrap`.)
    
-   If you get the error "no such file to load -- spec/rake/spectask" please install Rspec (gem i rspec).
+   If you get the error "no such file to load -- spec/rake/spectask" please
+   install Rspec (gem install rspec).
 
 4. Start it like a normal Rails application. To test execute:
    
@@ -35,4 +37,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://wiki.radiantcms.org/Radiant_Users
+http://wiki.github.com/radiant/radiant/radiant-users

data/README

@@ -22,7 +22,7 @@ Radiant features:
 
 == License
 
-Radiant is released under the MIT license and is copyright (c) 2006-2008
+Radiant is released under the MIT license and is copyright (c) 2006-2009
 John W. Long and Sean Cribbs. A copy of the MIT license can be found in the
 LICENSE file.
 
@@ -37,7 +37,10 @@ See the INSTALL file for more details.
 
 == Development Requirements
 
- * gem install ZenTest rspec rspec-rails
+To run tests you will need to have the following gems installed:
+
+  gem install ZenTest rspec rspec-rails cucumber webrat nokogiri
+
 
 == Support
 
@@ -45,13 +48,14 @@ The best place to get support is on the mailing list:
 
 http://radiantcms.org/mailing-list/
 
-There is also a Trac powered dev site available here:
+Most of the development for Radiant happens on Github:
+
+http://github.com/radiant/radiant/
+
+The project wiki is here:
 
-http://dev.radiantcms.org/
+http://wiki.github.com/radiant/radiant/
 
-Please Note: Before filing a ticket on the dev site discuss your question or
-problem on the mailing list. This makes it much easier to manage legitimate
-tickets.
 
 Enjoy!
 

data/app/controllers/admin/layouts_controller.rb

@@ -3,8 +3,11 @@ class Admin::LayoutsController < Admin::ResourceController
     :when => [:developer, :admin],
     :denied_url => { :controller => 'admin/pages', :action => 'index' },
     :denied_message => 'You must have developer privileges to perform this action.'
-    
+
   def show
-    redirect_to edit_admin_layout_path(params[:id])
+    respond_to do |format|
+      format.xml { super }
+      format.html { redirect_to edit_admin_layout_path(params[:id]) }
+    end
   end
 end

data/app/controllers/admin/pages_controller.rb

@@ -1,7 +1,7 @@
 class Admin::PagesController < Admin::ResourceController
   before_filter :initialize_meta_rows_and_buttons, :only => [:new, :edit, :create, :update]
   before_filter :count_deleted_pages, :only => [:destroy]
-  
+
   responses do |r|
     r.plural.js do
       @level = params[:level].to_i
@@ -10,14 +10,17 @@ class Admin::PagesController < Admin::ResourceController
       render :action => 'children.html.haml', :layout => false
     end
   end
-  
+
   def index
     @homepage = Page.find_by_parent_id(nil)
     response_for :plural
   end
-  
+
   def show
-    redirect_to edit_admin_page_path(params[:id])
+    respond_to do |format|
+      format.xml { super }
+      format.html { redirect_to edit_admin_page_path(params[:id]) }
+    end
   end
 
   def new
@@ -27,7 +30,7 @@ class Admin::PagesController < Admin::ResourceController
     end
     response_for :singular
   end
-  
+
   private
     def model_class
       if params[:page_id]

data/app/controllers/admin/snippets_controller.rb

@@ -1,5 +1,8 @@
 class Admin::SnippetsController < Admin::ResourceController
   def show
-    redirect_to edit_admin_snippet_path(params[:id])
+    respond_to do |format|
+      format.xml { super }
+      format.html { redirect_to edit_admin_snippet_path(params[:id]) }
+    end
   end
-end
+end

data/app/controllers/application_controller.rb

@@ -9,6 +9,7 @@ class ApplicationController < ActionController::Base
   protect_from_forgery
   
   before_filter :set_current_user
+  before_filter :set_timezone
   before_filter :set_javascripts_and_stylesheets
   
   attr_accessor :config, :cache
@@ -35,6 +36,8 @@ class ApplicationController < ActionController::Base
       'index'
     when 'new','create'
       'new'
+    when 'show'
+      'show'
     when 'edit', 'update'
       'edit'
     when 'remove', 'destroy'
@@ -56,6 +59,10 @@ class ApplicationController < ActionController::Base
     def set_current_user
       UserActionObserver.current_user = current_user
     end
+
+    def set_timezone
+      Time.zone = Radiant::Config['local.timezone'] || Time.zone_default
+    end
   
     def set_javascripts_and_stylesheets
       @stylesheets ||= []

data/app/helpers/admin/node_helper.rb

@@ -66,7 +66,7 @@ module Admin::NodeHelper
   end
 
   def node_title
-    %{<span class="title">#{ @current_node.title }</span>}
+    %{<span class="title">#{ h(@current_node.title) }</span>}
   end
 
   def page_type
@@ -74,7 +74,7 @@ module Admin::NodeHelper
     if display_name == 'Page'
       ""
     else
-      %{<small class="info">(#{ display_name })</small>}
+      %{<small class="info">(#{ h(display_name) })</small>}
     end
   end
 

data/app/helpers/application_helper.rb

@@ -112,7 +112,7 @@ module ApplicationHelper
   end
 
   def timestamp(time)
-    adjust_time(time).strftime("%I:%M <small>%p</small> on %B %d, %Y")     
+    time.strftime("%I:%M <small>%p</small> on %B %d, %Y")
   end 
   
   def meta_visible(symbol)
@@ -130,7 +130,7 @@ module ApplicationHelper
   end
   
   def toggle_javascript_for(id)
-    "Element.toggle('#{id}'); Element.toggle('more-#{id}'); Element.toggle('less-#{id}');"
+    "Element.toggle('#{id}'); Element.toggle('more-#{id}'); Element.toggle('less-#{id}'); return false;"
   end
   
   def image(name, options = {})

data/app/models/radiant/config.rb

@@ -24,19 +24,23 @@ module Radiant
   # defaults.page.status      :: a string representation of the default page status
   # defaults.page.filter      :: the default filter to use on new page parts
   # dev.host                  :: the hostname where draft pages are viewable
-  # local.timezone            :: the timezone offset (using a String or integer
-  #                              from http://api.rubyonrails.org/classes/TimeZone.html)
+  # local.timezone            :: the timezone name (`rake -D time` for full list)
   #                              used to correct displayed times
   # page.edit.published_date? :: when true, shows the datetime selector
   #                              for published date on the page edit screen
   class Config < ActiveRecord::Base
     set_table_name "config"
+    after_save :update_cache
 
     class << self
       def [](key)
         if table_exists?
-          pair = find_by_key(key)
-          pair.value if pair
+          unless Radiant::Config.cache_file_exists?
+            Radiant::Config.ensure_cache_file
+            Radiant::Config.initialize_cache
+          end
+          Radiant::Config.initialize_cache if Radiant::Config.stale_cache?
+          Rails.cache.read('Radiant::Config')[key]
         end
       end
 
@@ -51,6 +55,30 @@ module Radiant
       def to_hash
         Hash[ *find(:all).map { |pair| [pair.key, pair.value] }.flatten ]
       end
+      
+      def initialize_cache
+        Radiant::Config.ensure_cache_file
+        Rails.cache.write('Radiant::Config',Radiant::Config.to_hash)
+        Rails.cache.write('Radiant.cache_mtime', File.mtime(Rails.cache.read('Radiant.cache_file')))
+      end
+      
+      def cache_file_exists?
+        return false if Rails.cache.read('Radiant.cache_file').nil?
+        File.file?(Rails.cache.read('Radiant.cache_file'))
+      end
+      
+      def stale_cache?
+        return true unless Radiant::Config.cache_file_exists?
+        Rails.cache.read('Radiant.cache_mtime') != File.mtime(Rails.cache.read('Radiant.cache_file'))
+      end
+      
+      def ensure_cache_file
+        cache_path = "#{Rails.root}/tmp"
+        cache_file = File.join(cache_path,'radiant_config_cache.txt')
+        Rails.cache.write('Radiant.cache_file', cache_file)
+        FileUtils.mkpath(cache_path)
+        FileUtils.touch(cache_file)
+      end
     end
 
     def value=(param)
@@ -64,5 +92,9 @@ module Radiant
         self[:value]
       end
     end
+    
+    def update_cache
+      Radiant::Config.initialize_cache
+    end
   end
 end

data/app/models/standard_tags.rb

@@ -569,7 +569,7 @@ module StandardTags
     else
       page.published_at || page.created_at
     end
-    adjust_time(date).strftime(format)
+    date.strftime(format)
   end
 
   desc %{

data/app/views/admin/layouts/index.html.haml

@@ -3,8 +3,7 @@
   - top.help_text do
     %p
       Use layouts to apply a visual look to a  Web page. Layouts can contain special tags to include
-      page content and other elements such as the header or footer. Click on a layout name below to
-      edit it or click <code>Remove</code> to delete it.
+      page content and other elements such as the header or footer.
 
 %table#layouts.index{:cellspacing=>"0", :border=>"0", :cellpadding=>"0" }
   %thead
@@ -17,16 +16,20 @@
           %th.modify
             Modify
   %tbody
-    - @layouts.each do |layout|
-      %tr.node.level-1
-        - render_region :tbody do |tbody|
-          - tbody.title_cell do
-            %td.layout
-              = image('layout', :alt => 'layout-icon')
-              = link_to layout.name, edit_admin_layout_url(layout)
-          - tbody.modify_cell do
-            %td.remove
-              = link_to image('remove', :alt => 'Remove Layout'), remove_admin_layout_url(layout)
+    - if @layouts.any?
+      - @layouts.each do |layout|
+        %tr.node.level-1
+          - render_region :tbody do |tbody|
+            - tbody.title_cell do
+              %td.layout
+                = image('layout', :alt => 'layout-icon')
+                = link_to layout.name, edit_admin_layout_url(layout)
+            - tbody.modify_cell do
+              %td.remove
+                = link_to image('remove', :alt => 'Remove Layout'), remove_admin_layout_url(layout)
+    - else
+      %tr
+        %td.note{:colspan => admin.layout.index.tbody.length} No Layouts
 
 - render_region :bottom do |bottom|
   - bottom.new_button do

data/app/views/admin/page_parts/_page_part.html.haml

@@ -2,7 +2,7 @@
   .part{:id => "part-#{page_part.name.to_slug}"}
     = hidden_field_tag "page[parts_attributes][#{page_part_counter}][name]", page_part.name, :id => "part_#{page_part.name.to_slug}_name"
     = hidden_field_tag "page[parts_attributes][#{page_part_counter}][id]", page_part.id, :id => "part_#{page_part_counter}_id", :class => "id_input"
-    = hidden_field_tag "page[parts_attributes][#{page_part_counter}][_delete]", false, :class => "delete_input"
+    = hidden_field_tag "page[parts_attributes][#{page_part_counter}][_delete]", page_part._delete, :class => "delete_input"
     %p
       %label{:for => "part_#{page_part.name.to_slug}_filter_id"} Filter
       = select_tag "page[parts_attributes][#{page_part_counter}][filter_id]", filter_options_for_select(page_part.filter_id), :id => "part_#{page_part.name.to_slug}_filter_id"
@@ -14,4 +14,4 @@
           = link_to_function 'Available Tags', "load_tag_reference('#{page_part.name.to_slug}');"
       = render_region :part_controls, :locals => {:page_part => page_part}
     %div
-      ~ text_area_tag "page[parts_attributes][#{page_part_counter}][content]", h(page_part.content), :class => "textarea", :style => "width: 100%", :id => "part_#{page_part.name.to_slug}_content"
+      ~ text_area_tag "page[parts_attributes][#{page_part_counter}][content]", page_part.content, :class => "textarea", :style => "width: 100%", :id => "part_#{page_part.name.to_slug}_content"

data/app/views/admin/pages/index.html.haml

@@ -19,7 +19,7 @@
       = render_node @homepage
     - else
       %tr
-        %td.note{:colspan => 4} No Pages
+        %td.note{:colspan => admin.page.index.node.length} No Pages
 
 = render_region :bottom
 

data/app/views/admin/snippets/_form.html.haml

@@ -13,7 +13,7 @@
           ~ f.text_area :content, :class => "textarea", :style => "width: 100%"
       - form.edit_filter do
         %p
-          %label{:for=>"snippet_filter"} Filter
+          %label{:for=>"snippet_filter_id"} Filter
           = f.select :filter_id, [['none', '']] + TextFilter.descendants.map { |f| f.filter_name }.sort, :id => 'snippet_filter'
       - form.edit_timestamp do
         = updated_stamp @snippet

data/app/views/admin/snippets/index.html.haml

@@ -13,16 +13,20 @@
         - thead.modify_header do
           %th.modify Modify
   %tbody
-    - @snippets.each do |snippet|
-      %tr.node.level-1
-        - render_region :tbody do |tbody|
-          - tbody.title_cell do
-            %td.snippet
-              = image('snippet', :alt => 'snippet-icon')
-              %span= link_to snippet.name, edit_admin_snippet_url(snippet)
-          - tbody.modify_cell do
-            %td.remove
-              = link_to image('remove', :alt => 'Remove Snippet'), remove_admin_snippet_url(snippet)
+    - if @snippets.any?
+      - @snippets.each do |snippet|
+        %tr.node.level-1
+          - render_region :tbody do |tbody|
+            - tbody.title_cell do
+              %td.snippet
+                = image('snippet', :alt => 'snippet-icon')
+                %span= link_to snippet.name, edit_admin_snippet_url(snippet)
+            - tbody.modify_cell do
+              %td.remove
+                = link_to image('remove', :alt => 'Remove Snippet'), remove_admin_snippet_url(snippet)
+    - else
+      %tr
+        %td.note{:colspan => admin.snippet.index.tbody.length} No Snippets
 
 - render_region :bottom do |bottom|
   - bottom.new_button do