bookbindery 10.1.16 → 10.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69cc2186258774c31cb9cf1402996046da92e342b970aad6e1a8efd367edbc94
-  data.tar.gz: c5680e815770c903340974945d2ceb6b1983c4caf9f5be72463d9b16ff5f6379
+  metadata.gz: 47e765188260d8e1a4b9c0cd1792f18a4189727231ecf254319c0e7c2449d90f
+  data.tar.gz: 0e14f5c5444cece84358974458e573bbbdc216e6fc204f5dd49c27fe24a8dc4d
 SHA512:
-  metadata.gz: 580d2c2d713d114e8708d4b8c4d9ba293720d87595c404c5fa77a6767ee9a31c5c08e85dad6934c07fd5baa90c9db2c62a14c09cc77296982162a429c8fbc914
-  data.tar.gz: d0206360cbcb0ffb5e2bea62756f77a34217152498dc0c9f1ada51956bb6504da1006bb9cdb9ace926070c1fba2be192a6e42142abdb61a23c029f9b1689971e
+  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.16'
+  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']
@@ -25,7 +25,6 @@ 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.10.1']
   s.add_runtime_dependency 'thor', ['0.19.1']

data/template_app/Gemfile

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

data/template_app/Gemfile.lock

@@ -1,55 +1,51 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    elasticsearch (2.0.2)
-      elasticsearch-api (= 2.0.2)
-      elasticsearch-transport (= 2.0.2)
-    elasticsearch-api (2.0.2)
+    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.2)
-      faraday
+    elasticsearch-transport (7.5.0)
+      faraday (>= 0.14, < 1)
       multi_json
-    faraday (0.15.4)
+    faraday (0.17.4)
       multipart-post (>= 1.2, < 3)
-    libv8 (3.16.14.15)
-    mimemagic (0.3.9)
+    mimemagic (0.3.10)
       nokogiri (~> 1)
       rake
-    mini_portile2 (2.5.0)
-    multi_json (1.13.1)
-    multipart-post (2.0.0)
-    nokogiri (1.11.2)
-      mini_portile2 (~> 2.5.0)
+    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 (3.12.0)
-    racc (1.5.2)
-    rack (2.0.6)
+    puma (5.6.2)
+      nio4r (~> 2.0)
+    racc (1.6.0)
+    rack (2.2.3)
     rack-rewrite (1.5.1)
-    rake (13.0.3)
-    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 (~> 2.0.0)
+  elasticsearch
   mimemagic (~> 0.3.7)
   puma
   rack
   rack-rewrite
   sendgrid-ruby (< 3.0)
-  therubyracer
 
 RUBY VERSION
-   ruby 2.5.3p105
+   ruby 2.6.7p197
 
 BUNDLED WITH
-   1.17.3
+   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.16
+  version: 10.1.18
 platform: ruby
 authors:
 - Mike Grafton
@@ -21,10 +21,11 @@ authors:
 - Gregg Van Hove
 - Jess B Heron
 - Rajan Agaskar
+- Max Hufnagel
 autorequire:
 bindir: install_bin
 cert_chain: []
-date: 2021-05-21 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