wcc-contentful-app 1.1.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1c5db978665f7473218668fdf7086a3c2598b1228c35c76d8eaa92fde6a24f9
-  data.tar.gz: a8e34afa1a49597e75c9a64aec58df7aad0a602d2303dda722c63833e35cf946
+  metadata.gz: 3bf429e535dc9c5c753e3468a8595bf049e633bc75fdda5e3d9bca30ff971e02
+  data.tar.gz: bd25d75d2a97383392614936177d307ddb0577a3f7afba8a1d02234bdf81631a
 SHA512:
-  metadata.gz: 506d1c263c3fac5e51e4486a898fadf0f59595c1c19649df72829e98cd7614baf42b8ac58ba7346cbe878d886e3b867ec82ca8d40387b87c0bb80264ee8bebd1
-  data.tar.gz: 04e83685824a6ddc81f6aa3162b0268eee5700793b13dc14f28ff5130071b4f013ee78e2154a64a74ada0f094c119db0cbd33ccfaba9d5ecc343e482a1fbdd36
+  metadata.gz: a713913402d4b69b17ed490e4c25ac1e6c3110b9698e87ed6ab1e23f67aaebbc12acb209dfaaec44e5a2b16937cb08751ef7321020f2c3e1955bbf1d5ba34500
+  data.tar.gz: 3ce3e2b1f5d6a064faef9c86154b983febae13aaddd392c5a0575d3044ea8b9812ec2a2ed15943f0ca711165eae7429c7c744f7f281c3c891ce874b015cf8e47

data/Rakefile

@@ -5,12 +5,12 @@ require 'fileutils'
 
 require 'wcc/contentful'
 
-# rubocop:disable Metrics/LineLength
+# rubocop:disable Layout/LineLength
 # Disabling line length for contentful-schema-diff backtick execution
 
 namespace :app do
   desc "Imports a set of models from a space as a single template for the ModelGenerator.\n" \
-    'Usage: rake wcc:import_model[content-type-id,space-id?,extra-content-type-1,extra-content-type-2...]'
+       'Usage: rake wcc:import_model[content-type-id,space-id?,extra-content-type-1,extra-content-type-2...]'
   task :import_model, [:model, :space] do |_t, args|
     raise ArgumentError, 'Must give a content type' unless model = args[:model]
 
@@ -20,7 +20,7 @@ namespace :app do
     all_models = [model, *args.extras]
 
     unless space = args[:space].presence
-      space = ENV['CONTENTFUL_SPACE_ID']
+      space = ENV.fetch('CONTENTFUL_SPACE_ID', nil)
       space = "#{space}/#{ENV['CONTENTFUL_ENVIRONMENT']}" if ENV['CONTENTFUL_ENVIRONMENT']
     end
     raise ArgumentError, 'Must provide a space' unless space
@@ -118,7 +118,7 @@ namespace :app do
   end
 end
 
-# rubocop:enable Metrics/LineLength
+# rubocop:enable Layout/LineLength
 
 task :release do
   raise StandardError, 'Please run rake release only from the root folder.'

data/app/controllers/wcc/contentful/app/pages_controller.rb

@@ -12,7 +12,7 @@ class WCC::Contentful::App::PagesController < ApplicationController
   end
 
   def show
-    slug = '/' + params[:slug]
+    slug = "/#{params[:slug]}"
     @page = page_model.find_by(slug: slug, options: { include: 3, preview: preview? })
 
     return render 'pages/show' if @page

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

@@ -69,7 +69,7 @@ module WCC::Contentful::App::MenuHelper
 
   def hash_only(href)
     url = URI(href)
-    '#' + url.fragment if url.fragment.present?
+    "##{url.fragment}" if url.fragment.present?
   end
 
   # An href is local if it points to a part of the page

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

@@ -18,7 +18,7 @@ module WCC::Contentful::App::SectionHelper
   end
 
   def section_styles(section)
-    section_styles = ['section-' + section_css_name(section)]
+    section_styles = ["section-#{section_css_name(section)}"]
     if styles = section.try(:styles)
       section_styles.push(styles.map { |style| style.downcase.gsub(/[^\w]/, '-') })
     elsif style = section.try(:style)
