bookbindery 9.8.0 → 9.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba0eb60bf1b74bd384b03d691636d672d718c632
-  data.tar.gz: 733bc8f77a67d9e9cd7295f6d814b5ec248cc49a
+  metadata.gz: d3e9b9d9984fdb5afedfa756024384d4a9bf9e5b
+  data.tar.gz: 9cdf1c79a329c48f0811bfa4f418d17f7ec5a8e9
 SHA512:
-  metadata.gz: bf39f3a12f00b60420890535a5a9569fcf6f7a0c25c30b7c710692b9779fd8eddb1bc11afa78202ff73cb8127951442685441d436e997220d9103334eafbef4b
-  data.tar.gz: 2fdec800de37d2d01c805df4e7451dd09f75923e9cef60c0509b13a67800dc9bf5598af92a12b7b14605e1f92a09cd9465dfe0dc8ad2bc0c81a1765c2af3233f
+  metadata.gz: aab7f18000c610ea0fb322f403ebc2c3703b734fb3ff6867f260bf4666e375bf76564a12465a199205c8a5392f787c2ec8c686e37f15fe3fb53c46eb2924a43b
+  data.tar.gz: 55271d726387b9e4108c0519373c31eb26ff4e05e5e4166585c933f7d59f201442ba825fba387b2b121341514a1e372660a88e381bea513b7b35beca0e02fd0c

data/bookbinder.gemspec

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

data/lib/bookbinder/preprocessing/dita_pdf_preprocessor.rb

@@ -36,7 +36,7 @@ module Bookbinder
       end
 
       def most_recent_pdf(dir_path)
-        pdfs_by_modified_date = Dir.glob(dir_path + '*/*.pdf').sort_by{ |f| File.mtime(f) }
+        pdfs_by_modified_date = Dir.glob(dir_path + '**/*.pdf').sort_by{ |f| File.mtime(f) }
         pdfs_by_modified_date.last
       end
 

data/master_middleman/source/javascripts/bookbinder.js

@@ -45,6 +45,8 @@
 
   window.Bookbinder = {
     startSidenav: function(rootEl, currentPath) {
+      if (!rootEl) { return; }
+
       var submenus = rootEl.querySelectorAll('.has_submenu');
 
       for (var i = 0; i < submenus.length; i++) {

data/master_middleman/source/stylesheets/base.scss

@@ -30,7 +30,8 @@
   }
 
   @media (min-width: $bp-wide) {
-    #top {
+    #top:before {
+      content: '';
       padding-bottom: 4em;
       border: none;
       display: block;

data/master_middleman/source/stylesheets/partials/_vars.scss

@@ -60,4 +60,5 @@ $bp-superwide: 1340px/$em-base + 0em;
 $bp-widest: 900px/$em-base + 0em;
 $bp-wide: 700px/$em-base + 0em;
 
+@import "layout-vars.scss";
 @import "book-vars.scss";

data/template_app/lib/search/hit.rb

@@ -5,11 +5,13 @@ module Bookbinder
         source_fields = attrs.fetch('_source')
         @title = source_fields.fetch('title').sub(/\A(.+)\|.*\z/, '\\1').strip
         @url = source_fields.fetch('url')
+        @product_name = source_fields['product_name']
+        @product_version = source_fields['product_version']
 
         @text = attrs.fetch('highlight').fetch('text').first.strip
       end
 
-      attr_reader :title, :url, :text
+      attr_reader :title, :url, :text, :product_name, :product_version
     end
   end
 end

data/template_app/lib/search/query.rb

@@ -18,7 +18,7 @@ module Bookbinder
         options = YAML.load_file(File.expand_path('../../../search.yml', __FILE__))
 
         options['from'] = (page_number - 1) * 10
-        options['query']['bool']['should']['query_string']['query'] = search_term
+        options['query']['bool']['should']['simple_query_string']['query'] = search_term
 
         unless product_name.nil?
           filters = [{

data/template_app/search-results.html.erb

@@ -28,6 +28,10 @@
       <% result_list.each do |hit| %>
         <li>
           <a href="<%= hit.url %>"><%= hit.title %></a>
+          <% if hit.product_name %>
+            <br/>
+            <b><%= hit.product_name %> <%= hit.product_version %></b>
+          <% end %>
           <div><%= hit.text %></div>
         </li>
       <% end %>

data/template_app/search.yml

@@ -2,15 +2,19 @@
 query:
   bool:
     should:
-      query_string:
+      simple_query_string:
         query: ''
-        default_field: text
+        fields:
+          - text
+          - title^10
     minimum_should_match: 1
 from: 0
 size: 10
 _source:
 - url
 - title
+- product_name
+- product_version
 highlight:
   fields:
     text:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbindery
 version: !ruby/object:Gem::Version
-  version: 9.8.0
+  version: 9.9.0
 platform: ruby
 authors:
 - Mike Grafton
@@ -22,7 +22,7 @@ authors:
 autorequire: 
 bindir: install_bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -455,6 +455,7 @@ files:
 - master_middleman/source/stylesheets/partials/_default.scss
 - master_middleman/source/stylesheets/partials/_footer.scss
 - master_middleman/source/stylesheets/partials/_header.scss
+- master_middleman/source/stylesheets/partials/_layout-vars.scss
 - master_middleman/source/stylesheets/partials/_mixins.scss
 - master_middleman/source/stylesheets/partials/_reset.scss
 - master_middleman/source/stylesheets/partials/_search.scss