occams 1.0.7.3 → 1.0.8

data/config/environments/test.rb

@@ -10,12 +10,13 @@ require 'active_support/core_ext/integer/time'
 defined?(Occams::Application) && Occams::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
-  # Turn false under Spring and add config.action_view.cache_template_loading = true.
-  config.cache_classes = true
+  # While tests run files are not watched, reloading is not necessary.
+  config.enable_reloading = false
 
-  # Eager loading loads your whole application. When running a single test locally,
-  # this probably isn't necessary. It's a good idea to do in a continuous integration
-  # system, or in some way before deploying your code.
+  # Eager loading loads your entire application. When running a single test locally,
+  # this is usually not necessary, and can slow down your test suite. However, it's
+  # recommended that you enable it in continuous integration systems to ensure eager
+  # loading is working properly before deploying your code.
   config.eager_load = ENV['CI'].present?
 
   # Configure public file server for tests with Cache-Control for performance.
@@ -30,7 +31,11 @@ defined?(Occams::Application) && Occams::Application.configure do
   config.cache_store = :null_store
 
   # Raise exceptions instead of rendering exception templates.
-  config.action_dispatch.show_exceptions = false
+  config.action_dispatch.show_exceptions = if Gem::Version.new(Rails.version) < Gem::Version.new('7.1.0')
+                                             false
+                                           else
+                                             :none
+                                           end
 
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
@@ -48,7 +53,6 @@ defined?(Occams::Application) && Occams::Application.configure do
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
-  config.active_job.queue_adapter = :inline
   # Raise exceptions for disallowed deprecations.
   config.active_support.disallowed_deprecation = :raise
 
@@ -60,4 +64,9 @@ defined?(Occams::Application) && Occams::Application.configure do
 
   # Annotate rendered view with file names.
   # config.action_view.annotate_rendered_view_with_filenames = true
+
+  if Gem::Version.new(Rails.version) >= Gem::Version.new('7.1.0')
+    # Raise error when a before_action's only/except options reference missing actions
+    config.action_controller.raise_on_missing_callback_actions = true
+  end
 end

data/config/initializers/content_security_policy.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 # Be sure to restart your server when you modify this file.
 
 # Define an application-wide content security policy.
@@ -18,9 +17,9 @@
 #     # policy.report_uri "/csp-violation-report-endpoint"
 #   end
 #
-#   # Generate session nonces for permitted importmap and inline scripts
+#   # Generate session nonces for permitted importmap, inline scripts, and inline styles.
 #   config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
-#   config.content_security_policy_nonce_directives = %w(script-src)
+#   config.content_security_policy_nonce_directives = %w(script-src style-src)
 #
 #   # Report violations without enforcing the policy.
 #   # config.content_security_policy_report_only = true

data/config/initializers/filter_parameter_logging.rb

@@ -2,9 +2,9 @@
 
 # Be sure to restart your server when you modify this file.
 
-# Configure parameters to be filtered from the log file. Use this to limit dissemination of
-# sensitive information. See the ActiveSupport::ParameterFilter documentation for supported
-# notations and behaviors.
+# Configure parameters to be partially matched (e.g. passw matches password) and filtered from the log file.
+# Use this to limit dissemination of sensitive information.
+# See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors.
 Rails.application.config.filter_parameters += %i[
   passw secret token _key crypt salt certificate otp ssn
 ]

data/config/initializers/inflections.rb

@@ -1,5 +1,4 @@
 # 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

