markdown_views 0.4.0 → 2.0.0

data/app/assets/stylesheets/rouge.tulip.css

@@ -0,0 +1,164 @@
+.rouge-highlight table td { padding: 5px; }
+.rouge-highlight table pre { margin: 0; }
+.rouge-highlight {
+  color: #FFFFFF;
+  background-color: #231529;
+}
+.rouge-highlight .c, .rouge-highlight .cd, .rouge-highlight .cm, .rouge-highlight .c1, .rouge-highlight .cs {
+  color: #6D6E70;
+  font-style: italic;
+}
+.rouge-highlight .cp {
+  color: #41ff5b;
+  font-weight: bold;
+  font-style: italic;
+}
+.rouge-highlight .err {
+  color: #FFFFFF;
+  background-color: #CC0000;
+}
+.rouge-highlight .gr {
+  color: #FFFFFF;
+  background-color: #CC0000;
+}
+.rouge-highlight .k, .rouge-highlight .kd, .rouge-highlight .kv {
+  color: #FFF02A;
+  font-weight: bold;
+}
+.rouge-highlight .o, .rouge-highlight .ow {
+  color: #41ff5b;
+}
+.rouge-highlight .p, .rouge-highlight .pi {
+  color: #41ff5b;
+}
+.rouge-highlight .gd {
+  color: #CC0000;
+}
+.rouge-highlight .gi {
+  color: #3FB34F;
+}
+.rouge-highlight .ge {
+  font-style: italic;
+}
+.rouge-highlight .gs {
+  font-weight: bold;
+}
+.rouge-highlight .gt {
+  color: #FFFFFF;
+  background-color: #766DAF;
+}
+.rouge-highlight .gl {
+  color: #FFFFFF;
+  background-color: #766DAF;
+}
+.rouge-highlight .kc {
+  color: #9f93e6;
+  font-weight: bold;
+}
+.rouge-highlight .kn {
+  color: #FFFFFF;
+  font-weight: bold;
+}
+.rouge-highlight .kp {
+  color: #FFFFFF;
+  font-weight: bold;
+}
+.rouge-highlight .kr {
+  color: #FFFFFF;
+  font-weight: bold;
+}
+.rouge-highlight .gh {
+  color: #FFFFFF;
+  font-weight: bold;
+}
+.rouge-highlight .gu {
+  color: #FFFFFF;
+  font-weight: bold;
+}
+.rouge-highlight .kt {
+  color: #FAAF4C;
+  font-weight: bold;
+}
+.rouge-highlight .no {
+  color: #FAAF4C;
+  font-weight: bold;
+}
+.rouge-highlight .nc {
+  color: #FAAF4C;
+  font-weight: bold;
+}
+.rouge-highlight .nd {
+  color: #FAAF4C;
+  font-weight: bold;
+}
+.rouge-highlight .nn {
+  color: #FAAF4C;
+  font-weight: bold;
+}
+.rouge-highlight .bp {
+  color: #FAAF4C;
+  font-weight: bold;
+}
+.rouge-highlight .ne {
+  color: #FAAF4C;
+  font-weight: bold;
+}
+.rouge-highlight .nl {
+  color: #9f93e6;
+  font-weight: bold;
+}
+.rouge-highlight .nt {
+  color: #9f93e6;
+  font-weight: bold;
+}
+.rouge-highlight .m, .rouge-highlight .mf, .rouge-highlight .mh, .rouge-highlight .mi, .rouge-highlight .il, .rouge-highlight .mo, .rouge-highlight .mb, .rouge-highlight .mx {
+  color: #9f93e6;
+  font-weight: bold;
+}
+.rouge-highlight .ld {
+  color: #9f93e6;
+  font-weight: bold;
+}
+.rouge-highlight .ss {
+  color: #9f93e6;
+  font-weight: bold;
+}
+.rouge-highlight .s, .rouge-highlight .sb, .rouge-highlight .sd, .rouge-highlight .s2, .rouge-highlight .sh, .rouge-highlight .sx, .rouge-highlight .sr, .rouge-highlight .s1 {
+  color: #fff0a6;
+  font-weight: bold;
+}
+.rouge-highlight .se {
+  color: #FAAF4C;
+  font-weight: bold;
+}
+.rouge-highlight .sc {
+  color: #FAAF4C;
+  font-weight: bold;
+}
+.rouge-highlight .si {
+  color: #FAAF4C;
+  font-weight: bold;
+}
+.rouge-highlight .nb {
+  font-weight: bold;
+}
+.rouge-highlight .ni {
+  color: #999999;
+  font-weight: bold;
+}
+.rouge-highlight .w {
+  color: #BBBBBB;
+}
+.rouge-highlight .nf {
+  color: #41ff5b;
+}
+.rouge-highlight .py {
+  color: #41ff5b;
+}
+.rouge-highlight .na {
+  color: #41ff5b;
+}
+.rouge-highlight .nv, .rouge-highlight .vc, .rouge-highlight .vg, .rouge-highlight .vi {
+  color: #41ff5b;
+  font-weight: bold;
+}

data/lib/markdown_views.rb

@@ -1,8 +1,6 @@
-# require 'active_support/core_ext/module/attribute_accessors'
 require 'action_view'
-require 'cgi'
-require 'coderay'
-require 'redcarpet'
+require 'commonmarker'
+require 'rouge'
 
 %w(config engine handler renderer version).each do |f|
   require "markdown_views/#{f}"

data/lib/markdown_views/config.rb

@@ -5,34 +5,26 @@ module MarkdownViews
   mattr_accessor :preprocessor
   self.preprocessor = :erb
 
+  mattr_accessor :extensions
+  self.extensions = %i(autolink strikethrough table tagfilter)
+
+  mattr_accessor :transformers
+  self.transformers = %i(code_blocks)
+
   mattr_accessor :rendering_opts
-  self.rendering_opts = {
-    # filter_html: true,
-    hard_wrap: true,
-    # link_attributes: {'data-popup'=> true},
-    # no_styles: true,
-    # safe_links_only: true,
-  }
+  self.rendering_opts = %i(UNSAFE GITHUB_PRE_LANG HARDBREAKS TABLE_PREFER_STYLE_ATTRIBUTES)
+    # DEFAULT UNSAFE GITHUB_PRE_LANG HARDBREAKS NOBREAKS SOURCEPOS
+    # TABLE_PREFER_STYLE_ATTRIBUTES FULL_INFO_STRING
 
-  mattr_accessor :markdown_opts
-  self.markdown_opts = {
-    autolink: true,
-    disable_indented_code_blocks: true,
-    fenced_code_blocks: true,
-    lax_spacing: true,
-    no_intra_emphasis: true,
-    space_after_headers: true,
-    strikethrough: true,
-    tables: true,
-  }
+  mattr_accessor :parsing_opts
+  self.parsing_opts = %i(UNSAFE SMART VALIDATE_UTF8)
+    # DEFAULT, UNSAFE, FOOTNOTES, LIBERAL_HTML_TAG, SMART
+    # STRIKETHROUGH_DOUBLE_TILDE, VALIDATE_UTF8
 
