asciidoctor-doctest 1.5.1 → 1.5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 479daec9ac0dc0ec44479eb7675e59a7bc17889d
-  data.tar.gz: ee45df8e137d9e67c1e042f132b4c729bd3c021d
+  metadata.gz: 47a31dddb33a9e8dfbaed934d86d0911faa656fb
+  data.tar.gz: eaab4bbaaf8c7aa5418d1d2ac39e4904655e50b3
 SHA512:
-  metadata.gz: 6e5edb9b2d8b24065e3546422d93be5632ae76295cefad0d60b502ced846bad0e5144974e4e4f64dc35832ef08c5b222a2b7e78204424d4c73a645c98a40c3be
-  data.tar.gz: d76d62985066c12587a7233d2546a5c923aa97a4578eb5e3895c930aa986a00ad5bcbf0f6b1c5f7addf75310f2a4ff6fddcb245572dca26e61a0c9d178a0e75d
+  metadata.gz: f0daad1a5d383b391f2e2adece4949e7ef929f45e291988c84075b8b2dbc9bae18cc43f89339886d0d134d0f3d0854a35214aab5bd309c78a48f3d21fc3e8ca4
+  data.tar.gz: d1287cf3a9166bc59cc064fe57468999f590a84970bcb57991ebd030816ff3395177e61bed624cbcbec99cf25788af35acfd9133e4ebfc84de5fbbccce7a20a8

data/CHANGELOG.adoc

@@ -7,6 +7,14 @@ This document provides a high-level view of the changes introduced in DocTest by
 For a detailed view of what has changed, refer to the {repo-uri}/commits/master[commit history] on GitHub.
 
 
+== 1.5.1.1 (2014-12-30)
+
+Bug fixes::
+  * Avoid setting `backend_name` to an empty string.
+    When there’s an empty string and code highlighter is set to Pygments or CodeRay, then Asciidoctor doesn’t highlight listings at all. [{commit-uri}/bf5f077[bf5f077]]
+  * Update https://github.com/threedaymonk/htmlbeautifier[htmlbeautifier] to 0.0.11 that doesn’t modify content of `pre` element and adds newlines around block elements. {issue-uri}/3[#3] [{commit-uri}/4aaa137[4aaa137]]
+
+
 == 1.5.1 (2014-12-29)
 
 Improvements::

data/features/generator_html.feature

@@ -46,8 +46,10 @@ Feature: Generating output examples for a custom HTML backend
       </div>
 
       <!-- .with_title -->
-      <section class="quoteblock"><h6>After landing the cloaked Klingon bird of prey in Golden Gate park:</h6>
-        <blockquote>Everybody remember where we parked.</blockquote></section>
+      <section class="quoteblock">
+        <h6>After landing the cloaked Klingon bird of prey in Golden Gate park:</h6>
+        <blockquote>Everybody remember where we parked.</blockquote>
+      </section>
 
       """
     And the file "examples/html/document.html" should contain exactly:
@@ -106,15 +108,15 @@ Feature: Generating output examples for a custom HTML backend
       Failing example.
       -->
       <div class="quoteblock">
-        <blockquote>A person who never made a mistake
-          <em>never</em>
-          tried anything new.</blockquote>
+        <blockquote>A person who never made a mistake <em>never</em> tried anything new.</blockquote>
         <div class="attribution">— Albert Einstein</div>
       </div>
 
       <!-- .with_title -->
-      <section class="quoteblock"><h6>After landing the cloaked Klingon bird of prey in Golden Gate park:</h6>
-        <blockquote>Everybody remember where we parked.</blockquote></section>
+      <section class="quoteblock">
+        <h6>After landing the cloaked Klingon bird of prey in Golden Gate park:</h6>
+        <blockquote>Everybody remember where we parked.</blockquote>
+      </section>
 
       """
     And the file "examples/html/document.html" should contain exactly:
@@ -162,9 +164,7 @@ Feature: Generating output examples for a custom HTML backend
       Failing example.
       -->
       <div class="quoteblock">
