radiant 1.0.0.rc4 → 1.0.0.rc5

data/Gemfile

@@ -8,7 +8,7 @@ source :rubygems
 # dependency mentioned in radiant.gemspec.
 
 gem "rails",   "2.3.14"
-gem "sqlite3", "1.3.4"
+gem "sqlite3", "1.3.4", :group => [:development, :test]
 
 # When radiant is installed as a gem you can run all of
 # its tests and specs from an instance. If you're working

data/INSTALL.md

@@ -1,42 +1,10 @@
 # Installation and Setup
 
-Once you have extracted the files into the directory where you would like to
-install Radiant:
+From within the directory containing your Radiant instance:
 
-1. Change to the new application directory and run:
+1. Decide which database you want to use. SQLite is configured by default and
+   the easiest way to get started. If you want to use another database:
+   - Enable your preferred database adapter in the Gemfile
+   - Run `bundle update`
 
-    % bundle install
-
-to create a gem bundle containing all of the radiant app's dependencies.
-Whenever you edit the Gemfile to add new extensions, run `bundle install`
-again.
-
-2. Decide what database you want to use. Radiant ships with a SQLite
-configuration that will let you try it out. For serious use you will probably
-want to use on of the other supported databases: MySQL, PostgreSQL, SQL Server
-or DB2. This is the time to set up the database, grant permissions and edit
-config/database.yml to match.
-
-3. Run the database bootstrap rake task:
-
-    % bundle exec rake production db:bootstrap
-
-(If you would like bootstrap a development database run `bundle exec rake db:bootstrap`.)
-
-4. Radiant is a normal Rails application and you can run it in all the usual
-ways. To test your installation, try running:
-
-    % script/server production
-
-And type this address into a web browser:
-
-    http://localhost:3000
-
-The administrative interface is available at /admin/. If your site is empty,
-you will be directed there automatically to create a home page. By default the
-bootstrap rake task creates a user called "admin" with a password of
-"radiant".
-
-When using Radiant on a production system you may also need to set permissions
-on the public and cache directories so that your Web server can access those
-directories with the user that it runs under.
+2. Run `bundle exec rake production db:bootstrap` to initialize the database

data/app/controllers/admin/pages_controller.rb

@@ -55,20 +55,18 @@ class Admin::PagesController < Admin::ResourceController
       
     def render_preview
       Page.transaction do
-        PagePart.transaction do
-          page_class = Page.descendants.include?(model_class) ? model_class : Page
-          if request.referer =~ %r{/admin/pages/(\d+)/edit}
-            page = Page.find($1).becomes(page_class)
-            page.update_attributes(params[:page])
-            page.published_at ||= Time.now
-          else
-            page = page_class.new(params[:page])
-            page.published_at = page.updated_at = page.created_at = Time.now
-            page.parent = Page.find($1) if request.referer =~ %r{/admin/pages/(\d+)/children/new}
-          end
-          page.pagination_parameters = pagination_parameters
-          process_with_exception(page)
+        page_class = Page.descendants.include?(model_class) ? model_class : Page
+        if request.referer =~ %r{/admin/pages/(\d+)/edit}
+          page = Page.find($1).becomes(page_class)
+          page.update_attributes(params[:page])
+          page.published_at ||= Time.now
+        else
+          page = page_class.new(params[:page])
+          page.published_at = page.updated_at = page.created_at = Time.now
+          page.parent = Page.find($1) if request.referer =~ %r{/admin/pages/(\d+)/children/new}
         end
+        page.pagination_parameters = pagination_parameters
+        process_with_exception(page)
       end
     end
     

data/app/helpers/admin/references_helper.rb

@@ -1,20 +1,22 @@
+require "RedCloth"
+
 module Admin::ReferencesHelper
   def tag_reference
     String.new.tap do |output|
       class_of_page.tag_descriptions.sort.each do |tag_name, description|
         value = t("desc.#{tag_name.gsub(':','-')}").match('desc') ? description : t("desc.#{tag_name.gsub(':','-')}")
