occams 1.1.0 → 1.1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a97f751e8ded8222b0ef73e6f06b6633bdc5a2cef1858872d0e4ccbcdbc56c8
-  data.tar.gz: 1c1b034bc1599c94a72e99bf67b5eecb45cdffc35d4bccd2aa1c906780e760a7
+  metadata.gz: de6711b997c207a91f021b6f4bfb158f8a4ab7763b533367ca2726edda6c4af4
+  data.tar.gz: da3e64509b1689282afcb484d1f6942db43945a39cdfcce2baf566ed4e0ce80f
 SHA512:
-  metadata.gz: 2da69ad3d5a308ddc27208fba96417b6156029702f24337a76d43711ed9925cfe62b07cf52f413742aca58d0f01bc73391a3d59409936e904d88ab4b95cfe0a3
-  data.tar.gz: 9ed1193e3ba2976446bba4c04092b9af3ec39430a54b75db05a4d0f26466b2de8fef6b6725d30e565ec7a82dde7f428c014cf60d9456922b46a414362b0cac4d
+  metadata.gz: f63e97f7e35f9d722ddc95aeff8cf71b22973f388b773dcab39a5b61a698b8b980e31134ee944731887cacda1be2dca9209c1dc169fe45f7fb8d62eb4cd0fdc7
+  data.tar.gz: 38a2af2e7b3f4ad037669ce10e14186a9cb07def0d36130c4331ebf041d34b02c8634d7631b99b67feb77ceddfebd5e8eb98c0c61da4795f21b40ad3694a33f1

data/.github/workflows/coveralls.yml

@@ -10,9 +10,9 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-          - "3.2"
+          - "3.3"
         rails-version:
-          - "7.0"
+          - "7.1"
         continue-on-error: [true]
     name: ${{ format('Coverage (Ruby {0}, Rails {1})', matrix.ruby-version, matrix.rails-version) }}
     runs-on: ubuntu-latest

data/.github/workflows/rubyonrails.yml

@@ -10,7 +10,6 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-          - "2.7"
           - "3.1"
           - "3.2"
           - "3.3"

data/.rubocop.yml

@@ -1,3 +1,7 @@
+require:
+  # - rubocop-rails
+  # - rubocop-minitest
+
 AllCops:
   TargetRubyVersion: 2.7
   NewCops: enable

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v.1.1.1 19 May 2024
+
+- bump to Rails 7.1.3.3
+- bugfix: uploaded files index page was blank
+- create cms:image tag, simplifying from cms:file_link
+- add 'title' attribute to images
+- update and optimize test suite
+- drop support for ruby < 3.0 - no longer supported
+
 ## v.1.1.0 13 May 2024
 
 - Rails 7.1 compatibility, all tests passing

data/Gemfile

@@ -5,35 +5,34 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
-gem 'rails', '~> 7.1.2'
+gem 'rails', '~> 7.1.3'
 
 group :development, :test do
-  gem 'autoprefixer-rails', '~> 8.1.0'
+  gem 'autoprefixer-rails', '~> 10.4.16.0'
   gem 'byebug',             '~> 11.1.0', platforms: %i[mri mingw x64_mingw]
-  gem 'image_processing',   '>= 1.2'
+  gem 'image_processing',   '>= 1.12.0'
   gem 'sqlite3',            '~> 1.6.7'
   # gem 'mysql2',             '~> 0.5'
   # gem 'pg',                 '~> 1.5.4'
 end
 
 group :development do
-  gem 'listen',       '~> 3.8.0'
+  gem 'listen',       '~> 3.9.0'
   gem 'web-console',  '~> 4.2'
 end
 
 group :test do
-  gem 'brakeman',                 '~> 5.4.1'
+  gem 'brakeman',                 '~> 6.1.2'
   gem 'bundler-audit',            '~> 0.9.1'
-  gem 'capybara',                 '~> 3.39.0'
   gem 'coveralls_reborn',         '~> 0.28.0', require: false
-  gem 'cuprite',                  '~> 0.14.3'
-  gem 'diffy',                    '~> 3.4.2'
+  gem 'cuprite',                  '>= 0.15'
   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 'puma',                     '~> 6.4.0'
