mail 2.1.3 → 2.1.5

data/lib/mail/vendor/treetop-1.4.3/lib/treetop/version.rb

@@ -2,7 +2,7 @@ module Treetop #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 4
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/mail/vendor/treetop-1.4.3/script/generate_metagrammar.rb

@@ -1,14 +1,13 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-dir = File.dirname(__FILE__)
-require File.join(dir, '..', 'lib', 'treetop', 'bootstrap_gen_1_metagrammar')
+require File.expand_path('../../lib/treetop/bootstrap_gen_1_metagrammar', __FILE__)
 
-GENERATED_METAGRAMMAR_PATH = File.join(TREETOP_ROOT, 'compiler', 'metagrammar.rb')
+GENERATED_METAGRAMMAR_PATH = File.expand_path('../../lib/treetop/compiler/metagrammar.rb')
 
 File.open(METAGRAMMAR_PATH) do |source_file|
   File.open(GENERATED_METAGRAMMAR_PATH, 'w') do |target_file|
     generated_source = Treetop::Compiler::MetagrammarParser.new.parse(source_file.read).compile
     target_file.write(generated_source)
   end
-end
+end

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/and_predicate_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module AndPredicateSpec
   describe "An &-predicated terminal symbol" do
@@ -33,4 +33,4 @@ module AndPredicateSpec
       end
     end
   end
-end
+end

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/anything_symbol_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module AnythingSymbolSpec
   class Foo < Treetop::Runtime::SyntaxNode
@@ -41,4 +41,4 @@ module AnythingSymbolSpec
       end
     end
   end
-end
+end

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/character_class_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 module CharacterClassSpec
   class Foo < Treetop::Runtime::SyntaxNode

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/choice_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module ChoiceSpec
   describe "A choice between terminal symbols" do
@@ -77,4 +77,4 @@ module ChoiceSpec
       end
     end
   end
-end
+end

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/circular_compilation_spec.rb

@@ -1,5 +1,7 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
+
 BENCHMARK = false
+METAGRAMMAR_PATH = File.expand_path('../../../lib/treetop/compiler/metagrammar.treetop', __FILE__)
 
 module CircularCompilationSpec
   describe "a parser for the metagrammar" do

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/failure_propagation_functional_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 describe "An expression for braces surrounding zero or more letters followed by semicolons" do
   testing_expression "'{' ([a-z] ';')* '}'"
@@ -18,4 +18,4 @@ describe "An expression for braces surrounding zero or more letters followed by
       failure.expected_string.should == ';'
     end
   end
-end
+end

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/grammar_compiler_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 describe Compiler::GrammarCompiler do
   attr_reader :compiler, :source_path_with_treetop_extension, :source_path_with_tt_extension, :target_path, :alternate_target_path

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/grammar_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module GrammarSpec
   module Bar

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/multibyte_chars_spec.rb

@@ -1,15 +1,7 @@
 #!ruby19
 # encoding: utf-8
 
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
-
-# Require ActiveSupport for multibyte strings
-begin
-  require 'active_support'
-rescue
-  gem 'activesupport'
-  require 'active_support'
-end
+require 'spec_helper'
 
 module MultibyteCharsSpec
   describe "an anything symbol" do

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/nonterminal_symbol_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module NonterminalSymbolSpec
   describe "A nonterminal symbol followed by a block" do
@@ -37,4 +37,4 @@ module NonterminalSymbolSpec
       result.should respond_to(:a_method)
     end
   end
-end
+end

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/not_predicate_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module NotPredicateSpec
   describe "A !-predicated terminal symbol" do
@@ -35,4 +35,4 @@ module NotPredicateSpec
       parse('abc').should be_nil
     end
   end
-end
+end

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/one_or_more_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module OneOrMoreSpec
   class Foo < Treetop::Runtime::SyntaxNode
@@ -32,4 +32,4 @@ module OneOrMoreSpec
       end
     end
   end
-end
+end

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/optional_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module OptionalSpec
   describe "An optional terminal symbol" do

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/parenthesized_expression_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module ParenthesizedExpressionSpec
   describe "An unadorned expression inside of parentheses" do

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/parsing_rule_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module ParsingRuleSpec
   describe "a grammar with one parsing rule" do

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/repeated_subrule_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module RepeatedSubruleSpec
   describe "a repeated subrule" do

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/semantic_predicate_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module SemanticPredicateSpec
   describe "An &-predicate block" do

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/sequence_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module SequenceSpec
   class Foo < Treetop::Runtime::SyntaxNode

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/terminal_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module TerminalSymbolSpec
   class Foo < Treetop::Runtime::SyntaxNode

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/terminal_symbol_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module TerminalSymbolSpec
   class Foo < Treetop::Runtime::SyntaxNode

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/tt_compiler_spec.rb