@@ -0,0 +1,224 @@
+# 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.
+#
+# Uncomment each configuration one by one to switch to the new default.
+# Once your application is ready to run with all new defaults, you can remove
+# this file and set the `config.load_defaults` to `7.1`.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
+
+# No longer add autoloaded paths into `$LOAD_PATH`. This means that you won't be able
+# to manually require files that are managed by the autoloader, which you shouldn't do anyway.
+# This will reduce the size of the load path, making `require` faster if you don't use bootsnap, or reduce the size
+# of the bootsnap cache if you use it.
+# Rails.application.config.add_autoload_paths_to_load_path = false
+
+# Remove the default X-Download-Options headers since it is used only by Internet Explorer.
+# If you need to support Internet Explorer, add back `"X-Download-Options" => "noopen"`.
+# Rails.application.config.action_dispatch.default_headers = {
+#   "X-Frame-Options" => "SAMEORIGIN",
+#   "X-XSS-Protection" => "0",
+#   "X-Content-Type-Options" => "nosniff",
+#   "X-Permitted-Cross-Domain-Policies" => "none",
+#   "Referrer-Policy" => "strict-origin-when-cross-origin"
+# }
+
+# Do not treat an `ActionController::Parameters` instance
+# as equal to an equivalent `Hash` by default.
+# Rails.application.config.action_controller.allow_deprecated_parameters_hash_equality = false
+
+# Active Record Encryption now uses SHA-256 as its hash digest algorithm. Important: If you have
+# data encrypted with previous Rails versions, there are two scenarios to consider:
+#
+# 1. If you have +config.active_support.key_generator_hash_digest_class+ configured as SHA1 (the default
+# before Rails 7.0), you need to configure SHA-1 for Active Record Encryption too:
+# Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA1
+# 2. If you have +config.active_support.key_generator_hash_digest_class+ configured as SHA256 (the new default
+# in 7.0), then you need to configure SHA-256 for Active Record Encryption:
+# Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA256
+#
+# If you don't currently have data encrypted with Active Record encryption, you can disable this setting to
+# configure the default behavior starting 7.1+:
+# Rails.application.config.active_record.encryption.support_sha1_for_non_deterministic_encryption = false
+
+# No longer run after_commit callbacks on the first of multiple Active Record
+# instances to save changes to the same database row within a transaction.
+# Instead, run these callbacks on the instance most likely to have internal
+# state which matches what was committed to the database, typically the last
+# instance to save.
+# Rails.application.config.active_record.run_commit_callbacks_on_first_saved_instances_in_transaction = false
+
+# Configures SQLite with a strict strings mode, which disables double-quoted string literals.
+#
+# SQLite has some quirks around double-quoted string literals.
+# It first tries to consider double-quoted strings as identifier names, but if they don't exist
+# it then considers them as string literals. Because of this, typos can silently go unnoticed.
+# For example, it is possible to create an index for a non existing column.
+# See https://www.sqlite.org/quirks.html#double_quoted_string_literals_are_accepted for more details.
+# Rails.application.config.active_record.sqlite3_adapter_strict_strings_by_default = true
+
+# Disable deprecated singular associations names
+# Rails.application.config.active_record.allow_deprecated_singular_associations_name = false
+
+# Enable the Active Job `BigDecimal` argument serializer, which guarantees
+# roundtripping. Without this serializer, some queue adapters may serialize
+# `BigDecimal` arguments as simple (non-roundtrippable) strings.
+#
+# When deploying an application with multiple replicas, old (pre-Rails 7.1)
+# replicas will not be able to deserialize `BigDecimal` arguments from this
+# serializer. Therefore, this setting should only be enabled after all replicas
+# have been successfully upgraded to Rails 7.1.
+# Rails.application.config.active_job.use_big_decimal_serializer = true
+
+# Specify if an `ArgumentError` should be raised if `Rails.cache` `fetch` or
+# `write` are given an invalid `expires_at` or `expires_in` time.
+# Options are `true`, and `false`. If `false`, the exception will be reported
+# as `handled` and logged instead.
+# Rails.application.config.active_support.raise_on_invalid_cache_expiration_time = true
+
+# Specify whether Query Logs will format tags using the SQLCommenter format
+# (https://open-telemetry.github.io/opentelemetry-sqlcommenter/), or using the legacy format.
+# Options are `:legacy` and `:sqlcommenter`.
+# Rails.application.config.active_record.query_log_tags_format = :sqlcommenter
+
+# Specify the default serializer used by `MessageEncryptor` and `MessageVerifier`
+# instances.
+#
+# The legacy default is `:marshal`, which is a potential vector for
+# deserialization attacks in cases where a message signing secret has been
+# leaked.
+#
+# In Rails 7.1, the new default is `:json_allow_marshal` which serializes and
+# deserializes with `ActiveSupport::JSON`, but can fall back to deserializing
+# with `Marshal` so that legacy messages can still be read.
+#
+# In Rails 7.2, the default will become `:json` which serializes and
+# deserializes with `ActiveSupport::JSON` only.
+#
+# Alternatively, you can choose `:message_pack` or `:message_pack_allow_marshal`,
+# which serialize with `ActiveSupport::MessagePack`. `ActiveSupport::MessagePack`
+# can roundtrip some Ruby types that are not supported by JSON, and may provide
+# improved performance, but it requires the `msgpack` gem.
+#
+# For more information, see
+# https://guides.rubyonrails.org/v7.1/configuring.html#config-active-support-message-serializer
+#
+# If you are performing a rolling deploy of a Rails 7.1 upgrade, wherein servers
+# that have not yet been upgraded must be able to read messages from upgraded
+# servers, first deploy without changing the serializer, then set the serializer
+# in a subsequent deploy.
+# Rails.application.config.active_support.message_serializer = :json_allow_marshal
+
+# Enable a performance optimization that serializes message data and metadata
+# together. This changes the message format, so messages serialized this way
+# cannot be read by older versions of Rails. However, messages that use the old
+# format can still be read, regardless of whether this optimization is enabled.
+#
+# To perform a rolling deploy of a Rails 7.1 upgrade, wherein servers that have
+# not yet been upgraded must be able to read messages from upgraded servers,
+# leave this optimization off on the first deploy, then enable it on a
+# subsequent deploy.
+# Rails.application.config.active_support.use_message_serializer_for_metadata = true
+
+# Set the maximum size for Rails log files.
+#
+# `config.load_defaults 7.1` does not set this value for environments other than
+# development and test.
+#
+# if Rails.env.local?
+#   Rails.application.config.log_file_size = 100 * 1024 * 1024
+# end
+
+# Enable raising on assignment to attr_readonly attributes. The previous
+# behavior would allow assignment but silently not persist changes to the
+# database.
+# Rails.application.config.active_record.raise_on_assign_to_attr_readonly = true
+
+# Enable validating only parent-related columns for presence when the parent is mandatory.
+# The previous behavior was to validate the presence of the parent record, which performed an extra query
+# to get the parent every time the child record was updated, even when parent has not changed.
+# Rails.application.config.active_record.belongs_to_required_validates_foreign_key = false
+
+# Enable precompilation of `config.filter_parameters`. Precompilation can
+# improve filtering performance, depending on the quantity and types of filters.
+# Rails.application.config.precompile_filter_parameters = true
+
+# Enable before_committed! callbacks on all enrolled records in a transaction.
+# The previous behavior was to only run the callbacks on the first copy of a record
+# if there were multiple copies of the same record enrolled in the transaction.
+# Rails.application.config.active_record.before_committed_on_all_records = true
+
+# Disable automatic column serialization into YAML.
+# To keep the historic behavior, you can set it to `YAML`, however it is
+# recommended to explicitly define the serialization method for each column
+# rather than to rely on a global default.
+# Rails.application.config.active_record.default_column_serializer = nil
+
+# Enable a performance optimization that serializes Active Record models
+# in a faster and more compact way.
+#
+# To perform a rolling deploy of a Rails 7.1 upgrade, wherein servers that have
+# not yet been upgraded must be able to read caches from upgraded servers,
+# leave this optimization off on the first deploy, then enable it on a
+# subsequent deploy.
+# Rails.application.config.active_record.marshalling_format_version = 7.1
+
+# Run `after_commit` and `after_*_commit` callbacks in the order they are defined in a model.
+# This matches the behaviour of all other callbacks.
+# In previous versions of Rails, they ran in the inverse order.
+# Rails.application.config.active_record.run_after_transaction_callbacks_in_order_defined = true
+
+# Whether a `transaction` block is committed or rolled back when exited via `return`, `break` or `throw`.
+#
+# Rails.application.config.active_record.commit_transaction_on_non_local_return = true
+
+# Controls when to generate a value for <tt>has_secure_token</tt> declarations.
+#
+# Rails.application.config.active_record.generate_secure_token_on = :initialize
+
+# ** Please read carefully, this must be configured in config/application.rb **
+# Change the format of the cache entry.
+# Changing this default means that all new cache entries added to the cache
+# will have a different format that is not supported by Rails 7.0
+# applications.
+# Only change this value after your application is fully deployed to Rails 7.1
+# and you have no plans to rollback.
+# When you're ready to change format, add this to `config/application.rb` (NOT
+# this file):
+#   config.active_support.cache_format_version = 7.1
+
+# Configure Action View to use HTML5 standards-compliant sanitizers when they are supported on your
+# platform.
+#
+# `Rails::HTML::Sanitizer.best_supported_vendor` will cause Action View to use HTML5-compliant
+# sanitizers if they are supported, else fall back to HTML4 sanitizers.
+#
+# In previous versions of Rails, Action View always used `Rails::HTML4::Sanitizer` as its vendor.
+#
+# Rails.application.config.action_view.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
+
+# Configure Action Text to use an HTML5 standards-compliant sanitizer when it is supported on your
+# platform.
+#
+# `Rails::HTML::Sanitizer.best_supported_vendor` will cause Action Text to use HTML5-compliant
+# sanitizers if they are supported, else fall back to HTML4 sanitizers.
+#
+# In previous versions of Rails, Action Text always used `Rails::HTML4::Sanitizer` as its vendor.
+#
+# Rails.application.config.action_text.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
+
+# Configure the log level used by the DebugExceptions middleware when logging
+# uncaught exceptions during requests
+# Rails.application.config.action_dispatch.debug_exception_log_level = :error
+
+# Configure the test helpers in Action View, Action Dispatch, and rails-dom-testing to use HTML5
+# parsers.
+#
+# Nokogiri::HTML5 isn't supported on JRuby, so JRuby applications must set this to :html4.
+#
+# In previous versions of Rails, these test helpers always used an HTML4 parser.
+#
+# Rails.application.config.dom_testing_default_html_version = :html5