+  gem 'minitest',                 '>= 5.23.0'
+  gem 'minitest-reporters',       '>= 1.6.1'
+  gem 'mocha',                    '>= 2.3.0', require: false
   gem 'rails-controller-testing', '~> 1.0.5'
-  gem 'rubocop',                  '~> 1.56.0', require: false
-  gem 'simplecov',                '~> 0.22.0', require: false
+  gem 'rubocop',                  '~> 1.63.0', require: false
+  gem 'rubocop-minitest'
+  gem 'rubocop-rails'
+  gem 'simplecov', '~> 0.22.0', require: false
 end

data/README.md

@@ -47,9 +47,8 @@ ocCaM'S, pronounced "AH-kums" is a nod to [Occam's Razor](https://en.wikipedia.o
 
 ## Compatibility
 
-- [Test suite](https://github.com/avonderluft/occams/actions/workflows/rubyonrails.yml) on Ruby >= 2.7 with Rails >= 6.1
-- On Ruby 3.2, Rails 7.x + is recommended, since performance is noticably better than on 6.x
-- Sites do run on Rails 7.1, e.g. [GKNT](https://gknt.org/), but some tests fail in [Github Actions](https://github.com/avonderluft/occams/actions). Your mileage may vary.
+- [Test suite](https://github.com/avonderluft/occams/actions/workflows/rubyonrails.yml) on Ruby >= 3.0 with Rails >= 6.1
+- On Ruby 3.x, Rails 7.x + is recommended, since performance is noticably better than on 6.x
 
 ## Installation
 

data/TODOS.md

@@ -1,7 +1,6 @@
 # ToDos
 
-- set up Buildkite CI and add build badge to README
 - add duplicate page function in admin UI
 - add admin content search to list layouts, pages and snippets - see https://blog.robertsj.com/search/
-- add application console for testing
-- add feature to resize file_link'd images
+- diagnose and correct failure of ImageMagick params in file_link and image cms tags
+- lint for rubocop-rails and rubocop-minitest

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

@@ -2,8 +2,10 @@
 
 module Occams::Paginate
   def occams_paginate(scope, per_page: 50)
-    return unless defined?(Kaminari)
-
-    scope.page(params[:page]).per(per_page)
+    if defined?(Kaminari)
+      scope.page(params[:page]).per(per_page)
+    else
+      scope
+    end
   end
 end

data/app/controllers/occams/admin/cms/pages_controller.rb

@@ -127,8 +127,8 @@ protected
 
   def build_page
     @page = @site.pages.new(page_params)
-    @page.parent ||= (@site.pages.find_by_id(params[:parent_id]) || @site.pages.root)
-    @page.layout ||= (@page.parent&.layout || @site.layouts.first)
+    @page.parent ||= @site.pages.find_by_id(params[:parent_id]) || @site.pages.root
+    @page.layout ||= @page.parent&.layout || @site.layouts.first
   end
 
   def load_page

data/app/helpers/occams/admin/cms_helper.rb

@@ -39,8 +39,11 @@ module Occams
       # @param [Occams::Cms::File] file
       # @return [String] {{ cms:file_link #{file.id}, ... }}
       def cms_file_link_tag(file)
-        as = ', as: image' if file.attachment.image?
-        "{{ cms:file_link #{file.id}#{as} }}"
+        if file.attachment.image?
+          "{{ cms:image #{file.label} }}"
+        else
+          "{{ cms:file_link #{file.id} }}"
+        end
       end
     end
   end

data/app/helpers/occams/cms_helper.rb

@@ -65,9 +65,7 @@ module Occams
     def occams_paginate(collection)
       return unless collection
 
-      return unless defined?(Kaminari)
-
-      paginate collection, theme: 'occams'
+      paginate collection, theme: 'occams' if defined?(Kaminari)
     end
   end
 end

data/config/initializers/content_security_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Define an application-wide content security policy.

data/config/initializers/inflections.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections

data/config/initializers/new_framework_defaults_7_1.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 #
 # This file eases your Rails 7.1 framework defaults upgrade.

data/config/initializers/permissions_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Define an application-wide HTTP permissions policy. For further

data/gemfiles/6.1.gemfile

@@ -8,31 +8,24 @@ gemspec path: '../'
 gem 'rails', '~> 6.1.0'
 
 group :development, :test do
-  gem 'autoprefixer-rails', '~> 8.1.0'
-  gem 'byebug',             '~> 10.0.0', platforms: %i[mri mingw x64_mingw]
-  gem 'image_processing',   '>= 1.2'
+  gem 'autoprefixer-rails', '~> 10.4.16.0'
+  gem 'byebug',             '~> 11.1.0', platforms: %i[mri mingw x64_mingw]
+  gem 'image_processing',   '>= 1.12.0'
   gem 'sqlite3',            '~> 1.6.7'
 end
 
-group :development do
-  gem 'listen',       '~> 3.8.0'
-  gem 'web-console',  '~> 4.2'
-end
-
 group :test do
-  gem 'brakeman',                 '~> 5.4.1'
+  gem 'brakeman',                 '~> 6.1.2'
   gem 'bundler-audit',            '~> 0.9.1'
-  gem 'capybara',                 '~> 3.39.0'
   gem 'coveralls_reborn',         '~> 0.28.0', require: false
-  gem 'cuprite',                  '~> 0.14.3'
-  gem 'diffy',                    '~> 3.4.2'
+  gem 'cuprite',                  '>= 0.15'
   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 'puma',                     '~> 6.4.0'
+  gem 'minitest',                 '>= 5.23.0'
+  gem 'minitest-reporters',       '>= 1.6.1'
+  gem 'mocha',                    '>= 2.3.0', require: false
   gem 'rails-controller-testing', '~> 1.0.5'
-  gem 'rubocop',                  '~> 1.56.0', require: false
-  gem 'selenium-webdriver', '~> 4.9.0'
+  gem 'rubocop',                  '~> 1.63.0', require: false
+  gem 'rubocop-minitest'
+  gem 'rubocop-rails'
   gem 'simplecov', '~> 0.22.0', require: false
 end

data/gemfiles/7.0.gemfile

@@ -8,30 +8,24 @@ gemspec path: '../'
 gem 'rails', '~> 7.0.0'
 
 group :development, :test do
-  gem 'autoprefixer-rails', '~> 8.1.0'
-  gem 'byebug',             '~> 10.0.0', platforms: %i[mri mingw x64_mingw]
-  gem 'image_processing',   '>= 1.2'
+  gem 'autoprefixer-rails', '~> 10.4.16.0'
+  gem 'byebug',             '~> 11.1.0', platforms: %i[mri mingw x64_mingw]
+  gem 'image_processing',   '>= 1.12.0'
   gem 'sqlite3',            '~> 1.6.7'
 end
 
-group :development do
-  gem 'listen',       '~> 3.8.0'
-  gem 'web-console',  '~> 4.2'
-end
-
 group :test do
-  gem 'brakeman',                 '~> 5.4.1'
+  gem 'brakeman',                 '~> 6.1.2'
   gem 'bundler-audit',            '~> 0.9.1'
-  gem 'capybara',                 '~> 3.39.0'
   gem 'coveralls_reborn',         '~> 0.28.0', require: false
-  gem 'cuprite',                  '~> 0.14.3'
-  gem 'diffy',                    '~> 3.4.2'
+  gem 'cuprite',                  '>= 0.15'
   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 'puma',                     '~> 6.4.0'
+  gem 'minitest',                 '>= 5.23.0'
+  gem 'minitest-reporters',       '>= 1.6.1'
+  gem 'mocha',                    '>= 2.3.0', require: false
   gem 'rails-controller-testing', '~> 1.0.5'
-  gem 'rubocop',                  '~> 1.56.0', require: false
-  gem 'simplecov',                '~> 0.22.0', require: false
+  gem 'rubocop',                  '~> 1.63.0', require: false
+  gem 'rubocop-minitest'
+  gem 'rubocop-rails'
+  gem 'simplecov', '~> 0.22.0', require: false
 end

data/gemfiles/7.1.gemfile

@@ -8,30 +8,24 @@ gemspec path: '../'
 gem 'rails', '~> 7.1.0', '>= 7.1.1'
 
 group :development, :test do
-  gem 'autoprefixer-rails', '~> 8.1.0'
-  gem 'byebug',             '~> 10.0.0', platforms: %i[mri mingw x64_mingw]
-  gem 'image_processing',   '>= 1.2'
+  gem 'autoprefixer-rails', '~> 10.4.16.0'
+  gem 'byebug',             '~> 11.1.0', platforms: %i[mri mingw x64_mingw]
+  gem 'image_processing',   '>= 1.12.0'
   gem 'sqlite3',            '~> 1.6.7'
 end
 
-group :development do
-  gem 'listen',       '~> 3.8.0'
-  gem 'web-console',  '~> 4.2'
-end
-
 group :test do
-  gem 'brakeman',                 '~> 5.4.1'
+  gem 'brakeman',                 '~> 6.1.2'
   gem 'bundler-audit',            '~> 0.9.1'
-  gem 'capybara',                 '~> 3.39.0'
   gem 'coveralls_reborn',         '~> 0.28.0', require: false
-  gem 'cuprite',                  '~> 0.14.3'
-  gem 'diffy',                    '~> 3.4.2'
+  gem 'cuprite',                  '>= 0.15'
   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 'puma',                     '~> 6.4.0'
+  gem 'minitest',                 '>= 5.23.0'
+  gem 'minitest-reporters',       '>= 1.6.1'
+  gem 'mocha',                    '>= 2.3.0', require: false
   gem 'rails-controller-testing', '~> 1.0.5'
-  gem 'rubocop',                  '~> 1.56.0', require: false
-  gem 'simplecov',                '~> 0.22.0', require: false
+  gem 'rubocop',                  '~> 1.63.0', require: false
+  gem 'rubocop-minitest'
+  gem 'rubocop-rails'
+  gem 'simplecov', '~> 0.22.0', require: false
 end

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

@@ -7,23 +7,19 @@ require_relative 'mixins/file_content'
 #   {{cms:file_link id, as: image}}
 #
 # `as`      - url (default) | link | image - how file gets rendered out
-# `label`   - attach label attribute to link or image tag
-# `resize`  - imagemagic option. For example: "100x50>"
-# `gravity` - imagemagic option. For example: "center"
-# `crop`    - imagemagic option. For example: "100x50+0+0"
 # `class`   - any html classes that you want on the result link or image tag. For example "class1 class2"
 #
+# - variant_attrs are not functional, perhaps due to some change in ImageMagick
+# - Simply use a class in your CSS / SASS to style your image display
+# `label`   - attach label attribute to link or image tag
+# `resize`  - imagemagick option. For example: "100x50>"
+# `gravity` - imagemagick option. For example: "center"
+# `crop`    - imagemagick option. For example: "100x50+0+0"
+#
 class Occams::Content::Tags::FileLink < Occams::Content::Tag
   include Occams::Content::Tags::Mixins::FileContent
 
-  # @return [String] A {Occams::Cms::Site#files} ID.
-  attr_reader :identifier
-
-  # @type ["url", "link", "image"]
-  attr_reader :as
-
-  # @type [{String => String}]
-  attr_reader :variant_attrs
+  attr_reader :identifier, :as, :variant_attrs
 
   def initialize(context:, params: [], source: nil)
     super
@@ -32,7 +28,7 @@ class Occams::Content::Tags::FileLink < Occams::Content::Tag
     @identifier     = params[0]
     @as             = options['as'] || 'url'
     @class          = options['class']
-    @variant_attrs  = options.slice('resize', 'gravity', 'crop')
+    @variant_attrs  = options.slice('resize', 'gravity', 'crop') # broken for ImageMagick
 
     return if @identifier.present?
 

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require_relative 'mixins/file_content'
+
+# This is like the the file_link tag, but specifically for images
+# Identify the image by its label {{ cms:image label }}
+#
+# `class`   - any html classes that you want on the image tag. For example "class1 class2"
+#
+# - variant_attrs are not functional, perhaps due to some change in ImageMagick
+# - Simply use a class in your CSS / SASS to style your image display
+# `label`   - attach label attribute to link or image tag
+# `resize`  - imagemagick option. For example: "100x50>"
+# `gravity` - imagemagick option. For example: "center"
+# `crop`    - imagemagick option. For example: "100x50+0+0"
+
+class Occams::Content::Tags::Image < Occams::Content::Tag
+  include Occams::Content::Tags::Mixins::FileContent
+
+  attr_reader :identifier, :as, :variant_attrs
+
+  def initialize(context:, params: [], source: nil)
+    super
+
+    options = params.extract_options!
+    @identifier     = params[0]
+    @as             = 'image'
+    @class          = options['class']
+    @variant_attrs  = options.slice('resize', 'gravity', 'crop') # broken for ImageMagick
+
+    return if @identifier.present?
+
+    raise Error, 'Missing identifier label for image tag'
+  end
+
+  # @return [Occams::Cms::File]
+  def file_record
+    @file_record ||= context.site.files.detect { |f| f.label == identifier }
+  end
+
+  # @return [ActiveStorage::Blob]
+  def file
+    file_record&.attachment
+  end
+
+  # @return [String]
+  def label
+    return '' if file_record.nil?
+
+    file_record.label.presence || file.filename.to_s
+  end
+end
+
+Occams::Content::Renderer.register_tag(
+  :image, Occams::Content::Tags::Image
+)

data/lib/occams/content/tags/mixins/file_content.rb

@@ -25,7 +25,7 @@ module Occams::Content::Tags::Mixins
       when 'link'
         "<a href='#{attachment_url}'#{html_class_attribute} target='_blank'>#{label}</a>"
       when 'image'
-        "<img src='#{attachment_url}'#{html_class_attribute} alt='#{label}'/>"
+        "<img src='#{attachment_url}'#{html_class_attribute} alt='#{label}' title='#{label}'/>"
       else
         attachment_url
       end

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

@@ -16,11 +16,14 @@ require_relative 'mixins/file_content'
 #   {{ cms:page_file_link attachments, filename: "cat.jpg" }}
 #
 # `as`      - url (default) | link | image - how file gets rendered out
+# `class`   - any html classes that you want on the result link or image tag. For example "class1 class2"
+#
+# - the following params are deprecated / not functional, perhaps due to some change in ImageMagick
+# - Simply use a class in your CSS / SASS to style your image display
 # `label`   - attach label attribute to link or image tag
 # `resize`  - imagemagick option. For example: "100x50>"
 # `gravity` - imagemagick option. For example: "center"
 # `crop`    - imagemagick option. For example: "100x50+0+0"
-# `class`   - any html classes that you want on the result link or image tag. For example "class1 class2"
 #
 class Occams::Content::Tags::PageFileLink < Occams::Content::Tag
   include Occams::Content::Tags::Mixins::FileContent

data/lib/occams/content/tags.rb

@@ -18,6 +18,7 @@ require_relative 'tags/files'
 require_relative 'tags/snippet'
 require_relative 'tags/asset'
 require_relative 'tags/file_link'
+require_relative 'tags/image'
 require_relative 'tags/page_file_link'
 require_relative 'tags/helper'
 require_relative 'tags/partial'

data/lib/occams/error.rb

@@ -6,19 +6,19 @@ module Occams
 
   class MissingSite < Occams::Error
     def initialize(identifier)
-      super "Cannot find CMS Site with identifier: #{identifier}"
+      super("Cannot find CMS Site with identifier: #{identifier}")
     end
   end
 
   class MissingLayout < Occams::Error
     def initialize(identifier)
-      super "Cannot find CMS Layout with identifier: #{identifier}"
+      super("Cannot find CMS Layout with identifier: #{identifier}")
     end
   end
 
   class MissingPage < Occams::Error
     def initialize(path)
-      super "Cannot find CMS Page at #{path}"
+      super("Cannot find CMS Page at #{path}")
     end
   end
 end

data/lib/occams/version.rb

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

data/occams.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
     f.match(%r{^(test|doc)/})
   end
 
-  spec.required_ruby_version = '>= 2.7.0'
+  spec.required_ruby_version = '>= 3.0.0'
   spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.add_dependency 'active_link_to',       '~> 1.0',   '>= 1.0.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: occams
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1.1
 platform: ruby
 authors:
 - Andrew vonderLuft
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-04 00:00:00.000000000 Z
+date: 2024-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -719,6 +719,7 @@ files:
 - lib/occams/content/tags/files.rb
 - lib/occams/content/tags/fragment.rb
 - lib/occams/content/tags/helper.rb
+- lib/occams/content/tags/image.rb
 - lib/occams/content/tags/markdown.rb
 - lib/occams/content/tags/mixins/file_content.rb
 - lib/occams/content/tags/number.rb
@@ -765,7 +766,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="