mail_form 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0b14d8f2ac59f46da4bbb23169d7b5ddb1ef9b3
-  data.tar.gz: 9a9d445b691155afe94210e92c8d4d439724701c
+  metadata.gz: e6b8f5c9787d2e3df7e77a9eb5741997396b118a
+  data.tar.gz: ec07e70aeae2a978f4df65336d68873ea06fc3de
 SHA512:
-  metadata.gz: 8477e11459c4759986f18354379157531ded4989fb037a5d42364cb7889730c7f6436c7330e0f83a1034f98427358273d367cc33288ea36d1a6105bf836e3cd3
-  data.tar.gz: 1631dddb1fbeb0718f078f3278935514b7b2220ecf7c806353d11cf4a678e20d2a1fa346ceb9664097f8a0e080fab9d22f76df9a99815b866ba05e5b3c0bd028
+  metadata.gz: aa386fe08ebd407daa8a9cd2aa764e937074dd5b163a7878e802a86596510db83c4cc1d031da7299d146644a533295121cee1c0481ba6a857fcc465703d6feb4
+  data.tar.gz: 6ffdc31919b30fcd63d5b14163a4e614d24da438114cb7912d5782e0e0f617e0f6db4a064426848086daa241fe8abcabdd0b6ebf2e3ac3ec86e6174e4086edf5

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2013 Plataformatec http://plataformatec.com.br/
+Copyright (c) 2009-2015 Plataformatec http://plataformatec.com.br/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -53,7 +53,7 @@ you configured your mailer delivery method properly).
 When you inherit from `MailForm::Base`, it pulls down a set of stuff from `ActiveModel`,
 as `ActiveModel::Validation`, `ActiveModel::Translation` and `ActiveModel::Naming`.
 
-This bring `I18n`, error messages, validations and attributes handling like in
+This brings `I18n`, error messages, validations and attributes handling like in
 `ActiveRecord` to **MailForm**, so **MailForm** can be used in your controllers and form builders without extra tweaks. This also means that instead of the following:
 
 ```ruby
@@ -224,4 +224,4 @@ Take a look at lib/mail_form/views/mail_form/contact.erb in this repo to see how
 
 If you discover any bug, please use github issues tracker.
 
-Copyright (c) 2009-2013 Plataformatec http://plataformatec.com.br/
+Copyright (c) 2009-2015 Plataformatec http://plataformatec.com.br/

data/lib/mail_form/delivery.rb

@@ -148,7 +148,12 @@ module MailForm
 
     # Deliver the resource without running any validation.
     def deliver!
-      MailForm::Notifier.contact(self).deliver
+      mailer = MailForm::Notifier.contact(self)
+      if mailer.respond_to?(:deliver_now)
+        mailer.deliver_now
+      else
+        mailer.deliver
+      end
     end
 
     # Returns a hash of attributes, according to the attributes existent in

data/lib/mail_form/version.rb

@@ -1,3 +1,3 @@
 module MailForm
-  VERSION = "1.5.0".freeze
+  VERSION = "1.5.1".freeze
 end

data/test/mail_form_test.rb

@@ -103,12 +103,12 @@ class MailFormNotifierTest < ActiveSupport::TestCase
     assert_match %r[Rails Testing], last_delivery.body.to_s
   end
 
-  def test_request_info_hashes_are_print_inside_lis
+  def test_request_info_hashes_are_print_inside_lists
     @request.session = { :my => :session, :user => "data" }
     @advanced.deliver
     assert_match %r[<ul], last_delivery.body.to_s
     assert_match %r[<li>my: :session<\/li>], last_delivery.body.to_s
-    assert_match %r[<li>user: &quot;data&quot;<\/li>], last_delivery.body.to_s
+    assert_match %r[<li>user: \S+data\S+<\/li>], last_delivery.body.to_s
   end
 
   def test_error_is_raised_when_append_is_given_but_no_request_is_given

data/test/test_helper.rb

@@ -1,20 +1,29 @@
-begin
-  require 'test/unit'
-rescue LoadError
-end
+require 'minitest/autorun'
 
 RAILS_ENV = ENV["RAILS_ENV"] = "test"
 
+$:.unshift File.dirname(__FILE__) + '/../lib'
+require 'mail_form'
+
 require 'active_support'
 require 'active_support/test_case'
+require 'active_support/string_inquirer'
 require 'action_controller'
 require 'action_controller/test_case'
 require 'action_mailer'
 
+if ActiveSupport::TestCase.respond_to?(:test_order=)
+  ActiveSupport::TestCase.test_order = :random
+end
+
 ActionMailer::Base.delivery_method = :test
+I18n.enforce_available_locales = false
 
-$:.unshift File.dirname(__FILE__) + '/../lib'
-require 'mail_form'
+module Rails
+  def self.env
+    @env ||= ActiveSupport::StringInquirer.new('test')
+  end
+end
 
 class ContactForm < MailForm::Base
   attribute :name,     :validate => true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mail_form
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - José Valim
@@ -9,46 +9,46 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-21 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
 description: Send e-mail straight from forms in Rails with I18n, validations, attachments
@@ -58,25 +58,25 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG
 - MIT-LICENSE
 - README.md
 - lib/generators/rails/mail_form_generator.rb
 - lib/generators/rails/templates/model.rb
+- lib/mail_form.rb
 - lib/mail_form/base.rb
 - lib/mail_form/delivery.rb
 - lib/mail_form/notifier.rb
 - lib/mail_form/shim.rb
 - lib/mail_form/version.rb
 - lib/mail_form/views/mail_form/contact.erb
-- lib/mail_form.rb
 - test/mail_form_test.rb
 - test/resource_test.rb
 - test/test_file.txt
 - test/test_helper.rb
 - test/views/mail_form/custom_template.erb
 homepage: https://github.com/plataformatec/mail_form
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -84,17 +84,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: mail_form
-rubygems_version: 2.0.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Send e-mail straight from forms in Rails with I18n, validations, attachments

data/CHANGELOG

@@ -1,44 +0,0 @@
-# Version 1.5.0
-
-* Support Rails 4.
-* Drop support to Rails < 3.2 and Ruby 1.8.
-
-# Version 1.4
-
-* Fixed bug that was causing all activerecord attributes be saved as nil
-* Avoid symbol injection on forms
-
-# Version 1.3
-
-* Removed deprecated methods in version 1.2
-* Added persisted? header and a generator
-
-# Version 1.2
-
-* No more class attributes, just define a headers method
-
-# Version 1.1
-
-* Rails 3 compatibility
-
-# Version 1.0
-
-* Rename to mail_form and launch Rails 2.3 branch
-
-# Version 0.4
-
-* Added support to template
-
-# Version 0.3
-
-* Added support to symbols on :sender, :subject and :recipients
-* Added support to symbols on :validate
-
-# Version 0.2
-
-* Added support to request objects and append DSL
-* Added support to :attachments (thanks to @andrewtimberlake)
-
-# Version 0.1
-
-* First release