occams 1.0.8 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcc8760162308f5d0ad46ac82f46fa92be816f9e8c6ee291759709ddc472513e
-  data.tar.gz: f67e7efd920a103c3027e0201e824ee95bea38853893688ca7cbd9b0961d9a6d
+  metadata.gz: 4a97f751e8ded8222b0ef73e6f06b6633bdc5a2cef1858872d0e4ccbcdbc56c8
+  data.tar.gz: 1c1b034bc1599c94a72e99bf67b5eecb45cdffc35d4bccd2aa1c906780e760a7
 SHA512:
-  metadata.gz: aa7e678609d40af0dcd82a99a135f398006120c6b867a51a5814a7295f2540ec9771a21a0e972d64299e552b989b267748d35f8fe0c242b4fb2cc731e0086275
-  data.tar.gz: aaab1c6865ad43badee1f359c76fa3e45157f85ecb16f742c309c2ebd5de5430426745155f97fb619568d1d3280b2bdc21b33a9ba48f7e6eed763dcaa47a0ec9
+  metadata.gz: 2da69ad3d5a308ddc27208fba96417b6156029702f24337a76d43711ed9925cfe62b07cf52f413742aca58d0f01bc73391a3d59409936e904d88ab4b95cfe0a3
+  data.tar.gz: 9ed1193e3ba2976446bba4c04092b9af3ec39430a54b75db05a4d0f26466b2de8fef6b6725d30e565ec7a82dde7f428c014cf60d9456922b46a414362b0cac4d

data/.github/workflows/rubyonrails.yml

@@ -17,6 +17,7 @@ jobs:
         rails-version:
           - "6.1"
           - "7.0"
+          - "7.1"
         continue-on-error: [true]
     name: ${{ format('Tests (Ruby {0}, Rails {1})', matrix.ruby-version, matrix.rails-version) }}
     runs-on: ubuntu-latest

data/.gitignore

