wcc-contentful-app 1.0.3 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7e9b7d9c60463c93becc357408875dc33954b2a8
-  data.tar.gz: 5b6314552a866de365c4274e7cb76bea042e15b5
+SHA256:
+  metadata.gz: 847b51e62b8b74d6d2d41af8b69db98fc53341bb80423e84e586433398f5d151
+  data.tar.gz: 1fc55b4e5dac3db2e62ade4bc5abadb5cb5217bac8af0a225b67bd0157e81ede
 SHA512:
-  metadata.gz: a3fca4d5b6d4ba6ec05b7b01a52e4c1e9701db7dfe34e87c9a9d5df76dd7cdeae6a9eb3f6c3c31d8aeba8723b177f13cdb24e8207292f0ef8c324be78b0553bf
-  data.tar.gz: 1cf0983b4b606b8dce414ffe84bacc31796a2334c0ae95e667a1fdbec606dccf1c73d618c7428cf3c231f38ca414b4359c77548fb3baef52ac47aac5f9e8229a
+  metadata.gz: 5f93bb72ceb5ead8a965da22d9f5de330efd18243086e0f64684c38e8de3d1bd034dee6368473386eb9120554e617c77d60280566b7de28b6fe350c87eaa58d2
+  data.tar.gz: 8b0cf60b8f3d5374c1371f0684cc08896e6b05b82f0b30192e343be58c43c6f94b6a8f88dedfb4c31b8510e9634175836ae78615eae415a2c197e33ba439f85e

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

@@ -35,87 +35,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/{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,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.3'
+      VERSION = '1.0.7'
     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

data/wcc-contentful-app.gemspec

@@ -24,10 +24,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3'
 
-  spec.files         =
-    `git ls-files -z`.split("\x0").reject do |f|
-      f.match(%r{^(test|spec|features|Guardfile)/})
-    end
+  spec.files = Dir['app/**/*', 'config/**/*', 'lib/**/*'] +
+    %w[Rakefile README.md wcc-contentful-app.gemspec]
 
   spec.require_paths = ['lib']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-contentful-app
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.7
 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.3
+        version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.7
 description: Models, Controllers, and Views common to Watermark Church apps
 email:
 - dev@watermark.org
@@ -367,8 +367,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".rspec"
-- Guardfile
 - README.md
 - Rakefile
 - app/assets/config/manifest.js
@@ -386,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
@@ -404,12 +401,9 @@ files:
 - app/views/sections/_video.html.erb
 - app/views/sections/_video_highlight.html.erb
 - app/views/wcc/contentful/app/contact_mailer/contact_form_email.html.erb
-- bin/rails
 - config/routes.rb
-- doc
 - lib/generators/wcc/USAGE
 - lib/generators/wcc/model_generator.rb
-- lib/generators/wcc/templates/.keep
 - lib/generators/wcc/templates/Procfile
 - lib/generators/wcc/templates/contentful_shell_wrapper
 - lib/generators/wcc/templates/menu/migrations/generated_add_menus.ts
@@ -445,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
@@ -463,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
@@ -478,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)

data/.rspec

@@ -1,4 +0,0 @@
---require spec_helper
---format documentation
---color
---order rand

data/Guardfile

@@ -1 +0,0 @@
-./../wcc-contentful/Guardfile

data/bin/rails

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails gems
-# installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path('..', __dir__)
-ENGINE_PATH = File.expand_path('../lib/wcc/contentful/app/engine', __dir__)
-APP_PATH = File.expand_path('../spec/dummy/config/application', __dir__)
-
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-
-require 'rails/all'
-require 'rails/engine/commands'

data/doc

@@ -1 +0,0 @@
-./../doc/wcc-contentful-app