bookbindery 10.1.14 → 10.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bb06b8141b13aeb204196a540e8582da12347bd7
-  data.tar.gz: 01377b10c9631096add837879cbb6c1e174b546f
+SHA256:
+  metadata.gz: 47e765188260d8e1a4b9c0cd1792f18a4189727231ecf254319c0e7c2449d90f
+  data.tar.gz: 0e14f5c5444cece84358974458e573bbbdc216e6fc204f5dd49c27fe24a8dc4d
 SHA512:
-  metadata.gz: a70e95c9e33691ee3ae4c5397c02d94c34399a6e6f591305fb9610ce5f0682e0b650bb302e36c048930af281b967a980d3b61376766215632120234bc8944e8b
-  data.tar.gz: 199485cc23531dd469c623a1f90d71d88c86c7560929423a07579e4ddd7df134ea9091778a7d70dd79a14e5c9effe43367385f3591dec9e700a7e7a99b1cf23c
+  metadata.gz: 51cbee0bd5603c8dc5d540f26d99d19b316fbe0f5b8ff85bb6d06ba269e9f99cc98812af2cd5e7205f00ca20ea416787a243177c5a7043d1c60b94b9bb23df7c
+  data.tar.gz: da68052ef9937e89e97c098f5443dcaf9255e3b4ab938263e07aeefe3b4e0c7fc059b78c475b3804ed623eee058e102fa24bea3f23b6286c1a9fbf316173bdd4

data/bookbinder.gemspec

@@ -2,10 +2,10 @@ require 'base64'
 
 Gem::Specification.new do |s|
   s.name        = 'bookbindery'
-  s.version     = '10.1.14'
+  s.version     = '10.1.18'
   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', "Rajan Agaskar"]
+  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', 'Max Hufnagel']
   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']
@@ -25,14 +25,14 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'css_parser'
   s.add_runtime_dependency 'puma'
   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.8.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', ['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'

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.6.7'
 
 gem 'rack'
 gem 'rack-rewrite'
 gem 'puma'
-gem 'therubyracer'
 gem 'sendgrid-ruby', '< 3.0'
 gem 'elasticsearch'
+gem 'mimemagic', '~> 0.3.7'

data/template_app/Gemfile.lock

@@ -1,43 +1,51 @@
 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 (7.5.0)
+      elasticsearch-api (= 7.5.0)
+      elasticsearch-transport (= 7.5.0)
+    elasticsearch-api (7.5.0)
       multi_json
-    elasticsearch-transport (2.0.0)
-      faraday
+    elasticsearch-transport (7.5.0)
+      faraday (>= 0.14, < 1)
       multi_json
-    faraday (0.9.2)
+    faraday (0.17.4)
       multipart-post (>= 1.2, < 3)
-    libv8 (3.16.14.15)
-    mimemagic (0.3.2)
-    multi_json (1.12.1)
-    multipart-post (2.0.0)
-    puma (3.6.0)
-    rack (2.0.1)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
+    mini_portile2 (2.8.0)
+    multi_json (1.15.0)
+    multipart-post (2.1.1)
+    nio4r (2.5.8)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    puma (5.6.2)
+      nio4r (~> 2.0)
+    racc (1.6.0)
+    rack (2.2.3)
     rack-rewrite (1.5.1)
-    ref (2.0.0)
+    rake (13.0.6)
     sendgrid-ruby (1.1.6)
       faraday (~> 0.9)
       mimemagic
       smtpapi (~> 0.1)
     smtpapi (0.1.0)
-    therubyracer (0.12.2)
-      libv8 (~> 3.16.14.0)
-      ref
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   elasticsearch
+  mimemagic (~> 0.3.7)
   puma
   rack
   rack-rewrite
   sendgrid-ruby (< 3.0)
-  therubyracer
+
+RUBY VERSION
+   ruby 2.6.7p197
 
 BUNDLED WITH
-   1.12.5
+   1.17.2

data/template_app/lib/search/handler.rb

@@ -15,6 +15,12 @@ module Bookbinder
       end
 
       def call(request_env)
+        unless elasticsearch_url
+          puts "Configuration Warning: ElasticSearch URL not configured"
+          query = Query.empty_query('Search is currently disabled. Please try again later')
+          return [200, {'Content-Type' => 'text/html'}, [renderer.render_results(query)]]
+        end
+
         query = Query.new(extract_query_params(request_env['QUERY_STRING']))
         query.get_results(client_class.new(url: elasticsearch_url))
 
@@ -41,8 +47,6 @@ module Bookbinder
 
         searchly = get_searchly(services_hash)
         return searchly if searchly
-
-        raise 'No Elasticsearch configured!'
       end
 
       private
@@ -50,7 +54,8 @@ module Bookbinder
       attr_reader :renderer, :client_class, :environment
 
       def elasticsearch_url
-        @elasticsearch_url ||= extract_elasticsearch_url(JSON.parse(environment['VCAP_SERVICES']))
+        vcap_services = environment['VCAP_SERVICES']
+        @elasticsearch_url ||= vcap_services ? extract_elasticsearch_url(JSON.parse(vcap_services)) : nil
       end
 
       def get_user_provided(services_hash)

data/template_app/lib/search/query.rb

@@ -5,9 +5,17 @@ require_relative 'hit'
 module Bookbinder
   module Search
     class Query
-      attr_reader :search_term, :product_name, :product_version, :page_number, :result_list, :result_count, :last_page, :page_window
+      attr_accessor :result_count, :message
+      attr_reader :search_term, :product_name, :product_version, :page_number, :result_list, :last_page, :page_window
 
-      def initialize(params)
+      def self.empty_query(message)
+        new.tap do |q|
+          q.result_count = 0
+          q.message = message
+        end
+      end
+
+      def initialize(params={})
         @search_term = params.fetch('q', '')
         @product_name = params.fetch('product_name', nil)
         @product_version = @product_name && params.fetch('product_version', nil)
@@ -46,7 +54,7 @@ module Bookbinder
           @last_page = 1
         else
           results = elasticsearch_client.search index: 'searching', body: query_options
-          @result_count = results['hits']['total']
+          @result_count = results['hits']['total']['value']
           @result_list = results['hits']['hits'].map { |h| Hit.new(h) }
           @last_page = (result_count / 10.0).ceil
         end

data/template_app/search-results.html.erb

@@ -11,6 +11,9 @@ end
 %>
 
 <div class="search-results">
+  <% if message %>
+    <p><%= message %></p>
+  <% end %>
   <form method="get">
 
     <% unless product_name.nil? %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbindery
 version: !ruby/object:Gem::Version
-  version: 10.1.14
+  version: 10.1.18
 platform: ruby
 authors:
 - Mike Grafton
@@ -21,10 +21,11 @@ authors:
 - Gregg Van Hove
 - Jess B Heron
 - Rajan Agaskar
-autorequire: 
+- Max Hufnagel
+autorequire:
 bindir: install_bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2022-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -166,20 +167,6 @@ dependencies:
     - - ">="
       - !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
@@ -200,14 +187,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.10.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -278,6 +265,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
@@ -529,7 +530,7 @@ homepage: https://github.com/pivotal-cf/bookbinder
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -537,16 +538,15 @@ 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: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Markdown to Rackup application documentation generator
 test_files: []