bookbindery 9.11.1 → 9.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e190c8b59e376ad0d9ef0290912dd5f8b7cc528
-  data.tar.gz: 4734646b4d3bd8c3e3336ee85d2da9ee134394f9
+  metadata.gz: fcd5e2f139245d235d3e225698f2985b6458ba73
+  data.tar.gz: 9e4a26c0cf99324f2a201cd801ec4d5ab0f4bfcb
 SHA512:
-  metadata.gz: c5600ced967fd39ec7676e80af0ed5799c2882e7f9da0ef129e5997b9a062ed6a8d2127d1e0f06c539f3ab30ba4d2c78d4eb437ca5d17e9f5151bea1fa5b05e6
-  data.tar.gz: 2fb31439b5a192b1b451ea25866fc319e0d388963de1a48725655ba0551dab4febb8688d08c9356de76902274b8b691a89f757642623d5424178003613d160b7
+  metadata.gz: 309ebaec04b27d5b89075c79cc1c735fbfc444646289436d6aa5a12e025526538e8e70c8e6a97bf377da8b003991d6a473a3d4306b88c7ebb1397989e1b04fc2
+  data.tar.gz: c8260a429816001b1c12bf883a37ae259d965a1c82f6a368d72f2a3bf932056972e693ce273266867183eea1454f69ab7cad53edba64b21a8a4cfe84d2c138e4

data/bookbinder.gemspec

@@ -2,7 +2,7 @@ require 'base64'
 
 Gem::Specification.new do |s|
   s.name        = 'bookbindery'
-  s.version     = '9.11.1'
+  s.version     = '9.11.2'
   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', 'Andrew Bruce', 'Frank Kotsianas', 'Elena Sharma', 'Christa Hartsock', 'Michael Trestman', 'Alpha Chen', 'Sarah McAlear', 'Gregg Van Hove']

data/lib/bookbinder/commands/components/command_options.rb

@@ -32,7 +32,7 @@ module Bookbinder
         def streams
           base_streams.merge(
             out: verbosity ? base_streams[:out] :
-              Streams::FilterStream.new(/^\s*error/i, Streams::ColorizedStream.new(Colorizer::Colors.red, base_streams[:out])),
+              Streams::FilterStream.new(/^(?:\s*error|Invalid CSS|Undefined mixin|\/)/i, Streams::ColorizedStream.new(Colorizer::Colors.red, base_streams[:out])),
           )
         end
 

data/lib/bookbinder/ingest/local_filesystem_cloner.rb

@@ -29,31 +29,29 @@ module Bookbinder
 
       def link!(source_repo_name, source_dir, dest_dir, source_ref)
         source_exists = filesystem.file_exist?(source_dir)
+        unless source_exists
+          source_dir_with_ref = "#{source_dir}-#{source_ref}"
+          source_exists = filesystem.file_exist?(source_dir_with_ref)
+          source_dir = source_dir_with_ref if source_exists
+        end
+
+        if !source_exists
+          streams[:out].puts "  skipping (not found) #{source_dir}"
+          MissingWorkingCopy.new(source_repo_name, source_dir)
+        else
+          streams[:out].puts "  copying #{source_dir}"
+
+          unless filesystem.file_exist?(dest_dir)
+            filesystem.link_creating_intermediate_dirs(source_dir, dest_dir)
+          end
 
-        if source_exists && filesystem.file_exist?(dest_dir)
-          announce(source_dir)
-          WorkingCopy.new(
-            copied_to: dest_dir,
-            full_name: source_repo_name,
-            ref: source_ref
-          )
-        elsif source_exists
-          announce(source_dir)
-          filesystem.link_creating_intermediate_dirs(source_dir, dest_dir)
           WorkingCopy.new(
             copied_to: dest_dir,
             full_name: source_repo_name,
             ref: source_ref
           )
-        else
-          streams[:out].puts "  skipping (not found) #{source_dir}"
-          MissingWorkingCopy.new(source_repo_name, source_dir)
         end
       end
-
-      def announce(source_dir)
-        streams[:out].puts "  copying #{source_dir}"
-      end
     end
   end
 end

data/lib/bookbinder/postprocessing/link_checker.rb

@@ -1,5 +1,6 @@
 require 'nokogiri'
 require_relative '../css_link_checker'
+require_relative 'redirection'
 
 module Bookbinder
   module Postprocessing
@@ -9,8 +10,6 @@ module Bookbinder
         @root_path = root_path
         @output_streams = output_streams
         @broken_link_count = 0
