wcc-contentful-app 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5c30819cecaa3ca7080d5d0b5e12e04cfd5dfc50
-  data.tar.gz: 725e676d7d4753ff153e5fafd90c1329bc34dd42
+SHA256:
+  metadata.gz: 222d97e2c5e468eb06480abd758461d38c47cff94d3ae3b66546ca4a2dc28270
+  data.tar.gz: c29432ed47e73ae1be706e1aef01ccc38b74d812ce354d39fc5c8d55d34f79b0
 SHA512:
-  metadata.gz: efcc8b06b28c22b22e84f1e43a61d9512a0c437d5ddbd7098458d3f915d1c60bc491d82e58bd5b3f4140594123c76e37cedb0d71acc9352a2131721a2ae6373c
-  data.tar.gz: 6730a28919d3dde28d1bb8865faa02621327c88413ddd9b352ae8608d549e7a0ce0c666ea629673ace9f6a685674808e7be47efac75145d601112b179903ae22
+  metadata.gz: 37edcae2cb5a0bb83ec1cce4f19f42965e3a95c6f47899408dfd53883641bff88c6736a3cd7fdfa0a5d6609c3f0d0824ee776dbad374a44b7e31c3c25dbafb88
+  data.tar.gz: fca724980ba8a2594f14b51df9f86765350520fda4baca57719df8a013d3d24fc9e1297dc4c086378e720002cc5d3c46ed37874068d3a045eec97a8c51223c12

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'redcarpet'
+require '../wcc-contentful-app/lib/wcc/contentful/app/markdown_renderer'
 
 module WCC::Contentful::App::SectionHelper
   extend self
@@ -35,87 +36,13 @@ module WCC::Contentful::App::SectionHelper
   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))
+    html_to_render = WCC::Contentful::App::MarkdownRenderer.new.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/lib/wcc/contentful/app/markdown_renderer.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require_relative './custom_markdown_render'
+
+class WCC::Contentful::App::MarkdownRenderer
+  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)
+    markdown.render(remove_markdown_href_class_syntax(raw_classes, text))
+  end
+
+  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.5'
+      VERSION = '1.0.6'
     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.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Watermark Dev
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2021-12-21 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.5
+        version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.6
 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
@@ -458,7 +459,7 @@ licenses:
 - MIT
 metadata:
   documentation_uri: https://watermarkchurch.github.io/wcc-contentful/1.0/wcc-contentful-app
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -473,9 +474,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.11
-signing_key:
+rubyforge_project: 
+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)
   [![Build Status](https://circleci.com/gh/watermarkchurch/wcc-contentful.svg?style=svg)](https://circleci.com/gh/watermarkchurch/wcc-contentful)