radiant 0.9.0.rc2 → 0.9.1

data/vendor/radius/lib/radius/parser/scan.rl

@@ -5,7 +5,8 @@
 	action _prefix { mark_pfx = p }
 	action prefix {
 	  if data[mark_pfx..p-1] != @prefix
-      @nodes.last << data[mark_pfx-1..p]
+	    closing = data[mark_pfx-1,1] == '/'
+	    @nodes.last << data[mark_pfx-(closing ? 2 : 1)..p]
 	    fbreak;
     end
 	}

data/vendor/radius/lib/radius/version.rb

@@ -1,14 +1,8 @@
-module Radius
-  module Version
-    Major = '0'
-    Minor = '6'
-    Tiny  = '1'
-    
-    class << self
-      def to_s
-        [Major, Minor, Tiny].join('.')
-      end
-      alias :to_str :to_s
+module Radius #:nodoc:
+  def self.version
+    @version ||= begin
+      filename = File.join(File.dirname(__FILE__), '..', '..', 'VERSION')
+      IO.read(filename).strip
     end
   end
 end

data/vendor/radius/radius.gemspec

@@ -1,38 +1,71 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{radius}
-  s.version = "0.6.1"
+  s.version = "0.7.0.prerelease"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["John W. Long (me@johnwlong.com)", "David Chelimsky (dchelimsky@gmail.com)", "Bryce Kerley (bkerley@brycekerley.net)"]
-  s.date = %q{2009-04-07}
-  s.description = %q{Radius is a powerful tag-based template language for Ruby inspired by the template languages used in MovableType[http://www.movabletype.org] and TextPattern[http://www.textpattern.com]. It uses tags similar to XML, but can be used to generate any form of plain text (HTML, e-mail, etc...).}
-  s.email = ["me@johnwlong.com"]
-  s.extra_rdoc_files = ["Manifest.txt", "README.rdoc"]
-  s.files = ["CHANGELOG", "Manifest.txt", "QUICKSTART", "README.rdoc", "Rakefile", "lib/radius.rb", "lib/radius/context.rb", "lib/radius/dostruct.rb", "lib/radius/error.rb", "lib/radius/parser.rb", "lib/radius/parser/scan.rb", "lib/radius/parser/scan.rl", "lib/radius/parsetag.rb", "lib/radius/tagbinding.rb", "lib/radius/tagdefs.rb", "lib/radius/util.rb", "tasks/scan.rake", "test/context_test.rb", "test/parser_test.rb", "test/test_helper.rb"]
-  s.has_rdoc = true
-  s.homepage = %q{http://rubyforge.org/projects/radius/}
-  s.rdoc_options = ["--main", "README.rdoc"]
+  s.date = %q{2010-05-22}
+  s.description = %q{Radius is a powerful tag-based template language for Ruby inspired by the template languages used in MovableType and TextPattern. It uses tags similar to XML, but can be used to generate any form of plain text (HTML, e-mail, etc...).}
+  s.email = %q{me@johnwlong.com}
+  s.extra_rdoc_files = [
+    "CHANGELOG",
+     "LICENSE",
+     "QUICKSTART.rdoc",
+     "README.rdoc"
+  ]
+  s.files = [
+    "CHANGELOG",
+     "LICENSE",
+     "QUICKSTART.rdoc",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "lib/radius.rb",
+     "lib/radius/context.rb",
+     "lib/radius/delegating_open_struct.rb",
+     "lib/radius/error.rb",
+     "lib/radius/parse_tag.rb",
+     "lib/radius/parser.rb",
+     "lib/radius/parser/scan.rb",
+     "lib/radius/parser/scan.rl",
+     "lib/radius/tag_binding.rb",
+     "lib/radius/tag_definitions.rb",
+     "lib/radius/utility.rb",
+     "lib/radius/version.rb",
+     "tasks/jeweler.rake",
+     "tasks/rdoc.rake",
+     "tasks/scan.rake",
+     "tasks/test.rake",
+     "test/context_test.rb",
+     "test/parser_test.rb",
+     "test/quickstart_test.rb",
+     "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/jlong/radius}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{radius}
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{Radius is a powerful tag-based template language for Ruby inspired by the template languages used in MovableType[http://www.movabletype.org] and TextPattern[http://www.textpattern.com]}
-  s.test_files = ["test/context_test.rb", "test/parser_test.rb"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{A tag-based templating language for Ruby.}
+  s.test_files = [
+    "test/context_test.rb",
+     "test/parser_test.rb",
+     "test/quickstart_test.rb",
+     "test/test_helper.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<newgem>, [">= 1.2.3"])
-      s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
-      s.add_dependency(%q<newgem>, [">= 1.2.3"])
-      s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
-    s.add_dependency(%q<newgem>, [">= 1.2.3"])
-    s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end
 end
+

data/vendor/radius/tasks/jeweler.rake

@@ -0,0 +1,21 @@
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "radius"
+    gem.summary = "A tag-based templating language for Ruby."
+    gem.description = "Radius is a powerful tag-based template language for Ruby inspired by the template languages used in MovableType and TextPattern. It uses tags similar to XML, but can be used to generate any form of plain text (HTML, e-mail, etc...)."
+    gem.email = "me@johnwlong.com"
+    gem.homepage = "http://github.com/jlong/radius"
+    gem.authors = [
+      "John W. Long (me@johnwlong.com)",
+      "David Chelimsky (dchelimsky@gmail.com)",
+      "Bryce Kerley (bkerley@brycekerley.net)"
+    ]
+    gem.files = FileList["[A-Z]*", "{bin,lib,tasks,test}/**/*"].exclude("tmp")
+    gem.extra_rdoc_files = ['README.rdoc', 'QUICKSTART.rdoc', 'LICENSE', 'CHANGELOG']
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end

data/vendor/radius/tasks/rdoc.rake

@@ -0,0 +1,13 @@
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "Radius #{version}"
+  rdoc.main = "README.rdoc"
+  rdoc.rdoc_files.include('*.rdoc')
+  rdoc.rdoc_files.include('LICENSE')
+  rdoc.rdoc_files.include('CHANGELOG')
+  rdoc.rdoc_files.include('QUICKSTART.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/vendor/radius/tasks/test.rake

@@ -0,0 +1,7 @@
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << "lib" << "test"
+  t.test_files = FileList['test/*_test.rb']
+  t.verbose = true
+end

data/vendor/radius/test/parser_test.rb

@@ -249,6 +249,11 @@ class RadiusParserTest < Test::Unit::TestCase
     assert_equal "<r:ralph:hello />", @parser.parse("<r:ralph:hello />")
   end
   
+  def test_parse_with_other_namespaces
+    @parser = Radius::Parser.new(@context, :tag_prefix => 'r')
+    assert_equal "<fb:test>hello world</fb:test>", @parser.parse("<fb:test>hello world</fb:test>")
+  end
+  
   protected
   
     def assert_parse_output(output, input, message = nil)

data/vendor/radius/test/test_helper.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'timeout'
 
 unless defined? RADIUS_LIB

data/vendor/rails/actionmailer/CHANGELOG

@@ -1,15 +1,33 @@
+*2.3.8 (May 24, 2010)*
+
+* Version bump.
+
+
+*2.3.7 (May 24, 2010)*
+
+* Version bump.
+
+
+*2.3.6 (May 23, 2010)*
+
+* Upgrade TMail from 1.2.3 to 1.2.7.  [Mikel Lindsaar]
+
+
 *2.3.5 (November 25, 2009)*
 
 * Minor Bug Fixes and deprecation warnings
 
+
 *2.3.4 (September 4, 2009)*
 
 * Minor bug fixes.
 
+
 *2.3.3 (July 12, 2009)*
 
 * No changes, just a version bump.
 
+
 *2.3.2 [Final] (March 15, 2009)*
 
 * Fixed that ActionMailer should send correctly formatted Return-Path in MAIL FROM for SMTP #1842 [Matt Jones]

data/vendor/rails/actionmailer/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2009 David Heinemeier Hansson
+Copyright (c) 2004-2010 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/vendor/rails/actionmailer/Rakefile

@@ -54,7 +54,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "actionmailer"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 2.3.5' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 2.3.8' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'

data/vendor/rails/actionmailer/lib/action_mailer.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2009 David Heinemeier Hansson
+# Copyright (c) 2004-2010 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/vendor/rails/actionmailer/lib/action_mailer/base.rb

@@ -593,7 +593,7 @@ module ActionMailer #:nodoc:
       end
 
       def template_path
-        "#{template_root}/#{mailer_name}"
+        File.join(template_root, mailer_name)
       end
 
       def initialize_template_class(assigns)
@@ -675,7 +675,7 @@ module ActionMailer #:nodoc:
       def perform_delivery_smtp(mail)
         destinations = mail.destinations
         mail.ready_to_send
-        sender = (mail['return-path'] && mail['return-path'].spec) || mail['from']
+        sender = (mail['return-path'] && mail['return-path'].spec) || Array(mail.from).first
 
         smtp = Net::SMTP.new(smtp_settings[:address], smtp_settings[:port])
         smtp.enable_starttls_auto if smtp_settings[:enable_starttls_auto] && smtp.respond_to?(:enable_starttls_auto)

data/vendor/rails/actionmailer/lib/action_mailer/quoting.rb

@@ -1,3 +1,4 @@
+# encoding: us-ascii
 module ActionMailer
   module Quoting #:nodoc:
     # Convert the given text into quoted printable format, with an instruction

data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail.rb

@@ -3,3 +3,4 @@ require 'tmail/mail'
 require 'tmail/mailbox'
 require 'tmail/core_extensions'
 require 'tmail/net'
+require 'tmail/vendor/rchardet-1.3/lib/rchardet'

data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/Makefile

@@ -0,0 +1,18 @@
+# lib/tmail/Makefile
+#
+
+debug:
+	rm -f parser.rb
+	make parser.rb DEBUG=true
+
+parser.rb: parser.y
+	if [ "$(DEBUG)" = true ]; then \
+	    racc -v -g -o$@ parser.y ;\
+	else \
+	    racc -E -o$@ parser.y ;\
+	fi
+
+clean:
+	rm -f parser.rb parser.output
+
+distclean: clean

data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/address.rb

@@ -46,7 +46,7 @@ module TMail
   # 
   # Just pass the email address in as a string to Address.parse:
   # 
-  #  email = TMail::Address.parse('Mikel Lindsaar <mikel@lindsaar.net>)
+  #  email = TMail::Address.parse('Mikel Lindsaar <mikel@lindsaar.net>')
   #  #=> #<TMail::Address mikel@lindsaar.net>
   #  email.address
   #  #=> "mikel@lindsaar.net"
@@ -63,7 +63,7 @@ module TMail
   # Address.parse and catch any SyntaxError:
   # 
   #  begin
-  #    TMail::Mail.parse("mikel   2@@@@@ me .com")
+  #    TMail::Address.parse("mikel   2@@@@@ me .com")
   #  rescue TMail::SyntaxError
   #    puts("Invalid Email Address Detected")
   #  else
@@ -81,41 +81,7 @@ module TMail
     # 
     # Raises a TMail::SyntaxError on invalid email format
     def Address.parse( str )
-      Parser.parse :ADDRESS, special_quote_address(str)
-    end
-    
-    def Address.special_quote_address(str) #:nodoc:
-      # Takes a string which is an address and adds quotation marks to special
-      # edge case methods that the RACC parser can not handle.
-      #
-      # Right now just handles two edge cases:
-      #
-      # Full stop as the last character of the display name:
-      #   Mikel L. <mikel@me.com>
-      # Returns:
-      #   "Mikel L." <mikel@me.com>
-      #
-      # Unquoted @ symbol in the display name:
-      #   mikel@me.com <mikel@me.com>
-      # Returns:
-      #   "mikel@me.com" <mikel@me.com>
-      #
-      # Any other address not matching these patterns just gets returned as is. 
-      case
-      # This handles the missing "" in an older version of Apple Mail.app
-      # around the display name when the display name contains a '@'
-      # like 'mikel@me.com <mikel@me.com>'
-      # Just quotes it to: '"mikel@me.com" <mikel@me.com>'
-      when str =~ /\A([^"].+@.+[^"])\s(<.*?>)\Z/
-        return "\"#{$1}\" #{$2}"
-      # This handles cases where 'Mikel A. <mikel@me.com>' which is a trailing
-      # full stop before the address section.  Just quotes it to
-      # '"Mikel A. <mikel@me.com>"
-      when str =~ /\A(.*?\.)\s(<.*?>)\Z/
-        return "\"#{$1}\" #{$2}"
-      else
-        str
-      end
+      Parser.parse :ADDRESS, str
     end
 
     def address_group? #:nodoc:
@@ -412,7 +378,7 @@ module TMail
         if first
           first = false
         else
-          strategy.meta ','
+          strategy.puts_meta ','
         end
         strategy.space
         mbox.accept strategy

data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/attachments.rb

@@ -0,0 +1,65 @@
+=begin rdoc
+
+= Attachment handling file
+
+=end
+
+require 'kconv'
+require 'stringio'
+
+module TMail
+  class Attachment < StringIO
+    attr_accessor :original_filename, :content_type
+    alias quoted_filename original_filename
+  end
+
+  class Mail
+    def has_attachments?
+      attachment?(self) || multipart? && parts.any? { |part| attachment?(part) }
+    end
+
+    # Returns true if this part's content main type is text, else returns false.
+    # By main type is meant "text/plain" is text.  "text/html" is text
+    def text_content_type?
+      self.header['content-type'] && (self.header['content-type'].main_type == 'text')
+    end
+  
+    def inline_attachment?(part)
+      part['content-id'] || (part['content-disposition'] && part['content-disposition'].disposition == 'inline' && !part.text_content_type?)
+    end
+  
+    def attachment?(part)
+      part.disposition_is_attachment? || (!part.content_type.nil? && !part.text_content_type?) unless part.multipart?
+    end
+  
+    def attachments
+      if multipart?
+        parts.collect { |part| attachment(part) }.flatten.compact
+      elsif attachment?(self)
+        [attachment(self)]
+      end
+    end
+  
+    private
+  
+    def attachment(part)
+      if part.multipart?
+        part.attachments
+      elsif attachment?(part)
+        content   = part.body # unquoted automatically by TMail#body
+        file_name = (part['content-location'] && part['content-location'].body) ||
+                    part.sub_header('content-type', 'name') ||
+                    part.sub_header('content-disposition', 'filename') ||
+                    'noname'
+
+        return if content.blank?
+
+        attachment = TMail::Attachment.new(content)
+        attachment.original_filename = file_name.strip unless file_name.blank?
+        attachment.content_type = part.content_type
+        attachment
+      end
+    end
+
+  end
+end