ascii_binder 1.0 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26f9de41f109228dfa1478976e8d1b8f08a178300d092e3250dcca610e4e70b6
-  data.tar.gz: 4cf902ff6c38a7a9ce622cdfaef927ed3943c750bcf71051a0bf00d430fce603
+  metadata.gz: 2cf225b54975612036fdb2243443ae80fcb72edb2d214e60790b0419c58bdfa0
+  data.tar.gz: eb4175c2ef3164a9e6042c1de20efe92673e79c3533eeb2be56b91271dfca5c7
 SHA512:
-  metadata.gz: d978b66122655791fcefc86a04741b94940fdfffab86e2ace9dd2454bef63849bda46b8776b90bad9bf7f9a87a7cce42ca4115bb2650fd0ee7836f23ed5ca7cb
-  data.tar.gz: e8b18ebdb1a1fbc8114645692e91342f6d48b8bb42b63f5c763a18550fbf45d7c3cac73c6ebd164910400448e3a0a2babcf0faa51a5cf06e98def1d66f9bae76
+  metadata.gz: 6ee0f8b3a9f79fb640da73c9c7c708cf247662ba661254eb28c7c919bac3e3cec39073d2cf7bc3f793ffc782c416814e863af0fb842cedfff7c5304ac68dad53
+  data.tar.gz: e3e5ed0a821629a531ee4e84812bacb309dad4c502036606fdd89610cb2d2f3bdd4374c973d68d0dc037a186d18fc1a8a70aa714bcb29d6c5048acdb6e8c219c

data/Dockerfile

@@ -1,7 +1,7 @@
-FROM centos/ruby-22-centos7
+FROM centos/ruby-23-centos7
 
-RUN scl enable rh-ruby22 -- gem install listen -v 3.0.8
-RUN scl enable rh-ruby22 -- gem install ascii_binder
+RUN scl enable rh-ruby23 -- gem install listen -v 3.0.8
+RUN scl enable rh-ruby23 -- gem install ascii_binder
 USER root
 RUN yum install -y java-1.7.0-openjdk && \
     yum clean all

data/ascii_binder.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'json'
   spec.add_dependency 'sitemap_generator', '~> 6.0.1'
   spec.add_dependency 'trollop', '~> 2.1.2'
-  spec.add_dependency 'yajl-ruby', '~> 1.3.0'
+  spec.add_dependency "yajl-ruby", ">= 1.4.2"
   spec.add_dependency 'tilt'
 
 end

data/lib/ascii_binder/engine.rb

@@ -111,11 +111,13 @@ module AsciiBinder
         # create a combined temp file with all topic maps
         tf = Tempfile.new("#{TOPIC_MAP_FILENAME}")
 
-        Dir.glob("#{topic_map_folder}/*.yml").each do |filename|
+        Dir.glob("#{topic_map_folder}/*.yml").sort.each do |filename|
           lines = IO.read(filename)
           tf << lines
+          tf.write "\n"
         end
 
+        tf.rewind
         t = tf.path
       end
 
@@ -217,13 +219,18 @@ module AsciiBinder
     def page(args)
       # TODO: This process of rebuilding the entire nav for every page will not scale well.
       #       As the doc set increases, we will need to think about refactoring this.
-      args[:breadcrumb_root], args[:breadcrumb_group], args[:breadcrumb_subgroup], args[:breadcrumb_topic] = extract_breadcrumbs(args)
+      args[:breadcrumb_root], args[:breadcrumb_group], args[:breadcrumb_subgroup], args[:breadcrumb_subsubgroup], args[:breadcrumb_topic] = extract_breadcrumbs(args)
 
       args[:breadcrumb_subgroup_block] = ''
       if args[:breadcrumb_subgroup]
         args[:breadcrumb_subgroup_block] = "<li class=\"hidden-xs active\">#{args[:breadcrumb_subgroup]}</li>"
       end
 
