radiant 1.0.0.rc3 → 1.0.0.rc4

data/.gitignore

@@ -8,7 +8,7 @@ tmp/*
 TAGS
 public/tmp
 public/assets
-public/stylesheets/admin/styles.css
+public/stylesheets/admin
 spec/datasets/tmp
 *.tmproj
 .idea

data/CHANGELOG.md

@@ -2,26 +2,193 @@
 
 ## Edge
 
-* require HAML 3.0.25 [Jeff Casimir]
+* Ruby 1.9.3 compatibility [Jim Gay]
+* Allow page menus to be overridden by additional modules [Jim Gay]
+* Add migration to not crop page part content > 64kB in MySql and MSSQL [Benny Degezelle]
+* Add r:site:title, r:site:domain and r:site:dev_domain [Benny Degezelle]
+* Polish language pack generation [Benny Degezelle]
+* 1.9.2 compatibility [Johannes Fahrenkrug, John Muhl]
+* Fix view_path order [William Ross]
+* Extension rake task files loaded directly: no need to copy on update [William Ross]
+* Fake published_at on preview, if necessary [William Ross]
+* Ignore the generated admin stylesheets [jsntv200]
+* No need to boot Radiant during instance generation [jsntv200]
+* Rake test:extensions uses new extension loader [William Ross]
+* Rake spec:extensions updated [William Ross]
+* Don't disable ActionMailer [John Muhl]
+* Use example.com as the example sites [Jim Gay]
+* Allow the upgrade from an existing instance with no Gemfile [Jim Gay]
+* Fixed bootstrap so that migrations run from Radiant.root/db/migrate [William Ross]
+* Add config.ru for racking up in eg. Pow [William Ross]
+* Remove the extension post_install_message [jsntv200]
+* Extensions should require the module not the version [jsntv200]
+* Fix rake radiant:update by setting the missing variables [jsntv200]
+* Update rails binaries [Jim Gay]
+* Make PreviewStop exception explicit in purpose [Jim Gay]
+* Bundler instructions at the end of bootstrap [William Ross]
+* Less maintenance required in instance generator [William Ross]
+* Add extension root to autoload paths [William Ross]
+* Refactored extension loader [William Ross]
+* Extension generator updated for bundler compatibility [William Ross]
+* Add extension models, controllers and helpers to eager-load paths. [William Ross]
+* Explicit initialize_nav call to help test extensions [William Ross]
+* Instance mode uses Bundler [William Ross]
+* De-vendor Rails [William Ross]
+* Old CI tasks removed [William Ross]
+* Other text files markdowned, generator and tests updated [William Ross]
+* README in markdown with Travis badge [William Ross]
+* Setup Travis CI [John Muhl]
+* Add Bundler support [William Ross, Michal Cichra, Edmund Haselwanter]
+* Add sqlite and zentest as dev. dependencies [John Muhl]
+* Dev site should show draft and hidden pages [Jim Gay]
+* Better duplicate-config error reporting [William Ross]
+* Alter the environment path when running tests from RADIANT_ROOT [Jim Gay]
+* De-submodule built-in extensions and language packs, depend on gems instead [John Muhl, jsntv200]
+* Fixed "dev?" method so that pre-pending hostname with "dev." works. [Wes Gamble]
+* No need to migrate extensions after loading schema [William Ross]
+* Load templates from gems [Jim Gay]
+* Require all extension explicitly [Jim Gay]
+* De-vendor acts_as_tree, highline, rack-cache, radius, RedCloth [William Ross, John Muhl, jsntv200]
+* Removed custom pluralize method in the application helper. [Michael Stalker]
+* Reflect sqlite default in help output [John Muhl]
+* Fix import task name [Jim Gay]
+* Newextension.replaces("OldExtension") to inherit matching migrations [William Ross]
+* Make sqlite the default database. closes #224 [John Muhl]
+* Deprecating r:url family of tags [William Ross]
+* Explicitly load will_paginate in resource controller [Jim Gay]
+* Check for @current_tab [jsntv200]
+* Properly load features files in generated extension gemspecs [Jim Gay]
+* Alter compass initializer to load from tmp/stylesheets [Jim Gay]
+* Allow content areas without a 'page_part' naming scheme [Jim Gay]
+* Allow access to the instance of the user action observer [Jim Gay]
+* Allow extensions to add to the built-in cucumber paths [Jim Gay]
+* Remove git dependency on generated extension gemspecs [Jim Gay]
+* Unvendored haml [William Ross]
+* Removed non-portable (Windows-unfriendly) syntax from System commands [Chris Parrish]
+* Fix script/console path to boot [Andrew vonderLuft]
+* Gem dependency compatibility fix for ruby 1.9 [Andrew vonderLuft]
+* Fix case statements for ruby 1.9 compatibility [Andrew vonderLuft]
+* Migrate extensions in load order [Jim Gay]
+* Don't need the message about running the extension migration task [Jim Gay]
+* Migrate and update extensions after bootstrap [Jim Gay]
+* Use request.cookies [Jim Gay]
+* Explicitly find the preview page again after the post [Jim Gay]
+* Remove errant ruby-debug [Jim Gay]
+* Update instance boot [Jim Gay]
+* Patch for requiring RedCloth and gem dependencies [Jim Gay]
+* Ensure @extensions in the initializer is an array [Jim Gay]
+* We don't need to validate numericality of reference columns [Jim Gay]
+* Replace returning with tap [Jim Gay]
+* Don't validate id [Jim Gay]
+* Tweak to tabcontrol.Js [William Ross]
+* Add rake update task for static html files [Andrew vonderLuft]
+* Changes popup.js to support switching from one popup to another [William Ross]
+* Allow the :all symbol to represent gem extensions [Jim Gay]
+* Only show paginate link when depaginated [Benny Degezelle]
+* Require delocalize gem, so date input in non-English is interpreted correctly [Benny Degezelle]
+* Use white background for page preview [Jim Gay]
+* Add option to ignore extensions where ruby's -= operator won't cut it [Jim Gay]
+* Remove unused abstract_model_helper.rb [Jim Gay]
+* Provide access to standard configuration options through methods [Jim Gay]
+* Add reusable .action_button class [Jim Gay]
+* Move radiant-badge to /images/radiant/ [Andrew vonderLuft]
+* Fix rake method for extension script [Andrew vonderLuft]
+* Make environment files similar [Jeff Casimir]
+* Require HAML 3.0.25 [Jeff Casimir]
+* Fix extension installer script to run migrations and updates [Andrew vonderLuft]
+* Allow two link triggers to the same popup window [John Long]
+* Make popup windows draggable by their title bars [John Long]
+* Add tag alias for navigation:url/path [Andrew vonderLuft]
+* Define page subclasses with acts_as_tree [Jim Gay]
+* Add preview page feature [Jim Gay]
+* Modify locales to use Dir.glob so that dot files are ignored [jsntv200]
+* Don't show secondary nav when there is only one item [John Long]
+* Pull in changes from prototype [John Long]
+* Add .bundle to .gitignore [John Long]
+* Allow extensions to insert tabs after or before other tabs [John Long]
 * Provide an export function for custom templates [Jim Gay]
+* Cleanup styled blog template [Jim Gay]
+* Fix bug when rendering with nil content [Jim Gay]
+* Make rspec matchers available in cucumber [Jim Gay]
+* Better support for cucumber in generated extensions [Jim Gay]
+* Added development dependencies to gemspec [Michal Cichra]
+* Fixed boot to work with rubygems >= 1.6.0 [Michal Cichra]
+* Added .rvmrc and radiant-*.gem to gitignore [Michal Cichra]
+* Fixed gemspec to include all files from git repo [Michal Cichra, Jim Gay]
+* Move from url to path in sample templates [Jim Gay]
+* Updated available tags i18n [Jim Gay]
 * Remove legacy routes [Jim Gay]
 * Allow pagination in aggregated pages [Jim Gay]
+* Fix hard-coded string in page edit [Mario Visic]
+* Make NodeHelper available outside of PageHelper [William Ross]
+* User has_many pages [William Ross]
+* Remove arbitrary restriction on limit and offset [Jim Gay]
 * Make UserActionObserver thread safe [Mark Reginald James]
 * Speedup recursive snippet usage [Andrew O'Brian, Jim Gay]
+* Add validate_path helper to check that a page exists [William Ross]
+* Standardize on site:host for consistency with dev:host [William Ross]
 * Use <r:cycle /> for a numeric counter [Jim Gay, Dirk Kelly]
 * String format breadcrumb tag in archive pages [Oriol Gual]
+* More explicit cache strategy and cookies no longer force cache-bypass [William Ross]
+* Make pagination_parameters available to views [William Ross]
+* Add style for inline list of links in drawer [Andrew vonderLuft]
+* Added defaults.snippet.filter to the configuration view [Samuel Whited]
+* Defer default_child to class so we can bootstrap without error [Josh French]
+* Page.find_by_url → Page.find_by_path [Josh French]
+* Added config option defaults.snippet.filter [Samuel Whited]
 * Fix bug with deletion of page parts [Josh French]
+* Add Personal settings sub-tab [William Ross]
+* Cleaner large status spinner [John Muhl]
 * Unroll PageMenu into core [Josh French]
+* Add missing semicolons + add radix parameter to parseInt() for safety [vanderhoorn]
+* Fix status select box with more specific translate call [William Ross]
+* Make config validation case-insensitive [William Ross]
+* Don't run Radiant initializations if Radiant.root is the same as Rails.root [William Ross]
+* Fix page remove screen [Jim Gay]
+* Move <r:comment> to deprecated tags [Jim Gay]
+* Call find_by_url inside find_by_path so existing extensions continue to work [Jim Gay]
+* Update generated extension to include gemspec and better README [Jim Gay]
+* Config definition can specify units [William Ross]
 * Update Haml to 3.0.23 [Jim Gay]
+* Clicking on a tab focuses the associated textarea [John Muhl]
 * Localize <r:date> [Jim Gay]
 * Make any date column a valid value for <r:date /> [Jim Gay]
 * Move url methods to path [Jim Gay]
-* Allow use of custom TextFilter names[Petrik de Heus]
+* Allow use of custom TextFilter names [Petrik de Heus]
+* Prevent autofill when at new-user form [Gert Goet]
 * Set autocomplete="off" for password fields [Gert Goet]
 * Allow loading of database templates from extensions [Jim Gay]
 * Restore Roasters template styling [Jim Gay]
-* Integrated PageFields extension into core [Josh French]
+* Auto-expand Status and Actions columns to prevent clipping [Benny Degezelle]
+* Fix config import/export [William Ross]
+* Add Radiant.config method and radiant_config.rb initializer [William Ross]
+* Add configuration interface, with validation and error reporting [William Ross]
+* Close other menus when dropdown option clicked [Jim Gay]
+* Move markdown_filter into an extension [John Muhl]
+* Adding the <r:hide> tag to replace <r:comment> [Jim Gay]
+* Change "Website" to "More Info" on the Extensions page [Jim Gay]
+* Don't allow children for File Not Found pages [Jim Gay]
+* Get the children for the menu explicitly [Jim Gay]
+* Ensure parent_id and @page are set on Page#new [Jim Gay]
+* Move export into an extension [Jim Gay]
+* Add "noself" attribute to breadcrumbs tag [William Ross]
+* Separate Env Dump page into a debug extension [Jim Gay]
+* Support PageFields in imports & exports [Josh French]
+* More granular regionsets in Pages#edit [Josh French]
+* Integrate Compass [John Long]
+* Update the prototype import task [Jim Gay]
+* Fix bug for filtered Snippets not showing stored filter [Jim Gay]
+* Fix Layouts pagination [Andrew vonderLuft]
+* Fix Snippet pagination [Andrew vonderLuft]
+* Exclude dot files (e.g. .svn) in rake radiant:update:sass [Andrew vonderLuft]
+* Expose attribute assignment in Pages#new [Josh French]
+* Rename Page#fields[] to Page#field() [Josh French]
+* Add #scheduled? to Page [Jim Gay]
 * Added the Sheets extension to manage Javascript and Stylesheets [Jim Gay]
+* Update toSlug to allow periods in slugs [Jim Gay]
+* Protect against gems that are required but not installed [Sean Cribbs]
+* Updated index views to use latest markup and styles [John Long]
+* Integrated PageFields extension into core [Josh French]
 * Page-type select menu moved to Pages#index [Josh French]
 * Allow gem-extensions to override core views [Josh French]
 * Popup.js fix for multiple control instances [Josh French]
@@ -551,4 +718,5 @@ included in more than one extension will be loaded only once according to the ex
 * Fixed a problem with an error being thrown when the <r:context /> tag was rendered with the inherit attribute set to true and the page part did not exist (closes ticket #155) [Bodhi Philpot]
 
 ## 0.5.0 Grindstone (June 28, 2006)
-* First release. [John Long]
+
+* First release. [John Long]

data/CONTRIBUTORS.md

@@ -18,6 +18,19 @@ core:
 * Andrew vonderLuft
 * William Ross
 * John Muhl
+* Johannes Fahrenkrug
+* Benny Degezelle
+* Jason Taylor
+* Wes Gamble
+* Michael Stalker
+* Chris Parrish
+* John W. Long
+* Edmund Haselwanter
+* Michal Cichra
+* Jason Garber
+* Samuel Whited
+* vanderhoorn
+* Sean Cribbs
 
 ## 0.9.1 Refraction
 

data/Gemfile

@@ -6,9 +6,9 @@ source :rubygems
 # application. The instance has its own Gemfile, which
 # requires radiant and therefore pulls in every 
 # dependency mentioned in radiant.gemspec.
-#
-gem 'rails', '2.3.14'
-gem 'sqlite3', '1.3.4'
+
+gem "rails",   "2.3.14"
+gem "sqlite3", "1.3.4"
 
 # When radiant is installed as a gem you can run all of
 # its tests and specs from an instance. If you're working
@@ -20,4 +20,6 @@ gem 'sqlite3', '1.3.4'
 
 if ENV['TRAVIS']
   gemspec :development_group => :test
-end
+  gem "mysql"
+  gem "pg"
+end

data/Gemfile.lock

@@ -11,7 +11,7 @@ GEM
     activeresource (2.3.14)
       activesupport (= 2.3.14)
     activesupport (2.3.14)
-    rack (1.1.2)
+    rack (1.1.3)
     rails (2.3.14)
       actionmailer (= 2.3.14)
       actionpack (= 2.3.14)
@@ -19,7 +19,7 @@ GEM
       activeresource (= 2.3.14)
       activesupport (= 2.3.14)
       rake (>= 0.8.3)
-    rake (0.8.7)
+    rake (0.9.2.2)
     sqlite3 (1.3.4)
 
 PLATFORMS
@@ -27,4 +27,4 @@ PLATFORMS
 
 DEPENDENCIES
   rails (= 2.3.14)
-  sqlite3 (~> 1.3.4)
+  sqlite3 (= 1.3.4)

data/INSTALL.md

@@ -19,9 +19,9 @@ config/database.yml to match.
 
 3. Run the database bootstrap rake task:
 
-    % rake production db:bootstrap
+    % bundle exec rake production db:bootstrap
 
-(If you would like bootstrap a development database run `rake 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:

data/README.md

@@ -60,7 +60,7 @@ This will install the gem with the prerelease name, for example: ‘radiant-0.9.
 
 To run tests you will need to have the following gems installed:
 
-  gem install ZenTest rspec rspec-rails cucumber webrat nokogiri
+  gem install ZenTest rspec rspec-rails cucumber webrat nokogiri sqlite3-ruby
 
 ## Support
 

data/Rakefile

@@ -7,5 +7,6 @@ require 'rdoc/task'
 require 'tasks/rails'
 
 unless Rake::Task.task_defined? "radiant:release"
-  Dir["#{RADIANT_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
+  Dir["#{RADIANT_ROOT}/lib/tasks/**/*.rake"].sort.each { |taskfile| load taskfile }
+  Radiant::ExtensionPath.rake_task_paths.each { |taskfile| load taskfile }
 end

data/app/controllers/admin/pages_controller.rb

@@ -60,11 +60,13 @@ class Admin::PagesController < Admin::ResourceController
           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/node_helper.rb

@@ -2,6 +2,11 @@ module Admin::NodeHelper
 
   def render_node(page, locals = {})
     @current_node = page
+    page.extend MenuRenderer
+    page.view = self
+    if page.additional_menu_features?
+      page.extend(*page.menu_renderer_modules)
+    end
     locals.reverse_merge!(:level => 0, :simple => false).merge!(:page => page)
     render :partial => 'admin/pages/node', :locals =>  locals
   end
@@ -10,48 +15,6 @@ module Admin::NodeHelper
     @homepage ||= Page.find_by_parent_id(nil)
   end
 
-  def clean_page_description(page)
-    page.description.to_s.strip.gsub(/\t/,'').gsub(/\s+/,' ')
-  end
-
-  def child_link_for(page)
-    case children_for(page).size
-    when 0
-      content_tag :span, image('plus_disabled') + ' ' + t('add_child'), :class => 'action disabled'
-    when 1
-      link_to image('plus') + ' ' + t('add_child'), new_admin_page_child_path(page, :page_class => children_for(page).first), :class => "action"
-    else
-      link_to image('plus') + ' ' + t('add_child'), "#allowed_children_#{page.id}", :class => "action dropdown"
-    end
-  end
-
-  def child_menu_for(page)
-    children = children_for(page)
-    return nil if children.size < 2
-    children.unshift(children.delete(page.default_child), :separator) if children.include?(page.default_child)
-    name_for = proc { |p| (name = p.name.to_name('Page')).blank? ? t('normal_page') : name }
-    content_tag :ul, :class => 'menu', :id => "allowed_children_#{page.id}" do
-      children.map do |child|
-        if child == :separator
-          content_tag :li, nil, :class => 'separator'
-        else
-          content_tag :li, link_to(name_for[child], new_admin_page_child_path(page, :page_class => child), :title => clean_page_description(child))
-        end
-      end
-    end
-  end
-
-  def children_for(page)
-    page.allowed_children
-  end
-
-  def children_for_with_roles(page)
-    children = children_for_without_roles(page)
-    children.reject! { |p| p.new.virtual? } unless admin?
-    children
-  end
-  alias_method_chain :children_for, :roles
-
   def show_all?
     @controller.action_name == 'remove'
   end

data/app/helpers/admin/resource_helper.rb

@@ -0,0 +1,2 @@
+module Admin::ResourceHelper
+end

data/app/models/file_not_found_page.rb

@@ -13,7 +13,7 @@ class FileNotFoundPage < Page
     page type.
   }
   
-  tag "attempted_url" do
+  tag "attempted_url" do |tag|
     CGI.escapeHTML(request.request_uri) unless request.nil?
   end
    

data/app/models/menu_renderer.rb

@@ -0,0 +1,133 @@
+module MenuRenderer
+
+  def exclude(*type_names)
+    @excluded_class_names ||= []
+    @excluded_class_names.concat(type_names).uniq!
+  end
+  module_function :exclude
+
+  def excluded_class_names
+    MenuRenderer.instance_variable_get(:@excluded_class_names)
+  end
+
+  module_function :excluded_class_names
+  public :excluded_class_names
+
+  def view=(val)
+    @view = val
+  end
+
+  def view
+    @view
+  end
+
+  def additional_menu_features?
+    @additional_menu_features ||= (menu_renderer_module_name != 'MenuRenderer' && Object.const_defined?(menu_renderer_module_name))
+  end
+
+  def menu_renderer_module_name
+    simple_name = self.class_name.to_s.sub('Page','')
+    "#{simple_name}MenuRenderer"
+  end
+
+  def menu_renderer_modules
+    [Object.const_get(menu_renderer_module_name)]
+  end
+
+  def allowed_child_classes
+    (allowed_children_cache.to_s.split(',') - Array(excluded_class_names)).map(&:constantize)
+  end
+
+  def default_child_item
+    menu_item(default_child)
+  end
+
+  def separator_item
+    view.content_tag :li, '', :class => 'separator'
+  end
+
+  def child_items
+    (allowed_child_classes - [self.class.default_child]).map do |child|
+      menu_item(child)
+    end
+  end
+
+  def menu_items
+    [default_child_item, separator_item] + child_items
+  end
+
+  def menu_list
+    view.content_tag :ul, menu_items.join, :class => 'menu', :id => "allowed_children_#{id}"
+  end
+
+  def remove_link
+    view.link_to view.image('minus') + ' ' + I18n.t('remove'), view.remove_admin_page_url(self), :class => "action"
+  end
+
+  def remove_option
+    remove_link
+  end
+
+  def add_child_disabled?
+    allowed_child_classes.size == 0
+  end
+
+  def disabled_add_child_link
+    view.content_tag :span, view.image('plus_disabled') + ' ' + I18n.t('add_child'), :class => 'action disabled'
+  end
+
+  def add_child_link
+    view.link_to((view.image('plus') + ' ' + I18n.t('add_child')), view.new_admin_page_child_path(self, :page_class => default_child.name), :class => "action")
+  end
+
+  def add_child_link_with_menu_hook
+    view.link_to((view.image('plus') + ' ' + I18n.t('add_child')), "#allowed_children_#{id}", :class => "action dropdown")
+  end
+
+  def add_child_menu
+    menu_list
+  end
+
+  def add_child_link_with_menu
+    add_child_link_with_menu_hook + add_child_menu
+  end
+
+  def add_child_option
+    if add_child_disabled?
+      disabled_add_child_link
+    else
+      if allowed_child_classes.size == 1
+        add_child_link
+      else
+        add_child_link_with_menu
+      end
+    end
+  end
+
+  private
+
+  def clean_page_description(page_class)
+    page_class.description.to_s.strip.gsub(/\t/,'').gsub(/\s+/,' ')
+  end
+
+  def menu_item(child_class)
+    view.content_tag(:li, menu_link(child_class))
+  end
+
+  def menu_link(child_class)
+    title = clean_page_description(child_class)
+    path = view.new_admin_page_child_path(self, :page_class => child_class.name)
+    text = link_text_for_child_class(child_class.name)
+    view.link_to(text, path, :title => title)
+  end
+  
+  def link_text_for_child_class(given_class_name)
+    translation_key = if given_class_name == 'Page' || given_class_name.blank?
+      'normal_page'
+    else
+      given_class_name.sub('Page','').underscore
+    end
+    fallback = given_class_name == 'Page' ? 'Page' : given_class_name.sub('Page','').titleize
+    I18n.t(translation_key, :default => fallback)
+  end
+end