wcc-contentful-app 1.0.4 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e5a7b3e4f339c5c41851ed567148325b2050345b
-  data.tar.gz: 21e326e43a9acafacd50b09f6b56fb384e84dc00
+SHA256:
+  metadata.gz: 90e14d9120bf9e13feaac1b38d6de53374798a9b384bcc6b4acf099ffd83b183
+  data.tar.gz: f4276cdb1f6f466dd8252a5316ca0bb0a86310cabdf96e889a66bc68b8084194
 SHA512:
-  metadata.gz: e61db702889193b0b9bbf89b0b0513ef95bf95e79abf63e620204f642e382b8e4a9a759ae568d159bbf96b680c10d7a17a476331082a55d3f005f8e5da7488ca
-  data.tar.gz: 4104285fc476c42faed8f78a889cac82f373ec944623458f62d2e716dbfb26a785fa38de9d2364f3b2174ba1d9f53a777eba67c75387642833151c6ab1b2ad94
+  metadata.gz: c14a98f65f94a006d19b36b9ffd731ae0973190e12ef78be4188da0bc9429975a6657e04c7548ee3950d70d2d41105ceed703815754e87fc32abee2a90d19583
+  data.tar.gz: '09e349ec2bf158a6c6c5dbc7cf281e6850d35397c85bd9fd99bdfdb7acbca7bac28a7e83945bb2543f186e1f1ac388c00abf697ad9fd54615d7337a19f2dc4d3'

data/app/helpers/wcc/contentful/app/section_helper.rb

@@ -34,88 +34,17 @@ module WCC::Contentful::App::SectionHelper
     CGI.escape(title.gsub(/\W+/, '-')) if title.present?
   end
 
-  def markdown(text)
-    raise ArgumentError, 'markdown method requires text' unless text
-
-    markdown_links = links_within_markdown(text)
-    links_with_classes, raw_classes = gather_links_with_classes_data(markdown_links)
-
-    options = {
-      filter_html: true,
-      hard_wrap: true,
-      link_attributes: { target: '_blank' },
-      space_after_headers: true,
-      fenced_code_blocks: true,
-      links_with_classes: links_with_classes
-    }
-
-    extensions = {
-      autolink: true,
-      superscript: true,
-      disable_indented_code_blocks: true,
-      tables: true
-    }
-
-    renderer = ::WCC::Contentful::App::CustomMarkdownRender.new(options)
-    markdown = ::Redcarpet::Markdown.new(renderer, extensions)
-    html_to_render = markdown.render(remove_markdown_href_class_syntax(raw_classes, text))
+  def markdown(text, options = {})
+    renderer = WCC::Contentful::App::MarkdownRenderer.new(
+      options
+    )
+    html_to_render = renderer.markdown(text)
 
     content_tag(:div,
       CGI.unescapeHTML(html_to_render).html_safe,
       class: 'formatted-content')
   end
 
-  def links_within_markdown(text)
-    text.scan(/(\[(.*?)\]\((.*?)\)(\{\:.*?\})?)/)
-  end
-
-  def gather_links_with_classes_data(markdown_links)
-    links_with_classes_arr = []
-    raw_classes_arr = []
-    markdown_links.each do |markdown_link_arr|
-      next unless markdown_link_arr.last.present?
-
-      raw_class = markdown_link_arr[3]
-      url, title = url_and_title(markdown_link_arr[2])
-      content = markdown_link_arr[1]
-      classes = capture_individual_classes(raw_class)
-      link_class = combine_individual_classes_to_one_string(classes)
-
-      raw_classes_arr << raw_class
-      links_with_classes_arr << [url, title, content, link_class]
-    end
-
-    [links_with_classes_arr, raw_classes_arr]
-  end
-
-  def remove_markdown_href_class_syntax(raw_classes, text)
-    text_without_markdown_class_syntax = text.dup
-    raw_classes.each { |klass| text_without_markdown_class_syntax.slice!(klass) }
-    text_without_markdown_class_syntax
-  end
-
-  def url_and_title(markdown_link_and_title)
-    match =
-      markdown_link_and_title.scan(
-        /(\s|^)(https?:\/\/\S*|^\/\S*\/*\S*|^#\S*|mailto:\S*)(?=\s|$)|(\".*?\")/
-      )
-    url = match[0][1]
-    title = match[1] ? match[1][2] : nil
-    [url, title]
-  end
-
-  def capture_individual_classes(classes)
-    classes.scan(/\.[^\.\}\s]*/)
-  end
-
-  def combine_individual_classes_to_one_string(classes)
-    class_string = ''
-    classes.each do |klass|
-      class_string += klass.tr('.', '') + ' '
-    end
-    class_string
-  end
-
   def safe_line_break(text, options = {})
     return unless text.present?
 

data/{app/models → lib}/wcc/contentful/app/custom_markdown_render.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'redcarpet'
+
 module WCC::Contentful::App
   class CustomMarkdownRender < Redcarpet::Render::HTML
     def initialize(options)

data/lib/wcc/contentful/app/markdown_renderer.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+require_relative './custom_markdown_render'
+
+class WCC::Contentful::App::MarkdownRenderer
+  attr_reader :options, :extensions
+
+  def initialize(options = nil)
+    @extensions = {
+      autolink: true,
+      superscript: true,
+      disable_indented_code_blocks: true,
+      tables: true
+    }.merge!(options&.delete(:extensions) || {})
+
+    @options = {
+      filter_html: true,
+      hard_wrap: true,
+      link_attributes: { target: '_blank' },
+      space_after_headers: true,
+      fenced_code_blocks: true
+    }.merge!(options || {})
+  end
+
+  def markdown(text)
+    raise ArgumentError, 'markdown method requires text' unless text
+
+    markdown_links = links_within_markdown(text)
+    links_with_classes, raw_classes = gather_links_with_classes_data(markdown_links)
+
+    options = @options.merge({
+      links_with_classes: links_with_classes
+    })
+
+    renderer = ::WCC::Contentful::App::CustomMarkdownRender.new(options)
+    markdown = ::Redcarpet::Markdown.new(renderer, extensions)
+    markdown.render(remove_markdown_href_class_syntax(raw_classes, text))
+  end
+
+  alias_method :call, :markdown
+
+  private
+
+  def remove_markdown_href_class_syntax(raw_classes, text)
+    text_without_markdown_class_syntax = text.dup
+    raw_classes.each { |klass| text_without_markdown_class_syntax.slice!(klass) }
+    text_without_markdown_class_syntax
+  end
+
+  def links_within_markdown(text)
+    text.scan(/(\[(.*?)\]\((.*?)\)(\{\:.*?\})?)/)
+  end
+
+  def gather_links_with_classes_data(markdown_links)
+    links_with_classes_arr = []
+    raw_classes_arr = []
+    markdown_links.each do |markdown_link_arr|
+      next unless markdown_link_arr.last.present?
+
+      raw_class = markdown_link_arr[3]
+      url, title = url_and_title(markdown_link_arr[2])
+      content = markdown_link_arr[1]
+      classes = capture_individual_classes(raw_class)
+      link_class = combine_individual_classes_to_one_string(classes)
+
+      raw_classes_arr << raw_class
+      links_with_classes_arr << [url, title, content, link_class]
+    end
+
+    [links_with_classes_arr, raw_classes_arr]
+  end
+
+  def url_and_title(markdown_link_and_title)
+    match =
+      markdown_link_and_title.scan(
+        /(\s|^)(https?:\/\/\S*|^\/\S*\/*\S*|^#\S*|mailto:\S*)(?=\s|$)|(\".*?\")/
+      )
+    url = match[0][1]
+    title = match[1] ? match[1][2] : nil
+    [url, title]
+  end
+
+  def capture_individual_classes(classes)
+    classes.scan(/\.[^\.\}\s]*/)
+  end
+
+  def combine_individual_classes_to_one_string(classes)
+    class_string = ''
+    classes.each do |klass|
+      class_string += klass.tr('.', '') + ' '
+    end
+    class_string
+  end
+end

data/lib/wcc/contentful/app/version.rb

@@ -3,7 +3,7 @@
 module WCC
   module Contentful
     module App
-      VERSION = '1.0.4'
+      VERSION = '1.0.8'
     end
   end
 end

data/lib/wcc/contentful/app.rb

@@ -2,9 +2,9 @@
 
 require 'wcc/contentful/rails'
 
-require_relative './app/rails'
 require_relative './app/exceptions'
 require_relative './app/configuration'
+require_relative './app/markdown_renderer'
 
 module WCC::Contentful::App
   class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-contentful-app
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.8
 platform: ruby
 authors:
 - Watermark Dev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -352,14 +352,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.8
 description: Models, Controllers, and Views common to Watermark Church apps
 email:
 - dev@watermark.org
@@ -384,7 +384,6 @@ files:
 - app/mailers/wcc/contentful/app/contact_mailer.rb
 - app/models/concerns/wcc/contentful/app/preview_password.rb
 - app/models/wcc/contentful/app/contact_form_submission.rb
-- app/models/wcc/contentful/app/custom_markdown_render.rb
 - app/views/components/_faq_row.html.erb
 - app/views/components/_menu-item.html.erb
 - app/views/components/_other-menu-item.html.erb
@@ -440,8 +439,10 @@ files:
 - lib/generators/wcc/templates/wcc_contentful.rb
 - lib/wcc/contentful/app.rb
 - lib/wcc/contentful/app/configuration.rb
+- lib/wcc/contentful/app/custom_markdown_render.rb
 - lib/wcc/contentful/app/engine.rb
 - lib/wcc/contentful/app/exceptions.rb
+- lib/wcc/contentful/app/markdown_renderer.rb
 - lib/wcc/contentful/app/rails.rb
 - lib/wcc/contentful/app/version.rb
 - lib/wcc/contentful/model/dropdown_menu.rb
@@ -474,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6.2
 signing_key:
 specification_version: 4
 summary: "[![Gem Version](https://badge.fury.io/rb/wcc-contentful-app.svg)](https://rubygems.org/gems/wcc-contentful-app)