actionmailer-markdown 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 874c3169e4c82c8ca92ede8f58400d04266df87c
-  data.tar.gz: 5b05edf6162e53a0df8219a37a147918a8b86c20
+  metadata.gz: 286269f0bc2b88e8598c2dfe0c3082b57664155d
+  data.tar.gz: 5ee1501c9776bf0027a19d4173712de98db8aa9f
 SHA512:
-  metadata.gz: caa5bf5a3638f51410da282d057a7cc1ee19d94d7c54e083a34c7abe125c75cf3897771047f61e16c3082ce7754fc8fe189b906ab6470191bf6349fea80a16f0
-  data.tar.gz: db8a7e8212ad66eb758bf36f36191c67a39507fb172d5bb93d84a453e9e53e9d05274c90d60511f5d507473d0508b9728e3119980cb1e5e5d7b5f89cce913c82
+  metadata.gz: 577bb5245e8c6111a0b9758ac09dd7254ca8c1c764910b5f62d931530958ca703ae6644ebf990631f84993ca5ca596ee073389a4fc7d584df0c6f6701904229e
+  data.tar.gz: 1091e0b11499b8b098aa36bc5b8d58ce5d55a737d065caa6f4e4023a8ecab38ea7fc3b89193eb01a5e28b381a99511cccd1cb7468a1f7b5541629d5d777b1c44

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+log

data/README.md

@@ -1,6 +1,6 @@
 # ActionMailer::Markdown
 
-![build status](https://travis-ci.org/fnando/actionmailer-markdown.svg)
+[![build status](https://travis-ci.org/fnando/actionmailer-markdown.svg)](https://travis-ci.org/fnando/actionmailer-markdown)
 
 A different take on using ActionMailer, Markdown and I18n.
 
@@ -194,7 +194,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/actionmailer-markdown. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/fnando/actionmailer-markdown. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
 
 ## License

data/actionmailer-markdown.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rails'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'minitest-utils'
   spec.add_development_dependency 'pry-meta'

data/lib/action_mailer/markdown.rb

@@ -1,11 +1,18 @@
 module ActionMailer
   module Markdown
     require 'action_mailer'
+    require 'action_view'
     require 'redcarpet'
 
     require 'action_mailer/markdown/version'
+    require 'action_mailer/markdown/resolver'
     require 'action_mailer/markdown/ext'
     require 'action_mailer/markdown/renderer'
     require 'action_mailer/markdown/renderer/text'
+    require 'action_mailer/markdown/template_handler'
   end
 end
+
+ActionMailer::Base.prepend_view_path(ActionMailer::Markdown::Resolver.new)
+ActionView::Template.register_template_handler(:md, ActionMailer::Markdown::TemplateHandler::HTML)
+ActionView::Template.register_template_handler(:mdt, ActionMailer::Markdown::TemplateHandler::Text)

data/lib/action_mailer/markdown/ext.rb

@@ -3,24 +3,11 @@ ActionMailer::Base.class_eval do
 
   define_method(:mail) do |headers = {}, &block|
     options = variables_set_by_user
-    message = get_translation_for('body', options)
     subject = get_translation_for('subject', options)
     headers[:subject] ||= subject
-
-    if message
-      block = proc do |format|
-        format.text { render plain: ActionMailer::Markdown.text(message) }
-        format.html { render html: ActionMailer::Markdown.html(message).html_safe }
-      end
-    end
-
     mail_method.bind(self).call(headers, &block)
   end
 
-  def mailer_scope
-    self.class.mailer_name.tr('/', '.')
-  end
-
   def get_translation_for(key, options)
     I18n.t(key, options.merge(scope: [mailer_scope, action_name], raise: true))
   rescue I18n::MissingTranslationData
@@ -34,4 +21,8 @@ ActionMailer::Base.class_eval do
       buffer[name.to_sym] = instance_variable_get("@#{name}")
     end
   end
+
+  def mailer_scope
+    self.class.mailer_name.tr('/', '.')
+  end
 end

data/lib/action_mailer/markdown/renderer/text.rb

@@ -72,7 +72,7 @@ module ActionMailer
           end
 
           links_list = links.map.with_index(1) {|link, index| "[#{index}]: #{link}" }.join("\n")
-          node = Nokogiri::HTML.fragment "<pre>#{links_list}</pre>"
+          node = Nokogiri::HTML.fragment "<pre>\n#{links_list}\n</pre>"
 
           root << node
         end

data/lib/action_mailer/markdown/resolver.rb

@@ -0,0 +1,45 @@
+module ActionMailer
+  module Markdown
+    class Resolver < ActionView::Resolver
+      FORMAT_TO_EXTENSION = {
+        text: :mdt,
+        html: :md
+      }
+
+      def find_templates(name, prefix, partial, details)
+        contents = find_contents(name, prefix, details)
+        return [] unless contents
+
+        %i[html text].map do |format|
+          identifier = "#{prefix}##{name} (#{format})"
+          path = virtual_path(name, prefix)
+          build_template(path, contents, identifier, format)
+        end
+      end
+
+      def build_template(path, contents, identifier, format)
+        ActionView::Template.new(contents, identifier, handler_for(format),
+          virtual_path: path,
+          format: format
+        )
+      end
+
+      def handler_for(format)
+        ActionView::Template
+          .registered_template_handler(FORMAT_TO_EXTENSION.fetch(format))
+      end
+
+      def virtual_path(name, prefix)
+        "#{prefix}/#{name}"
+      end
+
+      def find_contents(name, prefix, details)
+        key = [prefix, name, :body].join(I18n.default_separator)
+
+        I18n.with_locale(details[:locale].first || I18n.locale) do
+          I18n.t(key, raise: true) rescue nil
+        end
+      end
+    end
+  end
+end

data/lib/action_mailer/markdown/template_handler.rb

@@ -0,0 +1,33 @@
+module ActionMailer
+  module Markdown
+    module TemplateHandler
+      UNDERSCORE = '_'.freeze
+
+      def self.render(template, context, format)
+        source = template.rstrip % extract_variables(context)
+        ActionMailer::Markdown.public_send(format, source)
+      end
+
+      def self.extract_variables(context)
+        context
+          .instance_variable_get(:@_assigns)
+          .each_with_object({}) do |(name, value), buffer|
+            next if name.start_with?(UNDERSCORE)
+            buffer[name.to_sym] = value
+          end
+      end
+
+      class Text
+        def self.call(template)
+          %[ActionMailer::Markdown::TemplateHandler.render(#{template.source.inspect}, self, :text)]
+        end
+      end
+
+      class HTML
+        def self.call(template)
+          %[ActionMailer::Markdown::TemplateHandler.render(#{template.source.inspect}, self, :html)]
+        end
+      end
+    end
+  end
+end

data/lib/action_mailer/markdown/version.rb

@@ -1,5 +1,5 @@
 module ActionMailer
   module Markdown
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer-markdown
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +157,8 @@ files:
 - lib/action_mailer/markdown/ext.rb
 - lib/action_mailer/markdown/renderer.rb
 - lib/action_mailer/markdown/renderer/text.rb
+- lib/action_mailer/markdown/resolver.rb
+- lib/action_mailer/markdown/template_handler.rb
 - lib/action_mailer/markdown/version.rb
 - lib/actionmailer-markdown.rb
 homepage: https://github.com/fnando/actionmailer-markdown
@@ -165,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A different take on using ActionMailer, Markdown and I18n.