bookbindery 10.1.9 → 10.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f1078aec1d9ace1967786f6b4a6ff33dfc76c061
-  data.tar.gz: d1d0259fcbe8134d68ac3858afdb9b5e42b2b0af
+SHA256:
+  metadata.gz: e78325488c028aff56103ebef8da10e8dad90885184ec986bc634c3a8dd87768
+  data.tar.gz: d2d216e9136a38187629c8f9ad2cac182be06b3078fa52c61936b0de695aee7c
 SHA512:
-  metadata.gz: 45dc63f66c36c7c803953e3a9132fc89946d1065814c8364c37125e2228c98d8323ccfcc58613733d41bfe28c6e9e531615783250aafebf6c5ed855d916721a5
-  data.tar.gz: db2728299b6087f6da94490edd0b945dc5dbe6a4664b7b6f5ba0c3aea15b172164e0ae3e8f1395103786655e4ef92726de54114b0724800683c8f30448554011
+  metadata.gz: 8ccdef42dbbcb3845e8ad89727838caf6b4628bf7f9842cad2a077c899a40771dfbd499fa3354a61e14529bcb41aa9cc5eceb2f24ac6d9849e5a0ce3eb0dbebc
+  data.tar.gz: e118d2695fdc3e0f63807af831532d8aeec854c4b3b0cd8a00ee2e6885c96584444ddf3e7aad7c6b1898acce80fd2fbc08186cd277eaf9e505cb2d40b133213b

data/bookbinder.gemspec

@@ -2,10 +2,10 @@ require 'base64'
 
 Gem::Specification.new do |s|
   s.name        = 'bookbindery'
-  s.version     = '10.1.9'
+  s.version     = '10.1.15'
   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', 'Jess B Heron']
+  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', 'Jess B Heron', "Rajan Agaskar"]
   s.email       = Base64.decode64('Z21vcmdhbkBnb3Bpdm90YWwuY29t') # Gavin's
 
   s.files       = Dir['lib/**/*'] + Dir['template_app/**/*'] + Dir['master_middleman/**/*'] + Dir['install_bin/bookbinder'] + Dir['bookbinder.gemspec']
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.bindir      = 'install_bin'
   s.executable  = 'bookbinder'
 
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.3.3'
   s.add_runtime_dependency 'fog-aws', ['~> 0.7.1']
   s.add_runtime_dependency 'ansi', ['~> 1.4']
   s.add_runtime_dependency 'middleman', ['4.1.10']
@@ -27,18 +27,20 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rack-rewrite'
   s.add_runtime_dependency 'therubyracer'
   s.add_runtime_dependency 'git', '~> 1.2.8'
-  s.add_runtime_dependency 'nokogiri', ['1.6.7.2']
+  s.add_runtime_dependency 'nokogiri', ['1.10.1']
   s.add_runtime_dependency 'thor', ['0.19.1']
   s.add_runtime_dependency 'elasticsearch'
-  s.add_runtime_dependency 'font-awesome-sass'
+  s.add_runtime_dependency 'font-awesome-sass', ['4.7.0']
   s.add_runtime_dependency 'middleman-sprockets'
   s.add_runtime_dependency 'middleman-compass'
+  s.add_runtime_dependency 'sprockets', '3.7.2'
 
   s.add_development_dependency 'license_finder'
   s.add_development_dependency 'pry-byebug'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'sendgrid-ruby', '< 3.0'
+  s.add_development_dependency 'sinatra', '1.4.8'
   s.add_development_dependency 'jasmine'
   s.add_development_dependency 'rack-test'
 end

data/lib/bookbinder/code_example_reader.rb

@@ -77,7 +77,7 @@ module Bookbinder
           end
         }.
         map(&:first).
-        detect ->{""} {|text| text}
+        detect(Proc.new {""}) {|text| text}
     end
 
     def pattern_for(marker)

data/lib/bookbinder/preprocessing/preprocessor.rb

@@ -12,7 +12,7 @@ module Bookbinder
 
       def preprocess(sections, *args)
         sections.group_by { |section|
-          processes.detect ->{ NullProcess.new } { |process| process.applicable_to?(section) }
+          processes.detect(Proc.new { NullProcess.new }) { |process| process.applicable_to?(section) }
         }.each do |process, grouped_sections|
           process.preprocess(grouped_sections, *args)
         end

data/master_middleman/bookbinder_helpers.rb

