bookbindery 7.1.0 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31e3c4c4ce805a8a0c47039f451d81e205a068ef
-  data.tar.gz: edc1de563ff7fd4855ff960bc34cfb886fcb47b3
+  metadata.gz: 60647d1c7441e4f13ec25b2f905afa5b108d4428
+  data.tar.gz: 2187d4e8f5e6accd3fbb607950a053ae6e1c5308
 SHA512:
-  metadata.gz: ebcdedfe7926b0a28a59793549d7013b3948ab8dbf3b7b16ef99d1761fcd0d7471fe51aaf42de6e14393c840997fcf0338cf0ef6507a32365f94318e375b17a9
-  data.tar.gz: 72b74779314a6fd58913328cbf3a1590d8f0d4925bb6d86116a89fecc3f6dc2cdc1c6e2246d19e792b9d27f1356ec22db76fe804b78c311312439725af850908
+  metadata.gz: b625693db01e696430423e1e4889e485c1c3b84746debb95d1ea6f5b4f3464db395a40d72876c961cc75918af4c2ed1ef848e92e708b9c91020b5cf8d7b96091
+  data.tar.gz: a497afbb4c57e31242c4cb638a761b0f0f1f9c26a2b98e96750484a9c96b97fb4b64fa398a3b21c0a1961d1800b231f3a50ca9ea82fb87bddc9e8ba399f0b01d

data/bookbinder.gemspec

@@ -2,7 +2,7 @@ require 'base64'
 
 Gem::Specification.new do |s|
   s.name        = 'bookbindery'
-  s.version     = '7.1.0'
+  s.version     = '7.2.0'
   s.summary     = 'Markdown to Rackup application documentation generator'
   s.description = 'A command line utility to be run in Book repositories to stitch together their constituent Markdown repos into a static-HTML-serving application'
   s.authors     = ['Mike Grafton', 'Lucas Marks', 'Gavin Morgan', 'Nikhil Gajwani', 'Dan Wendorf', 'Brenda Chan', 'Matthew Boedicker', 'Frank Kotsianas', 'Elena Sharma', 'Christa Hartsock']
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'middleman-syntax', ['~> 2.0']
   s.add_runtime_dependency 'rouge', '!= 1.9.1'
   s.add_runtime_dependency 'redcarpet', ['~> 3.2.3']
-  s.add_runtime_dependency 'vienna', ['= 0.4.0']
+  s.add_runtime_dependency 'vienna', ['= 0.4.1']
   s.add_runtime_dependency 'anemone'
   s.add_runtime_dependency 'css_parser'
   s.add_runtime_dependency 'puma'

data/lib/bookbinder/commands/collection.rb

@@ -9,7 +9,7 @@ require_relative '../config/remote_yaml_credential_provider'
 require_relative '../config/validator'
 require_relative '../config/yaml_loader'
 require_relative '../dita_command_creator'
-require_relative '../dita_html_to_middleman_formatter'
+require_relative '../dita_html_for_middleman_formatter'
 require_relative '../html_document_manipulator'
 require_relative '../ingest/cloner_factory'
 require_relative '../ingest/section_repository'
@@ -21,7 +21,6 @@ require_relative '../preprocessing/link_to_site_gen_dir'
 require_relative '../preprocessing/preprocessor'
 require_relative '../subnav/subnav_generator_factory'
 require_relative '../sheller'
-require_relative '../subnav/json_from_html'
 require_relative '../values/output_locations'
 
 module Bookbinder
