origen_doc_helpers 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f10206613a76375cd6ec5925e33ea6a4928585a5
-  data.tar.gz: 713eef54df6cbaa62ce7b30b9bf63aba164b29c6
+  metadata.gz: c9913b384df5e46cc7aaa1a413e4bdebf5707074
+  data.tar.gz: 0eec0a9f93a7760a5d19a833f12d4aa88c3221bf
 SHA512:
-  metadata.gz: e64c3ceefca6c63d72b561a20c5ca6bfd776e4ed62e1c0f2447757f31dd8f80d73b6505ae26703a49e3192f75451d2428297e8e7b7e69b2c53d369b5dbe7efe2
-  data.tar.gz: 13036d3ddafdbed4126f94f752e6e9f667a62d351b6e56523047fce98ce918f9779953343db3e9a5456fe59e324584708f22fac1d25fe108bac672fe91ae24b5
+  metadata.gz: 201b1b79b0c2ca2b556536ca635c1602154901fd25511f43a576f14ad805c7d5bc50dc97464c3229f4eed04ea2c966b581327618aaf2c2aa214f66a87c0123fc
+  data.tar.gz: 60ec544a89a90dfb5a3a040a2f7ca747f7d51e12ed488c58f0bcbd95187cea043243d1d9b4d1b3c47c0288f0df81647e047090c92999d33fdd2ccc4fe2306107

data/config/version.rb

@@ -1,7 +1,7 @@
 module OrigenDocHelpers
   MAJOR = 0
   MINOR = 7
-  BUGFIX = 0
+  BUGFIX = 1
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/origen_doc_helpers/guide_index.rb

@@ -10,6 +10,23 @@ module OrigenDocHelpers
       @pending_pages = []
     end
 
+    # Force any pending sections and pages into the index, these will be added
+    # at the end since their :after/:before reference is not valid
+    def force_pending
+      @force_pending = true
+      @pending_sections.each do |id, opts, blk|
+        section(id, opts, &blk)
+      end
+      @pending_pages.each do |section_id, id, opts|
+        @current_section_id = section_id
+        @current_section = @index[section_key]
+        page(id, opts)
+      end
+
+      @force_pending = nil
+      self
+    end
+
     def section(id, options = {}, &block)
       @current_section_id = id
       if options[:heading]
@@ -29,14 +46,14 @@ module OrigenDocHelpers
       @section_keys[id] ||= @section_keys[id].to_s if @section_keys[id]
       section_pending = false
       unless @index[section_key]
-        if options[:after]
+        if options[:after] && !@force_pending
           if has_key?(:@index, section_key(options[:after]))
             insert_after(:@index, section_key, section_key(options[:after]), {})
           else
             @pending_sections << [id, options.dup, block] unless @no_pending
             section_pending = true
           end
-        elsif options[:before]
+        elsif options[:before] && !@force_pending
           if has_key?(:@index, section_key(options[:before]))
             insert_before(:@index, section_key, section_key(options[:before]), {})
           else
@@ -52,7 +69,7 @@ module OrigenDocHelpers
       @current_section = nil
 
       # See if any pending sections can now be inserted
-      unless @no_pending
+      unless @no_pending || @force_pending
         @pending_sections.each do |id, opts, blk|
           @no_pending = true
           section(id, opts, &blk)
@@ -70,18 +87,18 @@ module OrigenDocHelpers
       value = options[:heading] || id
       value = value.to_s if value
       page_pending = false
-      if options[:after]
+      if options[:after] && !@force_pending
         if has_key?(:@current_section, topic_key(options[:after]))
           insert_after(:@current_section, topic_key, topic_key(options[:after]), value)
         else
-          @pending_pages << [id, options.dup] unless @no_page_pending
+          @pending_pages << [@current_section_id, id, options.dup] unless @no_page_pending
           page_pending = true
         end
-      elsif options[:before]
+      elsif options[:before] && !@force_pending
         if has_key?(:@current_section, topic_key(options[:before]))
           insert_before(:@current_section, topic_key, topic_key(options[:before]), value)
         else
-          @pending_pages << [id, options.dup] unless @no_page_pending
+          @pending_pages << [@current_section_id, id, options.dup] unless @no_page_pending
           page_pending = true
         end
       else
@@ -92,8 +109,8 @@ module OrigenDocHelpers
       @index[section_key] = @current_section unless page_pending
 
       # See if any pending pages can now be inserted
-      unless @no_page_pending
-        @pending_pages.each do |id, opts|
+      unless @no_page_pending || @force_pending
+        @pending_pages.each do |section_id, id, opts|
           @no_page_pending = true
           page(id, opts)
           @no_page_pending = false

data/templates/shared/_searchable.html.erb

@@ -1,7 +1,11 @@
 % options[:root] ||= "docs"
 % options[:path_separator] ||= "_"
 % pdf_filename = ::OrigenDocHelpers::PDF.register(options)
-% options[:index] = options[:index].to_h
+% if options[:index].is_a?(OrigenDocHelpers::GuideIndex)
+%   options[:index] = options[:index].force_pending.to_h
+% else
+%   options[:index] = options[:index].to_h
+% end
 
 <div class="row">
   <div class="col-md-3 sidebar-nav-container">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_doc_helpers
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen