bookbindery 7.2.0 → 7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60647d1c7441e4f13ec25b2f905afa5b108d4428
-  data.tar.gz: 2187d4e8f5e6accd3fbb607950a053ae6e1c5308
+  metadata.gz: 88ea31dee49567678221b2f7ec08271dbee24d4d
+  data.tar.gz: dc7bc2856531c909147a8c215466e4ca78f29224
 SHA512:
-  metadata.gz: b625693db01e696430423e1e4889e485c1c3b84746debb95d1ea6f5b4f3464db395a40d72876c961cc75918af4c2ed1ef848e92e708b9c91020b5cf8d7b96091
-  data.tar.gz: a497afbb4c57e31242c4cb638a761b0f0f1f9c26a2b98e96750484a9c96b97fb4b64fa398a3b21c0a1961d1800b231f3a50ca9ea82fb87bddc9e8ba399f0b01d
+  metadata.gz: 7edb2efc47d478fa5908c40ad733bcfd1ab73b56af875dcbbc00c49768c6356f544b1c4ff5e378e3c9ff8623a598d8628c3e53d81d8ead55a023a0e42791054c
+  data.tar.gz: 5899419c8b5cd1ab847ba3dd9d556f2dbc68a4fc832deb1536b306fae063fe6bfe28705dccb894c5175d342c85bb4593025e54f0ce45eb4edebcd63ef691ea42

data/bookbinder.gemspec

@@ -2,7 +2,7 @@ require 'base64'
 
 Gem::Specification.new do |s|
   s.name        = 'bookbindery'
-  s.version     = '7.2.0'
+  s.version     = '7.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']
@@ -23,13 +23,13 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'middleman-syntax', ['~> 2.0']
   s.add_runtime_dependency 'rouge', '!= 1.9.1'
   s.add_runtime_dependency 'redcarpet', ['~> 3.2.3']
-  s.add_runtime_dependency 'vienna', ['= 0.4.1']
   s.add_runtime_dependency 'anemone'
   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 'sendgrid-ruby'
 
   s.add_development_dependency 'license_finder'
   s.add_development_dependency 'pry-byebug'

data/lib/bookbinder/commands/bind.rb

@@ -55,7 +55,8 @@ module Bookbinder
           bind_config,
           File.expand_path('../../../../', __FILE__),
           output_locations,
-          cloner
+          cloner,
+          ref_override: bind_options.ref_override
         )
         sections = section_repository.fetch(
           configured_sections: bind_config.sections,

data/lib/bookbinder/commands/bind/directory_preparer.rb

@@ -8,14 +8,14 @@ module Bookbinder
           @fs = fs
         end
 
-        def prepare_directories(config, gem_root, output_locations, cloner)
+        def prepare_directories(config, gem_root, output_locations, cloner, ref_override: nil)
           fs.remove_directory(output_locations.output_dir)
           fs.empty_directory(output_locations.final_app_dir)
 
           copy_directory_from_gem(gem_root, 'template_app', output_locations.final_app_dir)
           copy_directory_from_gem(gem_root, 'master_middleman', output_locations.site_generator_home)
 
-          LayoutPreparer.new(fs).prepare(output_locations, cloner, config)
+          LayoutPreparer.new(fs).prepare(output_locations, cloner, ref_override, config)
         end
 
         private

data/lib/bookbinder/commands/bind/layout_preparer.rb

@@ -8,9 +8,11 @@ module Bookbinder
 
         attr_reader :fs
 
-        def prepare(output_locations, cloner, config)
+        def prepare(output_locations, cloner, ref_override, config)
           if config.has_option?('layout_repo')
+
             cloned_repo = cloner.call(source_repo_name: config.layout_repo,
+                                      source_ref: ref_override || config.layout_repo_ref,
                                       destination_parent_dir: Dir.mktmpdir)
 
             fs.copy_contents(cloned_repo.path, output_locations.site_generator_home)

data/lib/bookbinder/commands/collection.rb

@@ -71,6 +71,7 @@ module Bookbinder
           push_local_to_staging,
           Commands::PushToProd.new(streams, logger, configuration_fetcher, Dir.mktmpdir),
           Commands::RunPublishCI.new(bind, push_local_to_staging, build_and_push_tarball),
+          Commands::Punch.new(streams, configuration_fetcher, version_control_system),
           Commands::UpdateLocalDocRepos.new(
             streams,
             configuration_fetcher,

data/lib/bookbinder/commands/generate.rb

@@ -1,3 +1,5 @@
+require 'bundler'
+
 module Bookbinder
   module Commands
     class Generate

data/lib/bookbinder/commands/punch.rb

@@ -0,0 +1,44 @@
+require_relative '../errors/cli_error'
+require_relative 'naming'
+
+module Bookbinder
+  module Commands
+    class Punch
+      include Commands::Naming
+
+      def initialize(streams, configuration_fetcher, version_control_system)
+        @streams = streams
+        @configuration_fetcher = configuration_fetcher
+        @version_control_system = version_control_system
+      end
+
+      def usage
+        ["punch <git tag>", "Apply the specified <git tag> to your book, sections, and layout repo"]
+      end
+
+      def run((tag, *))
+        raise CliError::InvalidArguments unless tag
+
+        urls(config).each do |url|
+          version_control_system.remote_tag(url, tag, 'HEAD')
+        end
+
+        streams[:success].puts 'Success!'
+        streams[:out].puts "#{config.book_repo} and its sections were tagged with #{tag}"
+        0
+      end
+
+      private
+
+      attr_reader :streams, :configuration_fetcher, :version_control_system
+
+      def urls(config)
+        [config.book_repo_url, config.layout_repo_url] + config.sections.map(&:repo_url).uniq
+      end
+
+      def config
+        @config ||= configuration_fetcher.fetch_config
+      end
+    end
+  end
+end

data/lib/bookbinder/commands/push_from_local.rb

@@ -8,6 +8,7 @@ module Bookbinder
       include Commands::Naming
 
       CredentialKeyError = Class.new(RuntimeError)
+      FeedbackConfigError = Class.new(RuntimeError)
       REQUIRED_AWS_KEYS = %w(access_key secret_key green_builds_bucket)
       REQUIRED_CF_KEYS = %w(username password api_endpoint organization app_name)
 
@@ -61,7 +62,7 @@ module Bookbinder
         "push_local_to_#{environment}"
       end
 
-      def error_message
+      def creds_error_message
         <<-ERROR
 Cannot locate a specific key in credentials.yml.
 Your credentials file should follow this format:
@@ -88,6 +89,19 @@ cloud_foundry:
         ERROR
       end
 
+      def mail_error_message
+        <<-ERROR
+Your environment variables for sending feedback are not set.
+
+To enable feedback, you must set the following variables in your environment:
+
+export SENDGRID_USERNAME=<your-username>
+export SENDGRID_API_KEY=<your-api-key>
+export FEEDBACK_TO=<email-to-receive-feedback>
+export FEEDBACK_FROM=<email-to-send-feedback>
+        ERROR
+      end
+
       def validate
         missing_keys = []
 
@@ -106,7 +120,12 @@ cloud_foundry:
           missing_keys << key unless cf_creds.send(key)
         end
 
-        raise CredentialKeyError.new error_message if missing_keys.any?
+        raise CredentialKeyError.new(creds_error_message) if missing_keys.any?
+        raise FeedbackConfigError.new(mail_error_message) if config.feedback_enabled && mail_vars_absent?
+      end
+
+      def mail_vars_absent?
+        !(ENV['SENDGRID_USERNAME'] && ENV['SENDGRID_API_KEY'] && ENV['FEEDBACK_TO'] && ENV['FEEDBACK_FROM'])
       end
     end
   end

data/lib/bookbinder/config/archive_menu_configuration.rb

@@ -24,7 +24,7 @@ module Bookbinder
 
       def section_config(sections)
         sections.reduce({}) {|config, section|
-          config_path = section.path_to_repository.join(config_filename)
+          config_path = section.path_to_repo_dir.join(config_filename)
           archive_config = loader.load_key(config_path, 'archive_menu')
           if archive_config
             config.merge(section.desired_directory_name => archive_config)

data/lib/bookbinder/config/configuration.rb

@@ -66,7 +66,7 @@ module Bookbinder
       end
 
       CONFIG_REQUIRED_KEYS = %w(book_repo public_host)
-      CONFIG_OPTIONAL_KEYS = %w(archive_menu book_repo_url cred_repo cred_repo_url layout_repo layout_repo_url sections subnav_exclusions)
+      CONFIG_OPTIONAL_KEYS = %w(archive_menu book_repo_url cred_repo cred_repo_url layout_repo layout_repo_ref layout_repo_url sections subnav_exclusions feedback_enabled)
 
       CONFIG_REQUIRED_KEYS.each do |method_name|
         define_method(method_name) do

data/lib/bookbinder/config/section_config.rb

@@ -31,6 +31,10 @@ module Bookbinder
         repo['ref'] || 'master'
       end
 
+      def at_repo_path
+        repo['at_path']
+      end
+
       def dependent_sections
         @sections ||= (config['dependent_sections'] || []).map do |dep_section|
           SectionConfig.new(dep_section)

data/lib/bookbinder/dita_html_for_middleman_formatter.rb

@@ -10,17 +10,20 @@ module Bookbinder
       all_files_with_ext = file_system_accessor.find_files_with_ext('html', src)
 
       all_files_with_ext.map do |filepath|
-        file_text = file_system_accessor.read filepath
+        file_text = file_system_accessor.read(filepath)
+
         file_title_text = html_document_manipulator.read_html_in_tag(document: file_text,
                                                                      tag: 'title')
 
         file_body_text = html_document_manipulator.read_html_in_tag(document: file_text,
                                                                     tag: 'body')
 
+        cleansed_body_text = revert_to_erb(file_body_text)
+
         relative_path_to_file = file_system_accessor.relative_path_from(src, filepath)
         new_filepath = File.join dest, "#{relative_path_to_file}.erb"
 
-        output_text = frontmatter(file_title_text) + file_body_text
+        output_text = frontmatter(file_title_text) + cleansed_body_text
 
         file_system_accessor.write(to: new_filepath, text: output_text)
       end
@@ -34,6 +37,9 @@ module Bookbinder
       sanitized_title = title.gsub('"', '\"')
       "---\ntitle: \"#{sanitized_title}\"\ndita: true\n---\n"
     end
-  end
 
+    def revert_to_erb(text)
+      text.gsub('&lt;%', '<%').gsub('%&gt;', '%>')
+    end
+  end
 end

data/lib/bookbinder/ingest/git_accessor.rb

@@ -39,6 +39,29 @@ module Bookbinder
         end
       end
 
+      def remote_tag(url, tagname, commit_or_object)
+        Dir.mktmpdir do |dir|
+          path = Pathname(dir)
+          git = cached_clone(url, temp_name("tag"), path)
+          git.config('user.name', 'Bookbinder')
+          git.config('user.email', 'bookbinder@cloudfoundry.org')
+          begin
+            git.add_tag(tagname, "origin/#{commit_or_object}",
+              message: 'Tagged by Bookbinder')
+          rescue Git::GitExecuteError => e
+            case e.message
+              when /already exists/
+                raise TagExists
+              when /as a valid ref/
+                raise InvalidTagRef
+              else
+                raise
+            end
+          end
+          git.push("origin", "master", tags: true)
+        end
+      end
+
       def author_date(path)
         Pathname(path).dirname.ascend do |current_dir|
           if current_dir.to_s.include?(source_dir_name) && current_dir.entries.include?(Pathname(".git"))

data/lib/bookbinder/ingest/section_repository.rb

@@ -31,7 +31,8 @@ module Bookbinder
             section_config.desired_directory_name,
             section_config.subnav_template,
             section_config.subnav_name,
-            section_config.preprocessor_config
+            section_config.preprocessor_config,
+            section_config.at_repo_path
           )
         end
       end

data/lib/bookbinder/middleman_runner.rb

@@ -25,6 +25,7 @@ module Bookbinder
           template_variables: config.template_variables,
           local_repo_dir: local_repo_dir,
           workspace: output_locations.workspace_dir,
+          feedback_enabled: config.feedback_enabled
         }
         fs.write(to: "bookbinder_config.yml", text: YAML.dump(config))
         sheller.run_command({'MM_ROOT' => output_locations.master_dir.to_s},

data/lib/bookbinder/preprocessing/dita_preprocessor.rb

@@ -38,7 +38,7 @@ module Bookbinder
           end
 
           dita_formatter.format_html(section_html_dir(section), formatted_dir(section))
-          copy_images(section.path_to_repository, formatted_dir(section))
+          copy_images(section.path_to_repo_dir, formatted_dir(section))
           fs.copy_contents(formatted_dir(section), source_for_site_gen_dir(section))
         end
       end

data/lib/bookbinder/preprocessing/link_to_site_gen_dir.rb

@@ -10,13 +10,13 @@ module Bookbinder
       end
 
       def applicable_to?(section)
-        filesystem.file_exist?(section.path_to_repository)
+        filesystem.file_exist?(section.path_to_repo_dir)
       end
 
       def preprocess(sections, output_locations, config: nil, **_)
         sections.each do |section|
           filesystem.link_creating_intermediate_dirs(
-            section.path_to_repository,
+            section.path_to_repo_dir,
             output_locations.source_for_site_generator.join(section.destination_directory)
           )
         end

data/lib/bookbinder/spider.rb

@@ -79,9 +79,6 @@ Found #{broken_links.count} broken links!
         Anemone.crawl(url) do |anemone|
           dont_visit_fragments(anemone)
           anemone.on_every_page do |page|
-            if $sitemap_debug
-              puts "\n\n********** Visiting page: #{page.url}\n\n#{page.body}"
-            end
             broken, working = sieve.links_from Stabilimentum.new(page), is_first_pass
             broken_links.concat broken
             sitemap.concat working

data/lib/bookbinder/values/section.rb

@@ -7,9 +7,10 @@ module Bookbinder
                        :desired_directory_name,
                        :subnav_templ,
                        :desired_subnav_name,
-                       :preprocessor_config) do
-    def path_to_repository
-      Pathname(self[:path_to_repository].to_s)
+                       :preprocessor_config,
+                       :at_repo_path) do
+    def path_to_repo_dir
+      at_repo_path.nil? ? path_to_repository : path_to_repository.join(at_repo_path)
     end
 
     def subnav_template
@@ -30,12 +31,19 @@ module Bookbinder
     end
 
     def path_to_preprocessor_attribute(attr)
-      path_to_repository.join(preprocessor_config[attr]) if preprocessor_config[attr]
+      path_to_repo_dir.join(preprocessor_config[attr]) if preprocessor_config[attr]
     rescue NoMethodError => e
       raise Errors::ProgrammerMistake.new(
         "path_to_preprocessor_attribute assumes preprocessor_config is available, got nil.\n" +
         "Original exception:\n\n#{e.inspect}\n\n#{e.backtrace.join("\n")}"
       )
     end
+
+    private
+
+    def path_to_repository
+      Pathname(self[:path_to_repository].to_s)
+    end
+
   end
 end

data/master_middleman/bookbinder_helpers.rb

@@ -54,6 +54,14 @@ module Bookbinder
         end
       end
 
+      def exclude_feedback
+        current_page.add_metadata({page: {feedback_disabled: true}})
+      end
+
+      def yield_for_feedback
+        partial 'layouts/feedback' if config[:feedback_enabled] && !current_page.metadata[:page][:feedback_disabled]
+      end
+
       def mermaid_diagram(&blk)
         escaped_text = capture(&blk).gsub('-','\-')
 

data/template_app/config.ru

@@ -1,5 +1,9 @@
 require 'pathname'