@@ -4,7 +4,7 @@ require 'digest/sha1'
 # Treetop library versions, not a previously installed gem
 ENV['PATH'] = File.expand_path(File.dirname(__FILE__) + '../../../bin' +
                               File::PATH_SEPARATOR + ENV['PATH'])
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '../../../lib'))
+$LOAD_PATH.unshift(File.expand_path('../../../../lib', __FILE__))
 
 describe "The 'tt' comand line compiler" do
 

data/lib/mail/vendor/treetop-1.4.3/spec/compiler/zero_or_more_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module ZeroOrMoreSpec
   class Foo < Treetop::Runtime::SyntaxNode

data/lib/mail/vendor/treetop-1.4.3/spec/composition/grammar_composition_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module GrammarCompositionSpec
   describe "several composed grammars" do

data/lib/mail/vendor/treetop-1.4.3/spec/ruby_extensions/string_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 describe String do
   before do

data/lib/mail/vendor/treetop-1.4.3/spec/runtime/compiled_parser_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module CompiledParserSpec
   describe Runtime::CompiledParser, "for a grammar with two rules" do

data/lib/mail/vendor/treetop-1.4.3/spec/runtime/interval_skip_list/delete_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+require 'runtime/interval_skip_list/spec_helper'
 
 class IntervalSkipList
   public :insert_node, :delete_node, :head, :nodes
@@ -144,4 +144,4 @@ describe IntervalSkipList do
       end
     end
   end
-end
+end

data/lib/mail/vendor/treetop-1.4.3/spec/runtime/interval_skip_list/expire_range_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+require 'runtime/interval_skip_list/spec_helper'
 
 describe IntervalSkipList do
   it_should_behave_like "the palindromic fixture"
@@ -346,4 +346,4 @@ describe IntervalSkipList do
       end
     end
   end
-end
+end

data/lib/mail/vendor/treetop-1.4.3/spec/runtime/interval_skip_list/insert_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+require 'runtime/interval_skip_list/spec_helper'
 
 describe IntervalSkipList, " when #next_node_height returns 1, 3, 2, 3, 1 in order" do
   include IntervalSkipListSpecHelper

data/lib/mail/vendor/treetop-1.4.3/spec/runtime/interval_skip_list/interval_skip_list_spec.rb

@@ -1,4 +1,4 @@
-#require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+#require 'runtime/interval_skip_list/spec_helper'
 #
 #MAX_INTERVAL = 100000
 #
@@ -55,4 +55,4 @@
 #      end
 #    end
 #  end
-#end
+#end

data/lib/mail/vendor/treetop-1.4.3/spec/runtime/interval_skip_list/palindromic_fixture_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../../spec_helper")
-require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+require 'runtime/interval_skip_list/spec_helper'
 
 describe "The palindromic fixture" do
   it_should_behave_like "the palindromic fixture"
@@ -161,4 +160,4 @@ describe "The palindromic fixture" do
       end
     end
   end
-end
+end

data/lib/mail/vendor/treetop-1.4.3/spec/runtime/interval_skip_list/spec_helper.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../../spec_helper")
+require 'spec_helper'
 
 class IntervalSkipList
   public :insert_node, :delete_node, :nodes, :head, :next_node_height
@@ -81,4 +81,4 @@ module IntervalSkipListSpecHelper
   end
 end
 
-require "#{File.dirname(__FILE__)}/palindromic_fixture"
+require 'runtime/interval_skip_list/palindromic_fixture'

data/lib/mail/vendor/treetop-1.4.3/spec/runtime/syntax_node_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module SyntaxNodeSpec
   describe "A new terminal syntax node" do

data/lib/mail/vendor/treetop-1.4.3/spec/spec_helper.rb

@@ -1,12 +1,10 @@
-dir = File.dirname(__FILE__)
 require 'rubygems'
 require 'benchmark'
 require 'spec'
 require 'polyglot'
 
-unless $bootstrapped_gen_1_metagrammar
-  load File.join(dir, '..', 'lib', 'treetop', 'bootstrap_gen_1_metagrammar.rb')
-end
+$LOAD_PATH.unshift File.expand_path('../../lib')
+require 'treetop'
 include Treetop
 
 Spec::Runner.configure do |config|
@@ -66,6 +64,7 @@ module Treetop
     end
 
     def parse_multibyte(input, options = {})
+      require 'active_support/all'
       parse(input.mb_chars, options)
     end
 
@@ -107,5 +106,5 @@ class Symbol
     lambda do |x|
       x.send(self)
     end
-  end
+  end unless method_defined?(:to_proc)
 end

data/lib/mail/vendor/treetop-1.4.3/treetop.gemspec

@@ -1,4 +1,4 @@
-require "treetop/version"
+require File.expand_path("../lib/treetop/version", __FILE__)
 $gemspec = Gem::Specification.new do |s|
   s.name = "treetop"
   s.version = Treetop::VERSION::STRING
@@ -13,6 +13,6 @@ $gemspec = Gem::Specification.new do |s|
   s.require_path = "lib"
   s.autorequire = "treetop"
   s.has_rdoc = false
