RubyGems - simpler_navigation - Versions diffs - 0.2.0 → 0.3.0 - Mend

simpler_navigation 0.2.0 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml +4 -4
data/Gemfile.lock +126 -64
data/lib/simpler_navigation/renderers/base.rb +19 -17
data/lib/simpler_navigation/renderers/breadcrumb.rb +10 -3
data/lib/simpler_navigation/version.rb +1 -1
metadata +3 -7

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ac165ac094cedb9dde1875566c903d0312a005525a33235899089038b723a75
-  data.tar.gz: 5417062d855cef5368d129cf9f94615d13960a11c1e01fb066aae895849895db
+  metadata.gz: 31d56f3385357f7c2337b4c75f10376a560c9f06bae5a3bccba33979ee557b13
+  data.tar.gz: c9f12d5fcb6c3aa57d7e089757962cfec13861cf8d02400ab228706b7d68d1ae
 SHA512:
-  metadata.gz: 4f885bb2d8c54952e32dd159061397f6f1769f83258e674fed867cef193c38d76d877176bee00945edee58f5ac8c89bb53d2c4f13bd282e9682d68cab4a6873d
-  data.tar.gz: 97127515e3be1bed372ed7dc936a64922fd4ef2bac59b586d5367a6ccca19c27d8022b71745257eb36ed4a2c1f08346e720ea5bdec574a788beb5cc3bd3cc24e
+  metadata.gz: 543c251f069a62e4428a73c4a16813568f4e688f9e00d14bf951e25b2e38bf872d889194a49f181db1d84aa35a9f1604ad829c8a8af72be3dc25d31f31bdd4d5
+  data.tar.gz: be70a468eb9043da77d8f0ac2e2f8ab980d54cc6f5c33979605b003d78cf62bf609abda3fb230d5e8681061abd521fd6afa2188ddb6dd7a4f9f1f47a13eacae1

data/Gemfile.lock CHANGED Viewed

@@ -1,100 +1,162 @@
 PATH
   remote: .
   specs:
-    simpler_navigation (0.2.0)
+    simpler_navigation (0.3.0)
       actionview
       railties
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.4.2)
-      actionview (= 7.0.4.2)
-      activesupport (= 7.0.4.2)
-      rack (~> 2.0, >= 2.2.0)
+    actionpack (8.0.2)
+      actionview (= 8.0.2)
+      activesupport (= 8.0.2)
+      nokogiri (>= 1.8.5)
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.4.2)
-      activesupport (= 7.0.4.2)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actionview (8.0.2)
+      activesupport (= 8.0.2)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.4.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activesupport (8.0.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    ast (2.4.2)
-    builder (3.2.4)
-    concurrent-ruby (1.2.2)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    ast (2.4.3)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
+    builder (3.3.0)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
     crass (1.0.6)
-    erubi (1.12.0)
-    i18n (1.12.0)
+    date (3.4.1)
+    drb (2.2.3)
+    erb (5.0.1)
+    erubi (1.13.1)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    language_server-protocol (3.17.0.3)
-    loofah (2.19.1)
+    io-console (0.8.0)
+    irb (1.15.2)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.12.2)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    loofah (2.24.1)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    method_source (1.0.0)
-    minitest (5.17.0)
-    nokogiri (1.14.2-arm64-darwin)
+      nokogiri (>= 1.12.0)
+    minitest (5.25.5)
+    nokogiri (1.18.8-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-linux)
+    nokogiri (1.18.8-x86_64-linux-gnu)
       racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.2.1.0)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
-    racc (1.6.2)
-    rack (2.2.6.2)
-    rack-test (2.0.2)
+      racc
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.4.0)
+    psych (5.2.6)
+      date
+      stringio
+    racc (1.8.1)
+    rack (3.1.16)
+    rack-session (2.1.1)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rackup (2.2.1)
+      rack (>= 3)
+    rails-dom-testing (2.3.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
-    railties (7.0.4.2)
-      actionpack (= 7.0.4.2)
-      activesupport (= 7.0.4.2)
-      method_source
+    rails-html-sanitizer (1.6.2)
+      loofah (~> 2.21)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    railties (8.0.2)
+      actionpack (= 8.0.2)
+      activesupport (= 8.0.2)
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
       rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.7.0)
