radiant 0.6.1 → 0.6.2

data/CHANGELOG

@@ -1,5 +1,14 @@
 == Change Log
 
+=== 0.6.2 Jewel Carver (June 23, 2007)
+* Removed some of the database specific code from the ArchiveFinder [Daniel
+  Sheppard]
+* Fixed typo in extension model generator documentation
+* Reworked the way the generator extension is loaded (closing #500) [Keita]
+* Fixed failing unit tests in instance mode [Daniel Shephard]
+* Modified the page edit form to use multipart/form-data (useful for an upload 
+  extension) [Sean Cribbs]
+
 === 0.6.1 Stone Cutter (May 5, 2007)
 * Fixed a security vulnerability which caused passwords to appear in the logs
 * Fixed a bug in the site map code which caused it to forget which rows were

data/CONTRIBUTORS

@@ -4,6 +4,11 @@
 The following people have submitted changes which have been applied to the
 core:
 
+=== 0.6.2 Jewel Carver
+* Sean Cribbs
+* Daniel Sheppard
+* Keita
+
 === 0.6.1 Stone Cutter
 * Sean Cribbs
 * Daniel Sheppard

data/app/models/archive_finder.rb

@@ -10,23 +10,27 @@ class ArchiveFinder
   class << self
     def year_finder(finder, year)
       new do |method, options|
-        add_condition(options, "#{extract('year', 'published_at')} = ?", year.to_i)
+        start = Time.local(year)
+	finish = start.next_year
+        add_condition(options, "published_at >= ? and published_at < ?", start, finish)
         finder.find(method, options)
       end
     end
     
     def month_finder(finder, year, month)
-      finder = year_finder(finder, year)
       new do |method, options|
-        add_condition(options, "#{extract('month', 'published_at')} = ?", month.to_i)
+        start = Time.local(year, month)
+	finish = start.next_month
+        add_condition(options, "published_at >= ? and published_at < ?", start, finish)
         finder.find(method, options)
       end
     end
     
     def day_finder(finder, year, month, day)
-      finder = month_finder(finder, year, month)
       new do |method, options|
-        add_condition(options, "#{extract('day', 'published_at')} = ?", day.to_i)
+        start = Time.local(year, month, day)
+	finish = start.tomorrow
+        add_condition(options, "published_at >= ? and published_at < ?", start, finish)
         finder.find(method, options)
       end
     end
@@ -45,25 +49,5 @@ class ArchiveFinder
         options[:conditions] = conditions
         options
       end
-      
-      def extract(part, field)
-        case ActiveRecord::Base.connection.adapter_name
-        when /sqlite/i
-          format = case part
-          when /year/i
-           '%Y'
-          when /month/i
-           '%m'
-          when /day/i
-           '%d'
-          end
-          "CAST(STRFTIME('#{format}', #{field}) AS INTEGER)"
-        when /sqlserver/i
-          "DATEPART(#{part.upcase}, #{field})"
-        else
-          "EXTRACT(#{part.upcase} FROM #{field})"
-        end
-      end
-  
   end
-end
+end

data/app/views/admin/page/edit.rhtml

@@ -107,7 +107,7 @@
 <h1 id="edit_page">Edit Page</h1>
 <% end -%>
 
-<form method="post">
+<form method="post" enctype="multipart/form-data">
   <%= hidden_field "page", "lock_version" %>
   <div class="form-area">
     <p class="title">

data/lib/generators/extension_model/extension_model_generator.rb

@@ -12,7 +12,7 @@ class ExtensionModelGenerator < ModelGenerator
   end
   
   def banner
-    "Usage: #{$0} generate ExtensionName ModelName [field:type, field:type]"
+    "Usage: #{$0} extension_model ExtensionName ModelName [field:type, field:type]"
   end
   
   def extension_path

data/lib/{plugins/extension_patches/lib → generators}/generator_base_extension.rb

@@ -1,5 +1,4 @@
 require 'rails_generator'
-
 module Radiant
   module GeneratorBaseExtension
     def self.included(base)

data/lib/plugins/dependencies_fix/init.rb

@@ -0,0 +1,6 @@
+(class << Dependencies; self; end).class_eval do
+  def loadable_constants_for_path_with_filtered_args(*args)
+    loadable_constants_for_path_without_filtered_args(*args).select {|path| /^(::)?([A-Z]\w*)(::[A-Z]\w*)*$/ =~ path }
+  end
+  alias_method_chain :loadable_constants_for_path, :filtered_args
+end

data/lib/plugins/extension_patches/init.rb

@@ -1,7 +1,4 @@
 require 'routing_extension'
 require 'view_paths_extension'
 require 'mailer_view_paths_extension'
-if RAILS_ENV != 'production'
-  require 'generator_base_extension' 
-end
 require 'fixture_loading_extension'

data/lib/plugins/extension_patches/lib/fixture_loading_extension.rb

@@ -42,8 +42,35 @@ module Radiant
       end
     end  
   end
-  
 end
 
 require 'active_record/fixtures'
 Fixtures.class_eval { include Radiant::FixtureLoadingExtension }
+
+require 'action_controller/test_process'
+module ActionController::TestProcess
+  def fixture_file_upload(path, mime_type = nil)
+    if Test::Unit::TestCase.respond_to?(:fixture_path)
+      fixture_path = Test::Unit::TestCase.fixture_path
+      if(fixture_path.respond_to? :to_str)
+        ActionController::TestUploadedFile.new(
+          fixture_path.to_str + path, 
+          mime_type
+        )
+      else
+        best_path = fixture_path.find { |x| File.exist? (x + path) }
+        best_path ||= fixture_path.last
+        ActionController::TestUploadedFile.new(
+          best_path + path, 
+          mime_type
+        )        
+      end
+    else
+      ActionController::TestUploadedFile.new(
+        path, 
+        mime_type
+      )
+    end
+  end
+end
+

data/lib/radiant.rb

@@ -5,7 +5,7 @@ unless defined? Radiant::Version
     module Version
       Major = '0'
       Minor = '6'
-      Tiny  = '1'
+      Tiny  = '2'
     
       class << self
         def to_s

data/lib/tasks/release.rake

@@ -38,21 +38,21 @@ namespace 'radiant' do
     end
     s.extra_rdoc_files = RDOC_EXTRAS
     files = FileList['**/*']
-    files.include 'public/.htaccess'
     files.exclude '**/._*'
     files.exclude '**/*.rej'
-    files.exclude 'cache/*'
+    files.exclude 'cache/'
     files.exclude 'config/database.yml'
     files.exclude 'config/locomotive.yml'
     files.exclude 'config/lighttpd.conf'
     files.exclude 'config/mongrel_mimes.yml'
     files.exclude 'db/*.db'
-    files.exclude 'doc'
+    files.exclude /^doc/
     files.exclude 'log/*.log'
     files.exclude 'log/*.pid'
     files.include 'log/.keep'
-    files.exclude 'pkg'
-    files.exclude 'tmp'
+    files.exclude /^pkg/
+    files.include 'public/.htaccess'
+    files.exclude 'tmp/'
     s.files = files.to_a
   end
 
@@ -86,4 +86,4 @@ namespace 'radiant' do
       system %{rubyforge add_release #{RUBY_FORGE_GROUPID} #{RUBY_FORGE_PACKAGEID} "#{RELEASE_NAME}" #{file}}
     end
   end
-end
+end

data/script/generate

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/boot'
+require 'generators/generator_base_extension'
 require 'commands/generate'

data/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb

@@ -0,0 +1,65 @@
+require File.dirname(__FILE__) + '/tokenizer'
+require File.dirname(__FILE__) + '/node'
+require File.dirname(__FILE__) + '/selector'
+
+module HTML #:nodoc:
+  
+  # A top-level HTMl document. You give it a body of text, and it will parse that
+  # text into a tree of nodes.
+  class Document #:nodoc:
+
+    # The root of the parsed document.
+    attr_reader :root
+
+    # Create a new Document from the given text.
+    def initialize(text, strict=false, xml=false)
+      tokenizer = Tokenizer.new(text)
+      @root = Node.new(nil)
+      node_stack = [ @root ]
+      while token = tokenizer.next
+        node = Node.parse(node_stack.last, tokenizer.line, tokenizer.position, token)
+
+        node_stack.last.children << node unless node.tag? && node.closing == :close
+        if node.tag?
+          if node_stack.length > 1 && node.closing == :close
+            if node_stack.last.name == node.name
+              node_stack.pop
+            else
+              open_start = node_stack.last.position - 20
+              open_start = 0 if open_start < 0
+              close_start = node.position - 20
+              close_start = 0 if close_start < 0
+              msg = <<EOF.strip
+ignoring attempt to close #{node_stack.last.name} with #{node.name}
+  opened at byte #{node_stack.last.position}, line #{node_stack.last.line}
+  closed at byte #{node.position}, line #{node.line}
+  attributes at open: #{node_stack.last.attributes.inspect}
+  text around open: #{text[open_start,40].inspect}
+  text around close: #{text[close_start,40].inspect}
+EOF
+              strict ? raise(msg) : warn(msg)
+            end
+          elsif !node.childless?(xml) && node.closing != :close
+            node_stack.push node
+          end
+        end
+      end
+    end
+  
+    # Search the tree for (and return) the first node that matches the given
+    # conditions. The conditions are interpreted differently for different node
+    # types, see HTML::Text#find and HTML::Tag#find.
+    def find(conditions)
+      @root.find(conditions)
+    end
+
+    # Search the tree for (and return) all nodes that match the given
+    # conditions. The conditions are interpreted differently for different node
+    # types, see HTML::Text#find and HTML::Tag#find.
+    def find_all(conditions)
+      @root.find_all(conditions)
+    end
+    
+  end
+
+end

data/vendor/rails/railties/doc/README_FOR_APP

@@ -0,0 +1,2 @@
+Use this README file to introduce your application and point to useful places in the API for learning more.
+Run "rake appdoc" to generate API documentation for your models and controllers.

data/vendor/rails/railties/lib/tasks/documentation.rake

@@ -0,0 +1,82 @@
+namespace :doc do
+  desc "Generate documentation for the application"
+  Rake::RDocTask.new("app") { |rdoc|
+    rdoc.rdoc_dir = 'doc/app'
+    rdoc.title    = "Rails Application Documentation"
+    rdoc.options << '--line-numbers' << '--inline-source'
+    rdoc.rdoc_files.include('doc/README_FOR_APP')
+    rdoc.rdoc_files.include('app/**/*.rb')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+  }
+
+  desc "Generate documentation for the Rails framework"
+  Rake::RDocTask.new("rails") { |rdoc|
+    rdoc.rdoc_dir = 'doc/api'
+    rdoc.template = "#{ENV['template']}.rb" if ENV['template']
+    rdoc.title    = "Rails Framework Documentation"
+    rdoc.options << '--line-numbers' << '--inline-source'
+    rdoc.rdoc_files.include('README')
+    rdoc.rdoc_files.include('vendor/rails/railties/CHANGELOG')
+    rdoc.rdoc_files.include('vendor/rails/railties/MIT-LICENSE')
+    rdoc.rdoc_files.include('vendor/rails/activerecord/README')
+    rdoc.rdoc_files.include('vendor/rails/activerecord/CHANGELOG')
+    rdoc.rdoc_files.include('vendor/rails/activerecord/lib/active_record/**/*.rb')
+    rdoc.rdoc_files.exclude('vendor/rails/activerecord/lib/active_record/vendor/*')
+    rdoc.rdoc_files.include('vendor/rails/actionpack/README')
+    rdoc.rdoc_files.include('vendor/rails/actionpack/CHANGELOG')
+    rdoc.rdoc_files.include('vendor/rails/actionpack/lib/action_controller/**/*.rb')
+    rdoc.rdoc_files.include('vendor/rails/actionpack/lib/action_view/**/*.rb')
+    rdoc.rdoc_files.include('vendor/rails/actionmailer/README')
+    rdoc.rdoc_files.include('vendor/rails/actionmailer/CHANGELOG')
+    rdoc.rdoc_files.include('vendor/rails/actionmailer/lib/action_mailer/base.rb')
+    rdoc.rdoc_files.include('vendor/rails/actionwebservice/README')
+    rdoc.rdoc_files.include('vendor/rails/actionwebservice/CHANGELOG')
+    rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service.rb')
+    rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/*.rb')
+    rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/api/*.rb')
+    rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/client/*.rb')
+    rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/container/*.rb')
+    rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/dispatcher/*.rb')
+    rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/protocol/*.rb')
+    rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/support/*.rb')
+    rdoc.rdoc_files.include('vendor/rails/activesupport/README')
+    rdoc.rdoc_files.include('vendor/rails/activesupport/CHANGELOG')
+    rdoc.rdoc_files.include('vendor/rails/activesupport/lib/active_support/**/*.rb')
+  }
+
+  plugins = FileList['vendor/plugins/**'].collect { |plugin| File.basename(plugin) }
+
+  desc "Generate documation for all installed plugins"
+  task :plugins => plugins.collect { |plugin| "doc:plugins:#{plugin}" }
+
+  desc "Remove plugin documentation"
+  task :clobber_plugins do 
+    rm_rf 'doc/plugins' rescue nil
+  end
+
+  namespace :plugins do
+    # Define doc tasks for each plugin
+    plugins.each do |plugin|
+      task(plugin => :environment) do
+        plugin_base   = "vendor/plugins/#{plugin}"
+        options       = []
+        files         = Rake::FileList.new
+        options << "-o doc/plugins/#{plugin}"
+        options << "--title '#{plugin.titlecase} Plugin Documentation'"
+        options << '--line-numbers' << '--inline-source'
+        options << '-T html'
+
+        files.include("#{plugin_base}/lib/**/*.rb")
+        if File.exists?("#{plugin_base}/README")
+          files.include("#{plugin_base}/README")    
+          options << "--main '#{plugin_base}/README'"
+        end
+        files.include("#{plugin_base}/CHANGELOG") if File.exists?("#{plugin_base}/CHANGELOG")
+
+        options << files.to_s
+
+        sh %(rdoc #{options * ' '})
+      end
+    end
+  end
+end

data/vendor/rails/railties/lib/tasks/tmp.rake

@@ -0,0 +1,37 @@
+namespace :tmp do
+  desc "Clear session, cache, and socket files from tmp/"
+  task :clear => [ "tmp:sessions:clear",  "tmp:cache:clear", "tmp:sockets:clear"]
+
+  desc "Creates tmp directories for sessions, cache, and sockets"
+  task :create do
+    FileUtils.mkdir_p(%w( tmp/sessions tmp/cache tmp/sockets tmp/pids ))
+  end
+
+  namespace :sessions do
+    desc "Clears all files in tmp/sessions"
+    task :clear do
+      FileUtils.rm(Dir['tmp/sessions/[^.]*'])
+    end
+  end
+
+  namespace :cache do
+    desc "Clears all files and directories in tmp/cache"
+    task :clear do
+      FileUtils.rm_rf(Dir['tmp/cache/[^.]*'])
+    end
+  end
+
+  namespace :sockets do
+    desc "Clears all files in tmp/sockets"
+    task :clear do
+      FileUtils.rm(Dir['tmp/sockets/[^.]*'])
+    end
+  end
+
+  namespace :pids do
+    desc "Clears all files in tmp/pids"
+    task :clear do
+      FileUtils.rm(Dir['tmp/pids/[^.]*'])
+    end
+  end
+end

data/vendor/redcloth/doc/CHANGELOG

@@ -0,0 +1,160 @@
+--- %YAML:1.0
+- version: 3.0.4
+  date: 2005-02-18
+  changes:
+    - The caps class doesn't swallow spaces.
+    - Horizontal rules required to be on an empty line.
+    - Hard breaks don't screw with Markdown headers any longer.
+    - Fixed error triggered by complex lists.
+    - Inline markups need to be butted up against enclosing text, no spaces.
+    - Fixed problem with intermingled single and double quotes.
+    - Brought back lite_mode.
+
+- version: 3.0.3
+  date: 2005-02-06
+  changes:
+    - Stack overflow regexp on code inlines obliterated.
+    - Citations scaled back.
+    - Toggle span tags on CAPS with :no_span_tags accessor.
+
+- version: 3.0.2
+  date: 2005-02-02
+  changes:
+    - Stack overflow Regexps replaced.
+    - All code blocks protected from formatting.
+    - Hard breaks working.
+    - Filter HTML now uses detailed cleaner.
+
+- version: 3.0.1
+  date: 2004-11-15
+  changes:
+    - Using `float' rather than `text-align' to align image blocks.
+    - Shelving more HTML attributes to prevent them from clashing with Textile glyphs.
+    - Simplifying the block regexp.
+
+- version: 3.0
+  date: 2004-10-26
+  changes:
+    - Broke up the Textile engine into smaller parts, recoded central block parser.
+    - Added preliminary support for Markdown.
+    - Added support for custom Textile prefixes.
+    - RedCloth now generates XHTML fragments.
+    - Complete HTML documents should now work, RedCloth ignores complex HTML.
+      
+- version: 2.0.12
+  date: 2004-08-09
+  changes:
+    - Escaping tighter for <pre> tags that share a single line.
+    - No more String#htmlesc!.  Moved to RedCloth#htmlesc.
+    - Pruned out the code that was handling multibyte.
+
+- version: 2.0.11
+  date: 2004-06-01
+  changes:
+    - Fixed the new 2.0-style aliased links.
+    - Lines starting with div opening or closing tags aren't given paragraph tags.
+    - Escaped some sample markup that was being translated by RDoc.
+    - Subtle changes to the quick tags to help them interact with surrounding HTML better.
+    - Ensure angle brackets inside code quick tags get escaped.
+    - New patch and test by F. Ros to fix <pre> tags with class settings.
+    - Commented out encode_entities and fix_entities, they do nothing now.  Thanks, Denis.
+    - Scaled back QTAGS a back to avoid mixing up hyphens and dels.  Thanks, Denis.
+    - Work on the references to ensure they are generating at least XHTML 1.0 Transitional.
+
+- version: 2.0.10
+  date: 2004-05-26
+  changes:
+    - Table and list problems.  Rewrote the <pre> handling code.. again.
+
+- version: 2.0.9
+  date: 2004-05-26
+  changes:
+    - Improved RDoc.  Ri documentation is auto-installed now!
+    - Links were consuming closing HTML tags.  (See latest test in tests/links.yml.)
+    - Further speed patch from Denis.  Good good.
+    - Patch by F. Ros to fix <pre> tags with class settings.
+
+- version: 2.0.8
+  date: 2004-05-22
+  changes:
+    - First scan of the glyphs() method only scans for pre|notextile|code, the
+      deeper passes scan for all HTML.  Now inlines work around HTML tags!
+      (What a pain!)
+    - Moved tables and blocks into glyphs to keep them shielded from the parser
+      if they are in <pre> tags.
+    - Patch by Denis Mertz to speed up RedCloth by compiling the various RegExps
+      only once.  Thanks, David!
+
+- version: 2.0.7
+  date: 2004-04-21
+  changes:
+    - New REFERENCE and QUICK-REFERENCE.  See http://hobix.com/textile/.
+    - Lists rewritten to accomplish better line folding.
+    - Better, greedier links.
+    - Additional link and list tests.
+
+- version: 2.0.6
+  date: 2004-04-16
+  changes:
+    - Bold and strong tags were mixed up.  '*' is now strong.  '**' is bold.
+      They were swapped until now.
+    - Horizontal alignments were pretty buggy.  Combining alignments with
+      indents was totally broken.
+    - Fixed table problem.  Now glyphs are handled between tables and blocks.
+    - Nested <pre> and <code> tags are now escaped.  Much better handling of
+      HTML inside <pre> tags.  Really: quite nice.
+    - Patch from Florian Gross to fix an html filtration inconsistency.
+
+- version: 2.0.5
+  date: 2004-04-14
+  changes: 
+    - Added safe mode (patch courtesy of Florian Gross).
+    - Added line folding (suggested by Jim Menard).
+    - Fixing notextile tags to work multi-line.
+    - Ambiguity with em-dash and block opener.
+    - Footnote bug. (Thanks, Jim Menard!)
+
+- version: 2.0.4
+  date: 2004-04-08
+  changes:
+    - Scaled back aggresiveness of the inline matching to aid the em-dash.
+    - Scaled back footnotes to stay out of array indices.
+
+- version: 2.0.3
+  date: 2004-04-02
+  changes:
+    - Handling of pre, code, notextile was all wrong.  Also, got rid of the goofed up
+      split then collect.  Now using gsub! and recursion to handle inlines and glyphs.
+    - Better acronym support.
+    - Suppression of Regexp warnings.
+    - Single- and double-quoted string wierdness.  Thanks, Bret Pettichord.
+
+- version: 2.0.2
+  date: 2004-03-08
+  changes:
+    - Fixed broken lists, broken tables.
+    - code/pre tags now escape properly, glyphs are working, spans are working when surrounded by html tags.
+    - Fixed classes and ids. 
+    - Restricted notextile tags to a single line.
+
+- version: 2.0.1
+  date: 2004-02-10
+  changes:
+    - Unmatched closing slash on regexps in ruby 1.6.8.
+    - Fixes to bulleted lists.
+
+- version: 2.0
+  date: 2004-02-06
+  changes:
+    - Complete rewrite of RedCloth, against beta2 from textism.com.
+
+- version: 0.41
+  date: 2003-06-20
+  changes:
+    - Newlines were outputing as escaped.
+
+- version: 0.4
+  date: 2003-06-20
+  changes:
+    - Initial public release.
+    - Integration of YAML-based PyTextile tests.