-require 'vienna'
 require './rack_app'
-require './app'
-run Bookbinder::RackApp.new(Pathname('redirects.rb')).app
+require './mail_sender'
+
+mail_client = Bookbinder::MailSender.new(ENV['SENDGRID_USERNAME'],
+                                         ENV['SENDGRID_API_KEY'],
+                                         {to: ENV['FEEDBACK_TO'], from: ENV['FEEDBACK_FROM']})
+
+run Bookbinder::RackApp.new(Pathname('redirects.rb'), mail_client).app

data/template_app/lib/rack_static.rb

@@ -1,21 +1,23 @@
 require 'rack'
 
-class Rack::Static
-  def route_file(path)
-    @urls.kind_of?(Array) && @urls.any? { |url| url.index(path) == 0 }
-  end
+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
+    def overwrite_file_path(path)
+      path_has_trailing_slash?(path) && we_can_serve_index_at_path?(path)
+    end
 
-  private
+    private
 
-  def path_has_trailing_slash?(path)
-    !((path =~ /\/$/).nil?)
-  end
+    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)
+    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,28 +1,51 @@
-require 'vienna'
+require_relative './rack_static'
 
-class Vienna::Application
-  def initialize(root = 'public')
-    @app = Rack::Builder.new do
-      use Rack::Static, {
-        urls: Dir.glob("#{root}/**/*").map { |fn| fn.gsub(/^#{root}/, '')},
-        root: root,
-        index: 'index.html',
-        header_rules: [[:all, {'Cache-Control' => 'public, max-age=3600'}]]
-      }
-      run Vienna::NotFound.new("#{root}/404.html")
+module Bookbinder
+  module Vienna
+    class << self
+      def call(env)
+        Application.new.call(env)
+      end
     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)
+    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'}]]
+            }
+          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
-  end
 
