bookbindery 8.2.0 → 8.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcd1dc76ec62824fab802bbb5e08808386ef14c7
-  data.tar.gz: 8ff5324ec2299c32efb456ce6790bfc4e01f0b60
+  metadata.gz: 2b7c77c16ecbf1d55827b7eb99216d34de01ad9c
+  data.tar.gz: 2fbb5773c5a707b30e32773bc35fda5a337bd26a
 SHA512:
-  metadata.gz: b48e8514aa4342a99e7c1baf6e4bd63db7c853b6a98a5ee7023c20e0bb25c8fdccf4ed7b7b3d91362972cb1f9e0faa2e6489fbc3003df285bbf8237b58f7a30d
-  data.tar.gz: 2be9a7261db512afdf22020be057ceaae5b5395567e8c2f613a6342fc9eefd5d6ea33dae69549c02b194ddc5ab191848ac4d2ea4b5207eaabbf25aef0029c741
+  metadata.gz: 3c039454dac27d8cca438a0e4ec0019b0fe44ad4b5a0ac70f78af69970ccc6141ca0ef20ecd548c7a653139023cf2a5d2cb473e5adaf613d711d0910febeabe6
+  data.tar.gz: 3c25f9ab6cf73376322b9df8f13b1b680c91e2937e3796fc0175f34e6954b3011c37a0b6c384db32b588579844c055f753ca911f8374d3290e548a8ae004273b

data/bookbinder.gemspec

@@ -2,10 +2,10 @@ require 'base64'
 
 Gem::Specification.new do |s|
   s.name        = 'bookbindery'
-  s.version     = '8.2.0'
+  s.version     = '8.3.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', 'Frank Kotsianas', 'Elena Sharma', 'Christa Hartsock', 'Michael Trestman']
+  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']
   s.email       = Base64.decode64('Z21vcmdhbkBnb3Bpdm90YWwuY29t') # Gavin's
 
   s.files       = Dir['lib/**/*'] + Dir['template_app/**/*'] + Dir['master_middleman/**/*'] + Dir['install_bin/**/*'] + Dir['bookbinder.gemspec']

data/template_app/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 ruby '2.3.0'
 
-gem 'vienna'
+gem 'rack'
 gem 'rack-rewrite'
 gem 'therubyracer'
 gem 'sendgrid-ruby'

data/template_app/lib/rack_static_if_exists.rb

@@ -0,0 +1,19 @@
+require 'rack'
+
+module Bookbinder
+  class RackStaticIfExists < Rack::Static
+    def can_serve(path)
+      file_exists?(path) || dir_with_index_exists?(path)
+    end
+
+    private
+
+    def file_exists?(path)
+      File.file?(File.join(@file_server.root, path))
+    end
+
+    def dir_with_index_exists?(path)
+      File.directory?(File.join(@file_server.root, path)) && !!@index && file_exists?(File.join(path, @index))
+    end
+  end
+end

data/template_app/lib/server.rb

@@ -0,0 +1,52 @@
+require_relative './rack_static_if_exists'
+
+module Bookbinder
+  class Server
+    class << self
+      def call(env)
+        Bookbinder::Server.new.call(env)
+      end
+    end
+
+    def initialize
+      @app = Rack::Builder.new do
+        use RackStaticIfExists, {
+          urls: [''],
+          root: 'public',
+          index: 'index.html',
+          header_rules: [[:all, {
+            'Cache-Control' => 'public, max-age=3600',
+            'Access-Control-Allow-Origin' => '*'
+          }]]
+        }
+        run Bookbinder::NotFound.new("public/404.html")
+      end
+    end
+
+    def call(env)
+      if env['PATH_INFO'] == '' || env['PATH_INFO'] =~ MATCH
+        env['PATH_INFO'] += '/'
+        [301, {'Location' => Rack::Request.new(env).url, 'Content-Type' => ''}, []]
+      else
+        @app.call(env)
+      end
+    end
+
+    private
+    # regexp to match strings without periods that start but don't end with a slash
+    MATCH = %r{^/([^.]+)[^/]$}
+  end
+
+  class NotFound
+    def initialize(path = '')
+      @path = path
+    end
+
+    def call(env)
+      content = File.exist?(@path) ? File.read(@path) : 'Not Found'
+      length = content.length.to_s
+
+      [404, {'Content-Type' => 'text/html', 'Content-Length' => length}, [content]]
+    end
+  end
+end

