multiparterb 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 251b6ea729b75bd4bf083c6c5f25e84ed0d40ed4
-  data.tar.gz: 87ccb68f99ac3df5071dc7fbcf145174eafbdd97
+  metadata.gz: bc69aa4a1365d5167eaa5a564fecdcc2c1eb8ab9
+  data.tar.gz: 8903571b2e83db708a5178c9b050b355e305a465
 SHA512:
-  metadata.gz: 0c36a217f12d60c582e9cd4db64c48bbc7e5c6aa9fa253c7aa086976ff33a28f4ea0f0ff84f899bbd1227b5afab3dc278a9378765145aa44aedeb9fdfb65f9c9
-  data.tar.gz: b24e28a6fb3116f3a816d3cf1999d792fb362b1e7486e33665e9ceaf0a4975c13e2f413e49d2508e66b12fd6c57a7f7722d085d5df4fb93ae5d3bdc5b2f97715
+  metadata.gz: da2c4c6b126b50a5fb802064c3af747e70bd3d5e0cf16a7079fb2cd1bbd1029d4fdd55ab40b178b5e3381d2ca60f8341d075618cb4a323f3aa47ae9e3034180a
+  data.tar.gz: 6f1436773cc3e515a462153d94ca6ba6f576a3a210a916c3b6e217b033bdce410ade1b3a86d0170a18bab020eab84ee6740ecd26ccea68cd6b813e9c5c63734a

data/README.md

