occams 1.0.6.1 → 1.0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eed8972c3dacc31a1970b37be6efbc3f2d19d30d197f8342f13adcb171fa11e4
-  data.tar.gz: 4735ee50552cb9fd07f9b4dea67e05a53152779b057a1d5b4335a2ffe0bf3769
+  metadata.gz: a00b3daa132f332250a7764bb37a42535293eb290c00fdba37febd63f8950873
+  data.tar.gz: '05929ac5d67803f5fd855bc602e255e31dd730615108a1561c4e03541cb9528f'
 SHA512:
-  metadata.gz: 2434cbce961464f9d317625ff2d36605a3f0dda92d68516f2d5506683b02c97f936632b9868217529a477739124d4957a9d0d2cfc07f8331bb021083a681fe51
-  data.tar.gz: 6a1bc1e3e9ea9d7dab30de818904d7d5cf540afed08d23573c62029b61274050deb3de6c1c4dfd117eaccf28f4ef3873047e3e0d7761e4680b065de7ce984401
+  metadata.gz: ff72090234dae1fc2d750b696c7796d190a73b349bbe2f2e731f5b906c6b4e0550cbdf67a94c9b986f9f603841f7c00ecbe17fd2007492930eb8484a3aaade9d
+  data.tar.gz: 5da49c13c964c3b11f5af90b2576175cfdd9e85362a4339d29a3b6cf825615ece8610c141b8fc77c9f351cb302cfe5546753e816bba549adb9d6a2cfe48c5f90

data/.github/workflows/rubyonrails.yml

@@ -0,0 +1,47 @@
+name: "Test,Lint,Audit"
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  test_lint_audit:
+    strategy:
+      matrix:
+        ruby-version:
+          - "2.7"
+          - "3.1"
+          - "3.2"
+        rails-version:
+          - "6.1"
+          - "7.0"
+        continue-on-error: [false]
+    name: ${{ format('Test,Lint,Audit (Ruby {0}, Rails {1})', matrix.ruby-version, matrix.rails-version) }}
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.continue-on-error }}
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.rails-version }}.gemfile
+      RAILS_ENV: test
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+
+      - name: Set up DB
+        run: bin/rails db:migrate RAILS_ENV=test
+      - name: Run tests
+        run: bin/rake test
+
+      - name: Ruby Lint
+        run: bin/bundle exec rubocop --parallel
+
+      - name: Security audit application code
+        run: bin/bundle exec brakeman -q -w3
+      - name: Security audit dependencies
+        run: bin/bundle exec bundler-audit --update --gemfile-lock gemfiles/${{ matrix.rails-version }}.gemfile.lock

data/.gitignore

@@ -11,6 +11,7 @@ rdoc
 /tmp
 public/system/
 Gemfile.lock
+gemfiles/*.gemfile.lock
 .rvmrc
 .ruby-version
 .ruby-gemset

data/.rubocop.yml

@@ -7,6 +7,7 @@ AllCops:
     - db/migrate/**/*
     - test/fixtures/**/*
     - tmp/**/*
+    - vendor/bundle/**/*
 
 # -- Layout --------------------------------------------------------------------
 Layout/FirstArrayElementIndentation:

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## v1.0.7.1 - 9/22/2023
+
+- Addressed deprecations for file type 'image/jpg'
+- Added github workflow for tests, lints and audits
+- Fixed some flagged security warnings
+- Bumped rubocop version to latest
+- Updated some testing parameters
+
+## v1.0.7 - 9/12/2023
+
+- Updated coveralls Coverage reporting
+- Added minitest-reporters for test output
+- Adjusted tests to accomodate varying macos and linux outputs
+- Refined test for 'children' tag
+- Lints and 1 typo
+- Added Build Status and Coveralls Coverage Status to README
+
 ## v1.0.6.1 - 9/5/2023
 
 - Fixed siblings and children nav tags which as written had problems creating child pages in the admin panel

data/Gemfile

@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 
-source 'http://rubygems.org'
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
+gem 'rails', '~> 7.0'
+
 group :development, :test do
   gem 'autoprefixer-rails', '~> 8.1.0'
   gem 'byebug',             '~> 10.0.0', platforms: %i[mri mingw x64_mingw]
   gem 'capybara',           '~> 3.39.0'
   gem 'image_processing',   '>= 1.2'
   gem 'kaminari',           '~> 1.2', '>= 1.2.2'
-  gem 'rubocop',            '~> 0.55.0', require: false
   gem 'selenium-webdriver', '~> 4.9.0'
   gem 'sqlite3',            '~> 1.4.2'
 end
@@ -21,9 +23,14 @@ group :development do
 end
 
 group :test do
-  gem 'coveralls',                '~> 0.8.23', require: false
+  gem 'brakeman',                 '~> 5.4.1'
+  gem 'bundler-audit',            '~> 0.9.1'
+  gem 'coveralls_reborn',         '~> 0.28.0', require: false
   gem 'diffy',                    '~> 3.4.2'
   gem 'equivalent-xml',           '~> 0.6.0'
+  gem 'minitest-reporters',       '~> 1.6.1'
   gem 'mocha',                    '~> 2.1.0', require: false
   gem 'rails-controller-testing', '~> 1.0.5'
+  gem 'rubocop',                  '~> 1.56.0', require: false
+  gem 'simplecov',                '~> 0.22.0', require: false
 end

data/README.md

@@ -1,5 +1,8 @@
 # ocCaM'S
 
+[![Build status](https://badge.buildkite.com/6b70f3f81c5922bd134b33d3ba1412c68f53a9f67e0a907ade.svg?branch=main)](https://buildkite.com/gknt/occams)
+[![Test,Lint,Audit](https://github.com/avonderluft/occams/actions/workflows/rubyonrails.yml/badge.svg)](https://github.com/avonderluft/occams/actions/workflows/rubyonrails.yml)
+[![Coverage Status](https://coveralls.io/repos/github/avonderluft/occams/badge.svg?branch=main)](https://coveralls.io/github/avonderluft/occams?branch=main)
 [![Gem Version](https://img.shields.io/gem/v/occams.svg?style=flat)](http://rubygems.org/gems/occams)
 [![Gem Downloads](https://img.shields.io/gem/dt/occams.svg?style=flat)](http://rubygems.org/gems/occams)
 
@@ -20,11 +23,11 @@
 
 ## Raison d'etre
 
-ocCaM'S is a revival of [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa), with all due thanks and acknowledgements to [Oleg Khabarov](https://github.com/GBH), et al. 'Comfy' was the simplest and cleanest Rails-based CMS that I had used. Its last commit was in 2020, and I simply did not want to see it die on the vine as [RadiantCMS](https://github.com/radiant/radiant) did some years ago.
+ocCaM'S is a revival of [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa), with all due thanks and acknowledgements to [Oleg Khabarov](https://github.com/GBH), and others. 'Comfy' is in my experience the simplest and cleanest of all Rails-based CMSes. Seeing that its last commit was in 2020, I was determined that it should not die on the vine as [RadiantCMS](https://github.com/radiant/radiant) did some years ago.
 
 ## The name
 
-ocCaM'S, pronounced "AH-kums" is a nod to [Occam's Razor](https://en.wikipedia.org/wiki/Occam%27s_razor) - for this Rails-based Content Management System endeavors to follow the principle that unnecessarily complex models should not be preferred to simpler ones.
+ocCaM'S, pronounced "AH-kums" is a nod to [Occam's Razor](https://en.wikipedia.org/wiki/Occam%27s_razor) - for this Rails-based Content Management System endeavors to follow the principle that unnecessarily complex models should not be preferred over simpler ones.
 
 
 
@@ -42,7 +45,7 @@ ocCaM'S, pronounced "AH-kums" is a nod to [Occam's Razor](https://en.wikipedia.o
 ## Dependencies
 
 * File attachments are handled by [ActiveStorage](https://github.com/rails/rails/tree/master/activestorage). Make sure that you can run appropriate migrations by running: `rails active_storage:install` and then `rake db:migrate`
-* Image resizing is done with[ImageMagick](http://www.imagemagick.org/script/download.php), so make sure it's installed
+* Image resizing is done with [ImageMagick](http://www.imagemagick.org/script/download.php), so make sure it's installed
 * Pagination is handled by [kaminari](https://github.com/amatsuda/kaminari) or [will_paginate](https://github.com/mislav/will_paginate). Please add one of those to your Gemfile.
 
 ## Compatibility
@@ -58,15 +61,15 @@ Add gem definition to your Gemfile:
 gem "occams"
 ```
 
-* From the Rails project's root run:  
+* From the Rails project's root run:
   `bundle install`
-* Then add the CMS:  
+* Then add the CMS:
   `rails generate occams:cms`
-* If you want to store files in your CMS with Active Storage:  
+* If you want to store files in your CMS with Active Storage:
   `rails active_storage:install`
-* Set up the database:  
+* Set up the database:
   `rails db:migrate`
-    
+
 Now take a look inside your `config/routes.rb` file. You'll see where routes attach for the admin area and content serving. Make sure that content serving route appears as a very last item or it will make all other routes to be inaccessible.
 
 ```ruby
@@ -119,5 +122,5 @@ For more detail see [CONTRIBUTING](CONTRIBUTING.md)
 - Thanks to [Roman Almeida](https://github.com/nasmorn) for contributing OEM License for [Redactor Text Editor](http://imperavi.com/redactor)
 
 ---
+- [Occams](https://github.com/avonderluft/occams) Copyright 2023 Andrew vonderLuft, following Comfy,  released under the [MIT license](LICENSE)
 - [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) Copyright 2010-2019 Oleg Khabarov. Released under the [MIT license](LICENSE)
-- [Occams](https://github.com/avonderluft/occams) Copyright 2023 Andrew vonderLuft, following suit, also released under the [MIT license](LICENSE)

data/app/controllers/occams/admin/cms/revisions/base_controller.rb

@@ -43,6 +43,6 @@ protected
   end
 
   def record_path
-    raise 'no implemented'
+    raise 'not implemented'
   end
 end

data/db/cms_seeds/sample-site/pages/index/child_a/content.html

@@ -3,5 +3,5 @@ label: Child Seed Page
 layout: nested
 target_page: '/child_b'
 
-[textares content]
+[textarea content]
 Child A Page Seed Content

data/gemfiles/6.1.gemfile

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+gemspec path: '../'
+
+gem 'rails', '~> 6.1'
+
+group :development, :test do
+  gem 'autoprefixer-rails', '~> 8.1.0'
+  gem 'byebug',             '~> 10.0.0', platforms: %i[mri mingw x64_mingw]
+  gem 'capybara',           '~> 3.39.0'
+  gem 'image_processing',   '>= 1.2'
+  gem 'kaminari',           '~> 1.2', '>= 1.2.2'
+  gem 'selenium-webdriver', '~> 4.9.0'
+  gem 'sqlite3',            '~> 1.4.2'
+end
+
+group :development do
+  gem 'listen',       '~> 3.8.0'
+  gem 'web-console',  '~> 4.2'
+end
+
+group :test do
+  gem 'brakeman',                 '~> 5.4.1'
+  gem 'bundler-audit',            '~> 0.9.1'
+  gem 'coveralls_reborn',         '~> 0.28.0', require: false
+  gem 'diffy',                    '~> 3.4.2'
+  gem 'equivalent-xml',           '~> 0.6.0'
+  gem 'minitest-reporters',       '~> 1.6.1'
+  gem 'mocha',                    '~> 2.1.0', require: false
+  gem 'rails-controller-testing', '~> 1.0.5'
+  gem 'rubocop',                  '~> 1.56.0', require: false
+end

data/gemfiles/7.0.gemfile

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+gemspec path: '../'
+
+gem 'rails', '~> 7.0'
+
+group :development, :test do
+  gem 'autoprefixer-rails', '~> 8.1.0'
+  gem 'byebug',             '~> 10.0.0', platforms: %i[mri mingw x64_mingw]
+  gem 'capybara',           '~> 3.39.0'
+  gem 'image_processing',   '>= 1.2'
+  gem 'kaminari',           '~> 1.2', '>= 1.2.2'
+  gem 'selenium-webdriver', '~> 4.9.0'
+  gem 'sqlite3',            '~> 1.4.2'
+end
+
+group :development do
+  gem 'listen',       '~> 3.8.0'
+  gem 'web-console',  '~> 4.2'
+end
+
+group :test do
+  gem 'brakeman',                 '~> 5.4.1'
+  gem 'bundler-audit',            '~> 0.9.1'
+  gem 'coveralls_reborn',         '~> 0.28.0', require: false
+  gem 'diffy',                    '~> 3.4.2'
+  gem 'equivalent-xml',           '~> 0.6.0'
+  gem 'minitest-reporters',       '~> 1.6.1'
+  gem 'mocha',                    '~> 2.1.0', require: false
+  gem 'rails-controller-testing', '~> 1.0.5'
+  gem 'rubocop',                  '~> 1.56.0', require: false
+end

data/lib/occams/content/tags/children.rb

@@ -23,22 +23,23 @@ class Occams::Content::Tag::Children < Occams::Content::Tag
     super
     @locals = params.extract_options!
     @style  = ''
-    @style  = "<style>#children {#{@locals['style']}}</style>" if @locals['style']
+    @style  = "<style>#children {#{@locals['style']}}</style>\n" if @locals['style']
     @exclude = []
     @exclude = @locals['exclude'].split(',') if @locals['exclude']
     @list = ''
     # ActiveRecord_Associations_CollectionProxy
     @page_children = context.children.order(:position).to_ary
+    if Rails.env == 'production'
+      @page_children.delete_if { |child| !child.is_published }
+    end
     @page_children.delete_if { |child| @exclude.include? child.slug }
   end
 
   def content
     if @page_children.any?
-      @list = '<ul id="children">'
+      @list = "<ul id=\"children\">\n"
       @page_children.each do |c|
-        next if Rails.env == 'production' && !c.is_published
-
-        @list += "<li><a href=#{c.url(relative: true)}>#{c.label}</a></li>"
+        @list += "  <li><a href=#{c.url(relative: true)}>#{c.label}</a></li>\n"
       end
       @list += '</ul>'
     end

data/lib/occams/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Occams
-  VERSION = '1.0.6.1'
+  VERSION = '1.0.7.1'
 end

data/occams.gemspec

@@ -1,35 +1,35 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.unshift File.expand_path('lib', __dir__)
-require 'occams/version'
+require_relative 'lib/occams/version'
 
-Gem::Specification.new do |s|
-  s.name          = 'occams'
-  s.version       = Occams::VERSION
-  s.authors       = ['Andrew vonderLuft']
-  s.email         = ['wonder@hey.com']
-  s.homepage      = 'http://github.com/avonderluft/occams'
-  s.summary       = 'Rails 6-7+ CMS Engine'
-  s.description   = 'Occams is a powerful Rails 6-7+ CMS Engine'
-  s.license       = 'MIT'
+Gem::Specification.new do |spec|
+  spec.name          = 'occams'
+  spec.version       = Occams::VERSION
+  spec.authors       = ['Andrew vonderLuft']
+  spec.email         = ['wonder@hey.com']
+  spec.homepage      = 'http://github.com/avonderluft/occams'
+  spec.summary       = 'Rails 6-7+ CMS Engine'
+  spec.description   = 'Occams is a powerful Rails 6-7+ CMS Engine'
+  spec.license       = 'MIT'
 
-  s.files = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|doc)/})
   end
 
-  s.required_ruby_version = '>= 2.7.0'
-  s.metadata['rubygems_mfa_required'] = 'true'
+  spec.required_ruby_version = '>= 2.7.0'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
-  s.add_runtime_dependency 'active_link_to',       '~> 1.0', '>= 1.0.5'
-  s.add_runtime_dependency 'comfy_bootstrap_form', '~> 4.0', '>= 4.0.0'
-  s.add_runtime_dependency 'haml-rails',           '~> 2.1', '>= 2.1.0'
-  s.add_runtime_dependency 'image_processing',     '~> 1.12', '>= 1.12.2'
-  s.add_runtime_dependency 'jquery-rails',         '~> 4.6', '>= 4.6.0'
-  s.add_runtime_dependency 'kramdown',             '~> 2.4', '>= 2.4.0'
-  s.add_runtime_dependency 'mimemagic',            '~> 0.4', '>= 0.4.3'
-  s.add_runtime_dependency 'mini_magick',          '~> 4.12', '>= 4.12.0'
-  s.add_runtime_dependency 'rails',                '>= 6.1.0'
-  s.add_runtime_dependency 'rails-i18n',           '>= 6.0.0'
-  s.add_runtime_dependency 'sassc-rails',          '~> 2.1', '>= 2.1.2'
-  s.add_runtime_dependency 'sprockets-rails',      '~> 3.4', '>= 3.4.2'
+  spec.add_dependency 'active_link_to',       '~> 1.0', '>= 1.0.5'
+  spec.add_dependency 'comfy_bootstrap_form', '~> 4.0', '>= 4.0.0'
+  spec.add_dependency 'haml-rails',           '~> 2.1', '>= 2.1.0'
+  spec.add_dependency 'image_processing',     '~> 1.2', '>= 1.12.2'
+  spec.add_dependency 'jquery-rails',         '~> 4.6', '>= 4.6.0'
+  spec.add_dependency 'kaminari',             '~> 1.2', '>= 1.2.2'
+  spec.add_dependency 'kramdown',             '~> 2.4', '>= 2.4.0'
+  spec.add_dependency 'mimemagic',            '~> 0.4', '>= 0.4.3'
+  spec.add_dependency 'mini_magick',          '~> 4.12', '>= 4.12.0'
+  spec.add_dependency 'rails',                '>= 6.1.0'
+  spec.add_dependency 'rails-i18n',           '>= 6.0.0'
+  spec.add_dependency 'sassc-rails',          '~> 2.1', '>= 2.1.2'
+  spec.add_dependency 'sprockets-rails',      '~> 3.4', '>= 3.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: occams
 version: !ruby/object:Gem::Version
-  version: 1.0.6.1
+  version: 1.0.7.1
 platform: ruby
 authors:
 - Andrew vonderLuft
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-07 00:00:00.000000000 Z
+date: 2023-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -76,7 +76,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.12.2
@@ -86,7 +86,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.12.2
@@ -110,6 +110,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.6.0
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -249,9 +269,9 @@ files:
 - ".gitattributes"
 - ".github/issue_template.md"
 - ".github/pull_request_template.md"
+- ".github/workflows/rubyonrails.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -652,6 +672,8 @@ files:
 - db/cms_seeds/sample-site/snippets/default.html
 - db/migrate/00_create_active_storage_tables.rb
 - db/migrate/01_create_cms.rb
+- gemfiles/6.1.gemfile
+- gemfiles/7.0.gemfile
 - lib/generators/occams/cms/README
 - lib/generators/occams/cms/assets_generator.rb
 - lib/generators/occams/cms/cms_generator.rb

data/.travis.yml

@@ -1,45 +0,0 @@
-dist: xenial
-services:
-  - xvfb
-addons:
-  sources:
-  - google-chrome
-  apt:
-    packages:
-    - google-chrome-stable
-
-language: ruby
-rvm:
-  - 2.7.8
-  - 3.1.4
-  - 3.2.2
-gemfile:
-  - test/gemfiles/6.1.gemfile
-jobs:
-  include:
-    - rvm: 2.7.8
-      gemfile: test/gemfiles/6.1.gemfile
-    - rvm: 3.1.4
-      gemfile: test/gemfiles/6.1.gemfile
-    - rvm: 3.2.2
-      gemfile: test/gemfiles/7.0.gemfile
-branches:
-  only:
-    - master
-before_install:
-  - gem update --system
-  - gem update bundler
-before_script:
-  - wget http://chromedriver.storage.googleapis.com/2.36/chromedriver_linux64.zip
-  - unzip chromedriver_linux64.zip
-  - sudo apt-get install libnss3
-  - sudo apt-get --only-upgrade install google-chrome-stable
-  - sudo cp chromedriver /usr/local/bin/.
-  - sudo chmod +x /usr/local/bin/chromedriver
-  - export DISPLAY=:99.0
-  - sleep 3
-script:
-  - bundle exec rake db:migrate
-  - bundle exec rake test
-  - SKIP_COV=true bundle exec rake test:system
-  - bundle exec rubocop