maildown 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc3cbe06b036b2b31896e94b04c323ff7b62ee2a
-  data.tar.gz: 0569b01477e18c99bbb4bb5d5193b8e867878f21
+  metadata.gz: 793a913246a2706d4336913e23b351e8c255c3f3
+  data.tar.gz: 0d5295b0a21a1e5d918af96c2ff3d0ed48ad5c3c
 SHA512:
-  metadata.gz: cca81efba9a4c9f6e1e86243c33ca4f3e4f2678cd81270699386782da509c13b6410598b629864f436838b28134e24c6c84876f3d635a1bbd845a0fd3ec225b7
-  data.tar.gz: 459d8382ce237bb3c88773a45990fd3bbd85616ea6f084bde744089645fefe636efb5d8f793a87bb12742692a73bd8a53e7c28ac080836a47016567955788648
+  metadata.gz: 32c8aaeaeaa264b09bea442e80e80e5652c6f3b3eaeb22051841b17da1508ded3b020b2980c9dd059597e66f8a684e55f9d331b338d6ff4cd69d6903e9500d09
+  data.tar.gz: 0bf4c6835f2e1b74f029eea5214e9ab00cc58d6dddc55b46ed51a8599d777ebe20916ca00c3d5b4f4c1f1557e63b6ea572b8982ec02c3eef466bebdfaaeceadc

data/Rakefile

@@ -10,7 +10,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Maildown'
   rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
@@ -32,5 +32,4 @@ end
 
 task default: :test
 
-
 require "bundler/gem_tasks"

data/lib/maildown/ext/action_mailer.rb

@@ -1,3 +1,5 @@
+require 'action_mailer'
+
 mail_view_klass = ActionMailer::Base.view_context_class
 mail_view_klass.default_formats = (mail_view_klass.default_formats << :md)
 Mime::Type.register "text/md", :md, [], %w(md)

data/lib/maildown/markdown_engine.rb

@@ -1,21 +1,46 @@
 module Maildown
   module MarkdownEngine
     def self.to_html(string)
-      block.call(string)
+      html_block.call(string)
+    end
+
+    def self.to_text(string)
+      text_block.call(string)
+    end
+
+    def self.set_html(&block)
+      @maildown_markdown_engine_html_block = block
     end
 
     def self.set(&block)
-      Thread.current[:maildown_markdown_engine_block] = block
+      set_html(&block)
+    end
+
+    class << self
+      extend Gem::Deprecate
+      deprecate :set, :set_html, 2017, 6
     end
 
-    def self.block
-      Thread.current[:maildown_markdown_engine_block] || default
+    def self.set_text(&block)
+      @maildown_markdown_engine_text_block = block
     end
 
-    def self.default
+    def self.html_block
+      @maildown_markdown_engine_html_block || default_html_block
+    end
+
+    def self.text_block
+      @maildown_markdown_engine_text_block || default_text_block
+    end
+
+    def self.default_html_block
       require 'kramdown' unless defined? Kramdown
 
       ->(string) { Kramdown::Document.new(string).to_html }
     end
+
+    def self.default_text_block
+      ->(string) { string }
+    end
   end
 end

data/lib/maildown/md.rb

@@ -13,7 +13,7 @@ module Maildown
     end
 
     def to_text
-      string
+      Maildown::MarkdownEngine.to_text(string)
     end
 
     def to_html

data/lib/maildown/version.rb

@@ -1,3 +1,3 @@
 module Maildown
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/test/unit/markdown_engine_test.rb

@@ -23,4 +23,15 @@ class MarkdownEngineTest < ActiveSupport::TestCase
     end
     thread.join
   end
+
+  test "custom engine works in multiple threads" do
+    Maildown::MarkdownEngine.set do |text|
+      "foo: #{text}"
+    end
+
+    thread = Thread.new do
+      assert_equal "foo: bar", Maildown::MarkdownEngine.to_html("bar")
+    end
+    thread.join
+  end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: maildown
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - schneems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  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: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: Best practice is to send text/plain && text/html markdown works great
   for both, so why write your templates twices?
 email:
@@ -125,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Markdown in your mailbox