data/config/initializers/permissions_policy.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
+# Be sure to restart your server when you modify this file.
 
 # Define an application-wide HTTP permissions policy. For further
-# information see https://developers.google.com/web/updates/2018/06/feature-policy
-#
-# Rails.application.config.permissions_policy do |f|
-#   f.camera      :none
-#   f.gyroscope   :none
-#   f.microphone  :none
-#   f.usb         :none
-#   f.fullscreen  :self
-#   f.payment     :self, "https://secure.example.com"
+# information see: https://developers.google.com/web/updates/2018/06/feature-policy
+
+# Rails.application.config.permissions_policy do |policy|
+#   policy.camera      :none
+#   policy.gyroscope   :none
+#   policy.microphone  :none
+#   policy.usb         :none
+#   policy.fullscreen  :self
+#   policy.payment     :self, "https://secure.example.com"
 # end

data/gemfiles/6.1.gemfile

@@ -10,11 +10,8 @@ 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 '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'
+  gem 'sqlite3',            '~> 1.6.7'
 end
 
 group :development do
@@ -25,11 +22,17 @@ end
 group :test do
   gem 'brakeman',                 '~> 5.4.1'
   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 '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 'rails-controller-testing', '~> 1.0.5'
   gem 'rubocop',                  '~> 1.56.0', require: false
