padrino-mailer 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6a7aefa373c9acb4e329848a922d59aa206223c
-  data.tar.gz: 8e32434c7dd11ef4892435db8dedd2c13389134d
+  metadata.gz: dcadea24539f54965f30482d6ba1031e2d2c1735
+  data.tar.gz: 7072ecef88d36253f720ff449e4b4472548d3854
 SHA512:
-  metadata.gz: dd454eac17e55f1bad80e48c48383801c12490b604d3dbbab1d80bbba12db4ee337a95fd69db80026355e16cf6bdcca63c7a94b9e11f39f356e35d471fd2efee
-  data.tar.gz: 8116bb26ce0342b92ba10ec76454fc8ad4a3def790e0d880ab651f9f43223a166953de779f4a854b20c12c08e73f374db125b9db2089b96a691a5262e70dcf6e
+  metadata.gz: 715759f9eafb48d542337f4f42205228d6b875edc3fe4b9c26c414d6c48525abb5476dd42a4802fdf3755ce277a345762b80485876ba53f480ab148464af4691
+  data.tar.gz: e9509f3b64f2aa534886c746bd8747721dcdae10f5da81b0d9aa703f594a32283efb4a588f2b0a22e8c1f6def4be1ca0e00c4e9db413329e3960fdc1c066331b

data/lib/padrino-mailer/ext.rb

@@ -23,7 +23,8 @@ module Mail # @private
 
       initialize_without_app(*args, &block)
     end
-    alias_method_chain :initialize, :app
+    alias_method :initialize_without_app, :initialize
+    alias_method :initialize, :initialize_with_app
 
     ##
     # Setup like in Sinatra/Padrino apps content_type and template lookup.
@@ -115,10 +116,13 @@ module Mail # @private
 
     def do_delivery_with_logging
       logger.debug "Sending email to: #{destinations.join(" ")}"
-      encoded.to_lf.split("\n").each { |line| logger << ("  " + line) } if logger.debug?
+      encoded.each_line { |line| logger << ("  " + line.strip) } if logger.debug?
       do_delivery_without_logging
     end
-    alias_method_chain :do_delivery, :logging if Padrino.respond_to?(:logger)
+    if Padrino.respond_to?(:logger)
+      alias_method :do_delivery_without_logging, :do_delivery
+      alias_method :do_delivery, :do_delivery_with_logging
+    end
 
     ##
     # Sinatra and Padrino compatibility.
@@ -241,7 +245,8 @@ module Mail # @private
       mime = content_type_without_symbol(value)
       Padrino::Mailer::Mime.mime_type(mime)
     end
-    alias_method_chain :content_type, :symbol
+    alias_method :content_type_without_symbol, :content_type
+    alias_method :content_type, :content_type_with_symbol
 
     private
 

data/lib/padrino-mailer/helpers.rb

@@ -137,7 +137,7 @@ module Padrino
           message = _padrino_mailer::Message.new(self)
           message.delivery_method(*delivery_settings)
           message.instance_eval(&block) if block_given?
-          mail_attributes.reverse_merge(mailer_defaults) if respond_to?(:mailer_defaults)
+          mail_attributes = mailer_defaults.merge(mail_attributes) if respond_to?(:mailer_defaults)
           mail_attributes.each_pair { |k, v| message.method(k).call(v) }
           message.deliver
         end

data/padrino-mailer.gemspec

@@ -24,5 +24,6 @@ Gem::Specification.new do |s|
   s.rdoc_options  = ["--charset=UTF-8"]
 
   s.add_dependency("padrino-core", Padrino.version)
+  s.add_dependency("mime-types", "< 3")
   s.add_dependency("mail", "~> 2.5")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-mailer
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-17 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,26 +19,40 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.2
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
 description: Mailer system for padrino allowing easy delivery of application emails
@@ -48,9 +62,9 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .document
-- .gitignore
-- .yardopts
+- ".document"
+- ".gitignore"
+- ".yardopts"
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -93,17 +107,17 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 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: 1.3.6
 requirements: []