@@ -49,8 +49,8 @@ module WCC::Contentful::App::SectionHelper
     return unless text.present?
 
     text = CGI.escapeHTML(text)
-    text = text.gsub(/\&(nbsp|vert|\#\d+);/, '&\1;')
-      .gsub(/\&lt;br\/?\&gt;/, '<br/>')
+    text = text.gsub(/&amp;(nbsp|vert|\#\d+);/, '&\1;')
+      .gsub(/&lt;br\/?&gt;/, '<br/>')
     content_tag(:span, text.html_safe, {
       class: 'safe-line-break'
     }.merge(options))

data/app/views/components/_menu-item.html.erb

@@ -1,4 +1,4 @@
-<% return '' unless item
+<% return '' unless item # rubocop:disable Lint/TopLevelReturnWithArgument
 
    classes ||= ['nav-item']
    classes.push('active') if item_active?(item)

data/lib/generators/wcc/model_generator.rb

@@ -28,15 +28,13 @@ module Wcc
 
         unless deps.try(:[], '@watermarkchurch/contentful-migration').present?
           run 'npm install --save @watermarkchurch/contentful-migration ts-node ' \
-            'typescript contentful-export'
+              'typescript contentful-export'
         end
       end
     end
 
     def ensure_wrapper_script_in_bin_dir
-      unless inside('bin') { File.exist?('contentful') }
-        copy_file 'contentful_shell_wrapper', 'bin/contentful'
-      end
+      copy_file 'contentful_shell_wrapper', 'bin/contentful' unless inside('bin') { File.exist?('contentful') }
 
       if inside('bin') { File.exist?('release') }
         release = inside('bin') { File.read('release') }

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

@@ -19,7 +19,7 @@ class WCC::Contentful::App::Configuration
 
   def initialize(wcc_contentful_config)
     @wcc_contentful_config = wcc_contentful_config
-    @preview_password = ENV['CONTENTFUL_PREVIEW_PASSWORD']
+    @preview_password = ENV.fetch('CONTENTFUL_PREVIEW_PASSWORD', nil)
   end
 
   # Validates the configuration, raising ArgumentError if anything is wrong.  This
@@ -33,16 +33,12 @@ class WCC::Contentful::App::Configuration
   end
 
   class FrozenConfiguration
-    attr_reader(*ATTRIBUTES)
-
-    attr_reader :wcc_contentful_config
+    attr_reader(*ATTRIBUTES, :wcc_contentful_config)
 
     delegate(*WCC::Contentful::Configuration::ATTRIBUTES, to: :wcc_contentful_config)
 
     def initialize(configuration, frozen_wcc_contentful_config)
-      unless frozen_wcc_contentful_config.frozen?
-        raise ArgumentError, 'Please first freeze the wcc_contentful_config'
-      end
+      raise ArgumentError, 'Please first freeze the wcc_contentful_config' unless frozen_wcc_contentful_config.frozen?
 
       @wcc_contentful_config = frozen_wcc_contentful_config
 

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

@@ -25,7 +25,7 @@ module WCC::Contentful::App
         hash.map do |k, v|
           if v.is_a?(Hash)
             msgs = join_msg_keys(v)
-            msgs.map { |msg| Message.new(k.to_s + '.' + msg.path, msg.error) }
+            msgs.map { |msg| Message.new("#{k}.#{msg.path}", msg.error) }
           else
             v.map { |msg| Message.new(k.to_s, msg) }
           end

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

@@ -50,7 +50,7 @@ class WCC::Contentful::App::MarkdownRenderer
   end
 
   def links_within_markdown(text)
-    text.scan(/(\[(.*?)\]\((.*?)\)(\{\:.*?\})?)/)
+    text.scan(/(\[(.*?)\]\((.*?)\)(\{:.*?\})?)/)
   end
 
   def gather_links_with_classes_data(markdown_links)
@@ -75,7 +75,7 @@ class WCC::Contentful::App::MarkdownRenderer
   def url_and_title(markdown_link_and_title)
     match =
       markdown_link_and_title.scan(
-        /(\s|^)(https?:\/\/\S*|^\/\S*\/*\S*|^#\S*|mailto:\S*)(?=\s|$)|(\".*?\")/
+        /(\s|^)(https?:\/\/\S*|^\/\S*\/*\S*|^#\S*|mailto:\S*)(?=\s|$)|(".*?")/
       )
     url = match[0][1]
     title = match[1] ? match[1][2] : nil
@@ -83,13 +83,13 @@ class WCC::Contentful::App::MarkdownRenderer
   end
 
   def capture_individual_classes(classes)
-    classes.scan(/\.[^\.\}\s]*/)
+    classes.scan(/\.[^.}\s]*/)
   end
 
   def combine_individual_classes_to_one_string(classes)
     class_string = ''
     classes.each do |klass|
-      class_string += klass.tr('.', '') + ' '
+      class_string += "#{klass.tr('.', '')} "
     end
     class_string
   end

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

@@ -3,7 +3,7 @@
 module WCC
   module Contentful
     module App
-      VERSION = '1.1.2'
+      VERSION = '1.3.0'
     end
   end
 end

data/lib/wcc/contentful/model/site_config.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class WCC::Contentful::Model::SiteConfig < WCC::Contentful::Model
-  def self.instance(preview = false)
+  def self.instance(preview = false) # rubocop:disable Style/OptionalBooleanParameter
     find_by(foreign_key: 'default', options: { include: 4, preview: preview })
   end
 end

data/wcc-contentful-app.gemspec

@@ -6,7 +6,7 @@ require 'wcc/contentful/app/version'
 
 doc_version = Gem::Version.new(WCC::Contentful::App::VERSION).release.to_s.sub(/\.\d+$/, '')
 
-# rubocop:disable Metrics/LineLength
+# rubocop:disable Layout/LineLength
 Gem::Specification.new do |spec|
   spec.name          = 'wcc-contentful-app'
   spec.version       = WCC::Contentful::App::VERSION
@@ -19,10 +19,11 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.metadata = {
-    'documentation_uri' => "https://watermarkchurch.github.io/wcc-contentful/#{doc_version}/wcc-contentful-app"
+    'documentation_uri' => "https://watermarkchurch.github.io/wcc-contentful/#{doc_version}/wcc-contentful-app",
+'rubygems_mfa_required' => 'true'
   }
 
-  spec.required_ruby_version = '>= 2.3'
+  spec.required_ruby_version = '>= 2.7'
 
   spec.files = Dir['app/**/*', 'config/**/*', 'lib/**/*'] +
     %w[Rakefile README.md wcc-contentful-app.gemspec]
@@ -38,7 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1'
-  spec.add_development_dependency 'rubocop', '0.68'
   spec.add_development_dependency 'simplecov', '~> 0.16.1'
   spec.add_development_dependency 'vcr', '~> 5.0'
   spec.add_development_dependency 'webmock', '~> 3.0'
@@ -55,11 +55,11 @@ Gem::Specification.new do |spec|
   # wcc-contentful-app needs rails to function, so require it for specs.
   spec.add_development_dependency 'rails', '~> 5'
   spec.add_development_dependency 'rspec-rails', '~> 3.7'
-  spec.add_development_dependency 'sqlite3', '~> 1.3.6'
+  spec.add_development_dependency 'sqlite3', '~> 1.4'
   spec.add_development_dependency 'timecop', '~> 0.9.1'
   spec.add_development_dependency 'typhoeus', '~> 1.4.0'
 
   spec.add_dependency 'redcarpet', '~> 3.4'
   spec.add_dependency 'wcc-contentful', "~> #{WCC::Contentful::App::VERSION}"
 end
-# rubocop:enable Metrics/LineLength
+# rubocop:enable Layout/LineLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-contentful-app
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Watermark Dev
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2022-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -136,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.68'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.68'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -296,14 +282,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -352,14 +338,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.3.0
 description: Models, Controllers, and Views common to Watermark Church apps
 email:
 - dev@watermark.org
@@ -458,8 +444,9 @@ homepage: https://github.com/watermarkchurch/wcc-contentful
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://watermarkchurch.github.io/wcc-contentful/1.1/wcc-contentful-app
-post_install_message:
+  documentation_uri: https://watermarkchurch.github.io/wcc-contentful/1.3/wcc-contentful-app
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -467,16 +454,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6.2
-signing_key:
+rubygems_version: 3.1.6
+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)