pakyow-mailer 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5176cd98fcad18048eaeb52eeeeb3cff53dce1bd
-  data.tar.gz: af5629e8b9768e94752e1cdcf1b846d1b060b506
+  metadata.gz: 078a9bf4d7afbd84c0674c7e0bb89dc73cf383e9
+  data.tar.gz: cb84c77170807c604abf262e2e9f701434de9c6d
 SHA512:
-  metadata.gz: 4e4db00b1ec12894a8495f2c18f7b24b061010822d0bf1aa78e681505147d48ccfbcac77723ebf82bd03c7443effb338b7bf2abcaf37ae48ad07210fa2359109
-  data.tar.gz: 04e7f61535e189de36d546c8a360c1475041babb85494dbb8cf4ef1a83ec17f34b505c4e30057b6cf5eb4cd31e865373ee557978fbed84d3511f3c4f00e3fd37
+  metadata.gz: 54fe6ef23a9e653c307f272977fea6c8960dd3a054d139301d6cab1cfad16ce6bee88c96d8856805d45051a2d6a4eb996d61a7642f71f52ac2576ac597396c1d
+  data.tar.gz: 0ca068ebbea7fa205ac05e1b1683c0f60dbc3a5c1e0078aa31c501727b8e09d2466f2a55c4253619de64d3e00567f020e4eca88171fb6e86f150ec876ddaa1e3

data/pakyow-mailer/CHANGES

@@ -1,3 +1,7 @@
+= 0.9.0
+
+  * Removes support for Ruby versions < 2.0.0
+
 = 0.8.0 / 2014-03-02
 
   * Major rewrite, including premailer support
@@ -12,4 +16,4 @@
 
 = 0.7.0 / 2011-11-19
 
- * Initial gem release
+ * Initial gem release

data/pakyow-mailer/lib/mailer/config/mailer.rb

@@ -1,31 +1,16 @@
-module Pakyow
-  module Config
-    class Mailer
-      Config::Base.register_config(:mailer, self)
+Pakyow::Config.register(:mailer) { |config|
+  # the default sender name
+  config.opt :default_sender, 'Pakyow'
 
-      class << self
-        attr_accessor :default_sender, :default_content_type, :delivery_method, :delivery_options, :encoding
-        
-        def default_sender
-          @default_sender || "Pakyow"
-        end
-        
-        def default_content_type
-          @default_content_type || 'text/html; charset=' + encoding
-        end
-        
-        def delivery_method
-          @delivery_method || :sendmail
-        end
-        
-        def delivery_options
-          @delivery_options || {:enable_starttls_auto => false}
-        end
+  # the default mimetype to use
+  config.opt :default_content_type, lambda { 'text/html; charset=' + Pakyow::Config.mailer.encoding }
 
-        def encoding
-          @encoding || 'UTF-8'
-        end
-      end
-    end
-  end
-end
+  # the delivery method to use for sending mail
+  config.opt :delivery_method, :sendmail
+
+  # any delivery options necessary for `delivery_method`
+  config.opt :delivery_options, { enable_starttls_auto: false }
+
+  # the default encoding to use
+  config.opt :encoding, 'UTF-8'
+}

data/pakyow-mailer/lib/mailer/helpers.rb

@@ -1,7 +1,7 @@
 module Pakyow
   module AppHelpers
     def mailer(view_path)
-      Mailer.new(view_path, @presenter.store)
+      Mailer.from_store(view_path, @presenter.store)
     end
   end
 end

data/pakyow-mailer/lib/mailer/mailer.rb

@@ -1,59 +1,72 @@
 module Pakyow
   class Mailer
     attr_accessor :view, :message, :processed
-  
-    def initialize(view_path, view_store)
-      @view = view_store.view(view_path)
-      
+
+    def self.from_store(view_path, view_store)
+      new(view: view_store.view(view_path))
+    end
+
+    def initialize(view: nil, content: nil)
+      @view = view
+      @content = content
+
       @message               = Mail.new
-      @message.from          = Config::Base.mailer.default_sender
-      @message.content_type  = Config::Base.mailer.default_content_type
-      @message.delivery_method(Config::Base.mailer.delivery_method, Config::Base.mailer.delivery_options)
+      @message.from          = Config.mailer.default_sender
+      @message.content_type  = Config.mailer.default_content_type
+      @message.delivery_method(Config.mailer.delivery_method, Config.mailer.delivery_options)
     end
-    
+
     def deliver_to(recipient, subject = nil)
-      html = content(:html)
-      text = content(:text)
+      html = content :html
+      text = content :text
 
-      @message.html_part do
-        content_type 'text/html; charset=' + Config::Base.mailer.encoding
-        body html
-      end
+      if html.nil?
+        @message.body = text
+      else
+        @message.html_part do
+          content_type 'text/html; charset=' + Config.mailer.encoding
+          body html
+        end
 
-      @message.text_part do
-        body text
+        @message.text_part do
+          body text
+        end
       end
-      
+
       @message.subject = subject if subject
-      
+
       Array(recipient).each {|r| deliver(r)}
     end
 
     def content(type = :html)
-      return process[type]
+      return process.fetch(type, nil)
     end
 
     protected
 
     def process
       unless @processed
-        @premailer = Premailer.new(view.to_html, with_html_string: true, input_encoding: Config::Base.mailer.encoding)
+        @processed_content = {}
 
-        @premailer.warnings.each do |w|
-          Pakyow.logger.warn "#{w[:message]} (#{w[:level]}) may not render properly in #{w[:clients]}"
-        end
+        if @view
+          @premailer = Premailer.new(view.to_html, with_html_string: true, input_encoding: Config.mailer.encoding)
 
-        @processed_content = {
-          html: @premailer.to_inline_css,
-          text: @premailer.to_plain_text,
-        }
+          @premailer.warnings.each do |w|
+            Pakyow.logger.warn "#{w[:message]} (#{w[:level]}) may not render properly in #{w[:clients]}"
+          end
+
+          @processed_content[:html] = @premailer.to_inline_css
+          @processed_content[:text] = @content || @premailer.to_plain_text
+        else
+          @processed_content[:text] = @content
+        end
 
         @processed = true
       end
 
       return @processed_content
     end
-    
+
     def deliver(recipient)
       @message.to = recipient
       @message.deliver

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pakyow-mailer
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Bryan Powell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakyow-core
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: pakyow-presenter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: premailer
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-description: A library for delivering Pakyow views as mail.
+description: A library for delivering Pakyow views via email.
 email: bryan@metabahn.com
 executables: []
 extensions: []
@@ -106,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -114,8 +114,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: pakyow-mailer
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: A library for delivering Pakyow views as mail.
+summary: Mail functionality for Pakyow apps.
 test_files: []
+has_rdoc: