occams 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce680397bd166f37f751f3809e6bae83bfa630626d20e21d479631487ba03f59
-  data.tar.gz: 6b0bb13446c96370910182f7acdcb66ba9bc93cacb1815483fa182e1b51d9af5
+  metadata.gz: aca6dd86629db61b2c905c1e54bf45dc6d4153659bf46868ed4a4c8ee70f9ad0
+  data.tar.gz: 151a8b8aab7bcc69405e530a1100f18796515fc1e00fec3131c4cf68736f6778
 SHA512:
-  metadata.gz: 3389d7c086da5dd49d5a3e54c81e0036abd459b13c9885ff7159aa49d74d39ca0667b2618438edd8414c3a4d97f8b1ced0d5abd6bddf4ffdbb9b9f8bf28e538d
-  data.tar.gz: 9c47baa318396a1f77fc19cec2b0c8b7498a7946edb1ab6c0bbe66ca5df5de425211bcdf822758b4a8d752150327cfbbbf043031999bf410cfce97a1ed3ce304
+  metadata.gz: 67407dbc43513ff16a74bef095001a7c4f6bf544a0ab07bbf1c51388478ebd3e6d078bc82714ecd1f9899079d6832ab326a779ec2addad117d36708279337ca3
+  data.tar.gz: 807c7bd56f6684c6aca8c189bded644f843da7badac3beb883b3471c60ce45252a94486051d08468fc3fa778eff4808b01ff5c497a7c1c0b23586569c5c76242

data/.rubocop.yml

@@ -38,7 +38,7 @@ Metrics/MethodLength:
   Enabled: false
 
 Metrics/PerceivedComplexity:
-  Max: 12
+  Max: 15
 
 # -- Naming --------------------------------------------------------------------
 Naming/MethodParameterName:

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 # Changelog
 