@@ -119,6 +119,10 @@ module Bookbinder
         current_page.data.title= args.join(' ')
       end
 
+      def set_title_no_spaces(*args)
+        current_page.data.title= args.join
+      end
+
       def product_info
         config[:product_info].fetch(template_key, {})
       end

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

@@ -116,7 +116,9 @@ ol {
   padding: 0 0 0 1.4em;
 }
 ul ul,
-ol ol {
+ol ol,
+ul ol,
+ol ul {
   margin-top: 1em;
   padding-bottom: 0
 }

data/template_app/Gemfile

@@ -1,10 +1,10 @@
 source 'http://rubygems.org'
 
-ruby '~> 2.3.0'
+ruby '~> 2.5.0'
 
 gem 'rack'
 gem 'rack-rewrite'
 gem 'puma'
 gem 'therubyracer'
 gem 'sendgrid-ruby', '< 3.0'
-gem 'elasticsearch'
+gem 'elasticsearch', '~> 2.0.0'

data/template_app/Gemfile.lock

@@ -1,22 +1,22 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    elasticsearch (2.0.0)
-      elasticsearch-api (= 2.0.0)
-      elasticsearch-transport (= 2.0.0)
-    elasticsearch-api (2.0.0)
+    elasticsearch (2.0.2)
+      elasticsearch-api (= 2.0.2)
+      elasticsearch-transport (= 2.0.2)
+    elasticsearch-api (2.0.2)
       multi_json
-    elasticsearch-transport (2.0.0)
+    elasticsearch-transport (2.0.2)
       faraday
       multi_json
-    faraday (0.9.2)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     libv8 (3.16.14.15)
     mimemagic (0.3.2)
-    multi_json (1.12.1)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
-    puma (3.6.0)
-    rack (2.0.1)
+    puma (3.12.0)
+    rack (2.0.6)
     rack-rewrite (1.5.1)
     ref (2.0.0)
     sendgrid-ruby (1.1.6)
@@ -32,12 +32,15 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  elasticsearch
+  elasticsearch (~> 2.0.0)
   puma
   rack
   rack-rewrite
   sendgrid-ruby (< 3.0)
   therubyracer
 
+RUBY VERSION
+   ruby 2.5.3p105
+
 BUNDLED WITH
-   1.12.5
+   1.17.3

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']['simple_query_string']['query'] = search_term
+        options['query']['bool']['must']['simple_query_string']['query'] = search_term
 
         unless product_name.nil?
           filters = [{

data/template_app/search-results.html.erb

@@ -15,8 +15,8 @@ end
 
     <% unless product_name.nil? %>
       <h4 style="border: 1px solid #ccc; padding: 4px 20px;">
-        Filtering by: <%= product_name %>
-        <% unless product_version.nil? %>and <%= product_version %>
+        Filtering by: <%= escape_html product_name %>
+        <% unless product_version.nil? %>and <%= escape_html product_version %>
         <% end %>
       </h4>
     <% end %>

data/template_app/search.yml

@@ -1,7 +1,7 @@
 ---
 query:
   bool:
-    should:
+    must:
       simple_query_string:
         query: ''
         fields:
@@ -9,7 +9,6 @@ query:
           - title^20
           - h2^10
           - h3^10
-    minimum_should_match: 75%
 from: 0
 size: 10
 _source:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbindery
 version: !ruby/object:Gem::Version
-  version: 10.1.9
+  version: 10.1.15
 platform: ruby
 authors:
 - Mike Grafton
@@ -20,10 +20,11 @@ authors:
 - Sarah McAlear
 - Gregg Van Hove
 - Jess B Heron
-autorequire: 
+- Rajan Agaskar
+autorequire:
 bindir: install_bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -199,14 +200,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.7.2
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.7.2
+        version: 1.10.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -239,16 +240,16 @@ dependencies:
   name: font-awesome-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: middleman-sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -277,6 +278,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.7.2
 - !ruby/object:Gem::Dependency
   name: license_finder
   requirement: !ruby/object:Gem::Requirement
@@ -347,6 +362,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.8
 - !ruby/object:Gem::Dependency
   name: jasmine
   requirement: !ruby/object:Gem::Requirement
@@ -514,7 +543,7 @@ homepage: https://github.com/pivotal-cf/bookbinder
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -522,16 +551,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6
+signing_key:
 specification_version: 4
 summary: Markdown to Rackup application documentation generator
 test_files: []