occams 1.0.7.1 → 1.0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a00b3daa132f332250a7764bb37a42535293eb290c00fdba37febd63f8950873
-  data.tar.gz: '05929ac5d67803f5fd855bc602e255e31dd730615108a1561c4e03541cb9528f'
+  metadata.gz: 97f3c2e83bbf1b0aed1f59775a3bac214997aa5569687460ec48e44ff9c62bd8
+  data.tar.gz: fcba8bd301c5628533c5d048d4238429d3471f94bbe4d2bf06a8003628635136
 SHA512:
-  metadata.gz: ff72090234dae1fc2d750b696c7796d190a73b349bbe2f2e731f5b906c6b4e0550cbdf67a94c9b986f9f603841f7c00ecbe17fd2007492930eb8484a3aaade9d
-  data.tar.gz: 5da49c13c964c3b11f5af90b2576175cfdd9e85362a4339d29a3b6cf825615ece8610c141b8fc77c9f351cb302cfe5546753e816bba549adb9d6a2cfe48c5f90
+  metadata.gz: baadb59130faf8bcf1f50de653b9eb3238175830331a5fd1c8b899be92f84de23cb218c9a8ca1d5449b4c99793f14c13b6eed8b00130309a0fef50ffafcfc484
+  data.tar.gz: 237e11025f46b90286420873b9e0bc4278485a7e428bcffb1955ecd9aff13ec583031a4c349f2971f95b1276503dfa21f31f63e3249d6fcf6ed2a76f18330ad7

data/.github/workflows/coveralls.yml

