padrino-mailer 0.12.9 → 0.13.0.beta1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODZkNTBlY2Y3NzVjZWQ3NTA2N2Q4ZjI1ZGNiZmQwYjA4OWVhOGI1Zg==
-  data.tar.gz: !binary |-
-    NzJjZDhiYzFlN2U5ZTI0NjFmMzJlMzQzZjk2ZjMzYWNiNjc1NmZkZA==
+SHA1:
+  metadata.gz: af5f2d74cdb46f32376af2fae9d94744e70ce4aa
+  data.tar.gz: b2e49669898f683ed4b88d206f4df95d5a451825
 SHA512:
-  metadata.gz: !binary |-
-    OWNlOWUxYmUxZmI3Njc4OWUyZDJmMTZhNTU1Yjc0M2M0OWNkYWFiZmQzODRj
-    ZmVkNDc2NGEzYWJmYTU4YWVlMjAwZGEzNTAxOGZiOWQ5ZjkyM2I4YzA2ZmY5
-    YjVhOTE5MzgyMTljMDU3OTZiMTBkNDVkNzk3ODBjMGY3NWE5ODA=
-  data.tar.gz: !binary |-
-    MTVhMTViOGZjNmM0YTc3MjM4MGM0Mzc0NjMwY2VlNDZiZTJiYzhjNTNiNTJi
-    MTEzODQxNDBhZDEzMGNhNjBmMmU1OThjOTY5YmNlZmE3YjE4ODVjYTUxYTNm
-    MThhYmIyOTgxNzgxNjc2NmIwM2RjN2E4OTk5Yjk2YjYzOGJkMzI=
+  metadata.gz: 16624593c1523f840dae30913cf58111bfe65f958bcbe323b13d8a5d07eb87ac833cfc5df463d8cd732e7f0eff5928ebbc682551f98af4bf67ece5a5d82f8be9
+  data.tar.gz: 7bca86c488e848c681807a7b0bcbff4dc1c4419779220099a43ee649e9228ccde63d6b87e41d085ec4e6522cc4e44d2bbbd25fb19dfd2d20312b766491927360

data/lib/padrino-mailer/base.rb