+      args[:breadcrumb_subsubgroup_block] = ''
+      if args[:breadcrumb_subsubgroup]
+        args[:breadcrumb_subsubgroup_block] = "<li class=\"hidden-xs active\">#{args[:breadcrumb_subsubgroup]}</li>"
+      end
+
       args[:subtopic_shim] = '../' * (args[:topic_id].split('::').length - 2)
       args[:subtopic_shim] = '' if args[:subtopic_shim].nil?
 
@@ -233,38 +240,63 @@ module AsciiBinder
 
     def extract_breadcrumbs(args)
       breadcrumb_root = breadcrumb_group = breadcrumb_subgroup = breadcrumb_topic = nil
+      selected_subgroup = selected_subsubgroup = nil
 
       root_group          = args[:navigation].first
       selected_group      = args[:navigation].detect { |group| group[:id] == args[:group_id] }
       selected_subgroup   = selected_group[:topics].detect { |subgroup| subgroup[:id] == args[:subgroup_id] }
-      current_is_subtopic = selected_subgroup ? true : false
+      if selected_subgroup
+        selected_subsubgroup   = selected_subgroup[:topics].detect { |subsubgroup| subsubgroup[:id] == args[:subsubgroup_id] }
+      end
+
+      offset = 0;
+      if selected_subgroup
+        offset = 1
+      end
+      if selected_subsubgroup
+        offset = 2
+      end
 
       if root_group
         root_topic = root_group[:topics].first
-        breadcrumb_root = linkify_breadcrumb(root_topic[:path], "#{args[:distro]} #{args[:version]}", current_is_subtopic) if root_topic
+        breadcrumb_root = linkify_breadcrumb(root_topic[:path], "#{args[:distro]} #{args[:version]}", offset) if root_topic
       end
 
       if selected_group
         group_topic = selected_group[:topics].first
-        breadcrumb_group = linkify_breadcrumb(group_topic[:path], selected_group[:name], current_is_subtopic) if group_topic
+        breadcrumb_group = linkify_breadcrumb(group_topic[:path], selected_group[:name], offset) if group_topic
+        selected_topic = selected_group[:topics].detect { |topic| topic[:id] == args[:topic_id] }
+        breadcrumb_topic = linkify_breadcrumb(nil, selected_topic[:name], offset) if selected_topic
+      end
 
-        if selected_subgroup
-          subgroup_topic = selected_subgroup[:topics].first
-          breadcrumb_subgroup = linkify_breadcrumb(subgroup_topic[:path], selected_subgroup[:name], current_is_subtopic) if subgroup_topic
+      if selected_subgroup
+        subgroup_topic = selected_subgroup[:topics].first
+        breadcrumb_subgroup = linkify_breadcrumb(subgroup_topic[:path], selected_subgroup[:name], offset) if subgroup_topic
 
-          selected_topic = selected_subgroup[:topics].detect { |topic| topic[:id] == args[:topic_id] }
-          breadcrumb_topic = linkify_breadcrumb(nil, selected_topic[:name], current_is_subtopic) if selected_topic
-        else
-          selected_topic = selected_group[:topics].detect { |topic| topic[:id] == args[:topic_id] }
-          breadcrumb_topic = linkify_breadcrumb(nil, selected_topic[:name], current_is_subtopic) if selected_topic
-        end
+        selected_topic = selected_subgroup[:topics].detect { |topic| topic[:id] == args[:topic_id] }
+        breadcrumb_topic = linkify_breadcrumb(nil, selected_topic[:name], offset) if selected_topic
       end
 