+  gem 'selenium-webdriver', '~> 4.9.0'
+  gem 'simplecov', '~> 0.22.0', require: false
 end

data/gemfiles/7.0.gemfile

@@ -10,11 +10,8 @@ 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 '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'
+  gem 'sqlite3',            '~> 1.6.7'
 end
 
 group :development do
@@ -25,11 +22,16 @@ end
 group :test do
   gem 'brakeman',                 '~> 5.4.1'
   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 '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 'rails-controller-testing', '~> 1.0.5'
   gem 'rubocop',                  '~> 1.56.0', require: false
+  gem 'simplecov',                '~> 0.22.0', require: false
 end

data/gemfiles/7.1.gemfile

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+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 '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 '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 '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 'rails-controller-testing', '~> 1.0.5'
+  gem 'rubocop',                  '~> 1.56.0', require: false
+  gem 'simplecov',                '~> 0.22.0', require: false
+end

data/lib/generators/occams/cms/README

@@ -11,7 +11,15 @@ You are almost done.  Don't forget to:
   [Optional] - If you want to store files in your CMS with ActiveStorage: `rails active_storage:install`
   [Mandatory] - Create the tables in your database: `rails db:migrate`
 
-Then you can go to http://your-rails-app/admin to start adding content.
+Then go to http://your-rails-app/admin to start adding content.
 
