radiantcms-couchrest_model 0.1.4 → 0.1.5

data/vendor/radius/test/{parser_test.rb → radius_test.rb}

@@ -1,4 +1,83 @@
-require File.join(File.dirname(__FILE__), 'test_helper')
+require 'test/unit'
+require 'radius'
+
+module RadiusTestHelper
+  class TestContext < Radius::Context; end
+  
+  def new_context
+    Radius::Context.new do |c|
+      c.define_tag("reverse"   ) { |tag| tag.expand.reverse }
+      c.define_tag("capitalize") { |tag| tag.expand.upcase  }
+      c.define_tag("attr"      ) { |tag| tag.attr.inspect   }
+      c.define_tag("echo"      ) { |tag| tag.attr['value']  }
+      c.define_tag("wrap"      ) { |tag| "[#{tag.expand}]"  }
+    end
+  end
+  
+  def define_tag(name, options = {}, &block)
+    @context.define_tag name, options, &block
+  end
+end
+
+class RadiusContextTest < Test::Unit::TestCase
+  include RadiusTestHelper
+  
+  def setup
+    @context = new_context
+  end
+  
+  def test_initialize
+    @context = Radius::Context.new
+  end
+  
+  def test_initialize_with_block
+    @context = Radius::Context.new do |c|
+      assert_kind_of Radius::Context, c
+      c.define_tag('test') { 'just a test' }
+    end
+    assert_not_equal Hash.new, @context.definitions
+  end
+  
+  def test_with
+    got = @context.with do |c|
+      assert_equal @context, c
+    end
+    assert_equal @context, got
+  end
+  
+  def test_render_tag
+    define_tag "hello" do |tag|
+      "Hello #{tag.attr['name'] || 'World'}!"
+    end
+    assert_render_tag_output 'Hello World!', 'hello'
+    assert_render_tag_output 'Hello John!', 'hello', 'name' => 'John'
+  end
+  
+  def test_render_tag__undefined_tag
+    e = assert_raises(Radius::UndefinedTagError) { @context.render_tag('undefined_tag') }
+    assert_equal "undefined tag `undefined_tag'", e.message
+  end
+  
+  def test_tag_missing
+    class << @context
+      def tag_missing(tag, attr, &block)
+        "undefined tag `#{tag}' with attributes #{attr.inspect}"
+      end
+    end
+    
+    text = ''
+    expected = %{undefined tag `undefined_tag' with attributes {"cool"=>"beans"}}
+    assert_nothing_raised { text = @context.render_tag('undefined_tag', 'cool' => 'beans') }
+    assert_equal expected, text
+  end
+  
+  private
+    
+    def assert_render_tag_output(output, *render_tag_params)
+      assert_equal output, @context.render_tag(*render_tag_params)
+    end
+  
+end
 
 class RadiusParserTest < Test::Unit::TestCase
   include RadiusTestHelper
@@ -66,11 +145,6 @@ class RadiusParserTest < Test::Unit::TestCase
       assert_parsed_is_unchanged "<r:attr#{middle}>"
     end
   end
-  
-  def test_tags_inside_html_tags
-    assert_parse_output %{<div class="xzibit">tags in yo tags</div>},
-      %{<div class="<r:reverse>tibizx</r:reverse>">tags in yo tags</div>}
-  end
     
   def test_parse_result_is_always_a_string
     define_tag("twelve") { 12 }
@@ -117,12 +191,7 @@ class RadiusParserTest < Test::Unit::TestCase
     e = assert_raises(Radius::UndefinedTagError) { @parser.parse("<r:test />") }
     assert_equal "undefined tag `test'", e.message
   end
-
-  def test_parse_chirpy_bird
-    # :> chirp chirp
-    assert_parse_output "<:", "<:"
-  end
-
+  
   def test_parse_tag__binding_render_tag
     define_tag('test') { |tag| "Hello #{tag.attr['name']}!" }
     define_tag('hello') { |tag| tag.render('test', tag.attr) }
@@ -185,23 +254,6 @@ class RadiusParserTest < Test::Unit::TestCase
     assert_parse_output %{Three Stooges: "Larry", "Moe", "Curly"}, %{Three Stooges: <r:each between=", ">"<r:item />"</r:each>}
   end
   
-  def test_parse_speed
-    define_tag "set" do |tag|
-      tag.globals.var = tag.attr['value']
-      ''
-    end
-    define_tag "var" do |tag|
-      tag.globals.var
-    end
-    parts = %w{decima nobis augue at facer processus commodo legentis odio lectorum dolore nulla esse lius qui nonummy ullamcorper erat ii notare}
-    multiplier = parts.map{|p| "#{p}=\"#{rand}\""}.join(' ')
-    assert_nothing_raised do
-      Timeout.timeout(10) do
-        assert_parse_output " false", %{<r:set value="false" #{multiplier} /> <r:var />}
-      end
-    end
-  end
-  
   def test_tag_option_for
     define_tag 'fun', :for => 'just for kicks'
     assert_parse_output 'just for kicks', '<r:fun />'
@@ -231,27 +283,7 @@ class RadiusParserTest < Test::Unit::TestCase
   
   def test_parse_fail_on_missing_end_tag
     assert_raises(Radius::MissingEndTagError) { @parser.parse("<r:reverse>") }
-  end
-  
-  def test_parse_fail_on_wrong_end_tag
-    assert_raises(Radius::WrongEndTagError) { @parser.parse("<r:reverse><r:capitalize></r:reverse>") }
-  end
-  
-  def test_parse_with_default_tag_prefix
-    define_tag("hello") { |tag| "Hello world!" }
-    @parser = Radius::Parser.new(@context)
-    assert_equal "<p>Hello world!</p>", @parser.parse('<p><radius:hello /></p>')
-  end
-  
-  def test_parse_with_other_radius_like_tags
-    define_tag('hello') { "hello" }
-    @parser = Radius::Parser.new(@context, :tag_prefix => "ralph")
-    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>")
+    assert_raises(Radius::MissingEndTagError) { @parser.parse("<r:reverse><r:capitalize></r:reverse>") }
   end
   
   protected

data/vendor/rails/actionmailer/CHANGELOG

@@ -1,33 +1,11 @@
-*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-2010 David Heinemeier Hansson
+Copyright (c) 2004-2009 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.8' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 2.3.4' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'

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

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2010 David Heinemeier Hansson
+# Copyright (c) 2004-2009 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
-        File.join(template_root, mailer_name)
+        "#{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) || Array(mail.from).first
+        sender = (mail['return-path'] && mail['return-path'].spec) || mail['from']
 
         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,4 +1,3 @@
-# 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.7 → tmail-1.2.3}/tmail.rb

@@ -3,4 +3,3 @@ 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-1.2.3}/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::Address.parse("mikel   2@@@@@ me .com")
+  #    TMail::Mail.parse("mikel   2@@@@@ me .com")
   #  rescue TMail::SyntaxError
   #    puts("Invalid Email Address Detected")
   #  else
@@ -81,7 +81,41 @@ module TMail
     # 
     # Raises a TMail::SyntaxError on invalid email format
     def Address.parse( str )
-      Parser.parse :ADDRESS, 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
     end
 
     def address_group? #:nodoc:
@@ -378,7 +412,7 @@ module TMail
         if first
           first = false
         else
-          strategy.puts_meta ','
+          strategy.meta ','
         end
         strategy.space
         mbox.accept strategy

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

@@ -0,0 +1,46 @@
+=begin rdoc
+
+= Attachment handling file
+
+=end
+
+require 'stringio'
+
+module TMail
+  class Attachment < StringIO
+    attr_accessor :original_filename, :content_type
+  end
+
+  class Mail
+    def has_attachments?
+      multipart? && parts.any? { |part| attachment?(part) }
+    end
+
+    def attachment?(part)
+      part.disposition_is_attachment? || part.content_type_is_text?
+    end
+
+    def attachments
+      if multipart?
+        parts.collect { |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")
+            
+            next if file_name.blank? || content.blank?
+            
+            attachment = Attachment.new(content)
+            attachment.original_filename = file_name.strip
+            attachment.content_type = part.content_type
+            attachment
+          end
+        }.flatten.compact
+      end      
+    end
+  end
+end

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

@@ -113,7 +113,6 @@ module TMail
 
     encoded = '=\?(?:iso-2022-jp|euc-jp|shift_jis)\?[QB]\?[a-z0-9+/=]+\?='
     ENCODED_WORDS = /#{encoded}(?:\s+#{encoded})*/i
-    SPACER       = "\t"
 
     OUTPUT_ENCODING = {
       'EUC'  => 'e',
@@ -166,10 +165,6 @@ module TMail
       @f << str
     end
 
-    def puts_meta( str )
-      @f << str
-    end
-
     def text( str )
       @f << decode(str)
     end
@@ -306,10 +301,6 @@ module TMail
       add_text str
     end
 
-    def puts_meta( str )
-      add_text str + @eol + SPACER
-    end
-
     def text( str )
       scanadd normalize_encoding(str)
     end

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

@@ -243,8 +243,6 @@ module TMail
 
     def do_parse
       quote_boundary
-      quote_unquoted_name
-      quote_unquoted_bencode
       obj = Parser.parse(self.class::PARSE_TYPE, @body, @comments)
       set obj if obj
     end
@@ -316,7 +314,7 @@ module TMail
         if first
           first = false
         else
-          strategy.puts_meta ','
+          strategy.meta ','
           strategy.space
         end
         a.accept strategy
@@ -819,7 +817,7 @@ module TMail
         if v
           strategy.meta ';'
           strategy.space
-          strategy.kv_pair k, unquote(v)
+          strategy.kv_pair k, v
         end
       end
     end

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

@@ -595,12 +595,6 @@ module TMail
     # Invalid message IDs are ignored (silently, unless configured otherwise) and result in 
     # a nil message ID.  Left and right angle brackets are required.
     #
-    # Be warned however, that calling mail.ready_to_send will overwrite whatever value you
-    # have in this field with an automatically generated unique value.
-    # 
-    # If you really want to set your own message ID and know what you are doing per the
-    # various RFCs, you can do so with the enforced_message_id= command
-    # 
     # Example:
     # 
     #  mail = TMail::Mail.new
@@ -612,22 +606,6 @@ module TMail
       set_string_attr 'Message-Id', str
     end
 
-    # Destructively sets the message ID of the mail object instance to the passed in string
-    # and also guarantees that calling #ready_to_send will not destroy what you set as the
-    # message_id
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.message_id = "<348F04F142D69C21-291E56D292BC@xxxx.net>"
-    #  mail.message_id #=> "<348F04F142D69C21-291E56D292BC@xxxx.net>"
-    #  mail.ready_to_send
-    #  mail.message_id #=> "<348F04F142D69C21-291E56D292BC@xxxx.net>"
-    def enforced_message_id=( str )
-      @message_id_enforced = true
-      self.message_id = ( str )
-    end
-
     # Returns the "In-Reply-To:" field contents as an array of this mail instance if it exists
     # 
     # If the in_reply_to field does not exist, returns nil by default or you can pass in as
@@ -865,17 +843,7 @@ module TMail
       if h = @header['content-type']
         h['charset'] or default
       else
-        mime_version_charset || default
-      end
-    end
-
-    # some weird emails come with the charset specified in the mime-version header:
-    #
-    #  #<TMail::MimeVersionHeader "1.0\n charset=\"gb2312\"">
-    #
-    def mime_version_charset
-      if header['mime-version'].inspect =~ /charset=('|\\")?([^\\"']+)/
-        $2
+        default
       end
     end