actionmailer 4.1.0.rc1 → 4.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a14d6592f23edce89a35a8e248fe9c9aab6ec9db
-  data.tar.gz: 9b164dc18c93ab42fe0202d5ba9be3832ce417cd
+  metadata.gz: 2617a6874526fc8f77f608330ecaf03447cdc560
+  data.tar.gz: 868903f6b0cd0af7f608da1c11590a58a6b6c814
 SHA512:
-  metadata.gz: 8ae74e8854276fced21a93d2994ae4841afe49777b96ca49f7b341ed1241ccaae293546c09a00c877ef9afe8f2f07a68f60832729d5ab6eba073b420897c589a
-  data.tar.gz: ca8bf17a413211b4696fdbf3dc91e9f1310da3dc35fe5c322d6265468fd281a2c01b67920651e7a4f40ae678065d258adc876afac204e2b29ab5c691b03e6024
+  metadata.gz: a4d72c4089d13e72c45efb5c802e0b8ac72899f953a7b40d7d9e269515a02178b693cd77b0a7a8c25f6acad41e6db5aace65ea52c746f4f0213af0eb6436bcba
+  data.tar.gz: e98f99fa717dba60a1af446f282efaddf98f2f547bec401b55d878e6b931abe486717fdcee8c919c31c33ba090e4e377e3b1a1194e6c513971748510962f483a

data/README.rdoc

@@ -140,7 +140,7 @@ The latest version of Action Mailer can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/master/actionmailer
+* https://github.com/rails/rails/tree/4-1-stable/actionmailer
 
 
 == License

data/lib/action_mailer/base.rb

@@ -724,11 +724,11 @@ module ActionMailer
     #     format.html
     #   end
     #
-    # You can even render text directly without using a template:
+    # You can even render plain text directly without using a template:
     #
     #   mail(to: 'mikel@test.lindsaar.net') do |format|
-    #     format.text { render text: "Hello Mikel!" }
-    #     format.html { render text: "<h1>Hello Mikel!</h1>" }
+    #     format.text { render plain: "Hello Mikel!" }
+    #     format.html { render html: "<h1>Hello Mikel!</h1>".html_safe }
     #   end
     #
     # Which will render a +multipart/alternative+ email with +text/plain+ and

data/lib/action_mailer/gem_version.rb

@@ -0,0 +1,15 @@
+module ActionMailer
+  # Returns the version of the currently loaded ActionMailer as a <tt>Gem::Version</tt>
+  def self.gem_version
+    Gem::Version.new VERSION::STRING
+  end
+
+  module VERSION
+    MAJOR = 4
+    MINOR = 1
+    TINY  = 0
+    PRE   = "rc2"
+
+    STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
+  end
+end

data/lib/action_mailer/version.rb

@@ -1,11 +1,8 @@
+require_relative 'gem_version'
+
 module ActionMailer
-  # Returns the version of the currently loaded ActionMailer as a Gem::Version
+  # Returns the version of the currently loaded ActionMailer as a <tt>Gem::Version</tt>
   def self.version
-    Gem::Version.new "4.1.0.rc1"
-  end
-
-  module VERSION #:nodoc:
-    MAJOR, MINOR, TINY, PRE = ActionMailer.version.segments
-    STRING = ActionMailer.version.to_s
+    gem_version
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 4.1.0.rc1
+  version: 4.1.0.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc1
+        version: 4.1.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc1
+        version: 4.1.0.rc2
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc1
+        version: 4.1.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc1
+        version: 4.1.0.rc2
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,7 @@ files:
 - lib/action_mailer/base.rb
 - lib/action_mailer/collector.rb
 - lib/action_mailer/delivery_methods.rb
+- lib/action_mailer/gem_version.rb
 - lib/action_mailer/log_subscriber.rb
 - lib/action_mailer/mail_helper.rb
 - lib/action_mailer/preview.rb