@@ -84,8 +84,6 @@ module Padrino
         raise "The email '#{name}' is already defined" if self.messages[name].present?
         self.messages[name] = Proc.new { |*attrs|
           message = app.settings._padrino_mailer::Message.new(self.app)
-          message.mailer_name = mailer_name
-          message.message_name = name
           message.defaults = self.defaults if self.defaults.any?
           message.delivery_method(*delivery_settings)
           message.instance_exec(*attrs, &block)

data/lib/padrino-mailer/ext.rb

@@ -4,9 +4,7 @@ module Mail # @private
   class Message # @private
     include Sinatra::Templates
     include Padrino::Rendering if defined?(Padrino::Rendering)
-    include Padrino::Helpers::RenderHelpers if defined? Padrino::Helpers::RenderHelpers
     attr_reader :template_cache
-    attr_accessor :mailer_name, :message_name
 
     def initialize_with_app(*args, &block)
       @template_cache = Tilt::Cache.new
@@ -24,8 +22,7 @@ module Mail # @private
 
       initialize_without_app(*args, &block)
     end
-    alias_method :initialize_without_app, :initialize
-    alias_method :initialize, :initialize_with_app
+    alias_method_chain :initialize, :app
 
     ##
     # Setup like in Sinatra/Padrino apps content_type and template lookup.
@@ -117,13 +114,10 @@ module Mail # @private
 
     def do_delivery_with_logging
       logger.debug "Sending email to: #{destinations.join(" ")}"
-      encoded.each_line { |line| logger << ("  " + line.strip) } if logger.debug?
+      encoded.to_lf.split("\n").each { |line| logger << ("  " + line) } if logger.debug?
       do_delivery_without_logging
     end
-    if Padrino.respond_to?(:logger)
-      alias_method :do_delivery_without_logging, :do_delivery
-      alias_method :do_delivery, :do_delivery_with_logging
-    end
+    alias_method_chain :do_delivery, :logging if Padrino.respond_to?(:logger)
 
     ##
     # Sinatra and Padrino compatibility.
@@ -246,25 +240,17 @@ module Mail # @private
       mime = content_type_without_symbol(value)
       Padrino::Mailer::Mime.mime_type(mime)
     end
-    alias_method :content_type_without_symbol, :content_type
-    alias_method :content_type, :content_type_with_symbol
+    alias_method_chain :content_type, :symbol
 
     private
 
     ##
     # Defines the render for the mailer utilizing the padrino 'rendering' module
     #
-    def render(engine=nil, data=nil, options={}, locals={}, &block)
+    def render(engine, data=nil, options={}, locals={}, &block)
       locals = @_locals if options[:locals].blank? && locals.blank?
       @template_cache.clear if settings.reload_templates?
 
-      engine ||= message_name
-
-      if mailer_name && !engine.to_s.index('/')
-        settings.views += "/#{mailer_name}" 
-        engine = engine.to_s.sub(%r{^#{mailer_name}/}, '')
-      end
-
       provides.each do |format|
         part do |p|
           p.content_type(format)
@@ -276,12 +262,6 @@ module Mail # @private
       self.body = super(engine, data, options, locals, &block) if provides.empty?
     end
 
-    alias_method :original_partial, :partial if instance_methods.include?(:partial)
-    def partial(template, options={}, &block)
-      raise "gem 'padrino-helpers' is required to render partials" unless respond_to?(:original_partial)
-      self.body = original_partial(template, options, &block)
-    end
-
     ##
     # Register all special template configurations Padrino has to our fake settings object.
     #

data/lib/padrino-mailer/helpers.rb

@@ -106,9 +106,7 @@ module Padrino
         #   deliver(:example, :message, "John")
         #
         def deliver(mailer_name, message_name, *attributes)
-          mailer = registered_mailers[mailer_name] or fail "mailer '#{mailer_name}' is not registered"
-          message = mailer.messages[message_name] or fail "mailer '#{mailer_name}' has no message '#{message_name}'"
-          message = message.call(*attributes)
+          message = registered_mailers[mailer_name].messages[message_name].call(*attributes)
           message.delivery_method(*delivery_settings)
           message.deliver
         end

data/lib/padrino-mailer/mime.rb

@@ -36,7 +36,7 @@ module Padrino
       #
       # You can add your own mime types like:
       #
-      #   Padrino::Mailer::Mime::MIME_TYPES.merge!("text/xml" => :xml)
+      #   Padrino::Mailer::MIME_TYPES.merge!("text/xml" => :xml)
       #
       MIME_TYPES = {
         "text/html"  => :html,

data/padrino-mailer.gemspec

@@ -24,6 +24,5 @@ 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")
+  s.add_dependency("mail", "~> 2.5.3")
 end

data/test/fixtures/padrino_app/app.rb

@@ -45,35 +45,6 @@ class PadrinoApp < Padrino::Application
       render  'sample/helper_message'
     end
 
-    message :default_mailer_name do |name|
-      subject "Welcome Helper!"
-      to      'jim@fake.com'
-      from    'noreply@custom.com'
-      locals  :name => name
-      via     :test
-      render  'default_mailer_name'
-    end
-
-    message :default_mailer_email_name do |name|
-      subject "Welcome Helper!"
-      to      'jim@fake.com'
-      from    'noreply@custom.com'
-      locals  :name => name
-      via     :test
-      render
-    end
-
-    message :external do |name|
-      subject "Welcome Message!"
-      to      'john@fake.com'
-      from    'noreply@custom.com'
-      locals  :name => name
-      via     :test
-      render  'demo/sample_mail'
-    end
-  end
-
-  mailer :nonexistant do
   end
 
   post "/deliver/inline" do
@@ -101,28 +72,6 @@ class PadrinoApp < Padrino::Application
     result ? "mail delivered" : 'mail not delivered'
   end
 
-  post "/deliver/failing_mailer" do
-    deliver(:nonregistered, :mailer, "hey")
-  end
-
-  post "/deliver/failing_message" do
-    deliver(:nonexistant, :message, "hey")
-  end
-
-  post "/deliver/default_mailer_name" do
-    result = deliver(:sample, :default_mailer_name, "Jim")
-    result ? "mail delivered" : 'mail not delivered'
-  end
-
-  post "/deliver/default_mailer_email_name" do
-    result = deliver(:sample, :default_mailer_email_name, "Jim")
-    result ? "mail delivered" : 'mail not delivered'
-  end
-
-  post "/deliver/external" do
-    result = deliver(:sample, :external, "Joey")
-    result ? "mail delivered" : 'mail not delivered'
-  end
 end
 
 Padrino.mount("PadrinoApp").to("/")

data/test/helper.rb

@@ -6,7 +6,6 @@ require 'minitest/pride'
 require 'rack/test'
 require 'padrino-core'
 require 'padrino-helpers'
-require 'padrino/rendering'
 require 'padrino-mailer/ext'
 require 'padrino-mailer'
 
@@ -35,13 +34,11 @@ class MiniTest::Spec
     mail_message = Mail::TestMailer.deliveries.last
     raise "No mail message has been sent!" unless mail_message.present?
     delivery_attributes = mail_attributes
-    delivery_attributes.update(:to => Array(mail_attributes[:to]), :from => Array(mail_attributes[:from]))
-    delivery_attributes.each_pair do |key, expected|
-      next unless mail_message.respond_to?(key)
-      actual = mail_message.send(key)
-      actual = actual.to_s.chomp if key == :body
-      actual = mail_message.content_type_without_symbol.split(';').first if key == :content_type
-      assert_equal expected, actual, "Mail failure at field '#{key}'"
+    delivery_attributes = { :to => Array(mail_attributes[:to]), :from => Array(mail_attributes[:from]) }
+    delivery_attributes.each_pair do |k, v|
+      unless mail_message.method(k).call == v
+        raise "Mail failure (#{k}): #{mail_message.attributes.inspect} does not match #{delivery_attributes.inspect}"
+      end
     end
     Mail::TestMailer.deliveries.clear
   end

data/test/test_message.rb

@@ -152,18 +152,5 @@ describe "Message" do
       message.encoded
       assert_equal :plain,                message.content_type
     end
-
-    it 'should render partials' do
-      objects = [1,2,'<evil>','<good>'.html_safe]
-      message = Mail::Message.new do
-        from    'padrino@me.com'
-        to      'padrino@you.com'
-        subject 'Hello there Padrino'
-        views        File.dirname(__FILE__) + '/fixtures/views/mailers'
-        partial 'partial/object', :collection => objects
-      end
-
-      assert_equal "Object 1<br>\nObject 2<br>\nObject &lt;evil&gt;<br>\nObject <good><br>", message.body.to_s.chomp
-    end
   end
 end

data/test/test_padrino_mailer.rb

@@ -12,7 +12,8 @@ describe "PadrinoMailer" do
       assert_email_sent(:to => 'john@apple.com',
                         :from => 'joe@smith.com',
                         :subject => 'Test Email',
-                        :body => 'Test Body')
+                        :body => 'Test Body',
+                        :delivery_method => @app.delivery_method)
     end
 
     it 'should be able to deliver plain text emails' do
@@ -20,6 +21,7 @@ describe "PadrinoMailer" do
       assert_equal 'mail delivered', body
       assert_email_sent(:to => 'john@fake.com',
                         :from => 'noreply@birthday.com',
+                        :delivery_method => @app.delivery_method,
                         :subject => "Happy Birthday!",
                         :body => "Happy Birthday Joey!\nYou are turning 21")
     end
@@ -30,6 +32,7 @@ describe "PadrinoMailer" do
       assert_email_sent(:template => 'mailers/sample/foo_message',
                         :to => 'john@fake.com',
                         :from => 'noreply@custom.com',
+                        :delivery_method => @app.delivery_method,
                         :subject => 'Welcome Message!',
                         :body => 'Hello to Bobby')
     end
@@ -40,8 +43,9 @@ describe "PadrinoMailer" do
       assert_email_sent(:to => 'julie@fake.com',
                         :from => 'noreply@anniversary.com',
                         :content_type => 'text/html',
+                        :delivery_method => @app.delivery_method,
                         :subject => 'Happy anniversary!',
-                        :body => "<p>Yay Joey &amp; Charlotte!</p>\n<p>You have been married 16 years</p>")
+                        :body => "<p>Yay Joey & Charlotte!</p>\n<p>You have been married 16 years</p>")
     end
 
     it 'should be able to deliver a basic email using app settings' do
@@ -49,7 +53,8 @@ describe "PadrinoMailer" do
                  :subject => 'Test Email', :body => 'Test Body',
                  :via => :test)
       assert_email_sent(:to => 'john@apple.com', :from => 'joe@smith.com',
-                        :subject => 'Test Email', :body => 'Test Body')
+                        :subject => 'Test Email', :body => 'Test Body',
+                        :delivery_method => @app.delivery_method)
     end
   end
 