@@ -44,11 +44,11 @@ This example formats the elements as it finds them, standard HTML output. _(TODO
 
 ```ruby
 class MyHTMLFormatter < BaseFormatter
-  def email_heading(text)
+  def heading(text)
     content_tag :h1, text
   end
 
-  def email_text(text=nil, &block)
+  def text(text=nil, &block)
     content_tag :p, super
   end
 
@@ -62,11 +62,11 @@ And here is an example text formatter.
 
 ```ruby
 class MyTextFormatter < BaseFormatter
-  def email_heading(text)
+  def heading(text)
     "*** #{text} ***\n"
   end
 
-  def email_text(text=nil, &block)
+  def text(text=nil, &block)
     text + "\n"
   end
 
@@ -87,9 +87,9 @@ It will then call the relevent method for each element it finds in the template.
 
 The set of elements this currently supports, and the method that will get called are :
 
-* `<h1></h1>` => `email_heading`
-* `<p></p>` => `email_text`
-* `<a href="https://example.com">example</a>` => `anchor`
+* `<h1></h1>` => `Formatter#heading`
+* `<p></p>` => `Formatter#htext`
+* `<a href="https://example.com">example</a>` => `Formatter#hanchor`
 
 ### Mailers
 

data/lib/multiparterb/formatter.rb

@@ -5,26 +5,28 @@ module MultipartErb
 
   class Formatter
     def self.parse(node, formatter)
-      result = ""
-
-      node.children.each do |child|
-        result << case child.name
-                  when 'h1'
-                    formatter.email_heading(parse(child, formatter).html_safe)
-                  when 'p'
-                    formatter.email_text(parse(child, formatter).html_safe)
-                  when 'a'
-                    formatter.anchor(
-                      parse(child, formatter).html_safe,
-                      child.attributes['href'].content)
-                  when 'text'
-                    child.text
-                  else
-                    parse(child, formatter)
-                  end
+      "".tap do |result|
+        node.children.each do |child|
+          result << lookup(child, formatter)
+        end
       end
+    end
 
-      result
+    def self.lookup(child, formatter)
+      case child.name
+      when 'h1'
+        formatter.heading(parse(child, formatter).html_safe)
+      when 'p'
+        formatter.text(parse(child, formatter).html_safe)
+      when 'a'
+        formatter.anchor(
+          parse(child, formatter).html_safe,
+          child.attributes['href'].content)
+      when 'text'
+        child.text
+      else
+        parse(child, formatter)
+      end
     end
 
     def self.to_html(compiled_source)

data/lib/multiparterb/formatters/base_formatter.rb

@@ -2,11 +2,11 @@ class BaseFormatter
   include ActionView::Helpers::TagHelper
   include ActionView::Context
 
-  def email_heading(text)
+  def heading(text)
     raise NotImplementedError
   end
 
-  def email_text(text=nil, &block)
+  def text(text=nil, &block)
     text || capture(&block)
   end
 

data/lib/multiparterb/version.rb

@@ -1,3 +1,3 @@
 module MultipartErb
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/multiparterb.rb

@@ -17,8 +17,10 @@ module MultipartErb
 
       if template.formats.include?(:html)
         "MultipartErb::Formatter.to_html(begin;#{compiled_source};end).html_safe"
-      else
+      elsif template.formats.include?(:text)
         "MultipartErb::Formatter.to_text(begin;#{compiled_source};end).html_safe"
+      else
+        compiled_source
       end
     end
   end

data/test/formatters/my_html_formatter.rb

@@ -1,9 +1,9 @@
 class MyHTMLFormatter < BaseFormatter
-  def email_heading(text)
+  def heading(text)
     content_tag :h1, text
   end
 
-  def email_text(text=nil, &block)
+  def text(text=nil, &block)
     content_tag :p, super
   end
 

data/test/formatters/my_text_formatter.rb

@@ -1,9 +1,9 @@
 class MyTextFormatter < BaseFormatter
-  def email_heading(text)
+  def heading(text)
     text + "\n" + ("-" * text.length) + "\n"
   end
 
-  def email_text(text=nil, &block)
+  def text(text=nil, &block)
     text + "\n"
   end
 

data/test/generator_test.rb

@@ -9,8 +9,6 @@ class GeneratorTest < Rails::Generators::TestCase
   test "assert all views are properly created with given name" do
     run_generator %w(notifier foo bar baz)
 
-    # TODO: would be nice to have .erb as the pre-processor in the file name
-    # assert_file "app/views/notifier/foo.multipart.erb"
     assert_file "app/views/notifier/foo.multipart"
     assert_file "app/views/notifier/bar.multipart"
     assert_file "app/views/notifier/baz.multipart"

data/test/multiparterb_test.rb

@@ -5,9 +5,6 @@ class Notifier < ActionMailer::Base
 
   layout false
 
-  # TODO: want this to output both html and text, unless gem option given to give preferance
-  # mail(:to => @recipient, :from => "john.doe@example.com")
-
   def contact(recipient, format_type)
     @recipient = recipient
     mail(:to => @recipient, :from => "john.doe@example.com") do |format|
@@ -16,22 +13,28 @@ class Notifier < ActionMailer::Base
   end
 
   def link(format_type)
-    mail(:to => 'foo@bar.com', :from => "john.doe@example.com") do |format|
+    mail(:to => "foo@bar.com", :from => "john.doe@example.com") do |format|
       format.send(format_type)
     end
   end
 
+  def welcome
+    mail do |format|
+      format.html
+      format.text
+    end
+  end
+
   def user(format_type)
-    mail(:to => 'foo@bar.com', :from => "john.doe@example.com") do |format|
+    mail(:to => "foo@bar.com", :from => "john.doe@example.com") do |format|
       format.send(format_type)
     end
   end
 
-  def multiple_format_contact(recipient)
-    @recipient = recipient
-    mail(:to => @recipient, :from => "john.doe@example.com", :template => "contact") do |format|
-      format.text  { render 'contact' }
-      format.html  { render 'contact' }
+  def multiple_format_contact
+    mail(:to => "you@example.com", :from => "john.doe@example.com", :template => "contact") do |format|
+      format.text  { render "contact" }
+      format.html  { render "contact" }
     end
   end
 end
@@ -41,7 +44,6 @@ class MultipartErbTest < ActiveSupport::TestCase
     email = Notifier.contact("you@example.com", :text)
     assert_equal "text/plain", email.mime_type
     assert_equal false, email.multipart?
-    #assert_equal "Contact Heading\r\n---------------\r\n\r\n", email.body.encoded.strip
     assert_equal "Contact Heading\n---------------\n\n", email.body.raw_source
   end
 
@@ -49,12 +51,11 @@ class MultipartErbTest < ActiveSupport::TestCase
     email = Notifier.contact("you@example.com", :html)
     assert_equal "text/html", email.mime_type
     assert_equal false, email.multipart?
-    #assert_equal "Contact Heading\r\n---------------\r\n\r\n", email.body.encoded.strip
     assert_equal "<h1>Contact Heading</h1>", email.body.encoded.strip
   end
 
-  test 'dealing with multipart e-mails' do
-    email = Notifier.multiple_format_contact("you@example.com")
+  test "dealing with multipart e-mails" do
+    email = Notifier.multiple_format_contact
     assert_equal 2, email.parts.size
     assert_equal true, email.multipart?
     assert_equal "multipart/alternative", email.mime_type
@@ -64,15 +65,26 @@ class MultipartErbTest < ActiveSupport::TestCase
     assert_equal "<h1>Contact Heading</h1>", email.parts[1].body.encoded.strip
   end
 
-  test 'with link' do
+  test "format order is not important and default markup is text" do
+    email = Notifier.welcome
+    assert_equal 2, email.parts.size
+    assert_equal true, email.multipart?
+    assert_equal "multipart/alternative", email.mime_type
+    assert_equal "text/plain", email.parts[0].mime_type
+    assert_equal "Welcome\n\n", email.parts[0].body.raw_source
+    assert_equal "text/html", email.parts[1].mime_type
+    assert_equal "<p>Welcome\r\n</p>", email.parts[1].body.encoded.strip
+  end
+
+  test "with link" do
     email = Notifier.link(:html)
     assert_equal "text/html", email.mime_type
     assert_equal "<p>A link to <a href=\"https://econsultancy.com\">Econsultancy</a></p>", email.body.encoded.strip
   end
 
-  test 'with partial' do
+  test "with partial" do
     email = Notifier.user(:html)
     assert_equal "text/html", email.mime_type
-    #assert_equal '<p>User template rendering a partial User Info Partial</p>', email.body.encoded.strip
+    assert_equal "<p>User template rendering a partial </p><p>User Info Partial</p>", email.body.encoded.strip
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multiparterb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ian Vaughan