-Default username and password are: user/pass
+Default username and password are: user / pass
 Change these defaults in config/initializers/occams.rb
+
+----------------------------
+IF YOU ARE ON RAILS 6.x
+----------------------------
+and encounter errors referencing webpacker: 
+ensure that you have nvm installed, and then run
+- nvm install 13.7 && nvm use 13.7
+- rails webpacker:install

data/lib/occams/configuration.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Occams::Configuration
-  # Don't like Occams? Set it to whatever you like. :(
+  # Don't like Occams? Set it to whatever you like.
   attr_accessor :cms_title
 
   # Controller that is inherited from CmsAdmin::BaseController

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

@@ -7,7 +7,7 @@
 # `type` - css | js - what we're outputting here
 # `as`   - url (default) | tag - output url or wrap it in the appropriate tag
 #
-class Occams::Content::Tag::Asset < Occams::Content::Tag
+class Occams::Content::Tags::Asset < Occams::Content::Tag
   attr_reader :identifier, :type, :as
 
   def initialize(context:, params: [], source: nil)
@@ -53,5 +53,5 @@ class Occams::Content::Tag::Asset < Occams::Content::Tag
 end
 
 Occams::Content::Renderer.register_tag(
-  :asset, Occams::Content::Tag::Asset
+  :asset, Occams::Content::Tags::Asset
 )

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

@@ -14,7 +14,7 @@
 # }
 # and/or pass in style overrides with the 'style' parameter, as above
 
-class Occams::Content::Tag::Audio < Occams::Content::Tag
+class Occams::Content::Tags::Audio < Occams::Content::Tag
   attr_reader :path, :style, :locals
 
   def initialize(context:, params: [], source: nil)
@@ -35,5 +35,5 @@ class Occams::Content::Tag::Audio < Occams::Content::Tag
 end
 
 Occams::Content::Renderer.register_tag(
-  :audio, Occams::Content::Tag::Audio
+  :audio, Occams::Content::Tags::Audio
 )

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

@@ -15,7 +15,7 @@
 # }
 # and/or pass in style overrides with the 'style' parameter, as above
 
-class Occams::Content::Tag::Breadcrumbs < Occams::Content::Tag
+class Occams::Content::Tags::Breadcrumbs < Occams::Content::Tag
   attr_reader :links, :style, :locals
 
   def initialize(context:, params: [], source: nil)
@@ -39,5 +39,5 @@ class Occams::Content::Tag::Breadcrumbs < Occams::Content::Tag
 end
 
 Occams::Content::Renderer.register_tag(
-  :breadcrumbs, Occams::Content::Tag::Breadcrumbs
+  :breadcrumbs, Occams::Content::Tags::Breadcrumbs
 )

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

@@ -3,7 +3,7 @@
 # Tag for boolean content that is going to be rendered using checkbox
 #   {{ cms:checkbox identifier }}
 #
-class Occams::Content::Tag::Checkbox < Occams::Content::Tag::Fragment
+class Occams::Content::Tags::Checkbox < Occams::Content::Tags::Fragment
   def content
     fragment.boolean
   end
@@ -23,5 +23,5 @@ class Occams::Content::Tag::Checkbox < Occams::Content::Tag::Fragment
 end
 
 Occams::Content::Renderer.register_tag(
-  :checkbox, Occams::Content::Tag::Checkbox
+  :checkbox, Occams::Content::Tags::Checkbox
 )

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

@@ -15,7 +15,7 @@
 # To exclude children, list their slugs with the 'exclude' parameter
 # as comma-delimited string, e.g. as above - exclude: "404-page, search-page"
 
-class Occams::Content::Tag::Children < Occams::Content::Tag
+class Occams::Content::Tags::Children < Occams::Content::Tag
   attr_reader :style, :page_children, :locals
   attr_accessor :list
 
