radiant 1.1.0.beta → 1.1.0.rc1

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, :limit => 1500, :default => ''
+    add_column :pages, :allowed_children_cache, :text, :default => ''
     Page.reset_column_information
     Page.find_each do |page|
       page.save # update the allowed_children_cache

data/lib/generators/instance/templates/instance_gemfile

@@ -4,6 +4,7 @@ source :rubygems
 # If new versions of your installed gems are available, run `bundle update`
 
 gem "radiant", "~> <%= radiant_version %>"
+gem "compass-rails", "~> 1.0.3"
 
 # alternatively, in development
 # gem "radiant", :path => "/path/to/radiant/root"
@@ -17,7 +18,7 @@ gem "radiant", "~> <%= radiant_version %>"
 # 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"
+<%= '# ' unless db == 'sqlite3' %>gem "sqlite3", "~> 1.3.5"
 
 # To use MySQL
 <%= '# ' unless db == 'mysql' %>gem "mysql", "~> 2.8.1"
@@ -32,18 +33,21 @@ gem "radiant", "~> <%= radiant_version %>"
 <%= '# ' unless db == 'sqlserver' %>gem "tiny_tds"
 <%= '# ' unless db == 'sqlserver' %>gem "activerecord-sqlserver-adapter", "~> 3.1.0"
 
+gem "compass-rails", "~> 1.0.3"
+
 # Default Extensions
-gem "radiant-snippets-extension",			 "~> 1.0.1"
 gem "radiant-archive-extension",             "~> 1.0.7"
-gem "radiant-clipped-extension",             "~> 1.0.16"
+gem "radiant-clipped-extension",             "~> 1.1.0"
 gem "radiant-debug-extension",               "~> 1.0.2"
-gem "radiant-exporter-extension",            "~> 1.0.2"
+gem "radiant-exporter-extension",            "~> 1.1.0"
 gem "radiant-markdown_filter-extension",     "~> 1.0.2"
-gem "radiant-sheets-extension",              "~> 1.0.9"
+gem "radiant-sheets-extension",              "~> 1.1.0.alpha"
+gem "radiant-snippets-extension",            "~> 1.1.0.alpha"
 gem "radiant-site_templates-extension",      "~> 1.0.4"
 gem "radiant-smarty_pants_filter-extension", "~> 1.0.2"
 gem "radiant-textile_filter-extension",      "~> 1.0.4"
 
+
 # Language packs
 # gem "radiant-dutch_language_pack-extension",    "~> 1.0.0"
 # gem "radiant-french_language_pack-extension",   "~> 1.0.0"

data/lib/radiant.rb

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

data/lib/radiant/engine.rb

@@ -0,0 +1,10 @@
+module Radiant
+  class Engine < Rails::Engine
+    isolate_namespace Radiant
+
+    config.generators do |g|
+      g.test_framework :rspec
+      g.integration_tool :cucumber
+    end
+  end
+end

data/lib/radiant/extension.rb

@@ -108,7 +108,7 @@ module Radiant
       def activate_extension
         return if instance.active?
         instance.activate if instance.respond_to? :activate
-        ActionController::Routing::Routes.add_configuration_file(instance.routing_file) if instance.routed?
+        ActionController::Routing::Routes.configuration_files.unshift(instance.routing_file) if instance.routed?
         ActionController::Routing::Routes.reload
         instance.active = true
       end
@@ -121,19 +121,10 @@ module Radiant
       end
       alias :deactivate :deactivate_extension
 
-      def define_routes(&block)
-        ActiveSupport::Deprecation.warn("define_routes has been deprecated in favor of your extension's config/routes.rb",caller)
-        route_definitions << block
-      end
-
       def inherited(subclass)
         subclass.extension_name = subclass.name.to_name('Extension')
       end
 
-      def route_definitions
-        @route_definitions ||= []
-      end
-
       def migrate_from(extension_name, until_migration=nil)
         instance.migrates_from[extension_name] = until_migration
       end

data/lib/radiant/initializer.rb

@@ -292,6 +292,7 @@ module Radiant
       Rails::Rack::Metal.metal_paths = ["#{RADIANT_ROOT}/app/metal"] # reset Rails default to RADIANT_ROOT
       Rails::Rack::Metal.metal_paths += plugin_loader.engine_metal_paths
       Rails::Rack::Metal.metal_paths += extension_loader.paths(:metal)
+      Rails::Rack::Metal.metal_paths.uniq!
     
       configuration.middleware.insert_before(
         :"ActionController::ParamsParser",

data/lib/radiant/task_support.rb

@@ -0,0 +1,66 @@
+module Radiant
+  class TaskSupport
+    class << self
+      def establish_connection
+        unless ActiveRecord::Base.connected?
+          connection_hash = YAML.load_file("#{Rails.root}/config/database.yml").to_hash
+          env_connection = connection_hash[RAILS_ENV]
+          ActiveRecord::Base.establish_connection(env_connection)
+        end
+      end
+      def config_export(path = "#{Rails.root}/config/radiant_config.yml")
+        self.establish_connection
+        FileUtils.mkdir_p(File.dirname(path))
+        if File.open(File.expand_path(path), 'w') { |f| YAML.dump(Radiant::Config.to_hash.to_yaml,f) }
+          puts "Radiant::Config saved to #{path}"
+        end
+      end
+      def config_import(path = "#{Rails.root}/config/radiant_config.yml", clear = nil)
+        self.establish_connection
+        if File.exist?(path)
+          begin
+            Radiant::Config.transaction do
+              Radiant::Config.delete_all if clear
+              configs = YAML.load(YAML.load_file(path))
+              configs.each do |key, value|
+                c = Radiant::Config.find_or_initialize_by_key(key)
+                c.value = value
+                c.save
+              end
+            end
+            puts "Radiant::Config updated from #{path}"
+          rescue ActiveRecord::RecordInvalid => e
+            puts "IMPORT FAILED and rolled back. #{e}"
+          end
+        else
+          puts "No file exists at #{path}"
+        end
+      end
+
+      # Write the combined content of files in dir into cache_file in the same dir.
+      #
+      def cache_files(dir, files, cache_file)
+        cache_content = files.collect { |f|
+          File.read(File.join(dir, f)) }.join("\n\n")
+
+        cache_path = File.join(dir, cache_file)
+        File.delete(cache_path) if File.exists?(cache_path)
+        File.open(cache_path, "w+") { |f| f.write(cache_content) }
+      end
+
+      # Reads through the layout file and returns an array of JS filenames
+      #
+      def find_admin_js
+        layout = "#{RADIANT_ROOT}/app/views/layouts/application.html.haml"
+        js_regexp = /javascript_include_tag %w\((.*)\), :cache => 'admin\/all/
+        files = File.open(layout) { |f| f.read.match(js_regexp)[1].split }
+        files.collect { |f| f.split('/').last + '.js' }
+      end
+
+      def cache_admin_js
+        dir = "#{Rails.root}/public/javascripts/admin"
+        cache_files(dir, find_admin_js, 'all.js')
+      end
+    end
+  end
+end

data/lib/tasks/framework.rake

@@ -107,7 +107,7 @@ unless File.directory? "#{RAILS_ROOT}/app"
 
       desc "Update the cached assets for the admin UI"
       task :cached_assets do
-        TaskSupport.cache_admin_js
+        Radiant::TaskSupport.cache_admin_js
       end
 
       desc "Update Gemfile from your current radiant install, backing up if required."

data/lib/tasks/radiant_config.rake

@@ -1,18 +1,18 @@
-require 'task_support'
+require 'radiant/task_support'
 namespace :radiant do
   namespace :config do
     desc "Export Radiant::Config to Rails.root/config/radiant_config.yml. Specify a path with RADIANT_CONFIG_PATH - defaults to Rails.root/config/radiant_config.yml"
     task :export => :environment do
       config_path = ENV['RADIANT_CONFIG_PATH'] || "#{Rails.root}/config/radiant_config.yml"
       clear = ENV['CLEAR_CONFIG'] || nil
-      TaskSupport.config_export(config_path)
+      Radiant::TaskSupport.config_export(config_path)
     end
     
     desc "Import Radiant::Config from Rails.root/config/radiant_config.yml. Specify a path with RADIANT_CONFIG_PATH - defaults to Rails.root/config/radiant_config.yml Set CLEAR_CONFIG=true to delete all existing settings before import"
     task :import => :environment do
       config_path = ENV['RADIANT_CONFIG_PATH'] || "#{Rails.root}/config/radiant_config.yml"
       clear = ENV['CLEAR_CONFIG'] || nil
-      TaskSupport.config_import(config_path, clear)
+      Radiant::TaskSupport.config_import(config_path, clear)
     end
   end
 end

data/lib/tasks/release.rake

@@ -103,7 +103,7 @@ namespace 'radiant' do
 
   desc "Generates cached assets from source files"
   task :generate_cached_assets do
-    TaskSupport.cache_admin_js
+    Radiant::TaskSupport.cache_admin_js
   end
 
   desc "Publish the release files to RubyForge."

data/public/javascripts/admin/page_preview.js

@@ -31,7 +31,7 @@ document.observe('dom:loaded', function() {
       preview_tools.style['opacity'] = 1
       body.addClassName('clipped')
       form.target = frame.id
-      form.action = '/admin/preview'
+      form.action = relative_url_root + '/admin/preview'
       form.submit()
     } finally {
       form.target = oldTarget

data/public/javascripts/admin/pagefield.js

@@ -2,7 +2,7 @@ function addField(form) {
   if (validFieldName()) {
     new Ajax.Updater(
       $('attributes').down('tbody'),
-      '/admin/page_fields/',
+      relative_url_root + '/admin/page_fields/',
       {
         asynchronous: true,
         evalScripts: true,

data/public/javascripts/admin/shortcuts.js

@@ -3,8 +3,14 @@ var ShortcutKeysBehavior = Behavior.create({
     var character = String.fromCharCode(event.keyCode);
     if(!event.shiftKey && !character.blank())
       character = character.toLowerCase();
+    // Blindly passing RIGHT_ARROW through fromCharCode() returns a single-quote character (ascii decimal 39).
+    // I suspect that causes a bad string interpolation when evaluating `button`.
+    // Adding double-quotes to the accesskey spec seems to fix it.
+    // Now of course now keyCode 34 (double-quote in ascii decimal) will cause a problem... but your browser will likely catch Ctrl+PgDn anyway
+    // We should only evaluate keyCodes that can come from printable characters, now sure how feasible that is.
+    // Eg. http://www.cambiaresearch.com/articles/15/javascript-char-codes-key-codes
     if(event.ctrlKey && event.keyCode != 17){
-      var button = $$('input[accesskey='+character+']')[0];
+      var button = $$('input[accesskey="'+character+'"]')[0];
       if(button){
         event.stop();
         button.click();

data/radiant.gemspec

@@ -28,7 +28,8 @@ a general purpose content managment system--not merely a blogging engine.}
   s.add_dependency "rdoc",          ">= 3.9.2"
   s.add_dependency "acts_as_tree",  "~> 0.1.1"
   s.add_dependency "bundler",       ">= 1.0.0"
-  s.add_dependency "compass",       "~> 0.11.1"
+  s.add_dependency "compass",       "~> 0.12.2"
+  s.add_dependency "compass-rails", "~> 1.0.3"
   s.add_dependency "delocalize",    "~> 0.2.3"
   s.add_dependency "haml",          "~> 3.1.1"
   s.add_dependency "highline",      "~> 1.6.10"

data/rails/init.rb

@@ -0,0 +1 @@
+require 'compass-rails'

data/spec/dummy/Rakefile

@@ -0,0 +1,7 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+require 'rake'
+
+Dummy::Application.load_tasks

data/spec/dummy/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+end

data/spec/dummy/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag :all %>
+  <%= javascript_include_tag :defaults %>
+  <%= csrf_meta_tag %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/spec/dummy/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Dummy::Application

data/spec/dummy/config/application.rb

@@ -0,0 +1,45 @@
+require File.expand_path('../boot', __FILE__)
+
+require "active_model/railtie"
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_view/railtie"
+require "action_mailer/railtie"
+
+Bundler.require
+require "radiant"
+
+module Dummy
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # JavaScript files you want as :defaults (application.js is always included).
+    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+  end
+end

data/spec/dummy/config/boot.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+
+if File.exist?(gemfile)
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+end
+
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/database.yml

@@ -0,0 +1,22 @@
+# SQLite version 3.x
+#   gem install sqlite3
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000

data/spec/dummy/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+Dummy::Application.initialize!

data/spec/dummy/config/environments/development.rb

@@ -0,0 +1,26 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the webserver when you make code changes.
+  config.cache_classes = false
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_view.debug_rjs             = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
+end
+

data/spec/dummy/config/environments/production.rb

@@ -0,0 +1,49 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The production environment is meant for finished, "live" apps.
+  # Code is not reloaded between requests
+  config.cache_classes = true
+
+  # Full error reports are disabled and caching is turned on
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Specifies the header that your server uses for sending files
+  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+
+  # For nginx:
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+
+  # If you have no front-end server that supports something like X-Sendfile,
+  # just comment this out and Rails will serve the files
+
+  # See everything in the log (default is :info)
+  # config.log_level = :debug
+
+  # Use a different logger for distributed setups
+  # config.logger = SyslogLogger.new
+
+  # Use a different cache store in production
+  # config.cache_store = :mem_cache_store
+
+  # Disable Rails's static asset server
+  # In production, Apache or nginx will already do this
+  config.serve_static_assets = false
+
+  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Disable delivery errors, bad email addresses will be ignored
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable threaded mode
+  # config.threadsafe!
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners
+  config.active_support.deprecation = :notify
+end