@@ -60,7 +65,7 @@ describe "PadrinoMailer" do
       post '/deliver/inline'
       assert_equal 'mail delivered', body
       assert_email_sent(:to => 'john@apple.com', :from => 'joe@smith.com',
-                        :subject => 'Test Email',
+                        :delivery_method => @app.delivery_method, :subject => 'Test Email',
                         :body => 'Test Body')
     end
 
@@ -68,7 +73,7 @@ describe "PadrinoMailer" do
       post '/deliver/plain'
       assert_equal 'mail delivered', body
       assert_email_sent(:to => 'john@fake.com', :from => 'noreply@birthday.com',
-                        :subject => "Happy Birthday!",
+                        :delivery_method => @app.delivery_method, :subject => "Happy Birthday!",
                         :body => "Happy Birthday Joey!\nYou are turning 21")
     end
 
@@ -76,7 +81,7 @@ describe "PadrinoMailer" do
       post '/deliver/custom'
       assert_equal 'mail delivered', body
       assert_email_sent(:template => 'mailers/sample/foo_message', :to => 'john@fake.com',
-                        :from => 'noreply@custom.com',
+                        :from => 'noreply@custom.com', :delivery_method => @app.delivery_method,
                         :subject => 'Welcome Message!', :body => 'Hello to Bobby')
     end
 