@@ -12,6 +12,7 @@ coverage/
 db/*.sqlite3
 db/cms_fixtures/test-site/
 db/development_structure.sql
+db/development.sqlite3*
 db/schema.rb
 db/test.sqlite3*
 Gemfile.lock

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v.1.1.0 13 May 2024
+
+- Rails 7.1 compatibility, all tests passing
+- corrected bug in siblings tag to not display links to unpublished pages
+- children lists and sibling navs are updated after page create, update, delete
+- fixed zeitwerk check failures
+- updated README
+
 ## v1.0.8 - 29 December 2023
 
 - Updated configs, et al. in pursuit of Rails 7.1 compatibility

data/Gemfile

@@ -5,11 +5,11 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
-gem 'rails', '~> 7.0.0'
+gem 'rails', '~> 7.1.2'
 
 group :development, :test do
   gem 'autoprefixer-rails', '~> 8.1.0'
-  gem 'byebug',             '~> 10.0.0', platforms: %i[mri mingw x64_mingw]
+  gem 'byebug',             '~> 11.1.0', platforms: %i[mri mingw x64_mingw]
   gem 'image_processing',   '>= 1.2'
   gem 'sqlite3',            '~> 1.6.7'
   # gem 'mysql2',             '~> 0.5'

data/README.md

@@ -98,8 +98,6 @@ Once you have a layout, you may start creating pages and populating content. It'
 
 ## Documentation
 
-[Occams](https://github.com/avonderluft/occams)
-
 For more information on how to use this CMS please refer to the [Wiki](https://github.com/avonderluft/occams/wiki). Section that might be of interest is the entry
 on [Content Tags](https://github.com/comfy/avonderluft/occams/Content-Tags).
 
@@ -120,5 +118,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)
+- [Occams](https://github.com/avonderluft/occams) Copyright 2023-2024 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)

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

@@ -12,6 +12,9 @@ module Occams::ReorderAction
     (params.permit(order: [])[:order] || []).each_with_index do |id, index|
       resource_class.where(id: id).update_all(position: index)
     end
+    if resource_class == ::Occams::Cms::Page
+      Occams::Cms::Page.all.each(&:save!)
+    end
     head :ok
   end
 end

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

@@ -35,8 +35,14 @@ class Occams::Admin::Cms::PagesController < Occams::Admin::Cms::BaseController
     render
   end
 
+  def update_family
+    @page.siblings.each(&:save!) if @page.siblings
+    @page.parent.save! if @page.parent
+  end
+
   def create
     @page.save!
+    update_family
     flash[:success] = I18n.t('occams.admin.cms.pages.created')
     redirect_to action: :edit, id: @page
   rescue ActiveRecord::RecordInvalid
@@ -46,6 +52,7 @@ class Occams::Admin::Cms::PagesController < Occams::Admin::Cms::BaseController
 
   def update
     @page.save!
+    update_family
     flash[:success] = I18n.t('occams.admin.cms.pages.updated')
     redirect_to action: :edit, id: @page
   rescue ActiveRecord::RecordInvalid
@@ -55,6 +62,7 @@ class Occams::Admin::Cms::PagesController < Occams::Admin::Cms::BaseController
 
   def destroy
     @page.destroy
+    update_family
     flash[:success] = I18n.t('occams.admin.cms.pages.deleted')
     redirect_to action: :index
   end

data/config/application.rb

@@ -14,8 +14,6 @@ module Occams
     config.load_defaults Rails.version.scan(%r{^\d+\.\d+}).first.to_f
 
     # Rails 7.1 compatibility - See config/initializers/new_framework_defaults_7_1.rb
-    config.add_autoload_paths_to_load_path = true
-
     if Gem::Version.new(Rails.version) >= Gem::Version.new('7.1.0')
       config.active_record.default_column_serializer = YAML
       config.active_record.before_committed_on_all_records = false
@@ -30,6 +28,7 @@ module Occams
       # Please, add to the `ignore` list any other `lib` subdirectories that do
       # not contain `.rb` files, or that should not be reloaded or eager loaded.
       # Common ones are `templates`, `generators`, or `middleware`, for example.
+      config.add_autoload_paths_to_load_path = false
       config.autoload_lib(ignore: %w[generators])
     end
 

data/config/environments/test.rb

@@ -10,6 +10,8 @@ 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.
 
+  config.active_job.queue_adapter = :test # added for Rails 7.1
+
   # While tests run files are not watched, reloading is not necessary.
   config.enable_reloading = false
 

data/config/locales/en.yml

@@ -116,11 +116,11 @@ en:
             update: Update Layout
 
         pages:
-          created: Page created
+          created: Page created, siblings, and parent updated
           creation_failure: Failed to create page
-          updated: Page updated
+          updated: Page, siblings, and parent updated
           update_failure: Failed to update page
-          deleted: Page deleted
+          deleted: Page deleted, siblings, and parent updated
           not_found: Page not found
           layout_not_found: No Layouts found. Please create one.
 

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

@@ -31,6 +31,9 @@ class Occams::Content::Tags::Siblings < Occams::Content::Tag
     @links = ''
     # ActiveRecord_Associations_CollectionProxy
     @sibs = context.self_and_siblings.order(:position).to_ary
+    unless Rails.env == 'development'
+      @sibs.delete_if { |sib| !sib.is_published }
+    end
     @sibs.delete_if { |sib| @exclude.include? sib.slug }
   end
 

data/lib/occams/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: occams
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrew vonderLuft
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-29 00:00:00.000000000 Z
+date: 2024-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -737,8 +737,6 @@ files:
 - lib/occams/extensions/has_revisions.rb
 - lib/occams/form_builder.rb
 - lib/occams/render_methods.rb
-- lib/occams/routes/cms.rb
-- lib/occams/routes/cms_admin.rb
 - lib/occams/routing.rb
 - lib/occams/seeds.rb
 - lib/occams/seeds/file/exporter.rb
@@ -774,7 +772,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Rails 6.1-7.1+ CMS Engine

data/lib/occams/routes/cms.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-class ActionDispatch::Routing::Mapper
-  def occams_route_cms(options = {})
-    Occams.configuration.public_cms_path = options[:path]
-
-    scope module: :occams, as: :occams do
-      namespace :cms, path: options[:path] do
-        get 'cms-css/:site_id/:identifier(/:cache_buster)' => 'assets#render_css', as: 'render_css'
-        get 'cms-js/:site_id/:identifier(/:cache_buster)'  => 'assets#render_js',  as: 'render_js'
-
-        get '(*cms_path)' => 'content#show', as: 'render_page', action: '/:format'
-      end
-    end
-  end
-end

data/lib/occams/routes/cms_admin.rb

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-class ActionDispatch::Routing::Mapper
-  def occams_route_cms_admin(path: 'admin')
-    scope module: :occams, as: :occams do
-      scope module: :admin do
-        namespace :cms, as: :admin_cms, path: path, except: :show do
-          get '/', to: 'base#jump'
-
-          concern :with_revisions do |options|
-            resources :revisions, options.merge(only: %i[index show]) do
-              patch :revert, on: :member
-            end
-          end
-
-          concern :with_reorder do
-            put :reorder, on: :collection
-          end
-
-          concern :with_form_fragments do
-            get :form_fragments, on: :member
-          end
-
-          resources :sites do
-            resources :pages do
-              concerns :with_reorder
-              concerns :with_form_fragments
-              concerns :with_revisions, controller: 'revisions/page'
-
-              get :toggle_branch, on: :member
-
-              resources :translations, except: [:index] do
-                concerns :with_form_fragments
-                concerns :with_revisions, controller: 'revisions/translation'
-              end
-            end
-
-            resources :files, concerns: [:with_reorder]
-
-            resources :layouts do
-              concerns :with_reorder
-              concerns :with_revisions, controller: 'revisions/layout'
-            end
-
-            resources :snippets do
-              concerns :with_reorder
-              concerns :with_revisions, controller: 'revisions/snippet'
-            end
-
-            resources :categories
-          end
-        end
-      end
-    end
-  end
-end