-  private
-  # regexp to match strings without periods that start and end with a slash
-  MATCH = %r{^/([^.]*)[^/]$}
+    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

data/template_app/mail_sender.rb

@@ -0,0 +1,69 @@
+require 'sendgrid-ruby'
+require 'rack/response'
+require 'uri'
+
+module Bookbinder
+  class MailSender
+    def initialize(username, api_key, config={})
+      @config = config
+      @client = SendGrid::Client.new(api_user: username, api_key: api_key, raise_exceptions: false)
+    end
+
+    def send_mail(params)
+      params = whitelisted_params(params)
+      @subject = assemble_subject(params[:page_url])
+      @body = assemble_body(**params)
+      @mail = SendGrid::Mail.new(merged_options)
+
+      response = client.send(@mail)
+      Rack::Response.new(response.body, response.code, response.headers)
+    end
+
+    def assemble_subject(page_url)
+      "[Feedback] New feedback submitted for #{URI.parse(page_url).host}"
+    end
+
+    def assemble_body(helpful: nil, comments: nil, date: nil, page_url: nil)
+      <<-EOT
+Dear docs writer,
+
+You just received new feedback.
+
+The sender thought the document was #{helpfulness(helpful)}.
+
+Date: #{date}
+
+Page URL: #{page_url}
+
+Comments:
+#{comments || "None given"}
+
+Happy editing!
+      EOT
+    end
+
+    private
+
+    attr_reader :config, :client
+
+    def whitelist
+      %w{helpful comments date page_url}
+    end
+
+    def whitelisted_params(params)
+      {}.tap do |hash|
+        params.each do |key, value|
+          hash[key.to_sym] = value if whitelist.include?(key)
+        end
+      end
+    end
+
+    def merged_options
+      config.merge({text: @body, subject: @subject})
+    end
+
+    def helpfulness(was_helpful)
+      was_helpful ? 'helpful' : 'not helpful'
+    end
+  end
+end

data/template_app/rack_app.rb

@@ -1,43 +1,82 @@
+require 'rack'
 require 'rack/rewrite'
-require 'rack/auth/basic'
-require 'vienna'
+require_relative './lib/vienna_application'
 
 module Bookbinder
   class RackApp
-    def initialize(redirect_pathname, auth_required: true)
+    def initialize(redirect_pathname, mail_client=nil, auth_required: true)
       @redirect_pathname = redirect_pathname
+      @mail_client = mail_client
       @auth_required = auth_required
     end
 
     def app