-  s.add_dependency "polyglot", ">= 0.2.5"
+  s.add_dependency "polyglot", ">= 0.3.0"
 end
 

data/lib/mail/version.rb

@@ -3,7 +3,7 @@ module Mail
   module VERSION
     MAJOR = 2
     MINOR = 1
-    TINY  = 3
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/mail/version_specific/ruby_1_8.rb

@@ -78,7 +78,5 @@ module Mail
       language = Mail::Configuration.instance.param_encode_language
       "#{encoding}'#{language}'#{URI.escape(str)}"
     end
-    
   end
-  
-end
+end

data/lib/mail/version_specific/ruby_1_9.rb

@@ -72,6 +72,5 @@ module Mail
       language = Mail::Configuration.instance.param_encode_language
       "#{encoding}'#{language}'#{URI.escape(str)}"
     end
-
   end
-end
+end

data/lib/tasks/treetop.rake

@@ -3,7 +3,7 @@ namespace :treetop do
   desc "Pre-generate all the .treetop files into .rb files"
   task :generate do
     Dir[File.join(File.dirname(__FILE__), '..', 'mail', 'parsers', '*.treetop')].each do |filename|
-      `tt #{filename}`
+      `lib/mail/vendor/treetop-1.4.3/bin/tt #{filename}`
     end
   end
   

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mail
 version: !ruby/object:Gem::Version 
-  version: 2.1.3
+  prerelease: false
+  segments: 
+  - 2
+  - 1
+  - 5
+  version: 2.1.5
 platform: ruby
 authors: 
 - Mike Lindsaar
@@ -9,29 +14,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 +11:00
+date: 2010-03-28 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 4
         version: 2.3.4
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mime-types
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: A really Ruby Mail handler.
 email: raasdnil@gmail.com
 executables: []
@@ -63,9 +74,13 @@ files:
 - lib/mail/elements/mime_version_element.rb
 - lib/mail/elements/phrase_list.rb
 - lib/mail/elements/received_element.rb
+- lib/mail/encodings/7bit.rb
+- lib/mail/encodings/8bit.rb
 - lib/mail/encodings/base64.rb
+- lib/mail/encodings/binary.rb
 - lib/mail/encodings/encodings.rb
 - lib/mail/encodings/quoted_printable.rb
+- lib/mail/encodings/transfer_encoding.rb
 - lib/mail/envelope.rb
 - lib/mail/field.rb
 - lib/mail/field_list.rb
@@ -199,6 +214,7 @@ files:
 - lib/mail/vendor/treetop-1.4.3/lib/treetop/compiler/node_classes.rb
 - lib/mail/vendor/treetop-1.4.3/lib/treetop/compiler/ruby_builder.rb
 - lib/mail/vendor/treetop-1.4.3/lib/treetop/compiler.rb
+- lib/mail/vendor/treetop-1.4.3/lib/treetop/polyglot.rb
 - lib/mail/vendor/treetop-1.4.3/lib/treetop/ruby_extensions/string.rb
 - lib/mail/vendor/treetop-1.4.3/lib/treetop/ruby_extensions.rb
 - lib/mail/vendor/treetop-1.4.3/lib/treetop/runtime/compiled_parser.rb
@@ -213,6 +229,7 @@ files:
 - lib/mail/vendor/treetop-1.4.3/lib/treetop/version.rb
 - lib/mail/vendor/treetop-1.4.3/lib/treetop.rb
 - lib/mail/vendor/treetop-1.4.3/LICENSE
+- lib/mail/vendor/treetop-1.4.3/Or
 - lib/mail/vendor/treetop-1.4.3/Rakefile
 - lib/mail/vendor/treetop-1.4.3/README.md
 - lib/mail/vendor/treetop-1.4.3/script/generate_metagrammar.rb
@@ -263,9 +280,9 @@ files:
 - lib/mail/vendor/treetop-1.4.3/spec/runtime/interval_skip_list/spec_helper.rb
 - lib/mail/vendor/treetop-1.4.3/spec/runtime/syntax_node_spec.rb
 - lib/mail/vendor/treetop-1.4.3/spec/spec_helper.rb
-- lib/mail/vendor/treetop-1.4.3/spec/spec_suite.rb
 - lib/mail/vendor/treetop-1.4.3/treetop.gemspec
 - lib/mail/vendor/treetop-1.4.3/Treetop.tmbundle/info.plist
+- lib/mail/vendor/treetop-1.4.3/Treetop.tmbundle/Preferences/Comments.tmPreferences
 - lib/mail/vendor/treetop-1.4.3/Treetop.tmbundle/Snippets/grammar ___ end.tmSnippet
 - lib/mail/vendor/treetop-1.4.3/Treetop.tmbundle/Snippets/rule ___ end.tmSnippet
 - lib/mail/vendor/treetop-1.4.3/Treetop.tmbundle/Support/nibs/SyntaxTreeViewer.nib/designable.nib
@@ -293,18 +310,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Mail provides a nice Ruby DSL for making, sending and reading emails.