@@ -96,8 +95,9 @@ module Bookbinder
           Postprocessing::SitemapWriter.build(logger, final_app_directory, sitemap_port),
           Preprocessing::Preprocessor.new(
             Preprocessing::DitaPreprocessor.new(
-              DitaHtmlToMiddlemanFormatter.new(local_filesystem_accessor, dita_json_generator, html_document_manipulator),
               local_filesystem_accessor,
+              subnav_generator_factory,
+              DitaHtmlForMiddlemanFormatter.new(local_filesystem_accessor, html_document_manipulator),
               DitaCommandCreator.new(ENV['PATH_TO_DITA_OT_LIBRARY']),
               sheller
             ),
@@ -159,10 +159,6 @@ module Bookbinder
         Subnav::SubnavGeneratorFactory.new(local_filesystem_accessor, output_locations)
       end
 
-      def json_generator
-        Subnav::JsonFromConfig.new
-      end
-
       def directory_preparer
         Commands::BindComponents::DirectoryPreparer.new(local_filesystem_accessor)
       end
@@ -175,10 +171,6 @@ module Bookbinder
         @final_app_directory ||= File.absolute_path('final_app')
       end
 
-      def dita_json_generator
-        Subnav::JsonFromHtml.new
-      end
-
       def html_document_manipulator
         @html_document_manipulator ||= HtmlDocumentManipulator.new
       end

data/lib/bookbinder/config/checkers/subnavs_checker.rb

@@ -29,11 +29,11 @@ module Bookbinder
         end
 
         def invalid_subnav_names
-          invalid_subnavs.map(&:name).join(", ")
+          invalid_subnavs.map(&:subnav_name).join(", ")
         end
 
         def missing_subnavs
-          section_subnav_names - config.subnavs.map(&:name)
+          section_subnav_names - config.subnavs.map(&:subnav_name)
         end
 
         def required_subnav_keys

data/lib/bookbinder/config/checkers/topics_checker.rb

@@ -25,7 +25,7 @@ module Bookbinder
         end
 
         def invalid_subnav_names
-          invalid_subnavs.map(&:name).join(', ')
+          invalid_subnavs.map(&:subnav_name).join(', ')
         end
 
         def required_topic_keys

data/lib/bookbinder/config/configuration.rb

@@ -50,16 +50,12 @@ module Bookbinder
 
         def dita_subnav_template(all_sections, current_section)
           subnav_sections = all_sections.select { |section| section['ditamap_location'] }
-          if subnav_sections.empty?
-            nil
-          elsif subnav_sections.one?
-            "dita_subnav"
-          else
+          if subnav_sections.any?
             subnav_section = subnav_sections.include?(current_section) ? current_section : subnav_sections.first
             dest_dir = Ingest::DestinationDirectory.new(
               subnav_section.fetch('repository', {})['name'], subnav_section['directory'])
 
-            dest_dir ? "dita_subnav_#{dest_dir}" : "dita_subnav"
+            "dita_subnav_#{dest_dir}"
           end
         end
       end

data/lib/bookbinder/config/section_config.rb

@@ -31,6 +31,12 @@ module Bookbinder
         repo['ref'] || 'master'
       end
 
+      def dependent_sections
+        @sections ||= (config['dependent_sections'] || []).map do |dep_section|
+          SectionConfig.new(dep_section)
+        end
+      end
+
       def preprocessor_config
         config.fetch('preprocessor_config', {})
       end

data/lib/bookbinder/config/subnav_config.rb

@@ -8,7 +8,7 @@ module Bookbinder
         @topics = assemble_topics || []
       end
 
-      def name
+      def subnav_name
         config['name']
       end
 

data/lib/bookbinder/{dita_html_to_middleman_formatter.rb → dita_html_for_middleman_formatter.rb}

@@ -1,11 +1,8 @@
-require_relative 'values/subnav_template'
-
 module Bookbinder
 
-  class DitaHtmlToMiddlemanFormatter
-    def initialize(file_system_accessor, subnav_formatter, html_document_manipulator)
+  class DitaHtmlForMiddlemanFormatter
+    def initialize(file_system_accessor, html_document_manipulator)
       @file_system_accessor = file_system_accessor
-      @subnav_formatter = subnav_formatter
       @html_document_manipulator = html_document_manipulator
     end
 
@@ -29,23 +26,9 @@ module Bookbinder
       end
     end
 
-    def format_subnav(path_to_dita_section,
-                      subnav_template_text,
-                      json_props_location,
-                      unformatted_subnav_text)
-      formatted_json_links = subnav_formatter.get_links_as_json(unformatted_subnav_text,
-                                                                path_to_dita_section)
-
-      nav_text = html_document_manipulator.set_attribute(document: subnav_template_text,
-                                                         selector: 'div.nav-content',
-                                                         attribute: 'data-props-location',
-                                                         value: json_props_location)
-      SubnavTemplate.new(formatted_json_links, nav_text)
-    end
-
     private
 
-    attr_reader :file_system_accessor, :subnav_formatter, :html_document_manipulator
+    attr_reader :file_system_accessor, :html_document_manipulator
 
     def frontmatter(title)
       sanitized_title = title.gsub('"', '\"')

data/lib/bookbinder/html_document_manipulator.rb

@@ -12,6 +12,13 @@ module Bookbinder
       doc.to_html
     end
 
+    def add_class(document: nil, selector: nil, classname: nil)
+      doc = Nokogiri::HTML.fragment(document)
+      node_set = doc.css(selector)
+      node_set.add_class(classname)
+      doc.to_html
+    end
+
     def read_html_in_tag(document: nil, tag: nil)
       doc = Nokogiri::HTML(document)
       doc.css(tag).inner_html

data/lib/bookbinder/ingest/section_repository.rb

@@ -14,6 +14,17 @@ module Bookbinder
                                      source_ref: ref_override || section_config.repo_ref,
                                      destination_parent_dir: destination_dir,
                                      destination_dir_name: section_config.desired_directory_name)