-## v1.0.2 - 
+## v1.0.4 - 8/26/2023
+
+- Added [cms:breadcrumbs Nav tag](https://github.com/avonderluft/occams/wiki/Content-Tags#breadcrumbs)
+- Added [cms:siblings Nav tag](https://github.com/avonderluft/occams/wiki/Content-Tags#siblings)
+- Updated [wiki documentation](https://github.com/avonderluft/occams/wiki)
+
+## v1.0.3 - 8/15/2023
+
+- Added a [cms:audio tag](https://github.com/avonderluft/occams/wiki/Content-Tags#audio) for an embedded audio player
+- Some formatting of admin menu footer
+
+## v1.0.2 - 8/14/2023
 
 - Fixed image rendering which rubocop broke in v1.0.1
 - Show unpublished pages in Rails development mode

data/Gemfile

@@ -18,7 +18,7 @@ end
 
 group :development do
   gem 'listen',       '~> 3.8.0'
-  gem 'web-console',  '~> 3.5.1'
+  gem 'web-console',  '~> 4.2'
 end
 
 group :test do

data/README.md

@@ -29,9 +29,9 @@ Referring to the [ComfortableMexicanSofa](https://github.com/comfy/comfortable-m
 * 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.
-* [CMS Seeds](https://github.com/comfy/comfortable-mexican-sofa/wiki/Docs:-CMS-Seeds) for initial content population
-* [Revision History](https://github.com/comfy/comfortable-mexican-sofa/wiki/Docs:-Revisions) to revert changes
-* [Extendable Admin Area](https://github.com/comfy/comfortable-mexican-sofa/wiki/HowTo:-Reusing-Admin-Area) built with [Bootstrap 4](http://getbootstrap.com) (responsive design). Using [CodeMirror](http://codemirror.net) for HTML and Markdown highlighing and [Redactor](http://imperavi.com/redactor) as the WYSIWYG editor.
+* [CMS Seeds](https://github.com/avonderluft/occams/wiki/CMS-Seeds) for initial content population
+* [Revision History](https://github.com/avonderluft/occams/wiki/Revisions) to revert changes
+* [Extendable Admin Area](https://github.com/avonderluft/occams/wiki/HowTo:-Reusing-Admin-Area) built with [Bootstrap 4](http://getbootstrap.com) (responsive design). Using [CodeMirror](http://codemirror.net) for HTML and Markdown highlighing and [Redactor](http://imperavi.com/redactor) as the WYSIWYG editor.
 
 ## Dependencies
 
@@ -41,7 +41,7 @@ Referring to the [ComfortableMexicanSofa](https://github.com/comfy/comfortable-m
 
 ## Compatibility
 
-- Install and basic functionality validated on Ruby 3.2.2. with Rails 6.1.7.4 and 7.0.6 and 7.0.6
+- Install and basic functionality validated on Ruby 3.2.2. with Rails 6.1.7.4 and 7.0.6+
 - Rails 7 is recommended, since performance is noticably better
 
 ## Installation
@@ -114,4 +114,4 @@ For more detail see [CONTRIBUTING](CONTRIBUTING.md)
 
 ---
 - [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) Copyright 2010-2019 Oleg Khabarov. Released under the [MIT license](LICENSE)
-- [Occams] Copyright 2023 Andrew vonderLuft (https://github.com/avonderluft/occams) follows suit, being also released under the [MIT license](LICENSE)
+- [Occams](https://github.com/avonderluft/occams) Copyright 2023 Andrew vonderLuft, following suit, also released under the [MIT license](LICENSE)

data/TODOS.md

@@ -1,6 +1,6 @@
 # ToDos
 
+- add admin content search to list layouts, pages and snippets - see https://blog.robertsj.com/search/
 - add application console for testing
-- feature to resize file_link'd images
-- get the original [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) tests working
-- add documentation to Occams to replace ComfortableMexicanSofa 
+- add feature to resize file_link'd images
+- get the original [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) tests working with Rails 7 and Ruby 3

data/app/controllers/occams/cms/content_controller.rb

@@ -74,11 +74,11 @@ protected
   # Getting page and setting content_cache and fragments data if we need to
   # serve translation data
   def find_cms_page_by_full_path(full_path)
-    if Rails.env == 'production'
-      @cms_page = @cms_site.pages.published.find_by!(full_path: full_path)
-    else
-      @cms_page = @cms_site.pages.find_by!(full_path: full_path)
-    end
+    @cms_page = if Rails.env == 'production'
+                  @cms_site.pages.published.find_by!(full_path: full_path)
+                else
+                  @cms_site.pages.find_by!(full_path: full_path)
+                end
 
     @cms_page.translate!
     @cms_layout = @cms_page.layout

data/app/views/layouts/occams/admin/cms/_left.html.haml

@@ -41,4 +41,6 @@
   %span.version= Rails::version
   = link_to 'Ruby', 'https://www.ruby-lang.org', target: '_blank'
   %span.version= RUBY_VERSION
-  = Rails.env
+  %br
+  = Rails.env.upcase
+

data/lib/generators/occams/scaffold/templates/controller.rb.tt

@@ -1,4 +1,4 @@
-class Admin::<%= class_name.pluralize %>Controller < Comfy::Admin::BaseController
+class Admin::<%= class_name.pluralize %>Controller < Occams::Admin::BaseController
 
   before_action :build_<%= file_name %>,  only: [:new, :create]
   before_action :load_<%= file_name %>,   only: [:show, :edit, :update, :destroy]

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# Tag for injecting HTML5 audio player. Example tag:
+#   {{ cms:audio "path/to/audio", style: "height: 22px; width: 80%" }}
+# This expands into:
+#   <audio controls src="path/to/audio"></audio>
+# To customize your player style, add a 'audioplayer' class to your CSS, e.g
+# .audioplayer {
+#   border-radius: 6px;
+#   height: 22px;
+#   width: 60%;
+#   margin: 2px 0 2px 8px;
+#   padding: 0;
+# }
+# and/or pass in style overrides with the 'style' parameter, as above
+
+class Occams::Content::Tag::Audio < Occams::Content::Tag
+  attr_reader :path, :locals
+
+  def initialize(context:, params: [], source: nil)
+    super
+    options = params.extract_options!
+    @path   = params[0]
+    @style = ''
+    @style = "<style>.audioplayer {#{options['style']}}</style>" if options['style']
+    @style = options['style']
+
+    return if @path.present?
+
+    raise Error, 'Missing path for audio tag'
+  end
+
+  def content
+    format("#{@style}<audio controls class=\"audioplayer\" src=#{@path}></audio>")
+  end
+end
+
+Occams::Content::Renderer.register_tag(
+  :audio, Occams::Content::Tag::Audio
+)

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+# Nav Tag for rendering breadcrumb links to current page
+#   {{ cms:breadcrumbs }}
+#   {{ cms:breadcrumbs style: "font-weight: bold" }}
+# To customize your breadcrumbs style, add a 'breadcrumbs' id to your CSS, e.g
+# #breadcrumbs {
+#   color: #006633;
+#   font-family: Verdana, Arial, Helvetica, sans-serif;
+#   font-size: 105%;
+#   font-weight: bold;
+#   margin-top: 12px;
+#   margin-bottom: 4px;
+#   font-style: italic;
+# }
+# and/or pass in style overrides with the 'style' parameter, as above
+
+class Occams::Content::Tag::Breadcrumbs < Occams::Content::Tag
+  attr_reader :path, :locals
+
+  def initialize(context:, params: [], source: nil)
+    super
+    options = params.extract_options!
+    @style = ''
+    @style = "<style>#breadcrumbs {#{options['style']}}</style>" if options['style']
+
+    @links = '<div id="breadcrumbs">'
+    context.ancestors.reverse.each do |a|
+      next if Rails.env == 'production' && !a.is_published
+
+      @links += "<a href=#{a.url(relative: true)}>#{a.label}</a> &raquo; "
+    end
+    @links += "#{context.label}</div>"
+  end
+
+  def content
+    format("#{@style}#{@links}")
+  end
+end
+
+Occams::Content::Renderer.register_tag(
+  :breadcrumbs, Occams::Content::Tag::Breadcrumbs
+)

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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+# Nav Tag for rendering previous and next sibling links relative to current page
+#   {{ cms:siblings }}
+#   {{ cms:siblings style: "font-style: italic", exclude: "404-page, search-page" }}
+# 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)
+#
+# To exclude siblings, list their slugs with the 'exclude' parameter
+# as comma-delimited string, e.g. as above - exclude: "404-page, search-page"
+#
+# style and exclude parameters are optional
+
+class Occams::Content::Tag::Siblings < Occams::Content::Tag
+  attr_reader :path, :locals
+
+  def initialize(context:, params: [], source: nil)
+    super
+    options = params.extract_options!
+    @style = ''
+    @style = "<style>#siblings {#{options['style']}}</style>" if options['style']
+    @exclude = []
+    @exclude = options['exclude'].split(',') if options['exclude']
+    @links = '<div id="siblings">'
+
+    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
+
+      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>"
+      end
+    end
+    @links += '</div>'
+  end
+
+  def content
+    format("#{@style}#{@links}")
+  end
+end
+
+Occams::Content::Renderer.register_tag(
+  :siblings, Occams::Content::Tag::Siblings
+)

data/lib/occams/content.rb

@@ -29,3 +29,7 @@ require_relative 'content/tags/page_file_link'
 require_relative 'content/tags/helper'
 require_relative 'content/tags/partial'
 require_relative 'content/tags/template'
+
+require_relative 'content/tags/audio'
+require_relative 'content/tags/breadcrumbs'
+require_relative 'content/tags/siblings'

data/lib/occams/version.rb

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

data/occams.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'kramdown',             '~> 2.4', '>= 2.4.0'
   s.add_runtime_dependency 'mimemagic',            '~> 0.4', '>= 0.4.3'
   s.add_runtime_dependency 'mini_magick',          '~> 4.12', '>= 4.12.0'
-  s.add_dependency 'rails',                        '>= 6.1.7.4'
+  s.add_dependency 'rails',                        '>= 6.1.0'
   s.add_runtime_dependency 'rails-i18n',           '>= 6.0.0'
   s.add_runtime_dependency 'sassc-rails',          '~> 2.1', '>= 2.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: occams
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Andrew vonderLuft
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-14 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.7.4
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.7.4
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -653,6 +653,8 @@ files:
 - lib/occams/content/renderer.rb
 - lib/occams/content/tag.rb
 - lib/occams/content/tags/asset.rb
+- lib/occams/content/tags/audio.rb
+- lib/occams/content/tags/breadcrumbs.rb
 - lib/occams/content/tags/checkbox.rb
 - lib/occams/content/tags/date.rb
 - lib/occams/content/tags/datetime.rb
@@ -666,6 +668,7 @@ files:
 - lib/occams/content/tags/number.rb
 - lib/occams/content/tags/page_file_link.rb
 - lib/occams/content/tags/partial.rb
+- lib/occams/content/tags/siblings.rb
 - lib/occams/content/tags/snippet.rb
 - lib/occams/content/tags/template.rb
 - lib/occams/content/tags/text.rb