@@ -0,0 +1,38 @@
+name: "Coveralls"
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  coveralls:
+    strategy:
+      matrix:
+        ruby-version:
+          - "3.2"
+        rails-version:
+          - "7.0"
+        continue-on-error: [false]
+    name: ${{ format('Coverage (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
+      COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+
+    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 Test DB
+        run: bin/rails db:migrate RAILS_ENV=test
+      - name: Run tests
+        run: bin/rake test
+

data/.github/workflows/rubyonrails.yml

@@ -1,4 +1,4 @@
-name: "Test,Lint,Audit"
+name: "Rails CI"
 on:
   push:
     branches:
@@ -17,12 +17,13 @@ jobs:
           - "6.1"
           - "7.0"
         continue-on-error: [false]
-    name: ${{ format('Test,Lint,Audit (Ruby {0}, Rails {1})', matrix.ruby-version, matrix.rails-version) }}
+    name: ${{ format('Tests (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
+      SKIP_COV: true
 
     steps:
       - uses: actions/checkout@v2
@@ -33,7 +34,7 @@ jobs:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
 
-      - name: Set up DB
+      - name: Set up Test DB
         run: bin/rails db:migrate RAILS_ENV=test
       - name: Run tests
         run: bin/rake test
@@ -43,5 +44,6 @@ jobs:
 
       - 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

@@ -5,7 +5,7 @@ tmp/**/*
 .DS_Store
 db/schema.rb
 db/development_structure.sql
-db/test.sqlite3-journal
+db/test.sqlite3*
 pkg
 rdoc
 /tmp

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## v1.0.7.3 - 10/7/2023
+
+- Fixed edge case with siblings tag when current page is excluded
+- Git ignore all sqlite* files for testing
+- Small testing refinements
+- Prep for Rails 7.1 compatibility
+
+## v1.0.7.2 - 9/27/2023
+
+- Pulled will_paginate option out in favor of Kaminari
+- Switched CI from Buildkite to [Github actions](https://github.com/avonderluft/occams/actions/workflows/rubyonrails.yml)
+- Improved test coverage to 99+
+- Removed backward compatibility to Rails prior to 6.x
+
 ## v1.0.7.1 - 9/22/2023
 
 - Addressed deprecations for file type 'image/jpg'

data/Gemfile

@@ -5,7 +5,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
-gem 'rails', '~> 7.0'
+gem 'rails', '~> 7.0.0'
 
 group :development, :test do
   gem 'autoprefixer-rails', '~> 8.1.0'
@@ -28,6 +28,7 @@ group :test do
   gem 'coveralls_reborn',         '~> 0.28.0', require: false
   gem 'diffy',                    '~> 3.4.2'
   gem 'equivalent-xml',           '~> 0.6.0'
+  gem 'minitest',                 '~> 5.20.0'
   gem 'minitest-reporters',       '~> 1.6.1'
   gem 'mocha',                    '~> 2.1.0', require: false
   gem 'rails-controller-testing', '~> 1.0.5'

data/README.md

@@ -1,10 +1,10 @@
 # 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)
+[![Rails CI](https://github.com/avonderluft/occams/actions/workflows/rubyonrails.yml/badge.svg?branch=main)](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)
+[![GitHub Release Date - Published_At](https://img.shields.io/github/release-date/avonderluft/occams?label=last%20release&color=seagreen)](https://github.com/avonderluft/occams/releases)
 
 ***Prefer Simplicity.***
 
@@ -29,8 +29,6 @@ ocCaM'S is a revival of [ComfortableMexicanSofa](https://github.com/comfy/comfor
 
 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.
 
-
-
 ## Features
 
 * Simple drop-in integration with Rails 6.1+ apps with minimal configuration
@@ -46,12 +44,11 @@ ocCaM'S, pronounced "AH-kums" is a nod to [Occam's Razor](https://en.wikipedia.o
 
 * 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
-* 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
 
-- Test suite passing on Ruby 2.7.8, 3.1.4 and 3.2.2 with Rails 6.1 and 7.0+
-- Rails 7+ is recommended, since performance is noticably better than 6
+- [Test suite](https://github.com/avonderluft/occams/actions/workflows/rubyonrails.yml) on Ruby 2.7, 3.1 and 3.2 with Rails 6.1 and 7.0+
+- On Ruby 3.2, Rails 7+ is recommended, since performance is noticably better than 6
 
 ## Installation
 

data/app/controllers/concerns/occams/paginate.rb

@@ -1,14 +1,9 @@
 # frozen_string_literal: true
 
 module Occams::Paginate
-  # Wrapper to deal with WillPaginate vs Kaminari nonsense
   def occams_paginate(scope, per_page: 50)
-    if defined?(WillPaginate)
-      scope.paginate(page: params[:page], per_page: per_page)
-    elsif defined?(Kaminari)
-      scope.page(params[:page]).per(per_page)
-    else
-      scope
-    end
+    return unless defined?(Kaminari)
+
+    scope.page(params[:page]).per(per_page)
   end
 end

data/app/controllers/occams/cms/content_controller.rb

@@ -74,10 +74,10 @@ protected
   # Getting page and setting content_cache and fragments data if we need to
   # serve translation data
   def find_cms_page_by_full_path(full_path)
-    @cms_page = if Rails.env == 'production'
-                  @cms_site.pages.published.find_by!(full_path: full_path)
-                else
+    @cms_page = if Rails.env == 'development'
                   @cms_site.pages.find_by!(full_path: full_path)
+                else
+                  @cms_site.pages.published.find_by!(full_path: full_path)
                 end
 
     @cms_page.translate!

data/app/helpers/occams/cms_helper.rb

@@ -62,15 +62,12 @@ module Occams
       Occams::Cms::Site.find_site(host, path)
     end
 
-    # Wrapper to deal with Kaminari vs WillPaginate
     def occams_paginate(collection)
       return unless collection
 
-      if defined?(WillPaginate)
-        will_paginate collection
-      elsif defined?(Kaminari)
-        paginate collection, theme: 'occams'
-      end
+      return unless defined?(Kaminari)
+
+      paginate collection, theme: 'occams'
     end
   end
 end

data/app/models/occams/cms/file.rb

@@ -22,13 +22,8 @@ class Occams::Cms::File < ActiveRecord::Base
   # -- Callbacks ---------------------------------------------------------------
   before_validation :assign_label, on: :create
   before_create :assign_position
-  # active_storage attachment behavior changed in rails 6 - see PR#892 for details
-  if Rails::VERSION::MAJOR >= 6
-    before_save :process_attachment
-  else
-    after_save :process_attachment
-  end
-
+  # active_storage attachment behavior changed in rails 6
+  before_save :process_attachment
   after_save :clear_page_content_cache
 
   # -- Validations -------------------------------------------------------------

data/app/models/occams/cms/fragment.rb

@@ -10,12 +10,8 @@ class Occams::Cms::Fragment < ActiveRecord::Base
   attr_reader :files
 
   # -- Callbacks ---------------------------------------------------------------
-  # active_storage attachment behavior changed in rails 6 - see PR#892 for details
-  if Rails::VERSION::MAJOR >= 6
-    before_save :remove_attachments, :add_attachments
-  else
-    after_save :remove_attachments, :add_attachments
-  end
+  # active_storage attachment behavior changed in rails 6
+  before_save :remove_attachments, :add_attachments
 
   # -- Relationships -----------------------------------------------------------
   belongs_to :record, polymorphic: true, touch: true

data/config/application.rb

@@ -30,6 +30,13 @@ module Occams
 
     config.i18n.enforce_available_locales = true
 
-    config.active_record.yaml_column_permitted_classes = [Symbol, Date, Time, ActiveSupport::TimeWithZone, ActiveSupport::TimeZone]
+    config.active_record.yaml_column_permitted_classes = [
+      Symbol,
+      Date,
+      Time,
+      ActiveSupport::TimeWithZone,
+      ActiveSupport::TimeZone,
+      ActiveSupport::SafeBuffer
+    ]
   end
 end

data/gemfiles/6.1.gemfile

@@ -5,7 +5,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec path: '../'
 
-gem 'rails', '~> 6.1'
+gem 'rails', '~> 6.1.0'
 
 group :development, :test do
   gem 'autoprefixer-rails', '~> 8.1.0'

data/gemfiles/7.0.gemfile

@@ -5,7 +5,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec path: '../'
 
-gem 'rails', '~> 7.0'
+gem 'rails', '~> 7.0.0'
 
 group :development, :test do
   gem 'autoprefixer-rails', '~> 8.1.0'

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

@@ -29,7 +29,7 @@ class Occams::Content::Tag::Children < Occams::Content::Tag
     @list = ''
     # ActiveRecord_Associations_CollectionProxy
     @page_children = context.children.order(:position).to_ary
-    if Rails.env == 'production'
+    unless Rails.env == 'development'
       @page_children.delete_if { |child| !child.is_published }
     end
     @page_children.delete_if { |child| @exclude.include? child.slug }

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

@@ -42,6 +42,7 @@ class Occams::Content::Tag::Siblings < Occams::Content::Tag
         sib_idx = @sibs.index(sib)
         next if sib.slug == context.slug
         next if Rails.env == 'production' && !sib.is_published
+        next unless @sibs.index(context) # current page is excluded
 
         if sib_idx == @sibs.index(context) - 1
           @links += "<a href=#{sib.url(relative: true)}>#{sib.label}</a> &laquo;&nbsp;<em>Previous</em> &bull; "

data/lib/occams/seeds/file/exporter.rb

@@ -23,14 +23,10 @@ module Occams::Seeds::File
         # writing content
         begin
           ::File.binwrite(::File.join(path, ::File.basename(file_path)), file.attachment.download)
+          Occams.logger.info("[CMS SEEDS] Exported File \t #{file.attachment.filename}")
         rescue Errno::ENOENT, OpenURI::HTTPError
-          message = "[CMS SEEDS] No physical File \t #{file.attachment.filename}"
-          Occams.logger.warn(message)
-          next
+          Occams.logger.warn("[CMS SEEDS] No physical File \t #{file.attachment.filename}")
         end
-
-        message = "[CMS SEEDS] Exported File \t #{file.attachment.filename}"
-        Occams.logger.info(message)
       end
     end
   end

data/lib/occams/seeds/file/importer.rb

@@ -41,11 +41,9 @@ module Occams::Seeds::File
 
         if fresh_file
           if file.save
-            message = "[CMS SEEDS] Imported File \t #{file_path}"
-            Occams.logger.info(message)
+            Occams.logger.info("[CMS SEEDS] Imported File \t #{file_path}")
           else
-            message = "[CMS SEEDS] Failed to import File \n#{file.errors.inspect}"
-            Occams.logger.warn(message)
+            Occams.logger.warn("[CMS SEEDS] Failed to import File \n#{file.errors.inspect}")
           end
         end
 

data/lib/occams/seeds/layout/importer.rb

@@ -41,11 +41,9 @@ module Occams::Seeds::Layout
         )
 
         if layout.save
-          message = "[CMS SEEDS] Imported Layout \t #{layout.identifier}"
-          Occams.logger.info(message)
+          Occams.logger.info("[CMS SEEDS] Imported Layout \t #{layout.identifier}")
         else
-          message = "[CMS SEEDS] Failed to import Layout \n#{layout.errors.inspect}"
-          Occams.logger.warn(message)
+          Occams.logger.warn("[CMS SEEDS] Failed to import Layout \n#{layout.errors.inspect}")
         end
       end
 

data/lib/occams/seeds/page/importer.rb

@@ -79,8 +79,7 @@ module Occams::Seeds::Page
           page.fragments.where(identifier: old_frag_identifiers - new_frag_identifiers).destroy_all
 
         else
-          message = "[CMS SEEDS] Failed to import Page \n#{page.errors.inspect}"
-          Occams.logger.warn(message)
+          Occams.logger.warn("[CMS SEEDS] Failed to import Page \n#{page.errors.inspect}")
         end
       end
 

data/lib/occams/seeds/snippet/importer.rb

@@ -29,11 +29,9 @@ module Occams::Seeds::Snippet
           )
 
           if snippet.save
-            message = "[CMS SEEDS] Imported Snippet \t #{snippet.identifier}"
-            Occams.logger.info(message)
+            Occams.logger.info("[CMS SEEDS] Imported Snippet \t #{snippet.identifier}")
           else
-            message = "[CMS SEEDS] Failed to import Snippet \n#{snippet.errors.inspect}"
-            Occams.logger.warn(message)
+            Occams.logger.warn("[CMS SEEDS] Failed to import Snippet \n#{snippet.errors.inspect}")
           end
         end
 

data/lib/occams/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: occams
 version: !ruby/object:Gem::Version
-  version: 1.0.7.1
+  version: 1.0.7.3
 platform: ruby
 authors:
 - Andrew vonderLuft
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-22 00:00:00.000000000 Z
+date: 2023-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -269,6 +269,7 @@ files:
 - ".gitattributes"
 - ".github/issue_template.md"
 - ".github/pull_request_template.md"
+- ".github/workflows/coveralls.yml"
 - ".github/workflows/rubyonrails.yml"
 - ".gitignore"
 - ".rubocop.yml"