occams 1.0.5 → 1.0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efb5d94cf738164a3e046fa7cfb156622bd2bc0e9b8204b4b8351528e071d125
-  data.tar.gz: 1a258f13ab0e8f4d2bee5389fc35b9aaae9d1e8d21b9cbf785c4c87d4bdf64e5
+  metadata.gz: eed8972c3dacc31a1970b37be6efbc3f2d19d30d197f8342f13adcb171fa11e4
+  data.tar.gz: 4735ee50552cb9fd07f9b4dea67e05a53152779b057a1d5b4335a2ffe0bf3769
 SHA512:
-  metadata.gz: 9efc2ff6514d9232b567c2db268f2db505662f13c6de0393f4cb263f69883a73514b24bf528316eaadc08d7d077de08b1df806697dc727784291119040f70f05
-  data.tar.gz: 5599e31e8c182f8ce24cc8c23c1be933b0c84e3044d120d1e4ff3378a24aada88b509e2ac97ea94e1d7de48d6d1b7bcebc7477be6aca804630b0377cd596cf5e
+  metadata.gz: 2434cbce961464f9d317625ff2d36605a3f0dda92d68516f2d5506683b02c97f936632b9868217529a477739124d4957a9d0d2cfc07f8331bb021083a681fe51
+  data.tar.gz: 6a1bc1e3e9ea9d7dab30de818904d7d5cf540afed08d23573c62029b61274050deb3de6c1c4dfd117eaccf28f4ef3873047e3e0d7761e4680b065de7ce984401

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 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
+
+## v1.0.6 - 9/5/2023
+
+- Fixed [cms:siblings Nav tag](https://github.com/avonderluft/occams/wiki/Content-Tags#siblings) to handle edge case when page(s) are excluded by the `exclude` parameter
+- Added [cms:children Nav tag](https://github.com/avonderluft/occams/wiki/Content-Tags#children) to render unordered list of links for children of current page
+
 ## v1.0.5 - 8/31/2023
 
 - All tests now green on Rails 6.1 and 7.0, each tested with rubies 2.7.8, 3.1.4 and 3.2.2.

data/Gemfile

@@ -10,7 +10,6 @@ group :development, :test do
   gem 'capybara',           '~> 3.39.0'
   gem 'image_processing',   '>= 1.2'
   gem 'kaminari',           '~> 1.2', '>= 1.2.2'
-  gem 'puma',               '~> 3.12.2'
   gem 'rubocop',            '~> 0.55.0', require: false
   gem 'selenium-webdriver', '~> 4.9.0'
   gem 'sqlite3',            '~> 1.4.2'

data/README.md

@@ -1,10 +1,13 @@
 # ocCaM'S
 
-Prefer Simplicity
+[![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)
 
-## Raison d'etre
+***Prefer Simplicity.***
 
-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.
+<a href="https://en.wikipedia.org/wiki/William_of_Ockham" target="_blank">
+  <img align="left" height="150" src="https://upload.wikimedia.org/wikipedia/commons/7/70/William_of_Ockham.png" alt="William of Ockham" title="William of Ockham">
+</a>
 
 ```
              ____      __  __ _ ____
@@ -13,19 +16,22 @@ ocCaM'S is a revival of [ComfortableMexicanSofa](https://github.com/comfy/comfor
 | (_) | (__| |__| (_| | |  | |  ___) |
  \___/ \___|\____\__,_|_|  |_| |____/
 
-``` 
+```
+
+## 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.
 
 ## 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 the preferred solution is that which is simplest and built with the smallest possible set of components.
+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.
 
-## Features
 
-* Simple drop-in integration with Rails 6.1+ apps with minimal configuration
-* CMS stays away from the rest of your application
 
-Referring to the [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) documentation, substituting 'Occams' for 'ComfortableMexicanSofa' where appropriate.
+## Features
 
+* Simple drop-in integration with Rails 6.1+ apps with minimal configuration
+* The CMS keeps clear from the rest of your application
 * Powerful page templating capability using [Content Tags](https://github.com/avonderluft/occams/wiki/Content-Tags)
 * [Multiple Sites](https://github.com/avonderluft/occams/wiki/Sites) from a single installation
 * Multi-Language Support (i18n) (ca, cs, da, de, en, es, fi, fr, gr, hr, it, ja, nb, nl, pl, pt-BR, ru, sv, tr, uk, zh-CN, zh-TW) and page localization.
@@ -36,7 +42,7 @@ Referring to the [ComfortableMexicanSofa](https://github.com/comfy/comfortable-m
 ## 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 on Rails 7 or greater, 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

data/TODOS.md

@@ -1,6 +1,7 @@
 # ToDos
 
-- set up CI 
+- 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

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+# Nav Tag for unordered list of links to the children of the current page
+#   {{ cms:children }}
+#   {{ cms:children style: "font-weight: bold", exclude: "404-page, search-page" }}
+# To customize your children style, add a 'children' id to your CSS, e.g
+# #children {
+#   color: #006633;
+#   font-size: 90%;
+#   margin-bottom: 4px;
+#   font-style: italic;
+# }
+# and/or pass in style overrides with the 'style' parameter, as above
+#
+# 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
+  attr_reader :style, :page_children, :locals
+  attr_accessor :list
+
+  def initialize(context:, params: [], source: nil)
+    super
+    @locals = params.extract_options!
+    @style  = ''
+    @style  = "<style>#children {#{@locals['style']}}</style>" if @locals['style']
+    @exclude = []
+    @exclude = @locals['exclude'].split(',') if @locals['exclude']
+    @list = ''
+    # ActiveRecord_Associations_CollectionProxy
+    @page_children = context.children.order(:position).to_ary
+    @page_children.delete_if { |child| @exclude.include? child.slug }
+  end
+
+  def content
+    if @page_children.any?
+      @list = '<ul id="children">'
+      @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>"
+      end
+      @list += '</ul>'
+    end
+    format("#{@style}#{@list}")
+  end
+end
+
+Occams::Content::Renderer.register_tag(
+  :children, Occams::Content::Tag::Children
+)

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

@@ -6,10 +6,8 @@
 # To customize your siblings style, add a 'siblings' id to your CSS, e.g
 # #siblings {
 #   color: #006633;
-#   font-family: Verdana, Arial, Helvetica, sans-serif;
 #   font-size: 95%;
 #   margin-top: 12px;
-#   margin-bottom: 4px;
 #   font-style: italic;
 # }
 # and/or pass in style overrides with the 'style' parameter (see above)
@@ -20,7 +18,8 @@
 # style and exclude parameters are optional
 
 class Occams::Content::Tag::Siblings < Occams::Content::Tag
-  attr_reader :locals, :style, :links
+  attr_reader :locals, :style, :sibs
+  attr_accessor :links
 
   def initialize(context:, params: [], source: nil)
     super
@@ -29,29 +28,31 @@ class Occams::Content::Tag::Siblings < Occams::Content::Tag
     @style = "<style>#siblings {#{@locals['style']}}</style>" if @locals['style']
     @exclude = []
     @exclude = @locals['exclude'].split(',') if @locals['exclude']
-    @links = '<div id="siblings">'
+    @links = ''
+    # ActiveRecord_Associations_CollectionProxy
+    @sibs = context.self_and_siblings.order(:position).to_ary
+    @sibs.delete_if { |sib| @exclude.include? sib.slug }
+  end
 
-    prevp = false
-    sibs = context.self_and_siblings.sort_by(&:position)
-    page_idx = sibs.index(context)
-    sibs.each do |sib|
-      sib_idx = sibs.index(sib)
-      next if sibs.index(sib) == page_idx
-      next if @exclude.include? sib.slug
-      next if Rails.env == 'production' && !sib.is_published
+  def content
+    if @sibs.count > 1
+      @links = '<div id="siblings">'
+      prevp = false
+      @sibs.each do |sib|
+        sib_idx = @sibs.index(sib)
+        next if sib.slug == context.slug
+        next if Rails.env == 'production' && !sib.is_published
 
-      if sib_idx == page_idx - 1
-        @links += "<a href=#{sib.url(relative: true)}>#{sib.label}</a> &laquo;&nbsp;<em>Previous</em> &bull; "
-        prevp = true
-      elsif sib_idx == page_idx + 1
-        @links += '&bull;' unless prevp
-        @links += "<em>Next</em>&nbsp;&raquo; <a href=#{sib.url(relative: true)}>#{sib.label}</a>"
+        if sib_idx == @sibs.index(context) - 1
+          @links += "<a href=#{sib.url(relative: true)}>#{sib.label}</a> &laquo;&nbsp;<em>Previous</em> &bull; "
+          prevp = true
+        elsif sib_idx == @sibs.index(context) + 1
+          @links += '&bull;' unless prevp
+          @links += "<em>Next</em>&nbsp;&raquo; <a href=#{sib.url(relative: true)}>#{sib.label}</a>"
+        end
       end
+      @links += '</div>'
     end
-    @links += '</div>'
-  end
-
-  def content
     format("#{@style}#{@links}")
   end
 end

data/lib/occams/content.rb

@@ -32,4 +32,5 @@ require_relative 'content/tags/template'
 
 require_relative 'content/tags/audio'
 require_relative 'content/tags/breadcrumbs'
+require_relative 'content/tags/children'
 require_relative 'content/tags/siblings'

data/lib/occams/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: occams
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6.1
 platform: ruby
 authors:
 - Andrew vonderLuft
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-31 00:00:00.000000000 Z
+date: 2023-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -685,6 +685,7 @@ files:
 - lib/occams/content/tags/audio.rb
 - lib/occams/content/tags/breadcrumbs.rb
 - lib/occams/content/tags/checkbox.rb
+- lib/occams/content/tags/children.rb
 - lib/occams/content/tags/date.rb
 - lib/occams/content/tags/datetime.rb
 - lib/occams/content/tags/file.rb