Skip to content
Browse files

Remove i18n dependency and last vestiges of activesupport dependency …

…in specs

Closes #300
  • Loading branch information...
1 parent eb83845 commit 766f73cee9cd368ccc5cfd3c2baf2a7a66acbbe9 @jeremy jeremy committed
Showing with 10 additions and 8 deletions.
  1. +1 −0 CHANGELOG.rdoc
  2. +0 −2 Gemfile
  3. +5 −3 lib/mail/multibyte/unicode.rb
  4. +0 −1 mail.gemspec
  5. +4 −2 spec/mail/header_spec.rb
View
1 CHANGELOG.rdoc
@@ -23,6 +23,7 @@ Coping with third-party bugs:
* Parse multipart boundary from Content-Type headers containing extra semicolons (jeremy)
Housekeeping:
+* Remove i18n dependency and last vestiges of activesupport dependency in specs (jeremy)
* Clarify that Sender is a single address, not an address list (jeremy)
* Add an MIT-LICENSE file to make licensing clear & obvious; update to 2013 (jeremy)
* Close pull request 499 - Clean up some dead code (ConradIrwin)
View
2 Gemfile
@@ -1,10 +1,8 @@
source :rubygems
-gem "activesupport", ">= 2.3.6"
gem "tlsmail" if RUBY_VERSION <= '1.8.6'
gem "mime-types", "~> 1.16"
gem "treetop", "~> 1.4.10"
-gem "i18n", ">= 0.4.0"
if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
gem 'jruby-openssl'
View
8 lib/mail/multibyte/unicode.rb
@@ -391,8 +391,10 @@ def database
end
end
-module ActiveSupport
- unless const_defined?(:Multibyte)
- Multibyte = Mail::Multibyte
+unless defined?(ActiveSupport)
+ module ActiveSupport
+ unless const_defined?(:Multibyte)
+ Multibyte = Mail::Multibyte
+ end
end
end
View
1 mail.gemspec
@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
s.add_dependency('mime-types', "~> 1.16")
s.add_dependency('treetop', '~> 1.4.8')
- s.add_dependency('i18n', '>= 0.4.0')
s.add_dependency('jruby-openssl') if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
s.add_dependency('tlsmail', '~> 0.0.1') if RUBY_VERSION == '1.8.6'
View
6 spec/mail/header_spec.rb
@@ -1,6 +1,5 @@
# encoding: utf-8
require 'spec_helper'
-require "active_support/core_ext/kernel/reporting"
describe Mail::Header do
@@ -610,9 +609,12 @@
old_maximum_amount = Mail::Header.maximum_amount
begin
Mail::Header.maximum_amount = 10
- silence_warnings do
+ begin
+ $VERBOSE, old_verbose = nil, $VERBOSE
header = Mail::Header.new("X-SubscriberID: 345\n" * 11)
header.fields.size.should == 10
+ ensure
+ $VERBOSE = old_verbose
end
ensure
Mail::Header.maximum_amount = old_maximum_amount

0 comments on commit 766f73c

Please sign in to comment.
Something went wrong with that request. Please try again.