actionmailer-markdown 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 286269f0bc2b88e8598c2dfe0c3082b57664155d
-  data.tar.gz: 5ee1501c9776bf0027a19d4173712de98db8aa9f
+  metadata.gz: bceab9613ce531fdbe9702d005d92c6912c73a4f
+  data.tar.gz: 11d4c007f396d05099801df95ba96dcb960c9ad1
 SHA512:
-  metadata.gz: 577bb5245e8c6111a0b9758ac09dd7254ca8c1c764910b5f62d931530958ca703ae6644ebf990631f84993ca5ca596ee073389a4fc7d584df0c6f6701904229e
-  data.tar.gz: 1091e0b11499b8b098aa36bc5b8d58ce5d55a737d065caa6f4e4023a8ecab38ea7fc3b89193eb01a5e28b381a99511cccd1cb7468a1f7b5541629d5d777b1c44
+  metadata.gz: ca9ce1c031eca37131bf9a6fc941f931563acc03cf189ce5a5fce40cf06048c26ed6f3b673cd5a4d17ce4c48126efb6a509236effb5e32c85acd4bdebab35592
+  data.tar.gz: 1b897a6b32ea047278e43f709fde5de33a61a29a59a0086c2285112feb2616388b6bd0ba6ce05c848a4f81802c0718d500fca534fa0cd38d362799ea1f5ee08f

data/.travis.yml

@@ -2,7 +2,10 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 2.2.2
+- 2.3.1
 before_install: gem install bundler
 notifications:
   email: false
+env:
+  global:
+    secure: I9mcU1pn5N3LNhYv2AlaYm9myrnJ09XyCP3UC6JoWwI85xObKNShMcO0ADKEDU1T0QhrMVgX7Vrp/5mCgEkSYhDFy0NG62xZZKPC3CHPizqN56v0vX+7/tecAcSQ0Fz+ZrVZ1qiGrPesA9ssYWMROE0/DYWJRl0axxbstP6YBBN8TDdF2RAIYcLIb0NJc7ZlrJYoKPWSgEsio476/gschDxV5tK/AA0uvUJjejQFDWxhm87DRcfbwW+sb/URvCkUN4+dT5lKKFZ/UfOGVWmkyFOjleluSe0vyaR4/W3THB4djGpE5e3feGb8bTPbkyqBmpy6Js0+DihCaK58e3DbhT2vk0gSOVi/xMr6Rx7FOZrRQMnH8QkEnoxS4BH3ySAN08cQcict3LIN5GGW340QebDS5u7KwwyJ9BNyqocC1Ob1LZJFDHMfj3S96TLQ2W08vNkcOY5dBvUw9JzJvl6neRjIJila62Gt+Gezij9KnXrr1lBx7R8frR/LwL/32ET4E4lTXVp1soapqSHs9TF72EXOywIrsnJZDRFEngbxKdxuNB0diVWhuTipmVkSdExleXfsfGTGfS4iHYJEGOOWxGSEdiPWc5tNWxsAmA1lyM2jpJl7/XWzaRU5eZl9psYvGCL+nKW6gZrqbFl95D/txD5pAAHRg+Rpl1LE8VDIs3w=

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in actionmailer-markdown.gemspec
 gemspec

data/README.md

@@ -1,6 +1,10 @@
 # ActionMailer::Markdown
 