@@ -84,13 +89,8 @@ describe "PadrinoMailer" do
       post '/deliver/html'
       assert_equal 'mail delivered', body
       assert_email_sent(:to => 'julie@fake.com', :from => 'noreply@anniversary.com',
-                        :content_type => 'text/html',
-                        :subject => 'Happy anniversary!', :body => "<p>Yay Joey &amp; Charlotte!</p>\n<p>You have been married 16 years</p>")
-    end
-
-    it 'should be able to deliver emails with views in custom-named folders' do
-      post '/deliver/external'
-      assert_equal 'mail delivered', body
+                        :content_type => 'text/html', :delivery_method => @app.delivery_method,
+                        :subject => 'Happy anniversary!', :body => "<p>Yay Joey & Charlotte!</p>\n<p>You have been married 16 years</p>")
     end
 
     it 'should be able to deliver a basic email using app settings' do
@@ -98,7 +98,8 @@ describe "PadrinoMailer" do
                  :subject => 'Test Email', :body => 'Test Body',
                  :via => :test)
       assert_email_sent(:to => 'john@apple.com', :from => 'joe@smith.com',
-                        :subject => 'Test Email', :body => 'Test Body')
+                        :subject => 'Test Email', :body => 'Test Body',
+                        :delivery_method => @app.delivery_method)
     end
 
     it 'should be able to deliver a basic email using Padrino::Helpers' do
@@ -106,36 +107,8 @@ describe "PadrinoMailer" do
       post '/deliver/helper'
       assert_equal 'mail delivered', body
       assert_email_sent(:to => 'jim@fake.com', :from => 'noreply@custom.com',
-                        :content_type => 'text/html',
+                        :content_type => 'text/html', :delivery_method => @app.delivery_method,
                         :subject => 'Welcome Helper!', :body => "<a href=\"#\">jim</a>")
     end
-
-    it 'should fail with proper message if mailer is not registered' do
-      error = assert_raises RuntimeError do
-        post '/deliver/failing_mailer'
-      end
-      assert_match /is not registered/, error.message
-    end
-
-    it 'should fail with proper message if message does not exist' do
-      error = assert_raises RuntimeError do
-        post '/deliver/failing_message'
-      end
-      assert_match /has no message/, error.message
-    end
-
-    it 'should be able to render default mailer names' do
-      post '/deliver/default_mailer_name'
-      assert_equal 'mail delivered', body
-      assert_email_sent(:to => 'jim@fake.com', :from => 'noreply@custom.com',
-                        :content_type => 'text/plain', :body => "dmn")
-    end
-
-    it 'should be able to render default mailer email names' do
-      post '/deliver/default_mailer_email_name'
-      assert_equal 'mail delivered', body
-      assert_email_sent(:to => 'jim@fake.com', :from => 'noreply@custom.com',
-                        :content_type => 'text/plain', :body => "dmen")
-    end
   end
 end