-      return breadcrumb_root, breadcrumb_group, breadcrumb_subgroup, breadcrumb_topic
+      if selected_subsubgroup
+        subsubgroup_topic = selected_subsubgroup[:topics].first
+        breadcrumb_subsubgroup = linkify_breadcrumb(subsubgroup_topic[:path], selected_subsubgroup[:name], offset) if subsubgroup_topic
+
+        selected_topic = selected_subsubgroup[:topics].detect { |topic| topic[:id] == args[:topic_id] }
+        breadcrumb_topic = linkify_breadcrumb(nil, selected_topic[:name], offset) if selected_topic
+      end
+
+
+      return breadcrumb_root, breadcrumb_group, breadcrumb_subgroup, breadcrumb_subsubgroup, breadcrumb_topic
     end
 
-    def linkify_breadcrumb(href, text, extra_level)
-      addl_level = extra_level ? '../' : ''
+    def linkify_breadcrumb(href, text, offset)
+      addl_level = ''
+      if offset == 1
+        addl_level = '../'
+      end
+      if offset == 2
+        addl_level = '../../'
+      end
       href ? "<a href=\"#{addl_level}#{href}\">#{text}</a>" : text
     end
 
@@ -512,10 +544,24 @@ module AsciiBinder
         topic_id       = breadcrumb[-1][:id]
         subgroup_title = nil
         subgroup_id    = nil
+        subsubgroup_title = nil
+        subsubgroup_id    = nil
         if breadcrumb.length == 3
           subgroup_title = breadcrumb[1][:name]
           subgroup_id    = breadcrumb[1][:id]
         end
+
+        if breadcrumb.length == 4     
+          topic_title    = breadcrumb[-1][:name]
+          topic_id       = breadcrumb[-1][:id]
+          subsubgroup_title = breadcrumb[-2][:name]
+          subsubgroup_id    = breadcrumb[-2][:id]
+          subgroup_title = breadcrumb[-3][:name]
+          subgroup_id    = breadcrumb[-3][:id]
+          group_title    = breadcrumb[-4][:name]
+          group_id       = breadcrumb[-4][:id]
+        end
+
         dir_depth = '../' * topic.breadcrumb[-1][:id].split('::').length
         dir_depth = '' if dir_depth.nil?
 
@@ -533,12 +579,14 @@ module AsciiBinder
           :version           => branch_config.name,
           :group_title       => group_title,
           :subgroup_title    => subgroup_title,
+          :subsubgroup_title    => subsubgroup_title,
           :topic_title       => topic_title,
           :article_title     => article_title,
           :content           => topic_html,
           :navigation        => navigation,
           :group_id          => group_id,
           :subgroup_id       => subgroup_id,
+          :subsubgroup_id       => subsubgroup_id,
           :topic_id          => topic_id,
           :css_path          => "#{dir_depth}#{branch_config.dir}/#{STYLESHEET_DIRNAME}/",
           :javascripts_path  => "#{dir_depth}#{branch_config.dir}/#{JAVASCRIPT_DIRNAME}/",

data/lib/ascii_binder/topic_entity.rb

@@ -153,7 +153,7 @@ module AsciiBinder
       return false unless distro_keys.include?(distro_key)
 
       # If we're building a single page, check if we're on the right track.
-      if single_page_path.length > 0
+      if single_page_path.length > 0  and not single_page_path[depth].nil?
         if is_group?
           return false unless single_page_path[depth] == dir
         elsif is_topic?

data/lib/ascii_binder/version.rb

@@ -1,3 +1,3 @@
 module AsciiBinder
-  VERSION = "1.0"
+  VERSION = "1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ascii_binder
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.2'
 platform: ruby
 authors:
 - N. Harrison Ripps
@@ -9,10 +9,10 @@ authors:
 - Carlos Munoz
 - Brian Exelbierd
 - Vikram Goyal
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-23 00:00:00.000000000 Z
+date: 2023-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -228,16 +228,16 @@ dependencies:
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -351,7 +351,7 @@ homepage: https://github.com/redhataccess/ascii_binder
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -366,8 +366,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: AsciiBinder is an AsciiDoc-based system for authoring and publishing closely
   related documentation sets from a single source.