occams 1.0.6 → 1.0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d020dd30a0e74d5c86211e061b5018c726f9a07e364c96f9c9cc65ebf4762d3
-  data.tar.gz: cf50ea17c8fcc9a5bdc6baa008dbfb7503b0d6acbdfa05389f706d6ce934adce
+  metadata.gz: eed8972c3dacc31a1970b37be6efbc3f2d19d30d197f8342f13adcb171fa11e4
+  data.tar.gz: 4735ee50552cb9fd07f9b4dea67e05a53152779b057a1d5b4335a2ffe0bf3769
 SHA512:
-  metadata.gz: bf49d617a083d592d67dd6b5f72c2f3fb15618c64b5a954dd7fdefc71a578b1800279610bce9322867ef5ca5beef1cf4fa3356e766d1b4520810efb79f89ffbd
-  data.tar.gz: 37c7949c2bac89e22933d44177a6a713559fe14db0488062f9564cacd240a8b608e56275a4228d457411abce7478c595488d5b399cbd0566f4daafcb2a261942
+  metadata.gz: 2434cbce961464f9d317625ff2d36605a3f0dda92d68516f2d5506683b02c97f936632b9868217529a477739124d4957a9d0d2cfc07f8331bb021083a681fe51
+  data.tar.gz: 6a1bc1e3e9ea9d7dab30de818904d7d5cf540afed08d23573c62029b61274050deb3de6c1c4dfd117eaccf28f4ef3873047e3e0d7761e4680b065de7ce984401

data/CHANGELOG.md

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

data/README.md

@@ -3,6 +3,12 @@
 [![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)
 
+***Prefer Simplicity.***
+
+<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>
+
 ```
              ____      __  __ _ ____
   ___   ___ / ___|__ _|  \/  ( ) ___|
@@ -10,26 +16,22 @@
 | (_) | (__| |__| (_| | |  | |  ___) |
  \___/ \___|\____\__,_|_|  |_| |____/
 
-``` 
-
-Prefer Simplicity.
+```
 
 ## 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.

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

@@ -16,7 +16,8 @@
 # as comma-delimited string, e.g. as above - exclude: "404-page, search-page"
 
 class Occams::Content::Tag::Children < Occams::Content::Tag
-  attr_reader :list, :style, :locals
+  attr_reader :style, :page_children, :locals
+  attr_accessor :list
 
   def initialize(context:, params: [], source: nil)
     super
@@ -27,20 +28,20 @@ class Occams::Content::Tag::Children < Occams::Content::Tag
     @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 }
-    return unless 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>'
+    @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

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

@@ -18,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
@@ -27,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)
-    sibs.delete_if { |sib| @exclude.include? sib.slug }
-    page_idx = sibs.index(context)
-    sibs.each do |sib|
-      sib_idx = sibs.index(sib)
-      next if sibs.index(sib) == page_idx
-      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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Occams
-  VERSION = '1.0.6'
+  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.6
+  version: 1.0.6.1
 platform: ruby
 authors:
 - Andrew vonderLuft
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-06 00:00:00.000000000 Z
+date: 2023-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to