-    rexml (3.2.5)
-    rubocop (1.44.1)
+    rake (13.3.0)
+    rdoc (6.14.1)
+      erb
+      psych (>= 4.0.0)
+    regexp_parser (2.10.0)
+    reline (0.6.1)
+      io-console (~> 0.5)
+    rubocop (1.75.8)
       json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.27.0)
-      parser (>= 3.2.1.0)
-    rubocop-performance (1.15.2)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.11.0)
-    standard (1.24.3)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.45.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-performance (1.25.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
+    standard (1.50.0)
       language_server-protocol (~> 3.17.0.2)
-      rubocop (= 1.44.1)
-      rubocop-performance (= 1.15.2)
-    thor (1.2.1)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.75.5)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.8)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.8.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.25.0)
+    stringio (3.1.7)
+    thor (1.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
-    zeitwerk (2.6.7)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.3)
+    useragent (0.16.11)
+    zeitwerk (2.7.3)
 PLATFORMS
   arm64-darwin-21
+  arm64-darwin-24
   x86_64-linux
 DEPENDENCIES

data/lib/simpler_navigation/renderers/base.rb CHANGED Viewed

@@ -63,18 +63,19 @@ module SimplerNavigation
       end
       def link_tag_options(item)
-        options = if item.options[:link_html]
-          item.options[:link_html].dup
-        else
-          {}
-        end
+        render_options = @options[:link_html] || {}
+        item_options = item.options[:link_html] || {}
+        options = render_options.merge(item_options)
         classes = []
-        if options[:class]
-          classes << options[:class]
+        if render_options[:class]
+          classes << render_options[:class]
+        end
+        if item_options[:class]
+          classes << item_options[:class]
         end
         if selected?(item)
-          classes << SimplerNavigation.config.selected_class
+          classes << (@options[:selected_class] || SimplerNavigation.config.selected_class)
         end
         options[:class] = classes.compact.join(" ")
         if options[:class].empty?
@@ -85,21 +86,22 @@ module SimplerNavigation
       end
       def wrapper_tag_options(item)
-        options = if item.options[:html]
-          item.options[:html].dup
-        else
-          {}
-        end
+        render_options = @options[:html] || {}
+        item_options = item.options[:html] || {}
+        options = render_options.merge(item_options)
         classes = []
-        if options[:class]
-          classes << options[:class]
+        if render_options[:class]
+          classes << render_options[:class]
+        end
+        if item_options[:class]
+          classes << item_options[:class]
         end
         if selected?(item)
-          classes << SimplerNavigation.config.selected_class
+          classes << (@options[:selected_class] || SimplerNavigation.config.selected_class)
         end
         if active_leaf?(item)
-          classes << SimplerNavigation.config.active_leaf_class
+          classes << (@options[:active_leaf_class] || SimplerNavigation.config.active_leaf_class)
         end
         options[:class] = classes.compact.join(" ")
         if options[:class].empty?

data/lib/simpler_navigation/renderers/breadcrumb.rb CHANGED Viewed

@@ -8,8 +8,7 @@ module SimplerNavigation
         tags = crumb_tags(@item)
-        join_with = @options[:join_with] || " "
-        content_tag(:div, safe_join(tags, join_with), @options[:attributes])
+        content_tag(:ol, safe_join(tags), @options[:attributes])
       end
       private
@@ -20,12 +19,20 @@ module SimplerNavigation
         parent_item.children.each_value do |item|
           next unless show?(item) && selected?(item)
-          tags << if @options[:static_leaf] && active_leaf?(item)
+          active = active_leaf?(item)
+          li_content = if @options[:static_leaf] && active
             content_tag("span", item.name, link_tag_options(item))
           else
             link_tag(item)
           end
+          li_options = wrapper_tag_options(item)
+          if active
+            li_options[:"aria-current"] = "page"
+          end
+          tags << content_tag(:li, li_content, li_options)
           if include_sub_navigation?(item)
             tags += crumb_tags(item)
           end

data/lib/simpler_navigation/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module SimplerNavigation
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata CHANGED Viewed

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: simpler_navigation
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Nick Muerdter
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-23 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -38,7 +37,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - 12112+GUI@users.noreply.github.com
 executables: []
@@ -70,7 +68,6 @@ metadata:
   homepage_uri: https://github.com/GUI/simpler_navigation
   source_code_uri: https://github.com/GUI/simpler_navigation
   changelog_uri: https://github.com/GUI/simpler_navigation/blob/main/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -85,8 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A Rails gem to handle navigation menus and breadcrumbs.
 test_files: []