wcc-contentful-app 1.0.6 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 222d97e2c5e468eb06480abd758461d38c47cff94d3ae3b66546ca4a2dc28270
-  data.tar.gz: c29432ed47e73ae1be706e1aef01ccc38b74d812ce354d39fc5c8d55d34f79b0
+  metadata.gz: 62dc51426a6d8ef9b10016d7e1c7f6278029cbf9ce5f57243247de110fc85388
+  data.tar.gz: e9b8ebec6038303cd1d963d0b3e8fd2bde4b5063db76c453144f8e4877766513
 SHA512:
-  metadata.gz: 37edcae2cb5a0bb83ec1cce4f19f42965e3a95c6f47899408dfd53883641bff88c6736a3cd7fdfa0a5d6609c3f0d0824ee776dbad374a44b7e31c3c25dbafb88
-  data.tar.gz: fca724980ba8a2594f14b51df9f86765350520fda4baca57719df8a013d3d24fc9e1297dc4c086378e720002cc5d3c46ed37874068d3a045eec97a8c51223c12
+  metadata.gz: 3096d5d0f27919616f3a9ac40027b7e460c1292b8d22c6a64cba4c231373ba5b2b993b0ad11f8b89310a80cfb2340b788226e7926f1a98f866b1d2771c4decd9
+  data.tar.gz: 2404f239d0517c5c47623f329cc0774a16ef150ad75146884e2fc53c84f92d8500cfa1ef191cf6708d6182d29a276c82503a237b5bee80bdbdc36fe06a11eec5

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'redcarpet'
-require '../wcc-contentful-app/lib/wcc/contentful/app/markdown_renderer'
 
 module WCC::Contentful::App::SectionHelper
   extend self
@@ -35,8 +34,11 @@ module WCC::Contentful::App::SectionHelper
     CGI.escape(title.gsub(/\W+/, '-')) if title.present?
   end
 
-  def markdown(text)
-    html_to_render = WCC::Contentful::App::MarkdownRenderer.new.markdown(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,

data/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

@@ -3,33 +3,44 @@
 require_relative './custom_markdown_render'
 
 class WCC::Contentful::App::MarkdownRenderer
-  def markdown(text)
-    raise ArgumentError, 'markdown method requires text' unless text
+  attr_reader :options, :extensions
 
-    markdown_links = links_within_markdown(text)
-    links_with_classes, raw_classes = gather_links_with_classes_data(markdown_links)
+  def initialize(options = nil)
+    options = options&.dup
+
+    @extensions = {
+      autolink: true,
+      superscript: true,
+      disable_indented_code_blocks: true,
+      tables: true
+    }.merge!(options&.delete(:extensions) || {})
 
-    options = {
+    @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
-    }
+      fenced_code_blocks: true
+    }.merge!(options || {})
+  end
 
-    extensions = {
-      autolink: true,
-      superscript: true,
-      disable_indented_code_blocks: true,
-      tables: true
-    }
+  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)

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

@@ -3,7 +3,7 @@
 module WCC
   module Contentful
     module App
-      VERSION = '1.0.6'
+      VERSION = '1.1.1'
     end
   end
 end

data/lib/wcc/contentful/app.rb

@@ -37,7 +37,7 @@ module WCC::Contentful::App
     WCC::Contentful.init!
 
     # Extend all model types w/ validation & extra fields
-    WCC::Contentful.types.each_value do |t|
+    WCC::Contentful::Model.schema.each_value do |t|
       file = File.dirname(__FILE__) + "/model/#{t.name.underscore}.rb"
       require file if File.exist?(file)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-contentful-app
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.1
 platform: ruby
 authors:
 - Watermark Dev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2022-02-16 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.6
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.1.1
 description: Models, Controllers, and Views common to Watermark Church apps
 email:
 - dev@watermark.org
@@ -458,8 +458,8 @@ homepage: https://github.com/watermarkchurch/wcc-contentful
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://watermarkchurch.github.io/wcc-contentful/1.0/wcc-contentful-app
-post_install_message: 
+  documentation_uri: https://watermarkchurch.github.io/wcc-contentful/1.1/wcc-contentful-app
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -474,9 +474,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.6.2
-signing_key: 
+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)