-      app = resolve_redirects
-
-      if auth_required && site_username && site_password
-        authorize_user(app)
-      else
-        app
+      path = redirect_pathname
+      client = mail_client
+      auth = auth_required
+      Rack::Builder.new(Vienna) do
+        use ResolveRedirects, path
+        use AuthorizeUser, auth
+        map '/api/feedback' do
+          use MailFeedback, client
+          run Vienna::NotFound.new('public/404.html')
+        end
       end
     end
 
     private
 
-    attr_reader :redirect_pathname, :auth_required
+    attr_reader :redirect_pathname, :mail_client, :auth_required
+  end
+
+  class ResolveRedirects
+    def initialize(app, redirect_pathname)
+      @app = app
+      @redirect_pathname = redirect_pathname
+    end
 
-    def resolve_redirects
+    def rack_app
       if redirect_pathname.exist?
         p = redirect_pathname
-        Rack::Rewrite.new(Vienna) { eval(p.read) }
+        Rack::Rewrite.new(@app) { eval(p.read) }
       else
-        Vienna
+        @app
       end
     end
 
-    def authorize_user(app)
-      Rack::Auth::Basic.new(app) do |username, password|
-        [username, password] == [site_username, site_password]
+    def call(env)
+      rack_app.call(env)
+    end
+
+    private
+
+    attr_reader :redirect_pathname
+  end
+
+  class AuthorizeUser
+    def initialize(app, auth_required)
+      @app = app
+      @auth_required = auth_required
+    end
+
+    def rack_app
+      if auth_required && site_username && site_password
+        Rack::Auth::Basic.new(@app) do |username, password|
+          [username, password] == [site_username, site_password]
+        end
+      else
+        @app
       end
     end
 
+    def call(env)
+      rack_app.call(env)
+    end
+
+    private
+
+    attr_accessor :auth_required
+
     def site_username
       ENV['SITE_AUTH_USERNAME']
     end
@@ -46,4 +85,20 @@ module Bookbinder
       ENV['SITE_AUTH_PASSWORD']
     end
   end
+
+  class MailFeedback
+    def initialize(app, client)
+      @app = app
+      @client = client
+    end
+
+    def call(env)
+      request = Rack::Request.new(env)
+      if request.post? && @client
+        @client.send_mail(request.params)
+      else
+        @app.call(env)
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbindery
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 7.3.0
 platform: ruby
 authors:
 - Mike Grafton
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: install_bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -131,20 +131,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.3
-- !ruby/object:Gem::Dependency
-  name: vienna
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: anemone
   requirement: !ruby/object:Gem::Requirement
@@ -229,6 +215,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.8
+- !ruby/object:Gem::Dependency
+  name: sendgrid-ruby
+  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: license_finder
   requirement: !ruby/object:Gem::Requirement
@@ -309,6 +309,7 @@ files:
 - lib/bookbinder/commands/generate.rb
 - lib/bookbinder/commands/help.rb
 - lib/bookbinder/commands/naming.rb
+- lib/bookbinder/commands/punch.rb
 - lib/bookbinder/commands/push_from_local.rb
 - lib/bookbinder/commands/push_to_prod.rb
 - lib/bookbinder/commands/run_publish_ci.rb
@@ -387,12 +388,12 @@ files:
 - lib/bookbinder/values/section.rb
 - lib/bookbinder/values/subnav_template.rb
 - lib/bookbinder/values/user_message.rb
-- template_app/app.rb
 - template_app/config.ru
 - template_app/Gemfile
 - template_app/Gemfile.lock
 - template_app/lib/rack_static.rb
 - template_app/lib/vienna_application.rb
+- template_app/mail_sender.rb
 - template_app/rack_app.rb
 - master_middleman/archive_drop_down_menu.rb
 - master_middleman/bookbinder_helpers.rb

data/template_app/app.rb

@@ -1,3 +0,0 @@
-exec("rackup -p #{ARGV[0] || 4567}") if require('vienna')
-require_relative 'lib/vienna_application'
-require_relative 'lib/rack_static'