-        <blockquote>A person who never made a mistake
-          <em>never</em>
-          tried anything new.</blockquote>
+        <blockquote>A person who never made a mistake <em>never</em> tried anything new.</blockquote>
         <div class="attribution">— Albert Einstein</div>
       </div>
 

data/features/test_html.feature

@@ -11,9 +11,8 @@ Feature: Testing a custom HTML backend
       TestHtml :: block_quote : with_attribution:
       Failing example..
 
-           <blockquote>A person who never made a mistake
-             <em>never</em>
-             tried anything new.</blockquote>
+         <div class="quoteblock">
+           <blockquote>A person who never made a mistake <em>never</em> tried anything new.</blockquote>
       E    <span>Albert Einstein</span>
       A    <div class="attribution">— Albert Einstein</div>
          </div>
@@ -49,9 +48,7 @@ Feature: Testing a custom HTML backend
       Failing example..
 
          <div class="quoteblock">
-      E    <blockquote>A person who never made a mistake
-      E      <em>never</em>
-      E      tried anything new.</blockquote>
+      E    <blockquote>A person who never made a mistake <em>never</em> tried anything new.</blockquote>
       E    <span>Albert Einstein</span>
       A    <blockquote>A person who never made a mistake --TEMPLATE NOT FOUND-- tried anything new.</blockquote>
       A    <div class="attribution">— Albert Einstein</div>

data/lib/asciidoctor/doctest/asciidoc_renderer.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/array/wrap'
+require 'active_support/core_ext/object/blank'
 require 'asciidoctor'
 require 'asciidoctor/converter/template'
 
@@ -12,7 +13,7 @@ module Asciidoctor
       attr_reader :backend_name, :converter, :template_dirs
 
       ##
-      # @param backend_name [#to_s] the name of the tested backend.
+      # @param backend_name [#to_s, nil] the name of the tested backend.
       #
       # @param converter [Class, Asciidoctor::Converter::Base, nil]
       #        the backend's converter class (or its instance). If not
@@ -33,10 +34,10 @@ module Asciidoctor
       # @raise [ArgumentError] if some path from the +template_dirs+ doesn't
       #        exist or is not a directory.
       #
-      def initialize(backend_name: '', converter: nil, template_dirs: [],
+      def initialize(backend_name: nil, converter: nil, template_dirs: [],
                      templates_fallback: false)
 
-        @backend_name = backend_name.freeze
+        @backend_name = backend_name.to_s.freeze.presence
         @converter = converter
         @converter ||= NoFallbackTemplateConverter unless template_dirs.empty? || templates_fallback
 

data/lib/asciidoctor/doctest/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module DocTest
-    VERSION = '1.5.1'
+    VERSION = '1.5.1.1'
   end
 end

data/spec/asciidoc_renderer_spec.rb

@@ -11,12 +11,17 @@ describe DocTest::AsciidocRenderer do
 
     context 'with defaults' do
       subject { described_class.new }
-      it { is_expected.to have_attributes backend_name: '', converter: nil, template_dirs: nil }
+      it { is_expected.to have_attributes backend_name: nil, converter: nil, template_dirs: nil }
     end
 
     context 'with backend_name' do
       subject { described_class.new(backend_name: 'html5') }
       it { is_expected.to have_attributes backend_name: 'html5' }
+
+      context 'empty string' do
+        subject { described_class.new(backend_name: '') }
+        it { is_expected.to have_attributes backend_name: nil }
+      end
     end
 
     context 'with template_dirs' do

data/spec/html/examples_suite_spec.rb

@@ -230,7 +230,7 @@ describe DocTest::HTML::ExamplesSuite do
       let(:rendered) { '<p><b>chunky</b> bacon</p>' }
 
       it 'returns content without top-level <p> tags' do
-        expect(result.content.gsub(/\s+/, ' ')).to eq '<b>chunky</b> bacon'
+        expect(result.content).to eq '<b>chunky</b> bacon'
       end
 
       it 'does not add implicit include into returned example' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-doctest
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.1.1
 platform: ruby
 authors:
 - Jakub Jirutka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.11
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement