radiant 1.1.0.beta → 1.1.0.rc1

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Edge
 
+* Allow loading of snippets from the file system [Jim Gay]
+* Moved to compass-rails [Jim Gay]
+* Fixed avatar tags for HTTP and HTTPS [Sam Whited]
+* Updated r:date and deprecated r:rfc1123_date [Sam Whited]
+* Address UTF-8 params encoding in 1.9 [Johannes Fahrenkrug]
+
+## 1.0.1 (March 6, 2012)
+
 * 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]

data/CONTRIBUTORS.md

@@ -5,6 +5,12 @@ core:
 
 ## Edge
 
+* Jim Gay
+* Sam Whited
+* Johannes Fahrenkrug
+
+## 1.0.0
+
 * Jeff Casimir
 * Mario Visic
 * Mark Reginald James

data/Gemfile

@@ -8,7 +8,7 @@ source :rubygems
 # dependency mentioned in radiant.gemspec.
 
 gem "rails",   "2.3.14"
-gem "sqlite3", "1.3.4", :group => [:development, :test], :platform => :ruby
+gem "sqlite3", "1.3.5", :group => [:development, :test], :platform => :ruby
 
 # When radiant is installed as a gem you can run all of
 # its tests and specs from an instance. If you're working
@@ -17,16 +17,17 @@ gem "sqlite3", "1.3.4", :group => [:development, :test], :platform => :ruby
 # run `bundle install`.
 
 # gemspec
+# gem "compass-rails", "~> 1.0.3"
+
 # 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.1.0"
 # gem "radiant-markdown_filter-extension",     "~> 1.0.2"
-# gem "radiant-sheets-extension",              "~> 1.0.9"
-# gem "radiant-snippets-extension",            "~> 1.0.1"
+# 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-snippets-extension",            "~> 1.0.0"
 # gem "radiant-textile_filter-extension",      "~> 1.0.4"
 
 if ENV['TRAVIS']

data/Gemfile.lock

@@ -20,7 +20,7 @@ GEM
       activesupport (= 2.3.14)
       rake (>= 0.8.3)
     rake (0.9.2.2)
-    sqlite3 (1.3.4)
+    sqlite3 (1.3.5)
 
 PLATFORMS
   java
@@ -28,4 +28,4 @@ PLATFORMS
 
 DEPENDENCIES
   rails (= 2.3.14)
-  sqlite3 (= 1.3.4)
+  sqlite3 (= 1.3.5)

data/GemfileRails3

@@ -0,0 +1,37 @@
+source :rubygems
+
+# This is the minimum of dependency required to run 
+# the radiant instance generator, which is (normally)
+# the only time the radiant gem functions as an 
+# application. The instance has its own Gemfile, which
+# requires radiant and therefore pulls in every 
+# dependency mentioned in radiant.gemspec.
+
+gem "rails", "3.2.8"
+gem "sqlite3", "1.3.5", :group => [:development, :test], :platform => :ruby
+
+# When radiant is installed as a gem you can run all of
+# its tests and specs from an instance. If you're working
+# on radiant itself and you want to run specs from the 
+# radiant root directory, uncomment the lines below and
+# run `bundle install`.
+
+gemspec
+# gem "compass-rails", "~> 1.0.3"
+
+# gem "radiant-archive-extension",             "~> 1.0.7"
+# gem "radiant-clipped-extension",             "~> 1.1.0"
+# gem "radiant-debug-extension",               "~> 1.0.2"
+# gem "radiant-exporter-extension",            "~> 1.1.0"
+# gem "radiant-markdown_filter-extension",     "~> 1.0.2"
+# 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"
+
+if ENV['TRAVIS']
+  gemspec :development_group => :test
+  gem "mysql"
+  gem "pg"
+end

data/app/controllers/site_controller.rb

@@ -3,10 +3,12 @@ class SiteController < ApplicationController
 
   skip_before_filter :verify_authenticity_token
   no_login_required
-  cattr_writer :cache_timeout
 
+  def self.cache_timeout=(val)
+    Radiant::PageResponseCacheDirector.cache_timeout=(val)
+  end
   def self.cache_timeout
-    @@cache_timeout ||= 5.minutes
+    Radiant::PageResponseCacheDirector.cache_timeout
   end
 
   def show_page
@@ -28,6 +30,21 @@ class SiteController < ApplicationController
     redirect_to welcome_url
   end
 
+  def cacheable_request?
+    (request.head? || request.get?) && live?
+  end
+  hide_action :cacheable_request?
+
+  def set_expiry(time, options={})
+    expires_in time, options
+  end
+  hide_action :set_expiry
+
+  def set_etag(val)
+    headers['ETag'] = val
+  end
+  hide_action :set_expiry
+
   private
     def batch_page_status_refresh
       @changed_pages = []
@@ -44,12 +61,19 @@ class SiteController < ApplicationController
     end
 
     def set_cache_control
-      if (request.head? || request.get?) && @page.cache? && live?
-        expires_in self.class.cache_timeout, :public => true, :private => false
-      else
-        expires_in nil, :private => true, "no-cache" => true
-        headers['ETag'] = ''
+      response_cache_director(@page).set_cache_control
+    end
+
+    def response_cache_director(page)
+      klass_name = "Radiant::#{page.class}ResponseCacheDirector"
+      begin
+        klass = klass_name.constantize
+      rescue NameError, LoadError
+        director_klass = "Radiant::PageResponseCacheDirector"
+        eval(%Q{class #{klass_name} < #{director_klass}; end}, TOPLEVEL_BINDING)
+        klass = director_klass.constantize
       end
+      klass.new(page, self)
     end
 
     def find_page(url)

data/app/helpers/application_helper.rb

@@ -186,14 +186,14 @@ module ApplicationHelper
     
     # Default image url to be used when no gravatar is found
     # or when an image exceeds the rating parameter.
-    default_avatar_url = "#{request.protocol}#{request.host_with_port}/images/admin/avatar_#{([options[:size].to_i] * 2).join('x')}.png"
+    default_avatar_url = "#{request.protocol}#{request.host_with_port}#{ActionController::Base.relative_url_root}/images/admin/avatar_#{([options[:size].to_i] * 2).join('x')}.png"
     options[:default] ||= default_avatar_url
     
     unless email.blank?
       # Build the Gravatar url.
-      url = 'http://www.gravatar.com/avatar.php?'
-      url << "gravatar_id=#{Digest::MD5.new.update(email)}" 
-      url << "&rating=#{options[:rating]}" if options[:rating]
+      url = '//gravatar.com/avatar/'
+      url << "#{Digest::MD5.new.update(email)}?"
+      url << "rating=#{options[:rating]}" if options[:rating]
       url << "&size=#{options[:size]}" if options[:size]
       url << "&default=#{options[:default]}" if options[:default]
       url

data/app/models/deprecated_tags.rb

@@ -30,5 +30,12 @@ module DeprecatedTags
       keywords
     end
   end
+
+  deprecated_tag "rfc1123_date", :deadline => '2.0' do |tag|
+    page = tag.locals.page
+    if date = page.published_at || page.created_at
+      CGI.rfc1123_date(date.to_time)
+    end
+  end
   
-end
+end

data/app/models/page.rb

@@ -69,11 +69,6 @@ class Page < ActiveRecord::Base
   end
   alias_method :child_url, :child_path
 
-  def headers
-    # Return a blank hash that child classes can override or merge
-    { }
-  end
-
   def part(name)
     if new_record? or parts.to_a.any?(&:new_record?)
       parts.to_a.find {|p| p.name == name.to_s }
@@ -129,14 +124,31 @@ class Page < ActiveRecord::Base
 
   def process(request, response)
     @request, @response = request, response
+    set_response_headers(@response)
+    @response.body = render
+    @response.status = response_code
+  end
+
+  def headers
+    # Return a blank hash that child classes can override or merge
+    { }
+  end
+
+  def set_response_headers(response)
+    set_content_type(response)
+    headers.each { |k,v| response.headers[k] = v }
+  end
+  private :set_response_headers
+
+  def set_content_type(response)
     if layout
       content_type = layout.content_type.to_s.strip
-      @response.headers['Content-Type'] = content_type unless content_type.empty?
+      if content_type.present?
+        response.headers['Content-Type'] = content_type
+      end
     end
-    headers.each { |k,v| @response.headers[k] = v }
-    @response.body = render
-    @response.status = response_code
   end
+  private :set_content_type
 
   def response_code
     200

data/app/models/radiant/page_response_cache_director.rb

@@ -0,0 +1,43 @@
+module Radiant
+  class PageResponseCacheDirector
+    def initialize(page, listener)
+      @page = page
+      @listener = listener
+    end
+
+    def set_cache_control
+      cacheable? ? cacheable_response : non_cacheable_response
+    end
+
+    class << self
+      def cache_timeout
+        @cache_timeout ||= 5.minutes
+      end
+
+      def cache_timeout=(val)
+        @cache_timeout = val
+      end
+    end
+
+    private
+
+    def non_cacheable_response
+      @listener.set_expiry nil, :private => true, "no-cache" => true
+      @listener.set_etag('')
+    end
+
+    def cacheable_response
+      timeout = self.class.cache_timeout
+      if @page.respond_to?(:cache_timeout)
+        timeout = @page.cache_timeout
+      end
+
+      @listener.set_expiry timeout, :public => true, :private => false
+    end
+
+    def cacheable?
+      @listener.cacheable_request? && @page.cache?
+    end
+
+  end
+end

data/app/models/standard_tags.rb

@@ -734,9 +734,9 @@ module StandardTags
     email = User.find_by_name(name).email
     default = "#{request.protocol}#{request.host_with_port}/images/admin/avatar_#{([size.to_i] * 2).join('x')}.png"
     unless email.blank?
-      url = 'http://www.gravatar.com/avatar.php?'
-      url << "gravatar_id=#{Digest::MD5.new.update(email)}"
-      url << "&rating=#{rating}"
+      url = '//gravatar.com/avatar/'
+      url << "#{Digest::MD5.new.update(email)}?"
+      url << "rating=#{rating}"
       url << "&size=#{size.to_i}"
       url << "&default=#{default}"
       url
@@ -747,10 +747,11 @@ module StandardTags
 
   desc %{
     Renders the date based on the current page (by default when it was published or created).
-    The format attribute uses the same formating codes used by the Ruby @strftime@ function. By
-    default it's set to @%A, %B %d, %Y@.  The @for@ attribute selects which date to render.  Valid
-    options are @published_at@, @created_at@, @updated_at@, and @now@. @now@ will render the
-    current date/time, regardless of the  page.
+    The format attribute uses the same formating codes used by the Ruby @strftime@ function.
+    By default it's set to @%A, %B %d, %Y@. You may also use the string @rfc1123@ as a shortcut
+    for @%a, %d %b %Y %H:%M:%S GMT@ (non-localized). The @for@ attribute selects which date to
+    render. Valid options are @published_at@, @created_at@, @updated_at@, and @now@. @now@ will
+    render the current date/time, regardless of the page.
 
     *Usage:*
 
@@ -772,9 +773,14 @@ module StandardTags
     else
       page.published_at || page.created_at
     end
-    @i18n_date_format_keys ||= (I18n.config.backend.send(:translations)[I18n.locale][:date][:formats].keys rescue [])
+    case format
+    when 'rfc1123'
+      CGI.rfc1123_date(date.to_time)
+    else
+      @i18n_date_format_keys ||= (I18n.config.backend.send(:translations)[I18n.locale][:date][:formats].keys rescue [])
     format = @i18n_date_format_keys.include?(format.to_sym) ? format.to_sym : format
-    I18n.l date, :format => format
+      I18n.l date, :format => format
+    end
   end
 
   desc %{
@@ -896,20 +902,6 @@ module StandardTags
     CGI.escapeHTML(tag.expand)
   end
 
-  desc %{
-    Outputs the published date using the format mandated by RFC 1123. (Ideal for RSS feeds.)
-
-    *Usage:*
-
-    <pre><code><r:rfc1123_date /></code></pre>
-  }
-  tag "rfc1123_date" do |tag|
-    page = tag.locals.page
-    if date = page.published_at || page.created_at
-      CGI.rfc1123_date(date.to_time)
-    end
-  end
-
   desc %{
     Renders a list of links specified in the @paths@ attribute according to three
     states:
@@ -1127,15 +1119,25 @@ module StandardTags
   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  
-
+  desc %{
+    Returns Radiant::Config['site.title'] as configured under the Settings tab.
+  }
+  tag "site:title" do |tag|
+    Radiant::Config["site.title"]
+  end
+  desc %{
+    Returns Radiant::Config['site.host'] as configured under the Settings tab.
+  }
+  tag "site:host" do |tag|
+    Radiant::Config["site.host"]
+  end
+  desc %{
+    Returns Radiant::Config['dev.host'] as configured under the Settings tab.
+  }
+  tag "site:dev_host" do |tag|
+    Radiant::Config["dev.host"]
+  end
+  
   private
     def render_children_with_pagination(tag, opts={})
       if opts[:aggregate]

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

@@ -60,7 +60,7 @@
       = t('or')
       = link_to t('cancel'), admin_pages_url
     #preview_panel.fullcover.grey_out{:style => 'display: none;'}
-      %iframe{:id => 'page-preview', :class => 'fullcover', :name => 'page-preview', :src => '/loading-iframe.html', :frameborder => 0, :scrolling => "auto"}
+      %iframe{:id => 'page-preview', :class => 'fullcover', :name => 'page-preview', :src =>  ActionController::Base.relative_url_root.to_s + '/loading-iframe.html', :frameborder => 0, :scrolling => "auto"}
       .preview_tools
         =submit_tag(t('buttons.save_changes'), :class => 'big save_changes')
         =submit_tag(t('buttons.save_and_continue'), :class => 'big save_and_continue', :name => 'continue')

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

@@ -7,7 +7,7 @@
             = icon
             = node_title
           - else
-            = expander(level) + link_to("#{icon} #{node_title}", edit_admin_page_url(page), :title => page.url)
+            = expander(level) + link_to("#{icon} #{node_title}", edit_admin_page_url(page), :title => page.path)
             = page_type
             = spinner
     - node.status_column do

data/config/compass.config

@@ -1,5 +1,4 @@
 project_type = :rails
-project_path = Compass::AppIntegration::Rails.root
 
 http_path             = "/"
 http_stylesheets_path = "/stylesheets"
@@ -11,8 +10,6 @@ css_dir               = "public/stylesheets"
 images_dir            = "public/images"
 javascripts_dir       = "public/javascripts"
 
-environment = Compass::AppIntegration::Rails.env
-
 relative_assets = true
 
 output_style = :compressed

data/config/initializers/tmp.rb

@@ -0,0 +1,2 @@
+require 'fileutils'
+FileUtils.mkdir_p(Rails.root.join("tmp", "stylesheets"))

data/config/preinitializer.rb

@@ -1,19 +1,18 @@
-begin
-  require "rubygems"
-  require "bundler"
-rescue LoadError
-  raise "Could not load the bundler gem. Install it with `gem install bundler`."
-end
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+# Lessens Debians need to edit.
+require "rubygems" rescue nil
 
-if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new("1.0.0")
-  raise RuntimeError, "Your bundler version is too old for Rails 2.3. " +
-   "Run `gem install bundler` to upgrade."
-end
+# Since Bundler is not really a 'must have' for Rails development just send off
+# a warning and see if the sytem continues to load, the user can optionally use
+# RADIANT_NOWARNINGS to disable it.
 
-begin
-  # Set up load paths for all bundled gems
-  ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
-  Bundler.setup
-rescue Bundler::GemNotFound => e
-  raise RuntimeError, "Bundler couldn't find some gems: #{e}. Did you run `bundle install`?"
+if File.file?(ENV['BUNDLE_GEMFILE'])
+  begin
+    require 'bundler/setup'
+  rescue LoadError
+    unless ENV['RADIANT_NOWARNINGS'] == true
+      $stderr.puts 'WARNING: It seems you do not have Bundler installed.'
+      $stderr.puts 'WARNING: You can install it by doing `gem install bundler`'
+    end
+  end
 end