actionmailer 4.0.0 → 4.0.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb999052b352b85765b9ac2acb238f84d6975586
-  data.tar.gz: 4e3db21cd7757c1ab2f5861ab50979c6093abf6d
+  metadata.gz: ede3f5947ae4a0513140246d6ec4f7055519831a
+  data.tar.gz: f4da0da1aa814b6a68ba338cc566e852b2226b30
 SHA512:
-  metadata.gz: 0030bf89fa8aab3d098a58705b5d33bd5eb0094f501af58563e4c686073524b19bb2d457e23ca4b925b76f1c05385bd0f868203782501bd54cf51cc2de14f0ae
-  data.tar.gz: 491a794451b6df71cfbc728d643f94f073beac739e748406eea8c1ec2afe94aa32fb86e6fe2c52ea0c4c2e6ad6961b5dfb81701644a9da867995c931374effc9
+  metadata.gz: 8a6d1743f2a1372427085743c3d4af492a83f3a00fc719c7190991fab961bd1c08a4ff9465424a0cbffa2be8d041af8bee7dba455be2548d1000f56ca298318c
+  data.tar.gz: d905dc4f987572af698f4f78fdb91b2faea02b1674c734fd36b44a8cb7263bc8f915b3b234eebdee7f4824ba9da940ef398f400fe3669d4786906ede8289d041

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## Rails 4.0.1.rc1 (October 17, 2013) ##
+
+*   Invoke mailer defaults as procs only if they are procs, do not convert
+    with `to_proc`. That an object is convertible to a proc does not mean it's
+    meant to be always used as a proc.
+
+    Fixes #11533.
+
+    *Alex Tsukernik*
+
+
 ## Rails 4.0.0 (June 25, 2013) ##
 
 *   Allow passing interpolations to `#default_i18n_subject`, e.g.:

data/README.rdoc

@@ -142,7 +142,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-0-stable/actionmailer
 
 
 == License

data/lib/action_mailer/base.rb

@@ -670,7 +670,7 @@ module ActionMailer
       # Call all the procs (if any)
       class_default = self.class.default
       default_values = class_default.merge(class_default) do |k,v|
-        v.respond_to?(:to_proc) ? instance_eval(&v) : v
+        v.is_a?(Proc) ? instance_eval(&v) : v
       end
 
       # Handle defaults

data/lib/action_mailer/delivery_methods.rb

@@ -63,7 +63,7 @@ module ActionMailer
           raise "Delivery method cannot be nil"
         when Symbol
           if klass = delivery_methods[method]
-            mail.delivery_method(klass,(send(:"#{method}_settings") || {}).merge!(options || {}))
+            mail.delivery_method(klass, (send(:"#{method}_settings") || {}).merge(options || {}))
           else
             raise "Invalid delivery method #{method.inspect}"
           end

data/lib/action_mailer/version.rb

@@ -1,7 +1,7 @@
 module ActionMailer
   # Returns the version of the currently loaded ActionMailer as a Gem::Version
   def self.version
-    Gem::Version.new "4.0.0"
+    Gem::Version.new "4.0.1.rc1"
   end
 
   module VERSION #:nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.1.rc1
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.3
+        version: 2.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.3
+        version: 2.5.4
 description: Email on Rails. Compose, deliver, receive, and test emails using the
   familiar controller/view pattern. First-class support for multipart email and attachments.
 email: david@loudthinking.com
@@ -76,13 +76,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Email composition, delivery, and receiving framework (part of Rails).