markerb 1.0.0 → 1.0.1

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
-gem "rails", "3.0.7"
-gemspec
+gem "rails", "~> 3.0"
+gemspec

data/Gemfile.lock

@@ -1,79 +1,94 @@
 PATH
   remote: .
   specs:
-    markerb (1.0.0)
+    markerb (1.0.1)
       redcarpet (>= 2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
-    arel (2.0.9)
-    builder (2.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    mail (2.2.18)
-      activesupport (>= 2.3.6)
+    actionmailer (3.2.11)
+      actionpack (= 3.2.11)
+      mail (~> 2.4.4)
+    actionpack (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
+      builder (~> 3.0.0)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+    activesupport (3.2.11)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.4)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.6)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    polyglot (0.3.1)
-    rack (1.2.2)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    mime-types (1.19)
+    multi_json (1.5.0)
+    polyglot (0.3.3)
+    rack (1.4.4)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
+    rails (3.2.11)
+      actionmailer (= 3.2.11)
+      actionpack (= 3.2.11)
+      activerecord (= 3.2.11)
+      activeresource (= 3.2.11)
+      activesupport (= 3.2.11)
       bundler (~> 1.0)
-      railties (= 3.0.7)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
+      railties (= 3.2.11)
+    railties (3.2.11)
+      actionpack (= 3.2.11)
+      activesupport (= 3.2.11)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    redcarpet (2.1.0)
-    thor (0.14.6)
-    treetop (1.4.9)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.3)
+    rdoc (3.12)
+      json (~> 1.4)
+    redcarpet (2.2.2)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.16.0)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.26)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   markerb!
-  rails (= 3.0.7)
+  rails (~> 3.0)

data/Rakefile

@@ -1,29 +1,25 @@
-# encoding: UTF-8
-require 'rubygems'
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rake'
-require 'rake/rdoctask'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
+require 'rdoc/task'
+
+desc 'Default: run unit tests.'
+task :default => :test
 
+desc 'Test the simple_form plugin.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+  t.verbose = true
 end
 
-task :default => :test
-
-Rake::RDocTask.new(:rdoc) do |rdoc|
+desc 'Generate documentation for the markerb plugin.'
+RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Handlers'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.title    = 'Markerb'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
-end
+end

data/lib/markerb.rb

@@ -3,8 +3,9 @@ require "redcarpet"
 require "markerb/railtie"
 
 module Markerb
-  mattr_accessor :processing_options
-  @@processing_options = []
+  mattr_accessor :processing_options, :renderer
+  @@processing_options = {}
+  @@renderer = Redcarpet::Render::HTML
 
   class Handler
     def erb_handler
@@ -14,7 +15,7 @@ module Markerb
     def call(template)
       compiled_source = erb_handler.call(template)
       if template.formats.include?(:html)
-        "Redcarpet::Markdown.new(Redcarpet::Render::HTML, *Markerb.processing_options).render(begin;#{compiled_source};end)"
+        "Redcarpet::Markdown.new(Markerb.renderer, Markerb.processing_options).render(begin;#{compiled_source};end).html_safe"
       else
         compiled_source
       end

data/lib/markerb/version.rb

@@ -1,3 +1,3 @@
 module Markerb
-  VERSION = "1.0.0"
-end
+  VERSION = "1.0.1"
+end

data/test/markerb_test.rb

@@ -12,6 +12,18 @@ class Notifier < ActionMailer::Base
     end
   end
 
+  def link(format_type)
+    mail(:to => 'foo@bar.com', :from => "john.doe@example.com") do |format|
+      format.send(format_type)
+    end
+  end
+
+  def user(format_type)
+    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|
@@ -21,8 +33,30 @@ class Notifier < ActionMailer::Base
   end
 end
 
+class TestRenderer < Redcarpet::Render::HTML
+  attr_accessor :show_text
+  def initialize(render_options = {})
+    @show_text = render_options.delete(:show_text)
+    super(render_options)
+  end
+
+  def normal_text(text)
+    show_text ? "TEST #{text}" : "TEST"
+  end
+end
+
 class MarkerbTest < ActiveSupport::TestCase
 
+  setup do
+    @original_renderer = Markerb.renderer
+    @original_processing_options = Markerb.processing_options
+  end
+
+  teardown do
+    Markerb.renderer = @original_renderer
+    Markerb.processing_options = @original_processing_options
+  end
+
   test "plain text should be sent as a plain text" do
     email = Notifier.contact("you@example.com", :text)
     assert_equal "text/plain", email.mime_type
@@ -46,4 +80,31 @@ class MarkerbTest < ActiveSupport::TestCase
     assert_equal "<p>Dual templates <strong>rocks</strong>!</p>",
       email.parts[1].body.encoded.strip
   end
-end
+
+  test "with a custom renderer" do
+    Markerb.renderer = TestRenderer
+    email = Notifier.contact("you@example.com", :html)
+    assert_equal "text/html", email.mime_type
+    assert_equal "<p>TEST<strong>TEST</strong>TEST</p>", email.body.encoded.strip
+  end
+
+  test "with a custom renderer and options" do
+    Markerb.renderer = TestRenderer.new(:show_text => true)
+    email = Notifier.contact("you@example.com", :html)
+    assert_equal "text/html", email.mime_type
+    assert_equal "<p>TEST Dual templates <strong>TEST rocks</strong>TEST !</p>", email.body.encoded.strip
+  end
+
+  test 'with custom markdown processing options' do
+    Markerb.processing_options = {:autolink => true}
+    email = Notifier.link(:html)
+    assert_equal "text/html", email.mime_type
+    assert_equal '<p>Hello from <a href="http://www.fcstpauli.com">http://www.fcstpauli.com</a></p>', email.body.encoded.strip
+  end
+
+  test 'with partial' do
+    email = Notifier.user(:html)
+    assert_equal "text/html", email.mime_type
+    assert_equal '<p>woot! <strong>Partial</strong></p>', email.body.encoded.strip
+  end
+end

data/test/views/notifier/_user_info.markerb

@@ -0,0 +1 @@
+woot! **Partial**

data/test/views/notifier/link.markerb

@@ -0,0 +1 @@
+Hello from http://www.fcstpauli.com

data/test/views/notifier/user.markerb

@@ -0,0 +1 @@
+<%= render :partial => 'user_info' %>

metadata

@@ -1,27 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: markerb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
   prerelease: 
+  version: 1.0.1
 platform: ruby
 authors:
 - José Valim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-05 00:00:00.000000000 Z
+date: 2013-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  type: :runtime
+  prerelease: false
   name: redcarpet
-  requirement: &2152594060 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2152594060
 description: Multipart templates made easy with Markdown + ERb
 email: contact@plataformatec.com.br
 executables: []
@@ -43,7 +48,10 @@ files:
 - test/generator_test.rb
 - test/markerb_test.rb
 - test/test_helper.rb
+- test/views/notifier/_user_info.markerb
 - test/views/notifier/contact.markerb
+- test/views/notifier/link.markerb
+- test/views/notifier/user.markerb
 homepage: http://github.com/plataformatec/markerb
 licenses: []
 post_install_message: 
@@ -55,16 +63,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 4054513018052400510
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 4054513018052400510
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Multipart templates made easy with Markdown + ERb
@@ -72,4 +86,7 @@ test_files:
 - test/generator_test.rb
 - test/markerb_test.rb
 - test/test_helper.rb
+- test/views/notifier/_user_info.markerb
 - test/views/notifier/contact.markerb
+- test/views/notifier/link.markerb
+- test/views/notifier/user.markerb