+
+          if section_config.dependent_sections.any?
+            section_config.dependent_sections.map do |dependent_config|
+              streams[:success].puts("Gathering #{dependent_config.repo_name}")
+              cloner.call(source_repo_name: dependent_config.repo_name,
+                          source_ref: ref_override || dependent_config.repo_ref,
+                          destination_parent_dir: "#{destination_dir}/#{section_config.desired_directory_name}",
+                          destination_dir_name: dependent_config.desired_directory_name)
+            end
+          end
+
           Section.new(
             working_copy.path,
             working_copy.full_name,

data/lib/bookbinder/postprocessing/sitemap_writer.rb

@@ -9,7 +9,7 @@ module Bookbinder
         new(
           Spider.new(app_dir: final_app_directory),
           ServerDirector.new(
-            app: RackApp.new(Pathname('redirects.rb')).app,
+            app: RackApp.new(Pathname('redirects.rb'), auth_required: false).app,
             directory: final_app_directory,
             port: port
           )

data/lib/bookbinder/preprocessing/dita_preprocessor.rb

@@ -1,4 +1,5 @@
 require_relative '../values/subnav_template'
+require_relative '../../../lib/bookbinder/subnav/json_from_html_toc'
 
 module Bookbinder
   module Preprocessing
@@ -7,9 +8,10 @@ module Bookbinder
 
       ACCEPTED_IMAGE_FORMATS = %w(png jpeg jpg svg gif bmp tif tiff eps)
 
-      def initialize(dita_formatter, local_fs_accessor, command_creator, sheller)
+      def initialize(fs, subnav_gen_factory, dita_formatter, command_creator, sheller)
+        @fs = fs
+        @subnav_gen_factory = subnav_gen_factory
         @dita_formatter = dita_formatter
-        @local_fs_accessor = local_fs_accessor
         @command_creator = command_creator
         @sheller = sheller
       end
@@ -18,38 +20,44 @@ module Bookbinder
         section.subnav_template.include?('dita_subnav') if section.subnav_template
       end
 
-      def preprocess(dita_sections, output_locations, options: [], output_streams: nil, **_)
+      def preprocess(sections, output_locations, options: [], output_streams: nil, **_)
+        @output_locations = output_locations
+
         dita_options = dita_flags(options)
-        dita_sections.each do |dita_section|
-          if dita_section.path_to_preprocessor_attribute('ditamap_location')
-            convert_dita_files(dita_section,
+
+        sections.each do |section|
+          if section.path_to_preprocessor_attribute('ditamap_location')
+            convert_dita_files(section,
                                command_creator,
                                dita_options,
-                               output_locations.html_from_preprocessing_dir.join(dita_section.destination_directory),
+                               section_html_dir(section),
                                sheller,
                                output_streams)
 
-            generate_subnav(dita_section,
-                            output_locations,
-                            output_locations.source_for_site_generator.join('subnavs', '_dita_subnav_template.erb'),
-                            output_locations.subnavs_for_layout_dir)
+            subnav_generator.generate(section)
           end
 
-          section_html_dir = output_locations.html_from_preprocessing_dir.join(dita_section.destination_directory)
-          formatted_dir = output_locations.formatted_dir.join(dita_section.destination_directory)
-          source_for_site_gen_dir = output_locations.source_for_site_generator.join(dita_section.destination_directory)
+          dita_formatter.format_html(section_html_dir(section), formatted_dir(section))
+          copy_images(section.path_to_repository, formatted_dir(section))
+          fs.copy_contents(formatted_dir(section), source_for_site_gen_dir(section))
+        end
+      end
 
-          dita_formatter.format_html section_html_dir, formatted_dir
+      private
 
-          copy_images(dita_section.path_to_repository, formatted_dir)
+      attr_reader :fs, :subnav_gen_factory, :dita_formatter, :command_creator, :sheller, :subnav_generator, :output_locations
 
-          local_fs_accessor.copy_contents(formatted_dir, source_for_site_gen_dir)
-        end
+      def section_html_dir(section)
+        output_locations.html_from_preprocessing_dir.join(section.destination_directory)
       end
 
-      private
+      def formatted_dir(section)
+        output_locations.formatted_dir.join(section.destination_directory)
+      end
 
-      attr_reader :dita_formatter, :local_fs_accessor, :command_creator, :sheller
+      def source_for_site_gen_dir(section)
+        output_locations.source_for_site_generator.join(section.destination_directory)
+      end
 
       def convert_dita_files(section, command_creator, options, section_html_dir, sheller, output_streams)
         command = command_creator.convert_to_html_command(
@@ -66,44 +74,16 @@ module Bookbinder
         end
       end
 
-      def generate_subnav(dita_section, output_locations, dita_subnav_template_path, subnavs_dir)
-        dita_subnav_template_text = local_fs_accessor.read(dita_subnav_template_path)
-
-        tocjs_text = local_fs_accessor.read(
-          File.join(
-            output_locations.html_from_preprocessing_dir.join(dita_section.destination_directory),
-            'index.html')
-        )
-        json_props_location = json_props_location(dita_section.destination_directory)
-        props_file_location = File.join(subnavs_dir, json_props_location)
-
-        subnav = dita_formatter.format_subnav(dita_section.destination_directory,
-                                              dita_subnav_template_text,
-                                              json_props_location,
-                                              tocjs_text)
-
-        local_fs_accessor.write text: subnav.json_links, to: props_file_location
-
-        local_fs_accessor.write text: subnav.text,
-                                to: File.join(subnavs_dir, "#{dita_section.subnav_template}.erb")
-      end
-
       def copy_images(src, dest)
         image_paths = ACCEPTED_IMAGE_FORMATS.map do |format|
-          local_fs_accessor.find_files_with_ext(format, src)
+          fs.find_files_with_ext(format, src)
         end.flatten
 
         image_paths.each do |image_path|
-          local_fs_accessor.copy_including_intermediate_dirs(image_path,
-                                                             src,
-                                                             dest)
+          fs.copy_including_intermediate_dirs(image_path, src, dest)
         end
       end
 
-      def json_props_location(section_dir)
-        (["dita-subnav-props"] + Array(section_dir.to_s)).join("-") + ".json"
-      end
-
       def dita_flags(opts)
         matching_flags = opts.map {|o| o[flag_value_regex("dita-flags"), 1] }
         matching_flags.compact.first
@@ -112,6 +92,10 @@ module Bookbinder
       def flag_value_regex(flag_name)
         Regexp.new(/--#{flag_name}=(.+)/)
       end
+
+      def subnav_generator
+        @subnav_generator ||= subnav_gen_factory.produce(Subnav::JsonFromHtmlToc.new(fs))
+      end
     end
   end
 end

data/lib/bookbinder/preprocessing/link_to_site_gen_dir.rb

@@ -1,5 +1,5 @@
 require_relative '../subnav/subnav_generator'
-require_relative '../subnav/json_from_config'
+require_relative '../subnav/json_from_markdown_toc'
 
 module Bookbinder
   module Preprocessing
@@ -29,7 +29,7 @@ module Bookbinder
       private
 
       def subnav_generator
-        @subnav_generator ||= subnav_generator_factory.produce(Subnav::JsonFromConfig.new(filesystem))
+        @subnav_generator ||= subnav_generator_factory.produce(Subnav::JsonFromMarkdownToc.new(filesystem))
       end
 
       attr_reader :filesystem, :subnav_generator_factory

data/lib/bookbinder/subnav/json_from_html_toc.rb

@@ -0,0 +1,58 @@
+require 'nokogiri'
+require 'active_support/all'
+
+module Bookbinder
+  module Subnav
+    class JsonFromHtmlToc
+      def initialize(fs)
+        @fs = fs
+      end
+
+      def get_links(section, output_locations)
+        @section, @output_locations = section, output_locations
+
+        doc = parse_toc_file
+        set_anchor_values(doc.css('a'))
+
+        {
+          links: gather_urls_and_texts(doc.css('body > ul'))
+        }.to_json
+      end
+
+      private
+
+      attr_reader :fs, :section, :output_locations
+
+      def parse_toc_file
+        html = fs.read(
+          File.join(
+            output_locations.html_from_preprocessing_dir,
+            section.destination_directory,
+            'index.html')
+        )
+        Nokogiri::XML(html)
+      end
+
+      def set_anchor_values(anchors)
+        anchors.each do |anchor|
+          anchor['href'] = "/#{section.destination_directory}/#{anchor['href']}"
+        end
+      end
+
+      def gather_urls_and_texts(base_node)
+        top_level_li = base_node.css("> li")
+        top_level_li.map do |li|
+          anchor = li.css('a')[0]
+          href = anchor['href']
+          text = anchor.inner_text
+          ul = li.css('> ul')
+          if ul.size > 0
+            {url: href, text: text, nestedLinks: gather_urls_and_texts(ul)}
+          else
+            {url: href, text: text}
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bookbinder/subnav/{json_from_config.rb → json_from_markdown_toc.rb}

@@ -4,14 +4,14 @@ require 'redcarpet'
 
 module Bookbinder
   module Subnav
-    class JsonFromConfig
+    class JsonFromMarkdownToc
       def initialize(fs)
         @fs = fs
         @renderer = Redcarpet::Markdown.new(Redcarpet::Render::HTML.new)
       end
 
-      def get_links(subnav_config, source_for_site_gen)
-        @source_for_site_gen = source_for_site_gen
+      def get_links(subnav_config, output_locations)
+        @source_for_site_gen = output_locations.source_for_site_generator
         @config = subnav_config
 
         { links: get_links_and_headers }.to_json

data/lib/bookbinder/subnav/json_props_creator.rb

@@ -7,12 +7,12 @@ module Bookbinder
         @json_generator = json_generator
       end
 
-      def create(subnav_config)
-        json_links = json_generator.get_links(subnav_config, output_locations.source_for_site_generator)
+      def create(subnav_spec)
+        json_links = json_generator.get_links(subnav_spec, output_locations)
 
-        fs.write(text: json_links, to: props_path(subnav_config.name))
+        fs.write(text: json_links, to: props_path(subnav_spec.subnav_name))
 
-        filename(subnav_config.name)
+        filename(subnav_spec.subnav_name)
       end
 
       attr_reader :fs, :output_locations, :json_generator

data/lib/bookbinder/subnav/subnav_generator.rb

@@ -7,13 +7,19 @@ module Bookbinder
         @pdf_config_creator = pdf_config_creator
       end
 
-      def generate(subnav_config)
-        filename = json_props_creator.create(subnav_config)
-        template_creator.create(filename, subnav_config)
-        pdf_config_creator.create(filename, subnav_config) if subnav_config.pdf_config
+      def generate(subnav_spec)
+        filename = json_props_creator.create(subnav_spec)
+        template_creator.create(filename, subnav_spec)
+        pdf_config_creator.create(filename, subnav_spec) if pdf?(subnav_spec)
       end
 
       attr_reader :json_props_creator, :template_creator, :pdf_config_creator
+
+      private
+
+      def pdf?(subnav_spec)
+        subnav_spec.respond_to?(:pdf_config) && subnav_spec.pdf_config
+      end
     end
   end
 end

data/lib/bookbinder/subnav/template_creator.rb

@@ -1,3 +1,7 @@
+require_relative '../../../lib/bookbinder/values/user_message'
+require_relative '../../../lib/bookbinder/colorizer'
+require_relative '../../../lib/bookbinder/terminal'
+
 module Bookbinder
   module Subnav
     class TemplateCreator
@@ -7,20 +11,28 @@ module Bookbinder
         @html_doc_manipulator = html_doc_manipulator
       end
 
-      def create(props_filename, subnav_config)
+      def create(props_filename, subnav_spec)
         template_content = fs.read(template_path)
-        nav_content = html_doc_manipulator.set_attribute(document: template_content,
+        nav_with_props = html_doc_manipulator.set_attribute(document: template_content,
+                                                            selector: 'div.nav-content',
+                                                            attribute: 'data-props-location',
+                                                            value: props_filename)
+
+        nav_content = html_doc_manipulator.add_class(document: nav_with_props,
                                                          selector: 'div.nav-content',
-                                                         attribute: 'data-props-location',
-                                                         value: props_filename)
+                                                         classname: nav_type(subnav_spec))
 
-        fs.write(text: nav_content, to: subnav_destination(subnav_config.name))
+        fs.write(text: nav_content, to: subnav_destination(subnav_spec.subnav_name))
       end
 
       attr_reader :fs, :output_locations, :html_doc_manipulator
 
       private
 
+      def nav_type(subnav_spec)
+        subnav_spec.subnav_name.include?('dita') ? 'deepnav-content' : 'shallownav-content'
+      end
+
       def subnavs_path
         output_locations.subnavs_for_layout_dir
       end
@@ -30,7 +42,16 @@ module Bookbinder
       end
 
       def template_path
-        subnavs_path.join('subnav_template.erb')
+        deprecated_prefix = '_dita_' unless fs.file_exist?(subnavs_path.join('subnav_template.erb'))
+
+        if deprecated_prefix
+          Terminal.new(Colorizer.new).update(UserMessage.new(
+            "Use of '_dita_subnav_template.erb' is deprecated. " +
+              "The preferred template is 'subnav_template.erb'. Please rename your file.",
+            EscalationType.warn
+          ))
+        end
+        subnavs_path.join("#{deprecated_prefix}subnav_template.erb")
       end
 
       def subnav_destination(name)

data/lib/bookbinder/values/section.rb

@@ -6,7 +6,7 @@ module Bookbinder
                        :full_name,
                        :desired_directory_name,
                        :subnav_templ,
-                       :subnav_name,
+                       :desired_subnav_name,
                        :preprocessor_config) do
     def path_to_repository
       Pathname(self[:path_to_repository].to_s)
@@ -22,8 +22,11 @@ module Bookbinder
 
     def subnav
       namespace = destination_directory.to_s.gsub('/', '_')
-      template = subnav_template || subnav_name || 'default'
-      {namespace => template}
+      {namespace => subnav_name}
+    end
+
+    def subnav_name
+      subnav_template || desired_subnav_name || 'default'
     end
 
     def path_to_preprocessor_attribute(attr)

data/template_app/rack_app.rb

@@ -1,13 +1,29 @@
 require 'rack/rewrite'
+require 'rack/auth/basic'
 require 'vienna'
 
 module Bookbinder
   class RackApp
-    def initialize(redirect_pathname)
+    def initialize(redirect_pathname, auth_required: true)
       @redirect_pathname = redirect_pathname
+      @auth_required = auth_required
     end
 
     def app
+      app = resolve_redirects
+
+      if auth_required && site_username && site_password
+        authorize_user(app)
+      else
+        app
+      end
+    end
+
+    private
+
+    attr_reader :redirect_pathname, :auth_required
+
+    def resolve_redirects
       if redirect_pathname.exist?
         p = redirect_pathname
         Rack::Rewrite.new(Vienna) { eval(p.read) }
@@ -16,8 +32,18 @@ module Bookbinder
       end
     end
 
-    private
+    def authorize_user(app)
+      Rack::Auth::Basic.new(app) do |username, password|
+        [username, password] == [site_username, site_password]
+      end
+    end
 
-    attr_reader :redirect_pathname
+    def site_username
+      ENV['SITE_AUTH_USERNAME']
+    end
+
+    def site_password
+      ENV['SITE_AUTH_PASSWORD']
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbindery
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.2.0
 platform: ruby
 authors:
 - Mike Grafton
@@ -17,118 +17,118 @@ authors:
 autorequire: 
 bindir: install_bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: ansi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: middleman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: middleman-livereload
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.3
 - !ruby/object:Gem::Dependency
   name: middleman-syntax
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '!='
+    - - "!="
       - !ruby/object:Gem::Version
         version: 1.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '!='
+    - - "!="
       - !ruby/object:Gem::Version
         version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.3
 - !ruby/object:Gem::Dependency
@@ -137,152 +137,152 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: anemone
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: css_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-rewrite
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.8
 - !ruby/object:Gem::Dependency
   name: license_finder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A command line utility to be run in Book repositories to stitch together
@@ -347,7 +347,7 @@ files:
 - lib/bookbinder/deprecated_logger.rb
 - lib/bookbinder/directory_helpers.rb
 - lib/bookbinder/dita_command_creator.rb
-- lib/bookbinder/dita_html_to_middleman_formatter.rb
+- lib/bookbinder/dita_html_for_middleman_formatter.rb
 - lib/bookbinder/errors/cli_error.rb
 - lib/bookbinder/errors/programmer_mistake.rb
 - lib/bookbinder/html_document_manipulator.rb
@@ -375,8 +375,8 @@ files:
 - lib/bookbinder/spider.rb
 - lib/bookbinder/stabilimentum.rb
 - lib/bookbinder/streams/colorized_stream.rb
-- lib/bookbinder/subnav/json_from_config.rb
-- lib/bookbinder/subnav/json_from_html.rb
+- lib/bookbinder/subnav/json_from_html_toc.rb
+- lib/bookbinder/subnav/json_from_markdown_toc.rb
 - lib/bookbinder/subnav/json_props_creator.rb
 - lib/bookbinder/subnav/pdf_config_creator.rb
 - lib/bookbinder/subnav/subnav_generator.rb
@@ -412,12 +412,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/lib/bookbinder/subnav/json_from_html.rb

@@ -1,38 +0,0 @@
-require 'nokogiri'
-require 'active_support/all'
-
-module Bookbinder
-  module Subnav
-    class JsonFromHtml
-      def get_links_as_json(raw_subnav_text, base_dirname)
-        doc = Nokogiri::XML(raw_subnav_text)
-
-        all_anchors = doc.css('a')
-        all_anchors.each do |anchor|
-          anchor['href'] = "/#{base_dirname}/#{anchor['href']}"
-        end
-
-        {
-          links: gather_urls_and_texts(doc.css('body > ul'))
-        }.to_json
-      end
-
-      private
-
-      def gather_urls_and_texts(base_node)
-        top_level_li = base_node.css("> li")
-        top_level_li.map do |li|
-          anchor = li.css('a')[0]
-          href = anchor['href']
-          text = anchor.inner_text
-          ul = li.css('> ul')
-          if ul.size > 0
-            {url: href, text: text, nestedLinks: gather_urls_and_texts(ul)}
-          else
-            {url: href, text: text}
-          end
-        end
-      end
-    end
-  end
-end