Permalink
Browse files

Updating gem loads and active support loads

  • Loading branch information...
1 parent c35ec73 commit 090e0e2746a5b240b8037a4c2501f697731e8fbb @mikel committed Nov 20, 2009
Showing with 14 additions and 11 deletions.
  1. +2 −2 Gemfile
  2. +1 −1 Rakefile
  3. +7 −7 lib/mail.rb
  4. +1 −1 lib/mail/version.rb
  5. +3 −0 spec/spec_helper.rb
View
@@ -1,8 +1,8 @@
source "http://gemcutter.org"
gem "tlsmail"
-gem "treetop"
-gem "activesupport"
+gem "treetop", ">= 1.4"
+gem 'activesupport', ">= 2.3"
gem "mime-types"
only :test do
View
@@ -7,7 +7,7 @@ require 'bundler'
spec = Gem::Specification.new do |s|
s.name = "mail"
- s.version = "1.2.6"
+ s.version = "1.2.7"
s.author = "Mike Lindsaar"
s.email = "raasdnil@gmail.com"
s.homepage = "http://github.com/mikel/mail"
View
@@ -3,15 +3,15 @@ module Mail # :doc:
require 'date'
- gem "treetop", ">= 1.4"
require 'treetop'
- gem 'activesupport', ">= 2.3"
require 'active_support'
- begin
- require 'active_support/hash_with_indifferent_access'
- rescue LoadError
- HashWithIndifferentAccess # Ensure this is available in any case
- end
+ require 'active_support'
+
+ # Have to handle ActiveSupport 2.3 and 3.0
+ # Following two lines make sure that HashWithIndifferentAccess is available
+ # regardless of having activesupport 3 or 2.3 loaded
+ require 'active_support/core_ext/hash/indifferent_access'
+ HashWithIndifferentAccess
require 'uri'
require 'net/smtp'
View
@@ -3,7 +3,7 @@ module Mail
module VERSION
MAJOR = 1
MINOR = 2
- TINY = 6
+ TINY = 7
STRING = [MAJOR, MINOR, TINY].join('.')
end
View
@@ -10,6 +10,9 @@
end
require 'rubygems'
+gem "treetop", ">= 1.4"
+gem 'activesupport', ">= 2.3"
+
require 'ruby-debug' if RUBY_VERSION < '1.9'
require 'spec'
require 'treetop'

0 comments on commit 090e0e2

Please sign in to comment.