-        output << render(:partial => "admin/references/tag_reference.haml", 
-            :locals => {:tag_name => tag_name, 
+        output << render(:partial => "admin/references/tag_reference.haml",
+            :locals => {:tag_name => tag_name,
                         :description =>  RedCloth.new(Radiant::Taggable::Util.strip_leading_whitespace(value)).to_html
                        })
       end
     end
   end
-  
+
   def filter_reference
     unless filter.blank?
-      if filter.description.blank? 
-        "There is no documentation on this filter." 
+      if filter.description.blank?
+        "There is no documentation on this filter."
       else
         filter.description
       end
@@ -22,7 +24,7 @@ module Admin::ReferencesHelper
       "There is no filter on the current page part."
     end
   end
-  
+
   def _display_name
     case params[:type]
     when 'filters'
@@ -31,7 +33,7 @@ module Admin::ReferencesHelper
       class_of_page.display_name
     end
   end
-  
+
   def filter
     @filter ||= begin
       TextFilter.find_descendant(params[:filter_name])

data/app/models/menu_renderer.rb

@@ -35,9 +35,16 @@ module MenuRenderer
   end
 
   def allowed_child_classes
-    (allowed_children_cache.to_s.split(',') - Array(excluded_class_names)).map(&:constantize)
+    (allowed_children_cache.to_s.split(',') - Array(excluded_class_names)).map do |name|
+      begin
+        name.constantize
+      rescue LoadError, NameError => e
+        nil
+      end
+    end.compact
   end
 
+
   def default_child_item
     menu_item(default_child)
   end

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

@@ -19,8 +19,7 @@
             - render_region :tbody, :locals => {:layout => layout} do |tbody|
               - tbody.title_cell do
                 %td.name
-                  = image('layout', :alt => '')
-                  = link_to layout.name, edit_admin_layout_url(layout)
+                  = link_to image('layout', :alt => '') + ' ' + layout.name, edit_admin_layout_url(layout)
               - tbody.actions_cell do
                 %td.actions
                   = link_to image('minus') + ' ' + t('remove'), remove_admin_layout_url(layout), :class => "action"
@@ -33,4 +32,4 @@
     #actions
       = pagination_for(@layouts)
       %ul
-        %li= link_to image('plus') + " " + t('new_layout'), new_admin_layout_url, :class => 'action_button'
+        %li= link_to image('plus') + " " + t('new_layout'), new_admin_layout_url, :class => 'action_button'

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

@@ -23,4 +23,4 @@
 - unless @homepage
   #actions
     %ul
-      %li= link_to image('plus') + " " + t("new_homepage"), new_admin_page_path, :class => 'action_button'
+      %li= link_to image('plus') + ' ' + t("new_homepage"), new_admin_page_path, :class => 'action_button'

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

@@ -17,8 +17,7 @@
             - render_region :tbody, :locals => {:snippet => snippet} do |tbody|
               - tbody.title_cell do
                 %td.name
-                  = image('snippet', :alt => '')
-                  = link_to snippet.name, edit_admin_snippet_url(snippet)
+                  = link_to image('snippet', :alt => '') + ' ' + snippet.name, edit_admin_snippet_url(snippet)
               - tbody.actions_cell do
                 %td.actions
                   = link_to image('minus') + ' ' + t('remove'), remove_admin_snippet_url(snippet), :class => "action"

data/config/locales/en.yml

@@ -54,7 +54,7 @@ en:
       snippet:
         filter: "snippet filter"
     dev:
-      host: "dev site domain name"
+      host: "dev site domain"
     local:
       timezone: "local timezone"
     site:

data/db/migrate/20100805155020_convert_page_metas.rb

@@ -11,5 +11,10 @@ class ConvertPageMetas < ActiveRecord::Migration
   def self.down
     add_column :pages, :description, :string
     add_column :pages, :keywords, :string
+    Page.all.each do |page|
+      page.description = page.field('description').content
+      page.keywords = page.field('keywords').content
+      page.save
+    end
   end
 end

data/db/migrate/20110902203823_add_allowed_children_cache_to_pages.rb

@@ -1,6 +1,6 @@
 class AddAllowedChildrenCacheToPages < ActiveRecord::Migration
   def self.up
-    add_column :pages, :allowed_children_cache, :string, :default => ''
+    add_column :pages, :allowed_children_cache, :string, :limit => 1500, :default => ''
     Page.reset_column_information
     Page.find_each do |page|
       page.save # update the allowed_children_cache

data/db/migrate/20120209231801_change_pages_allowed_children_cache_to_text.rb

@@ -0,0 +1,9 @@
+class ChangePagesAllowedChildrenCacheToText  < ActiveRecord::Migration
+  def self.up
+    change_column :pages, :allowed_children_cache, :text
+  end
+
+  def self.down
+    change_column :pages, :allowed_children_cache, :string, :limit => 1500
+  end
+end

data/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110902203823) do
+ActiveRecord::Schema.define(:version => 20120209231801) do
 
   create_table "assets", :force => true do |t|
     t.string   "caption"
@@ -79,7 +79,7 @@ ActiveRecord::Schema.define(:version => 20110902203823) do
     t.string   "slug",                   :limit => 100
     t.string   "breadcrumb",             :limit => 160
     t.string   "class_name",             :limit => 25
-    t.integer  "status_id",                             :default => 1,     :null => false
+    t.integer  "status_id",                              :default => 1,     :null => false
     t.integer  "parent_id"
     t.integer  "layout_id"
     t.datetime "created_at"
@@ -87,9 +87,9 @@ ActiveRecord::Schema.define(:version => 20110902203823) do
     t.datetime "published_at"
     t.integer  "created_by_id"
     t.integer  "updated_by_id"
-    t.boolean  "virtual",                               :default => false, :null => false
-    t.integer  "lock_version",                          :default => 0
-    t.string   "allowed_children_cache",                :default => ""
+    t.boolean  "virtual",                                :default => false, :null => false
+    t.integer  "lock_version",                           :default => 0
+    t.text     "allowed_children_cache", :limit => 1500, :default => ""
   end
 
   add_index "pages", ["class_name"], :name => "altered_pages_class_name"

data/lib/generators/extension/templates/RSpecRakefile

@@ -97,7 +97,7 @@ namespace :spec do
 end
 
 desc 'Generate documentation for the <%= file_name %> extension.'
-RDoc:Task.new(:rdoc) do |rdoc|
+RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = '<%= class_name %>'
   rdoc.options << '--line-numbers' << '--inline-source'
@@ -106,4 +106,4 @@ RDoc:Task.new(:rdoc) do |rdoc|
 end
 
 # Load any custom rakefiles for extension
-Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f }
+Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f }

data/lib/generators/extension/templates/Rakefile

@@ -13,7 +13,7 @@ Rake::TestTask.new(:test) do |t|
 end
 
 desc 'Generate documentation for the <%= file_name %> extension.'
-RDoc:Task.new(:rdoc) do |rdoc|
+RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = '<%= class_name %>'
   rdoc.options << '--line-numbers' << '--inline-source'
@@ -22,4 +22,4 @@ RDoc:Task.new(:rdoc) do |rdoc|
 end
 
 # Load any custom rakefiles for extension
-Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f }
+Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f }

data/lib/generators/instance/instance_generator.rb

@@ -1,5 +1,21 @@
 require 'rbconfig'
 
+# Small addition to enable the enqueing of "bundle install"
+class Rails::Generator::Commands::Create
+  def run_bundler(destination_root)
+    # thanks to http://spectator.in/2011/01/28/bundler-in-subshells/
+    bundler_vars = %w(BUNDLE_GEMFILE RUBYOPT )
+    command = %{"#{Gem.ruby}" -rubygems "#{Gem.bin_path('bundler', 'bundle')}" install --gemfile="#{File.join(File.expand_path(destination_root), 'Gemfile')}"}
+    begin
+      bundled_env = ENV.to_hash
+      bundler_vars.each{ |var| ENV.delete(var) }
+      print `#{command}`
+    ensure
+      ENV.replace(bundled_env)
+    end
+  end
+end
+
 class InstanceGenerator < Rails::Generator::Base
   DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
                               Config::CONFIG['ruby_install_name'])
@@ -95,6 +111,9 @@ class InstanceGenerator < Rails::Generator::Base
       m.template "instance_boot.rb", "config/boot.rb"
       m.file "instance_radiant_config.rb", "config/initializers/radiant_config.rb"
       
+      # Run bundler
+      m.run_bundler @destination_root
+      
       m.readme radiant_root("INSTALL.md")
     end
   end

data/lib/generators/instance/templates/instance_gemfile

@@ -8,6 +8,14 @@ gem "radiant", "~> <%= radiant_version %>"
 # alternatively, in development
 # gem "radiant", :path => "/path/to/radiant/root"
 
+# Uncomment to support CoffeeScript with a JS runtime (used in the Sheets extension)
+# gem "execjs"
+# And you may need one of these:
+# gem "mustang" # Google V8 for Ruby
+# gem "therubyracer" # Google V8 for Ruby
+# gem "therubyrhino" # Mozilla Rhino for JRuby
+# gem "johnson" # Mozilla SpiderMonkey for Ruby
+
 # SQLite is the default database connection but only suitable for local use
 <%= '# ' unless db == 'sqlite3' %>gem "sqlite3", "~> 1.3.4"
 

data/lib/radiant.rb

@@ -6,7 +6,7 @@ unless defined? Radiant::Version
       Major = '1'
       Minor = '0'
       Tiny  = '0'
-      Patch = 'rc4' # set to nil for normal release
+      Patch = 'rc5' # set to nil for normal release
 
       class << self
         def to_s