-        @redirect_regexes = {}
-        @redirect_strings = {}
 
         @convert_to_relative = %r{\A.*#{root_path.to_s}/public}
         @default_link_exclusions = %r{\A(?:https?://|javascript:|mailto:)}
@@ -19,7 +18,7 @@ module Bookbinder
 
       def check!(link_exclusions = /(?!.*)/)
         @output_streams[:out].puts "\nChecking for broken links..."
-        load_redirects!
+        @redirects = Redirection.new(@fs, File.join(@root_path, 'redirects.rb'))
         load_page_links
 
         report_broken_links!(link_exclusions)
@@ -53,6 +52,7 @@ module Bookbinder
         end
 
         broken_css_links = Dir.chdir(@root_path) { CssLinkChecker.new.broken_links_in_all_stylesheets }
+        broken_css_links.reject! { |link| link_exclusions.match(link) }
 
         @broken_link_count += broken_css_links.size
         broken_css_links.each do |link|
@@ -81,9 +81,7 @@ module Bookbinder
       end
 
       def page_exists?(link)
-        @page_links.has_key?(link) ||
-          @redirect_strings.has_key?(link) ||
-          @redirect_regexes.keys.detect {|reg| reg.match(link)}
+        @page_links.has_key?(link) || @redirects.redirected?(link)
       end
 
       def normalize_link(link, page)
@@ -107,19 +105,14 @@ module Bookbinder
           if !@excluded_pages.match(public_path)
             html = Nokogiri::HTML(@fs.read(file_path))
 
-            links[public_path] = html.css('a[href]').map { |link| link['href'] }
+            links[public_path] = [
+              html.css('a[href]').map { |link| link['href'] },
+              html.css('img').map { |image| image['src'] }
+            ].flatten
           end
         end
       end
 
-      def load_redirects!
-        redirects_path = File.join(@root_path, 'redirects.rb')
-        if @fs.is_file?(redirects_path)
-          contents = @fs.read(redirects_path)
-          instance_eval contents
-        end
-      end
-
       def out(str)
         @output_streams[:out].puts(str)
       end
@@ -127,19 +120,6 @@ module Bookbinder
       def err(str)
         @output_streams[:err].puts(str)
       end
-
-      def r301(source, dest, options={})
-        return if options.has_key?(:if)
-
-        case source
-        when Regexp
-          @redirect_regexes[source] = dest
-        when String
-          @redirect_strings[source] = dest
-        end
-      end
-      alias r302 r301
-      alias rewrite r301
     end
   end
 end

data/lib/bookbinder/postprocessing/redirection.rb

@@ -0,0 +1,38 @@
+module Bookbinder
+  module Postprocessing
+    class Redirection
+      def initialize(fs, file_path)
+        @redirect_regexes = {}
+        @redirect_strings = {}
+        load!(fs, file_path)
+      end
+
+      def redirected?(url)
+        @redirect_strings.has_key?(url) ||
+          @redirect_regexes.keys.detect {|regex| regex.match(url)}
+      end
+
+      private
+
+      def load!(fs, file_path)
+        if fs.is_file?(file_path)
+          contents = fs.read(file_path)
+          instance_eval contents
+        end
+      end
+
+      def r301(source, dest, options={})
+        return if options.has_key?(:if)
+
+        case source
+        when Regexp
+          @redirect_regexes[source] = dest
+        when String
+          @redirect_strings[source] = dest
+        end
+      end
+      alias r302 r301
+      alias rewrite r301
+    end
+  end
+end

data/lib/bookbinder/streams/filter_stream.rb

@@ -7,11 +7,11 @@ module Bookbinder
       end
 
       def puts(line)
-        stream.puts(line) if line.match(matcher_regex)
+        stream.puts(line.gsub("\n", '')) if line.match(matcher_regex)
       end
 
       def <<(line)
-        stream << line if line.match(matcher_regex)
+        stream << line.gsub("\n", '') if line.match(matcher_regex)
       end
 
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbindery
 version: !ruby/object:Gem::Version
-  version: 9.11.1
+  version: 9.11.2
 platform: ruby
 authors:
 - Mike Grafton
@@ -22,7 +22,7 @@ authors:
 autorequire: 
 bindir: install_bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -392,6 +392,7 @@ files:
 - lib/bookbinder/local_filesystem_accessor.rb
 - lib/bookbinder/middleman_runner.rb
 - lib/bookbinder/postprocessing/link_checker.rb
+- lib/bookbinder/postprocessing/redirection.rb
 - lib/bookbinder/preprocessing/dita_html_preprocessor.rb
 - lib/bookbinder/preprocessing/dita_pdf_preprocessor.rb
 - lib/bookbinder/preprocessing/link_to_site_gen_dir.rb