-[![build status](https://travis-ci.org/fnando/actionmailer-markdown.svg)](https://travis-ci.org/fnando/actionmailer-markdown)
+[![Travis-CI](https://travis-ci.org/fnando/actionmailer-markdown.png)](https://travis-ci.org/fnando/actionmailer-markdown)
+[![Code Climate](https://codeclimate.com/github/fnando/actionmailer-markdown/badges/gpa.svg)](https://codeclimate.com/github/fnando/actionmailer-markdown)
+[![Test Coverage](https://codeclimate.com/github/fnando/actionmailer-markdown/badges/coverage.svg)](https://codeclimate.com/github/fnando/actionmailer-markdown/coverage)
+[![Gem](https://img.shields.io/gem/v/actionmailer-markdown.svg)](https://rubygems.org/gems/actionmailer-markdown)
+[![Gem](https://img.shields.io/gem/dt/actionmailer-markdown.svg)](https://rubygems.org/gems/actionmailer-markdown)
 
 A different take on using ActionMailer, Markdown and I18n.
 

data/Rakefile

@@ -1,10 +1,11 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
+require "bundler/gem_tasks"
+require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.libs << 'lib'
-  t.test_files = FileList['test/**/*_test.rb']
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
+  t.warning = false
 end
 
-task :default => :test
+task default: :test

data/actionmailer-markdown.gemspec

@@ -1,27 +1,28 @@
-require './lib/action_mailer/markdown/version'
+require "./lib/action_mailer/markdown/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'actionmailer-markdown'
+  spec.name          = "actionmailer-markdown"
   spec.version       = ActionMailer::Markdown::VERSION
-  spec.authors       = ['Nando Vieira']
-  spec.email         = ['fnando.vieira@gmail.com']
-  spec.summary       = 'A different take on using ActionMailer, Markdown and I18n.'
+  spec.authors       = ["Nando Vieira"]
+  spec.email         = ["fnando.vieira@gmail.com"]
+  spec.summary       = "A different take on using ActionMailer, Markdown and I18n."
   spec.description   = spec.summary
-  spec.homepage      = 'https://github.com/fnando/actionmailer-markdown'
-  spec.license       = 'MIT'
+  spec.homepage      = "https://github.com/fnando/actionmailer-markdown"
+  spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.files         = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/}) }
+  spec.executables   = spec.files.grep(%r{^exe/}) {|f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
-  spec.add_dependency 'actionmailer'
-  spec.add_dependency 'redcarpet'
+  spec.add_dependency "actionmailer"
+  spec.add_dependency "redcarpet"
 
-  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'
-  spec.add_development_dependency 'kramdown'
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rails"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest-utils"
+  spec.add_development_dependency "pry-meta"
+  spec.add_development_dependency "kramdown"
+  spec.add_development_dependency "codeclimate-test-reporter"
 end

data/lib/action_mailer/markdown.rb

@@ -1,15 +1,15 @@
 module ActionMailer
   module Markdown
-    require 'action_mailer'
-    require 'action_view'
-    require 'redcarpet'
+    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'
+    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
 

data/lib/action_mailer/markdown/ext.rb

@@ -3,8 +3,9 @@ ActionMailer::Base.class_eval do
 
   define_method(:mail) do |headers = {}, &block|
     options = variables_set_by_user
-    subject = get_translation_for('subject', options)
+    subject = get_translation_for("subject", options)
     headers[:subject] ||= subject
+    headers[:locals] = {a: 1}
     mail_method.bind(self).call(headers, &block)
   end
 
@@ -23,6 +24,6 @@ ActionMailer::Base.class_eval do
   end
 
   def mailer_scope
-    self.class.mailer_name.tr('/', '.')
+    self.class.mailer_name.tr("/", ".")
   end
 end

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

@@ -10,7 +10,7 @@ module ActionMailer
 
         def initialize(source)
           @source = source
-          @root = Nokogiri::HTML(Markdown.html(source)).css('body')
+          @root = Nokogiri::HTML(Markdown.html(source)).css("body")
         end
 
         def extract
@@ -25,32 +25,32 @@ module ActionMailer
         end
 
         def process_code
-          root.css('code').each do |code|
-            next if code.parent.name == 'pre'
+          root.css("code").each do |code|
+            next if code.parent.name == "pre"
             code.content = "`#{code.content}`"
           end
         end
 
         def process_hr
-          root.css('hr').each(&:remove)
+          root.css("hr").each(&:remove)
         end
 
         def process_h1
-          root.css('h1').each do |heading|
-            heading.content = "#{heading.text}\n#{'=' * heading.text.size}"
+          root.css("h1").each do |heading|
+            heading.content = build_heading(heading.text, "=")
           end
         end
 
         def process_h2
-          root.css('h2').each do |heading|
-            heading.content = "\n#{heading.text}\n#{'-' * heading.text.size}"
+          root.css("h2").each do |heading|
+            heading.content = "\n#{build_heading(heading.text, "-")}"
           end
         end
 
         def process_lists
-          root.css('ol, ul').each do |list|
-            list.css('li').to_enum(:each).with_index(1) do |item, index|
-              prefix = (list.name == 'ol' ? "#{index}." : "-")
+          root.css("ol, ul").each do |list|
+            list.css("li").to_enum(:each).with_index(1) do |item, index|
+              prefix = (list.name == "ol" ? "#{index}." : "-")
               item.content = "#{prefix} #{item.text}"
             end
           end
@@ -59,11 +59,11 @@ module ActionMailer
         def process_links
           links = []
 
-          root.css('a').each do |link|
-            href = link['href']
+          root.css("a").each do |link|
+            href = link["href"]
 
-            if href.starts_with?('mailto:')
-              link.content = href.sub('mailto:', '')
+            if href.starts_with?("mailto:")
+              link.content = href.sub("mailto:", "")
             elsif link.content.match(%r[^(?!\w+://)])
               links << href unless links.include?(href)
               index = links.index(href) + 1
@@ -76,6 +76,12 @@ module ActionMailer
 
           root << node
         end
+
+        private
+
+        def build_heading(text, separator)
+          "#{text}\n#{separator * text.size}"
+        end
       end
     end
   end

data/lib/action_mailer/markdown/resolver.rb

@@ -6,7 +6,7 @@ module ActionMailer
         html: :md
       }
 
-      def find_templates(name, prefix, partial, details)
+      def find_templates(name, prefix, _partial, details, outside_app_allowed = false)
         contents = find_contents(name, prefix, details)
         return [] unless contents
 
@@ -18,9 +18,11 @@ module ActionMailer
       end
 
       def build_template(path, contents, identifier, format)
-        ActionView::Template.new(contents, identifier, handler_for(format),
-          virtual_path: path,
-          format: format
+        ActionView::Template.new(
+          contents,
+          identifier,
+          handler_for(format),
+          virtual_path: path, format: format
         )
       end
 
@@ -33,12 +35,16 @@ module ActionMailer
         "#{prefix}/#{name}"
       end
 
-      def find_contents(name, prefix, details)
-        key = [prefix, name, :body].join(I18n.default_separator)
+      def translations
+        I18n.backend.initialize unless I18n.backend.initialized?
+        I18n.backend.send(:translations)
+      end
 
-        I18n.with_locale(details[:locale].first || I18n.locale) do
-          I18n.t(key, raise: true) rescue nil
-        end
+      def find_contents(name, prefix, details)
+        [details[:locale].try(:first) || I18n.locale, prefix, name, :body]
+          .reduce(translations) do |buffer, key|
+            buffer && buffer[key.to_sym]
+          end
       end
     end
   end

data/lib/action_mailer/markdown/template_handler.rb

@@ -1,13 +1,24 @@
 module ActionMailer
   module Markdown
     module TemplateHandler
-      UNDERSCORE = '_'.freeze
+      UNDERSCORE = "_".freeze
+      OBJECT_ATTRIBUTE_MATCHER = /%\{([a-z0-9_]+\.[a-z0-9_]+)\}/i
 
       def self.render(template, context, format)
-        source = template.rstrip % extract_variables(context)
+        variables = expand_variables(template, extract_variables(context))
+        source = template.rstrip % variables
         ActionMailer::Markdown.public_send(format, source)
       end
 
+      def self.expand_variables(template, variables)
+        template.scan(OBJECT_ATTRIBUTE_MATCHER)
+          .map(&:first)
+          .each_with_object(variables) do |match, buffer|
+            target, attribute = match.split(".")
+            buffer[match.to_sym] = variables[target.to_sym].public_send(attribute)
+          end
+      end
+
       def self.extract_variables(context)
         context
           .instance_variable_get(:@_assigns)
@@ -19,13 +30,19 @@ module ActionMailer
 
       class Text
         def self.call(template)
-          %[ActionMailer::Markdown::TemplateHandler.render(#{template.source.inspect}, self, :text)]
+          %[
+            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)]
+          %[
+            ActionMailer::Markdown::TemplateHandler
+              .render(#{template.source.inspect}, self, :html)
+          ]
         end
       end
     end

data/lib/action_mailer/markdown/version.rb

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

data/lib/actionmailer-markdown.rb

@@ -1 +1 @@
-require 'action_mailer/markdown'
+require "action_mailer/markdown"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer-markdown
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -42,30 +42,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  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'
 description: A different take on using ActionMailer, Markdown and I18n.
 email:
 - fnando.vieira@gmail.com
@@ -181,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A different take on using ActionMailer, Markdown and I18n.