data/lib/tasks/database.rake

@@ -49,12 +49,18 @@ namespace :db do
     Rake::Task['db:migrate:extensions'].invoke
     Rake::Task['radiant:extensions:update_all'].invoke
     puts %{
+Your Radiant application is ready to use. Run `script/server -e production` to
+start the server. Your site will then be running at http://localhost:3000
 
-Your radiant application is now complete. You can test it by running script/server and directing a web browser to http://localhost:3000/.
+You can access the administrative interface at http://localhost:3000/admin
 
-To add radiant extensions, just add gem lines to your application's Gemfile and run bundle install again. 
+You may also need to set permissions on the public and cache directories so that
+your Web server can access those directories with the user that it runs under.
 
-To find radiant extensions, please visit http://ext.radiantcms.org.
+To add more extensions just add them to your Gemfile and run `bundle install`.
+If an extension is not available as a gem use `script/extension install name`.
+
+Visit http://ext.radiantcms.org to find more extensions.
 
 }
   end

data/public/stylesheets/sass/admin/_base.sass

@@ -14,4 +14,5 @@ $primary-tab-current: white
 // Modules
 @import "compass"
 @import "modules/links"
-@import "modules/boxes"
+@import "modules/boxes"
+@import "modules/gradients"

data/public/stylesheets/sass/admin/modules/_boxes.sass

@@ -2,5 +2,5 @@
   background: #d8d8d8
   +linear-gradient(color-stops(#fff, #ccc))
   +border-radius(8px)
-  +box-shadow(rgba(0,0,0,0.15), 2px, 2px, 3px)
+  +single-box-shadow(rgba(0,0,0,0.15), 2px, 2px, 3px)
   padding: 12px 10px

data/public/stylesheets/sass/admin/modules/_gradients.sass

@@ -0,0 +1,4 @@
+// Reproduce the deprecated Compass linear-gradient mixin
+
+=linear-gradient($color-stops, $start: top, $image: false)
+  +background-image($image, linear-gradient($start, $color-stops))

data/public/stylesheets/sass/admin/partials/_actions.sass

@@ -1,7 +1,7 @@
 =button-shadow
-  +box-shadow(#555, 1px, 2px, 3px)
+  +single-box-shadow(#555, 1px, 2px, 3px)
 =no-button-shadow
-  +box-shadow(#555,0,0,0)
+  +single-box-shadow(#555,0,0,0)
 
 #actions
   position: fixed

data/public/stylesheets/sass/admin/partials/_avatars.sass

@@ -3,8 +3,8 @@ img.avatar
   border: none
   padding: 4px
   +border-radius(3px)
-  +box-shadow(rgba(0,0,0,0.25), 1px, 1px, 3px)
+  +single-box-shadow(rgba(0,0,0,0.25), 1px, 1px, 3px)
   &.avatar_32x32
     padding: 2px
     +border-radius(2px)
-    +box-shadow(rgba(0,0,0,0.3), 1px, 1px, 2px)
+    +single-box-shadow(rgba(0,0,0,0.3), 1px, 1px, 2px)

data/public/stylesheets/sass/admin/partials/_dateinput.sass

@@ -4,7 +4,7 @@ input.date
   width: 11em
 
 .calendar_popup
-  +box-shadow
+  +single-box-shadow
   +border-radius
   z-index: 1000
   border: 1px solid #b2b2b2

data/public/stylesheets/sass/admin/partials/_dropdown.sass

@@ -1,7 +1,7 @@
 .dropdown_wrapper
   border: 1px solid #b3b3b3
   border-top: 1px solid #c3c3c3
-  +box-shadow(rgba(0,0,0,0.35), 0px, 8px, 25px)
+  +single-box-shadow(rgba(0,0,0,0.35), 0px, 8px, 25px)
   +border-top-right-radius
   +border-bottom-radius
 

data/public/stylesheets/sass/admin/partials/_forms.sass

@@ -236,7 +236,7 @@ body.reversed
         padding: 20px 15px
         margin-bottom: 20px
         overflow: hidden
-        +box-shadow(#ababab, 1px, 1px, 0)
+        +single-box-shadow(#ababab, 1px, 1px, 0)
         +border-radius(8px)
         h3
           font-weight: bold
@@ -251,7 +251,7 @@ body.reversed
     textarea
       border: 1px solid white
     .box
-      +box-shadow(rgba(0,0,0,0.15), 2px, 2px, 3px)
+      +single-box-shadow(rgba(0,0,0,0.15), 2px, 2px, 3px)
 
 body.single_form
   #content