Skip to content

Commit 972c595

Browse files
committed
Merge pull request rapid7#798 from rapid7/bump-rails-gemcache
Bump rails-related gem versions to 3.2.8.
2 parents 8b251b0 + 4d63218 commit 972c595

File tree

1,349 files changed

+4712
-57993
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,349 files changed

+4712
-57993
lines changed

lib/gemcache/ruby/1.9.1/bin/rails

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@ require 'rubygems'
1010

1111
version = ">= 0"
1212

13-
if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
14-
version = $1
15-
ARGV.shift
13+
if ARGV.first
14+
str = ARGV.first
15+
str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
16+
if str =~ /\A_(.*)_\z/
17+
version = $1
18+
ARGV.shift
19+
end
1620
end
1721

1822
gem 'railties', version

lib/gemcache/ruby/1.9.1/bin/rake2thor

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@ require 'rubygems'
1010

1111
version = ">= 0"
1212

13-
if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
14-
version = $1
15-
ARGV.shift
13+
if ARGV.first
14+
str = ARGV.first
15+
str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
16+
if str =~ /\A_(.*)_\z/
17+
version = $1
18+
ARGV.shift
19+
end
1620
end
1721

1822
gem 'thor', version

lib/gemcache/ruby/1.9.1/bin/thor

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@ require 'rubygems'
1010

1111
version = ">= 0"
1212

13-
if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
14-
version = $1
15-
ARGV.shift
13+
if ARGV.first
14+
str = ARGV.first
15+
str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
16+
if str =~ /\A_(.*)_\z/
17+
version = $1
18+
ARGV.shift
19+
end
1620
end
1721

1822
gem 'thor', version

lib/gemcache/ruby/1.9.1/gems/actionmailer-3.2.2/CHANGELOG.md renamed to lib/gemcache/ruby/1.9.1/gems/actionmailer-3.2.8/CHANGELOG.md

Lines changed: 33 additions & 0 deletions

lib/gemcache/ruby/1.9.1/gems/actionmailer-3.2.2/README.rdoc renamed to lib/gemcache/ruby/1.9.1/gems/actionmailer-3.2.8/README.rdoc

Lines changed: 1 addition & 1 deletion

lib/gemcache/ruby/1.9.1/gems/actionmailer-3.2.2/lib/action_mailer/base.rb renamed to lib/gemcache/ruby/1.9.1/gems/actionmailer-3.2.8/lib/action_mailer/base.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
require 'active_support/core_ext/proc'
66
require 'active_support/core_ext/string/inflections'
77
require 'active_support/core_ext/hash/except'
8+
require 'active_support/core_ext/module/anonymous'
89
require 'action_mailer/log_subscriber'
910

1011
module ActionMailer #:nodoc:
@@ -375,7 +376,7 @@ def register_interceptor(interceptor)
375376
end
376377

377378
def mailer_name
378-
@mailer_name ||= name.underscore
379+
@mailer_name ||= anonymous? ? "anonymous" : name.underscore
379380
end
380381
attr_writer :mailer_name
381382
alias :controller_path :mailer_name

0 commit comments

Comments
 (0)