-  mattr_accessor :coderay_opts
-  self.coderay_opts = {
-    bold_every: false,
-    css: :class,
-    line_number_anchors: false,
-    line_numbers: false,
+  mattr_accessor :rouge_opts
+  self.rouge_opts = {
+    formatter: Rouge::Formatters::HTML.new,
+    wrap: true,
   }
 
 end
-

data/lib/markdown_views/renderer.rb

@@ -4,49 +4,50 @@ module MarkdownViews
 
       def render(template)
         out = template.to_s
-        out = strip_comments(out) if MarkdownViews.strip_comments
-        out = renderer.render(out)
-        out = strip_comments(out) if MarkdownViews.strip_comments
+        strip_comments!(out) if MarkdownViews.strip_comments
+        out = render_md(out)
+        strip_comments!(out) if MarkdownViews.strip_comments
         out.html_safe
       end
 
-      def renderer
-        @@renderer ||= begin
-          r = ExtendedMarkdownHtml.new MarkdownViews.rendering_opts
-          Redcarpet::Markdown.new r, MarkdownViews.markdown_opts
-        end
+      # remainder all considered private
+
+      def render_md(input)
+        doc = CommonMarker.render_doc(input, MarkdownViews.parsing_opts, MarkdownViews.extensions)
+
+        MarkdownViews.transformers.each {|name| send("transform_#{name}", doc) }
+
+        doc.to_html(MarkdownViews.rendering_opts, MarkdownViews.extensions)
       end
 
-      def strip_comments(input)
-        input.gsub(/[ \t\r\n\f]*<!--(.*?)-->*/m, '')
+      def rouge_formatter
+        MarkdownViews.rouge_opts[:formatter] || Rouge::Formatters::HTML.new
       end
 
-    end
-  end
+      def strip_comments!(input)
+        input.gsub!(/[ \t\r\n\f]*<!--(.*?)-->*/m, '')
+      end
 
-  class ExtendedMarkdownHtml < Redcarpet::Render::HTML
-    include Redcarpet::Render::SmartyPants
+      def transform_code_blocks(doc)
+        doc.walk do |node|
+          next unless node.type == :code_block
+          next if node.fence_info == ''
 
-    def block_code(text, language)
-      language ||= 'text'
-      html = CGI::unescapeHTML(text).sub(/\A[ \t\n\r]+/, '').sub(/[ \t\n\r]+\Z/, '')
-      cr = CodeRay.scan(html, language).html(MarkdownViews.coderay_opts)
-      %Q{<pre class="lang-#{language.to_s.gsub(/[^a-z0-9]/,'')}"><code class="CodeRay">#{cr.chomp}</code></pre>}
-    end
+          lang = node.fence_info
+          code = node.string_content
+          lexer = Rouge::Lexer.find(lang) || Rouge::Lexers::PlainText
+          html = rouge_formatter.format(lexer.lex code).rstrip
+          if MarkdownViews.rouge_opts[:wrap]
+            html = %Q{<pre lang="#{lang.gsub(/[^a-z0-9_-]/,'')}"><code class="rouge-highlight">#{html}</code></pre>}
+          end
+
+          new_node = CommonMarker::Node.new(:html)
+          new_node.string_content = html
+          node.insert_before new_node
+          node.delete
+        end
+      end
 
-    def table(header, body)
-      <<-TBL
-        <div class="table-responsive">
-          <table class="table">
-            <thead>
-              #{header}
-            </thead>
-            <tbody>
-              #{body}
-            </tbody>
-          </table>
-        </div>
-      TBL
     end
   end
 end

data/lib/markdown_views/version.rb

@@ -1,3 +1,3 @@
 module MarkdownViews
-  VERSION = '0.4.0'
+  VERSION = '2.0.0'
 end

data/markdown_views.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["thomas morgan"]
   spec.email         = ["tm@iprog.com"]
   spec.summary       = %q{Add .md template handler to Rails.}
-  spec.description   = %q{Makes Rails handle .md templates, with optional preprocessing of ERB, HAML, etc. Easily configurable; uses RedCarpet & CodeRay.}
+  spec.description   = %q{Enables Rails handling of .md templates, with optional preprocessing of ERB, HAML, etc. Also provides a markdown() view helper. Uses CommonMarker & Rouge.}
   spec.homepage      = "https://github.com/zarqman/markdown_views"
   spec.license       = "MIT"
 
@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'redcarpet', '~> 3.1'
-  spec.add_dependency 'coderay', '~> 1.1'
-  spec.add_dependency 'actionpack', '>= 4.0', '< 6'
+  spec.add_dependency 'commonmarker', '~> 0.18.2'
+  spec.add_dependency 'rouge', '~> 3.3.0'
+  spec.add_dependency 'actionpack', '>= 5.0', '< 6'
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

metadata

@@ -1,50 +1,50 @@
 --- !ruby/object:Gem::Specification
 name: markdown_views
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - thomas morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2018-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: commonmarker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 0.18.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 0.18.2
 - !ruby/object:Gem::Dependency
-  name: coderay
+  name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -54,7 +54,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -86,8 +86,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Makes Rails handle .md templates, with optional preprocessing of ERB,
-  HAML, etc. Easily configurable; uses RedCarpet & CodeRay.
+description: Enables Rails handling of .md templates, with optional preprocessing
+  of ERB, HAML, etc. Also provides a markdown() view helper. Uses CommonMarker & Rouge.
 email:
 - tm@iprog.com
 executables: []
@@ -99,7 +99,23 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/assets/stylesheets/coderay.css
+- app/assets/stylesheets/rouge.base16.dark.css
+- app/assets/stylesheets/rouge.base16.light.css
+- app/assets/stylesheets/rouge.base16.monokai.dark.css
+- app/assets/stylesheets/rouge.base16.monokai.light.css
+- app/assets/stylesheets/rouge.base16.solarized.dark.css
+- app/assets/stylesheets/rouge.base16.solarized.light.css
+- app/assets/stylesheets/rouge.colorful.css
+- app/assets/stylesheets/rouge.github.css
+- app/assets/stylesheets/rouge.gruvbox.dark.css
+- app/assets/stylesheets/rouge.gruvbox.light.css
+- app/assets/stylesheets/rouge.igorpro.css
+- app/assets/stylesheets/rouge.molokai.css
+- app/assets/stylesheets/rouge.monokai.css
+- app/assets/stylesheets/rouge.monokai.sublime.css
+- app/assets/stylesheets/rouge.pastie.css
+- app/assets/stylesheets/rouge.thankful_eyes.css
+- app/assets/stylesheets/rouge.tulip.css
 - app/helpers/markdown_views_helper.rb
 - lib/markdown_views.rb
 - lib/markdown_views/config.rb
@@ -128,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Add .md template handler to Rails.