padrino-mailer 0.10.7 → 0.11.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 72f22cdede10f09a210484af70efe5b4ee4cfc24
+  data.tar.gz: 344494c4fabc6232c4ddee140cb38432516bf053
+SHA512:
+  metadata.gz: e850182419d09cd2bc2ba422c70d1a9b195c144d58c54845a5678b18f4a81984d240c7a5f4447b6ac55904e9485595f923be5865dd1e1063d8e46768565159e4
+  data.tar.gz: 83ccd2eaf3d56ecaf5992459d0356c482baa10abf21d72e766018bbbd98a31ac5c11392d232da494ae2c46787f6a3b144bf8cec53fa91c7d9f24e9faea1ad6fe

data/lib/padrino-mailer/base.rb

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

data/lib/padrino-mailer/ext.rb

@@ -16,6 +16,9 @@ module Mail # @private
         settings.views = File.expand_path("./mailers")
         settings.reload_templates = true
       end
+
+      initialize_template_settings!
+
       # Run the original initialize
       initialize_without_app(*args, &block)
     end
@@ -52,13 +55,11 @@ module Mail # @private
     #  text_part "Some text"
     #  text_part { render('multipart/basic.text') }
     #
-    def text_part(value=nil, &block)
-      if block_given? || value
-        @text_part = self.part(:content_type => "text/plain", :body => value, :part_block => block)
-        add_multipart_alternate_header unless html_part.blank?
-      else
-        @text_part || find_first_mime_type("text/plain")
-      end
+    def text_part(value = nil, &block)
+      add_resolved_part(:variable     => :text_part, 
+                        :value        => value, 
+                        :content_type => 'text/plain',
+                        &block)
     end
 
     ##
@@ -70,12 +71,20 @@ module Mail # @private
     #  html_part "Some <b>Html</b> text"
     #  html_part { render('multipart/basic.html') }
     #
-    def html_part(value=nil, &block)
+    def html_part(value = nil, &block)
+      add_resolved_part(:variable     => :html_part, 
+                        :value        => value, 
+                        :content_type => 'text/html', 
+                        &block)
+    end
+
+    def add_resolved_part(attributes = {}, &block)
+      variable, value, content_type = attributes.values_at(:variable, :value, :content_type)
       if block_given? || value
-        @html_part = self.part(:content_type => "text/html", :body => value, :part_block => block)
-        add_multipart_alternate_header unless text_part.blank?
+        instance_variable_set "@#{variable}", self.part(:content_type => content_type, :body => value, :part_block => block)
+        add_multipart_alternate_header unless self.send(variable).blank?
       else
-        @html_part || find_first_mime_type("text/html")
+        instance_variable_get("@#{variable}") || find_first_mime_type(content_type)
       end
     end
 
@@ -240,5 +249,11 @@ module Mail # @private
         self.body = super(engine, data, options, locals, &block) if provides.empty?
       end
 
+      # register all special template configurations Padrino has to our fake settings object.
+      def initialize_template_settings!
+        Padrino::Rendering.engine_configurations.each do |name, value|
+          settings.class.instance_eval { define_method(name) { value } }
+        end
+      end
   end # Message
 end # Mail

data/lib/padrino-mailer/helpers.rb

@@ -136,9 +136,10 @@ module Padrino
         #
         # @api public
         def email(mail_attributes={}, &block)
-          message = Mail::Message.new(self)
+          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.each_pair { |k, v| message.method(k).call(v) }
           message.deliver
         end

data/lib/padrino-mailer.rb

@@ -5,10 +5,6 @@ rescue LoadError
   require 'sinatra/tilt'
 end
 require 'padrino-core/support_lite' unless defined?(SupportLite)
-require 'mail'
-
-# Require respecting order of our dependencies
-FileSet.glob_require('padrino-mailer/**/*.rb', __FILE__)
 
 module Padrino
   ##
@@ -45,6 +41,15 @@ module Padrino
       #
       # @api public
       def registered(app)
+        require 'padrino-mailer/base'
+        require 'padrino-mailer/helpers'
+        require 'padrino-mailer/mime'
+        # This lazily loads the mail gem, due to its long require time.
+        app.set :_padrino_mailer, proc {
+          require 'mail'
+          require 'padrino-mailer/ext'
+          app._padrino_mailer = Mail
+        }
         app.helpers Padrino::Mailer::Helpers
       end
       alias :included :registered

data/padrino-mailer.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
   s.rdoc_options  = ["--charset=UTF-8"]
 
   s.add_dependency("padrino-core", Padrino.version)
-  s.add_dependency("mail", "~> 2.3.0")
+  s.add_dependency("mail", "~> 2.5.3")
 end

data/test/fixtures/basic.erb

@@ -1 +1 @@
-This is a body of text from a template
+This is a body of text from a template with interpolated <%= "<i>" %> and non-interpolated tags<br/>

data/test/test_email.rb

@@ -68,7 +68,7 @@ describe "Email" do
       assert_equal ['padrino@me.com'],    email.from
       assert_equal ['padrino@you.com'],   email.to
       assert_equal 'Hello there Padrino', email.subject
-      assert_equal 'This is a body of text from a template', email.body.to_s.chomp
+      assert_equal 'This is a body of text from a template with interpolated &lt;i&gt; and non-interpolated tags<br/>', email.body.to_s.chomp
     end
 
     should 'send emails with scoped mailer defaults' do

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-mailer
 version: !ruby/object:Gem::Version
-  version: 0.10.7
-  prerelease: 
+  version: 0.11.0
 platform: ruby
 authors:
 - Padrino Team
@@ -12,40 +11,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.7
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.7
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.5.3
 description: Mailer system for padrino allowing easy delivery of application emails
 email: padrinorb@gmail.com
 executables: []
@@ -93,28 +88,27 @@ files:
 - test/test_part.rb
 homepage: http://www.padrinorb.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: padrino-mailer
-rubygems_version: 1.8.21
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Mailer system for padrino
 test_files:
 - test/fixtures/basic.erb