data/test/test_part.rb

@@ -33,6 +33,7 @@ describe "Part" do
       assert_equal 'other', message.parts[2].body.decoded
 
       assert_equal 'This is a foo message in mailers/sample dir', message.html_part.body.decoded.chomp
+      assert_equal 'plain text', message.text_part.body.decoded
     end
 
     it 'should works with multipart templates' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-mailer
 version: !ruby/object:Gem::Version
-  version: 0.12.9
+  version: 0.13.0.beta1
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,46 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.9
+        version: 0.13.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.9
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          Mw==
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          Mw==
+        version: 0.13.0.beta1
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi41
+        version: 2.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi41
+        version: 2.5.3
 description: Mailer system for padrino allowing easy delivery of application emails
 email: padrinorb@gmail.com
 executables: []
@@ -84,8 +66,6 @@ files:
 - test/fixtures/padrino_app/views/mailers/demo/sample_mail.erb
 - test/fixtures/padrino_app/views/mailers/sample/anniversary.erb
 - test/fixtures/padrino_app/views/mailers/sample/birthday.erb
-- test/fixtures/padrino_app/views/mailers/sample/default_mailer_email_name.erb
-- test/fixtures/padrino_app/views/mailers/sample/default_mailer_name.erb
 - test/fixtures/padrino_app/views/mailers/sample/foo_message.erb
 - test/fixtures/padrino_app/views/mailers/sample/helper_message.erb
 - test/fixtures/sinatra_app/app.rb
@@ -100,7 +80,6 @@ files:
 - test/fixtures/views/mailers/layouts/sample.erb
 - test/fixtures/views/mailers/multipart/basic.html.erb
 - test/fixtures/views/mailers/multipart/basic.plain.erb
-- test/fixtures/views/mailers/partial/_object.erb
 - test/fixtures/views/mailers/sample/foo.erb
 - test/helper.rb
 - test/test_email.rb
@@ -118,18 +97,45 @@ 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
+      version: 1.3.1
 requirements: []
 rubyforge_project: padrino-mailer
-rubygems_version: 2.6.14
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Mailer system for padrino
-test_files: []
+test_files:
+- test/fixtures/basic.erb
+- test/fixtures/layout.erb
+- test/fixtures/padrino_app/app.rb
+- test/fixtures/padrino_app/views/mailers/demo/sample_mail.erb
+- test/fixtures/padrino_app/views/mailers/sample/anniversary.erb
+- test/fixtures/padrino_app/views/mailers/sample/birthday.erb
+- test/fixtures/padrino_app/views/mailers/sample/foo_message.erb
+- test/fixtures/padrino_app/views/mailers/sample/helper_message.erb
+- test/fixtures/sinatra_app/app.rb
+- test/fixtures/sinatra_app/views/mailers/demo/sample_mail.erb
+- test/fixtures/sinatra_app/views/mailers/sample/anniversary.erb
+- test/fixtures/sinatra_app/views/mailers/sample/birthday.erb
+- test/fixtures/sinatra_app/views/mailers/sample/foo_message.erb
+- test/fixtures/views/mailers/alternate/foo.erb
+- test/fixtures/views/mailers/bar.erb
+- test/fixtures/views/mailers/i18n/hello.en.erb
+- test/fixtures/views/mailers/i18n/hello.it.erb
+- test/fixtures/views/mailers/layouts/sample.erb
+- test/fixtures/views/mailers/multipart/basic.html.erb
+- test/fixtures/views/mailers/multipart/basic.plain.erb
+- test/fixtures/views/mailers/sample/foo.erb
+- test/helper.rb
+- test/test_email.rb
+- test/test_message.rb
+- test/test_padrino_mailer.rb
+- test/test_part.rb
+has_rdoc: 

data/test/fixtures/padrino_app/views/mailers/sample/default_mailer_email_name.erb

@@ -1 +0,0 @@
-dmen

data/test/fixtures/padrino_app/views/mailers/sample/default_mailer_name.erb

@@ -1 +0,0 @@
-dmn

data/test/fixtures/views/mailers/partial/_object.erb

@@ -1 +0,0 @@
-Object <%= object %><br>