radiant 1.0.0.rc3 → 1.0.0.rc4

data/app/models/page.rb

@@ -7,7 +7,7 @@ class Page < ActiveRecord::Base
   end
 
   # Callbacks
-  before_save :update_virtual, :update_status
+  before_save :update_virtual, :update_status, :set_allowed_children_cache
 
   # Associations
   acts_as_tree :order => 'virtual DESC, title ASC'
@@ -38,8 +38,6 @@ class Page < ActiveRecord::Base
 
   annotate :description
   attr_accessor :request, :response, :pagination_parameters
-  class_inheritable_accessor :in_menu
-  self.in_menu = true
   class_inheritable_accessor :default_child
   self.default_child = self
 
@@ -201,7 +199,6 @@ class Page < ActiveRecord::Base
     true    
   end
 
-
   def to_xml(options={}, &block)
     super(options.reverse_merge(:include => :parts), &block)
   end
@@ -210,17 +207,21 @@ class Page < ActiveRecord::Base
     self.class.default_child
   end
 
-  def allowed_children
-    [default_child, *Page.descendants.sort_by(&:name)].select(&:in_menu?)
+  def allowed_children_lookup
+    [default_child, *Page.descendants.sort_by(&:name)].uniq
   end
 
+  def set_allowed_children_cache
+    self.allowed_children_cache = allowed_children_lookup.collect(&:name).join(',')
+  end
 
   class << self
-    alias_method :in_menu?, :in_menu
-    alias_method :in_menu, :in_menu=
+
+    def root
+      find_by_parent_id(nil)
+    end
 
     def find_by_path(path, live = true)
-      root = find_by_parent_id(nil)
       raise MissingRootPageError unless root
       root.find_by_path(path, live)
     end
@@ -323,7 +324,6 @@ class Page < ActiveRecord::Base
     def attributes_protected_by_default
       super - [self.class.inheritance_column]
     end
-    
 
     def update_virtual
       unless self.class == Page.descendant_class(class_name)

data/app/models/radiant/config.rb

@@ -100,6 +100,7 @@ module Radiant
         Radiant::Config.ensure_cache_file
         Rails.cache.write('Radiant::Config',Radiant::Config.to_hash)
         Rails.cache.write('Radiant.cache_mtime', File.mtime(cache_file))
+        Rails.cache.silence!
       end
       
       def cache_file_exists?
@@ -237,7 +238,7 @@ Config definition error: '#{key}' is defined twice:
       if newvalue != self[:value]
         raise ConfigError, "#{self.key} cannot be changed" unless settable? || self[:value].blank?
         if boolean?
-          self[:value] = (newvalue == "0" || newvalue == "false" || newvalue.blank? ) ? "false" : "true"
+          self[:value] = (newvalue == "1" || newvalue == "true") ? "true" : "false"
         else
           self[:value] = newvalue
         end

data/app/models/standard_tags.rb

@@ -364,7 +364,7 @@ module StandardTags
       tag.locals.page = aggregate_page
       aggregates << tag.expand
     end
-    aggregates
+    aggregates.flatten.join('')
   end
   
   tag "aggregate:each:children" do |tag|
@@ -382,7 +382,7 @@ module StandardTags
       tag.locals.page = item
       result << tag.expand
     end
-    result
+    result.flatten.join('')
   end
   
   tag "aggregate:children" do |tag|
@@ -1198,6 +1198,18 @@ module StandardTags
       else field
     end
   end
+  
+  tag 'site' do |tag|
+    tag.expand
+  end
+  %w(title domain dev_domain).each do |attr|
+    desc %{
+      Returns Radiant::Config['site.#{attr}'] as configured under the Settings tab.
+    }
+    tag "site:#{attr}" do |tag|
+      Radiant::Config["site.#{attr}"]
+    end
+  end  
 
   private
     def render_children_with_pagination(tag, opts={})
@@ -1223,7 +1235,7 @@ module StandardTags
         tag.locals.paginated_list = displayed_children
         result << tag.render('pagination', tag.attr.dup)
       end
-      result
+      result.flatten.join('')
     end
     
     def children_find_options(tag)

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

@@ -17,10 +17,10 @@
     - node.actions_column do
       - unless simple
         %td.actions
-          = child_link_for(page)
-          = link_to image('minus') + ' ' + t('remove'), remove_admin_page_url(page), :class => "action"
-          = child_menu_for(page)
+          = page.add_child_option
+          = page.remove_option
 
 - if expanded
   - page.children.each do |child|
+    - child.becomes(child.class_name.constantize) if child.class_name.present?
     = render_node child, :level => level + 1, :simple => simple

data/bin/ci/before_script

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+case $DB in
+  "mysql" )
+    mysql -e 'create database radiant_test;'
+    cp spec/ci/database.mysql.yml config/database.yml;;
+  "postgres" )
+    psql -c 'create database radiant_test;' -U postgres
+    cp spec/ci/database.postgresql.yml config/database.yml;;
+esac
+
+bundle exec rake db:migrate
+bundle exec rake db:migrate:extensions

data/bin/radiant

@@ -2,8 +2,6 @@
 
 ENV['RAILS_ENV'] ||= 'production'
 
-require File.join(File.dirname(__FILE__), '..', 'config', 'boot')
-
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..')
 
 require 'ruby_version_check'

data/config.ru

@@ -0,0 +1,2 @@
+require File.dirname(__FILE__) + '/config/environment'
+run ActionController::Dispatcher.new

data/config/boot.rb

@@ -2,7 +2,6 @@
 # Configure your app in config/environment.rb and config/environments/*.rb
 
 RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
-RAILS_ENV = (ENV['RAILS_ENV'] || 'development').dup unless defined?(RAILS_ENV)
 
 module Rails
   class << self

data/config/cucumber.yml

@@ -1,7 +1,7 @@
 <%
 rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
 rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "#{rerun_opts} --format rerun --out rerun.txt --strict --tags ~@wip"
+std_opts = "#{rerun_opts} --format rerun --out rerun.txt --strict --require features --tags ~@wip"
 %>
 default: <%= std_opts %>
 wip: --tags @wip:3 --wip features

data/config/environment.rb

@@ -9,6 +9,8 @@ require File.join(File.dirname(__FILE__), 'boot')
 
 require 'radius'
 
+YAML::ENGINE.yamler = 'syck' if RUBY_VERSION =~ /1.9/
+
 Radiant::Initializer.run do |config|
   # Skip frameworks you're not going to use (only works if using vendor/rails).
   # To use Rails without a database, you must remove the Active Record framework

data/config/initializers/radiant_config.rb

@@ -4,7 +4,7 @@ Radiant.config do |config|
   config.define 'local.timezone', :allow_change => true, :select_from => lambda { ActiveSupport::TimeZone::MAPPING.keys.sort }
   config.define 'defaults.locale', :select_from => lambda { Radiant::AvailableLocales.locales }, :allow_blank => true
   config.define 'defaults.page.parts', :default => "Body,Extended"
-  config.define 'defaults.page.status', :select_from => lambda { Status.selectable_values }, :allow_blank => true, :default => "Draft"
+  config.define 'defaults.page.status', :select_from => lambda { Status.selectable_values }, :allow_blank => false, :default => "Draft"
   config.define 'defaults.page.filter', :select_from => lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, :allow_blank => true
   config.define 'defaults.page.fields'
   config.define 'defaults.snippet.filter', :select_from => lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, :allow_blank => true

data/config/initializers/rails_patch.rb

@@ -0,0 +1,2 @@
+# The following code alters Rails MissingSourceFile to catch errors in Ruby 1.9.3
+MissingSourceFile::REGEXPS.push([/^cannot load such file -- (.+)$/i, 1])

data/config/locales/en.yml

@@ -75,7 +75,10 @@ en:
       only_day: "%e"
       short: "%e %b"
     month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]   
-    order: [ :year, :month, :day ]
+    order:
+      - :year
+      - :month
+      - :day
   delete_layout: 'Delete Layout'
   delete_pages: 'Delete %{pages}'
   delete_snippet: 'Delete Snippet'

data/config/preinitializer.rb

@@ -13,7 +13,7 @@ end
 begin
   # Set up load paths for all bundled gems
   ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
-  Bundler.setup(:default, RAILS_ENV)
+  Bundler.setup
 rescue Bundler::GemNotFound => e
   raise RuntimeError, "Bundler couldn't find some gems: #{e}. Did you run `bundle install`?"
 end

data/db/migrate/20110902203823_add_allowed_children_cache_to_pages.rb

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

data/db/migrate/20111016150725_extend_page_part_content_limit.rb

@@ -0,0 +1,15 @@
+class ExtendPagePartContentLimit < ActiveRecord::Migration
+  def self.up
+    if ActiveRecord::Base.connection.adapter_name =~ /m[sy]sql/i
+      # Make sure text longer than 64kB is not cropped in MySQL and MSSQL
+      # See https://github.com/radiant/radiant-sheets-extension/issues/10
+      change_column :page_parts, :content, :text, :limit => 1048575
+    end
+  end
+
+  def self.down
+    if ActiveRecord::Base.connection.adapter_name =~ /m[sy]sql/i
+      change_column :page_parts, :content, :text
+    end
+  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 => 20100810151922) do
+ActiveRecord::Schema.define(:version => 20110902203823) do
 
   create_table "assets", :force => true do |t|
     t.string   "caption"
@@ -76,10 +76,10 @@ ActiveRecord::Schema.define(:version => 20100810151922) do
 
   create_table "pages", :force => true do |t|
     t.string   "title"
-    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.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  "parent_id"
     t.integer  "layout_id"
     t.datetime "created_at"
@@ -87,8 +87,9 @@ ActiveRecord::Schema.define(:version => 20100810151922) 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.boolean  "virtual",                               :default => false, :null => false
+    t.integer  "lock_version",                          :default => 0
+    t.string   "allowed_children_cache",                :default => ""
   end
 
   add_index "pages", ["class_name"], :name => "altered_pages_class_name"

data/features/admin/pages_management.feature

@@ -17,27 +17,17 @@ Feature: Managing pages
     
   Scenario: Creating a homepage
     Given I am logged in as "existing"
-    Given there are no pages
-    When I go to the "pages" admin page
-    And I follow "New Homepage"
-    Then I should see "New Page"
-    And there should be a "body" part
-    And there should be an "extended" part
-    When I fill in "Page Title" with "My site"
-    And I fill in "Slug" with "/"
-    And I fill in "Breadcrumb" with "My site"
-    And I fill in the "body" content with "Under Construction"
-    And I fill in the "extended" content with "foobar"
-    And I select "Published" from "Status"
-    And I press "Create page"
+    And there are no pages
+    And I create a homepage
     Then I should be on the sitemap
     And I should see "My site"
     When I go to the homepage
     Then I should see "Under Construction"
   
   Scenario: Creating child pages
-    Given I am logged in as "existing"
-    And there is a homepage
+    Given there are no pages
+    And I am logged in as "existing"
+    And I create a homepage
     When I go to the "pages" admin page
     And I follow "Add Child"
     And I follow "Normal Page"

data/features/step_definitions/admin/pages_management_steps.rb

@@ -26,3 +26,20 @@ When /^I edit the "([^\"]*)" page$/ do |name|
   page = pages(name.to_sym)
   visit "/admin/pages/#{page.id}/edit"
 end
+
+Given /^I create a homepage$/ do
+  steps %Q{
+    When I go to the "pages" admin page
+    And I follow "New Homepage"
+    Then I should see "New Page"
+    And there should be a "body" part
+    And there should be an "extended" part
+    When I fill in "Page Title" with "My site"
+    And I fill in "Slug" with "/"
+    And I fill in "Breadcrumb" with "My site"
+    And I fill in the "body" content with "Under Construction"
+    And I fill in the "extended" content with "foobar"
+    And I select "Published" from "Status"
+    And I press "Create page"
+  }
+end

data/lib/generators/extension/templates/tasks.rake

@@ -24,14 +24,6 @@ namespace :radiant do
           mkdir_p RAILS_ROOT + directory, :verbose => false
           cp file, RAILS_ROOT + path, :verbose => false
         end
-        unless <%= class_name %>.root.starts_with? RAILS_ROOT # don't need to copy vendored tasks
-          puts "Copying rake tasks from <%= class_name %>"
-          local_tasks_path = File.join(RAILS_ROOT, %w(lib tasks))
-          mkdir_p local_tasks_path, :verbose => false
-          Dir[File.join <%= class_name %>.root, %w(lib tasks *.rake)].each do |file|
-            cp file, local_tasks_path, :verbose => false
-          end
-        end
       end  
       
       desc "Syncs all available translations for this ext to the English ext master"

data/lib/generators/instance/instance_generator.rb

@@ -46,8 +46,9 @@ class InstanceGenerator < Rails::Generator::Base
       schema_file = %w{db/schema.rb}
       scripts = Dir["#{root}/script/**/*"].reject { |f| f =~ /(destroy|generate|plugin)$/ }
       public_files = ["public/.htaccess"] + Dir["#{root}/public/**/*"]
+      test_files = ["config/cucumber.yml"]
       
-      files = base_dirs + text_files + environments + bundler_compatibility_files + schema_file + scripts + public_files
+      files = base_dirs + text_files + environments + bundler_compatibility_files + schema_file + scripts + public_files + test_files
       files.map! { |f| f = $1 if f =~ %r{^#{root}/(.+)$}; f }
       files.sort!
       
@@ -75,9 +76,7 @@ class InstanceGenerator < Rails::Generator::Base
 
       # Instance Gemfile
       m.template "instance_gemfile", "Gemfile", :assigns => {
-        :radiant_path => RADIANT_ROOT,
         :radiant_version => Radiant::Version.to_s,
-        :sqlite_version => Gem.loaded_specs['sqlite3'].version.to_s,
         :db => options[:db]
       }
 

data/lib/generators/instance/templates/instance_gemfile

@@ -3,13 +3,13 @@ source :rubygems
 # If you make any changes in this file, please run `bundle install`.
 # If new versions of your installed gems are available, run `bundle update`
 
-gem "radiant", '~> <%= radiant_version %>'
+gem "radiant", "~> <%= radiant_version %>"
 
 # alternatively, in development
-# gem 'radiant', :path => '/path/to/radiant/root'
+# gem "radiant", :path => "/path/to/radiant/root"
 
 # SQLite is the default database connection but only suitable for local use
-<%= '# ' unless db == 'sqlite3' %>gem "sqlite3", "~> <%= sqlite_version %>"
+<%= '# ' unless db == 'sqlite3' %>gem "sqlite3", "~> 1.3.4"
 
 # To use MySQL
 <%= '# ' unless db == 'mysql' %>gem "mysql", "~> 2.8.1"
@@ -21,37 +21,37 @@ gem "radiant", '~> <%= radiant_version %>'
 <%= '# ' unless db == 'db2' %>gem "db2", "~> 2.6.2"
 
 # SQL Server
-<%= '#' unless db == 'sqlserver' %>gem 'tiny_tds'
-<%= '#' unless db == 'sqlserver' %>gem "activerecord-sqlserver-adapter", "~> 3.1.0"
+<%= '# ' unless db == 'sqlserver' %>gem "tiny_tds"
+<%= '# ' unless db == 'sqlserver' %>gem "activerecord-sqlserver-adapter", "~> 3.1.0"
 
 # Language packs
-# gem 'radiant-dutch_language_pack-extension', '~> 1.0.0'
-# gem 'radiant-french_language_pack-extension', '~> 1.0.0'
-# gem 'radiant-german_language_pack-extension', '~> 1.0.0'
-# gem 'radiant-italian_language_pack-extension', '~> 1.0.0'
-# gem 'radiant-japanese_language_pack-extension', '~> 1.0.0'
-# gem 'radiant-russian_language_pack-extension', '~> 1.0.0'
+# gem "radiant-dutch_language_pack-extension",    "~> 1.0.0"
+# gem "radiant-french_language_pack-extension",   "~> 1.0.0"
+# gem "radiant-german_language_pack-extension",   "~> 1.0.0"
+# gem "radiant-italian_language_pack-extension",  "~> 1.0.0"
+# gem "radiant-japanese_language_pack-extension", "~> 1.0.0"
+# gem "radiant-russian_language_pack-extension",  "~> 1.0.0"
 
 # A standard gem extension
-# gem 'radiant-example-extension', :version => '~> 1.0.0'
+# gem "radiant-example-extension", :version => "~> 1.0.0"
 
 # Your own forked extension
-# gem 'radiant-modified-extension', :git => 'git://github.com/your/fork.git'
+# gem "radiant-modified-extension", :git => "git://github.com/your/fork.git"
 
 # A local extension in development
-# gem 'radiant-new-extension', :path => '/path/to/extension/root'
+# gem "radiant-new-extension", :path => "/path/to/extension/root"
 
 # Gems you would like to have in your development environment
 # group :development do
-#   gem 'wirble'
+#   gem "wirble"
 # end
 
 # If you're running tests or specs
 # group :test do
-#   gem "cucumber-rails",    "~> 0.3.2"
-#   gem "database_cleaner",  "~> 0.6.5"
-#   gem "webrat",            "~> 0.7.3"
-#   gem "rspec-rails",       "~> 1.3.3"
-#   gem "sqlite3",           "~> 1.3.4"
-#   gem "ZenTest",           "4.6.0"
-# end
+#   gem "cucumber-rails",   "~> 0.3.2"
+#   gem "database_cleaner", "~> 0.6.5"
+#   gem "webrat",           "~> 0.7.3"
+#   gem "rspec-rails",      "~> 1.3.3"
+#   gem "sqlite3",          "~> 1.3.4"
+#   gem "ZenTest",          "4.6.0"
+# end