@@ -48,5 +48,5 @@ class Occams::Content::Tag::Children < Occams::Content::Tag
 end
 
 Occams::Content::Renderer.register_tag(
-  :children, Occams::Content::Tag::Children
+  :children, Occams::Content::Tags::Children
 )

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

@@ -3,7 +3,7 @@
 # Tag for text content that is going to be rendered using text input with date widget
 #   {{ cms:date identifier }}
 #
-class Occams::Content::Tag::Date < Occams::Content::Tag::Datetime
+class Occams::Content::Tags::Date < Occams::Content::Tags::Datetime
   def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][datetime]"
     options = { id: form_field_id, class: 'form-control', data: { 'cms-date' => true } }
@@ -15,5 +15,5 @@ class Occams::Content::Tag::Date < Occams::Content::Tag::Datetime
 end
 
 Occams::Content::Renderer.register_tag(
-  :date, Occams::Content::Tag::Date
+  :date, Occams::Content::Tags::Date
 )

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

@@ -5,7 +5,7 @@
 #
 # `strftime` - Format datetime string during rendering
 #
-class Occams::Content::Tag::Datetime < Occams::Content::Tag::Fragment
+class Occams::Content::Tags::Datetime < Occams::Content::Tags::Fragment
   attr_reader :strftime
 
   def initialize(context:, params: [], source: nil)
@@ -38,5 +38,5 @@ class Occams::Content::Tag::Datetime < Occams::Content::Tag::Fragment
 end
 
 Occams::Content::Renderer.register_tag(
-  :datetime, Occams::Content::Tag::Datetime
+  :datetime, Occams::Content::Tags::Datetime
 )

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

@@ -13,8 +13,8 @@ require_relative 'mixins/file_content'
 # `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"
 #
-class Occams::Content::Tag::File < Occams::Content::Tag::Fragment
-  include Occams::Content::Tag::Mixins::FileContent
+class Occams::Content::Tags::File < Occams::Content::Tags::Fragment
+  include Occams::Content::Tags::Mixins::FileContent
 
   # @type ["url", "link", "image"]
   attr_reader :as
@@ -66,5 +66,5 @@ protected
 end
 
 Occams::Content::Renderer.register_tag(
-  :file, Occams::Content::Tag::File
+  :file, Occams::Content::Tags::File
 )

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

@@ -13,8 +13,8 @@ require_relative 'mixins/file_content'
 # `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"
 #
-class Occams::Content::Tag::FileLink < Occams::Content::Tag
-  include Occams::Content::Tag::Mixins::FileContent
+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
@@ -58,5 +58,5 @@ class Occams::Content::Tag::FileLink < Occams::Content::Tag
 end
 
 Occams::Content::Renderer.register_tag(
-  :file_link, Occams::Content::Tag::FileLink
+  :file_link, Occams::Content::Tags::FileLink
 )

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

@@ -5,7 +5,7 @@
 # Example tag:
 #   {{ cms:files identifier }}
 #
-class Occams::Content::Tag::Files < Occams::Content::Tag::File
+class Occams::Content::Tags::Files < Occams::Content::Tags::File
   def content
     return '' if fragment.attachments.blank?
 
@@ -37,5 +37,5 @@ class Occams::Content::Tag::Files < Occams::Content::Tag::File
 end
 
 Occams::Content::Renderer.register_tag(
-  :files, Occams::Content::Tag::Files
+  :files, Occams::Content::Tags::Files
 )

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

@@ -8,7 +8,7 @@
 #   `namespace`:
 #     Just a string that allows grouping of form elements in the admin area
 #
-class Occams::Content::Tag::Fragment < Occams::Content::Tag
+class Occams::Content::Tags::Fragment < Occams::Content::Tag
   attr_accessor :renderable
   attr_reader :identifier, :namespace
 
@@ -48,7 +48,7 @@ class Occams::Content::Tag::Fragment < Occams::Content::Tag
 
   # Tag renders its own form inputs via `form_field(template, index)`
   # For example:
-  #   class MyTag < Occams::Content::Tag::Fragment
+  #   class MyTag < Occams::Content::Tags::Fragment
   #     def form_field(view, index, &block)
   #       # omit yield if you don't want default wrapper
   #       yield view.text_area "input_name", "value"