data/template_app/rack_app.rb

@@ -1,6 +1,6 @@
 require 'rack'
 require 'rack/rewrite'
-require_relative './lib/vienna_application'
+require_relative './lib/server'
 
 module Bookbinder
   class RackApp
@@ -14,12 +14,20 @@ module Bookbinder
       path = redirect_pathname
       client = mail_client
       auth = auth_required
-      Rack::Builder.new(Vienna) do
+      Rack::Builder.new do
         use ResolveRedirects, path
         use AuthorizeUser, auth
         map '/api/feedback' do
           use MailFeedback, client
-          run Vienna::NotFound.new('public/404.html')
+          run Bookbinder::NotFound.new('public/404.html')
+        end
+        if ENV['CUSTOM_ROOT']
+          map ENV['CUSTOM_ROOT'] do
+            run Bookbinder::Server
+          end
+          run Bookbinder::NotFound.new('public/404.html')
+        else
+          run Bookbinder::Server
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbindery
 version: !ruby/object:Gem::Version
-  version: 8.2.0
+  version: 8.3.0
 platform: ruby
 authors:
 - Mike Grafton
@@ -11,14 +11,18 @@ authors:
 - Dan Wendorf
 - Brenda Chan
 - Matthew Boedicker
+- Andrew Bruce
 - Frank Kotsianas
 - Elena Sharma
 - Christa Hartsock
 - Michael Trestman
+- Alpha Chen
+- Sarah McAlear
+- Gregg Van Hove
 autorequire: 
 bindir: install_bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -434,8 +438,8 @@ files:
 - template_app/Gemfile
 - template_app/Gemfile.lock
 - template_app/config.ru
-- template_app/lib/rack_static.rb
-- template_app/lib/vienna_application.rb
+- template_app/lib/rack_static_if_exists.rb
+- template_app/lib/server.rb
 - template_app/mail_sender.rb
 - template_app/rack_app.rb
 homepage: https://github.com/pivotal-cf/bookbinder

data/template_app/lib/rack_static.rb

@@ -1,23 +0,0 @@
-require 'rack'
-
-module Bookbinder
-  class RackStatic < Rack::Static
-    def route_file(path)
-      @urls.kind_of?(Array) && @urls.any? { |url| url.index(path) == 0 }
-    end
-
-    def overwrite_file_path(path)
-      path_has_trailing_slash?(path) && we_can_serve_index_at_path?(path)
-    end
-
-    private
-
-    def path_has_trailing_slash?(path)
-      !((path =~ /\/$/).nil?)
-    end
-
-    def we_can_serve_index_at_path?(path)
-      @index && File.exists?(File.join @file_server.root, path, @index)
-    end
-  end
-end

data/template_app/lib/vienna_application.rb

@@ -1,54 +0,0 @@
-require_relative './rack_static'
-
-module Bookbinder
-  module Vienna
-    class << self
-      def call(env)
-        Application.new.call(env)
-      end
-    end
-
-    class Application
-      def initialize(root = 'public')
-        @app = Rack::Builder.new do
-          use RackStatic, {
-              urls: Dir.glob("#{root}/**/*").map { |fn| fn.gsub(/^#{root}/, '')},
-              root: root,
-              index: 'index.html',
-              header_rules: [[:all, {
-                'Cache-Control' => 'public, max-age=3600',
-                'Access-Control-Allow-Origin' => '*'
-              }]]
-            }
-          run NotFound.new("#{root}/404.html")
-        end
-      end
-
-      def call(env)
-        if env['PATH_INFO'] != '/' && env['PATH_INFO'] =~ MATCH
-          env['PATH_INFO'] += '/'
-          [301, {'Location' => Rack::Request.new(env).url, 'Content-Type' => ''}, []]
-        else
-          @app.call(env)
-        end
-      end
-
-      private
-      # regexp to match strings without periods that start and end with a slash
-      MATCH = %r{^/([^.]*)[^/]$}
-    end
-
-    class NotFound
-      def initialize(path = '')
-        @path = path
-      end
-
-      def call(env)
-        content = File.exist?(@path) ? File.read(@path) : 'Not Found'
-        length = content.length.to_s
-
-        [404, {'Content-Type' => 'text/html', 'Content-Length' => length}, [content]]
-      end
-    end
-  end
-end