govspeak 1.2.0 → 1.2.2

data/lib/govspeak.rb

@@ -22,7 +22,6 @@ module Govspeak
 
     def initialize(source, options = {})
       @source = source ? source.dup : ""
-      Parser.document_domains = options.delete(:document_domains)
       @options = {input: PARSER_CLASS_NAME, entity_output: :symbolic}.merge(options)
       @images = []
     end

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "1.2.0"
+  VERSION = "1.2.2"
 end

data/lib/kramdown/parser/kramdown_with_automatic_external_links.rb

@@ -1,19 +1,35 @@
 require "uri"
+require "kramdown/options"
 
 module Kramdown
+  module Options
+    class AlwaysEqual
+      def ==(other)
+        true
+      end
+    end
+
+    define(:document_domains, Object, %w{www.gov.uk}, <<EOF) do |val|
+Defines the domains which are considered local to the document
+
+Default: www.gov.uk
+Used by: KramdownWithAutomaticExternalLinks
+EOF
+      simple_array_validator(val, :document_domains, AlwaysEqual.new)
+    end
+  end
+
   module Parser
     class KramdownWithAutomaticExternalLinks < Kramdown::Parser::Kramdown
-      class << self
-        attr_writer :document_domains
-        def document_domains
-          @document_domains || %w(www.gov.uk)
-        end
+      def initialize(source, options)
+        @document_domains = options[:document_domains] || %w(www.gov.uk)
+        super
       end
 
       def add_link(el, href, title, alt_text = nil)
         begin
           host = URI.parse(href).host
-          unless host.nil? || (self.class.document_domains.compact.include?(host))
+          unless host.nil? || (@document_domains.compact.include?(host))
             el.attr['rel'] = 'external'
           end
         rescue URI::InvalidURIError, URI::InvalidComponentError

data/test/govspeak_test.rb

@@ -337,6 +337,20 @@ $CTA
       </div>}
   end
 
+  test_given_govspeak "
+    [internal link](http://www.not-external.com)
+
+    $CTA
+    Click here to start the tool
+    $CTA", [], document_domains: %w(www.not-external.com) do
+    assert_html_output %{
+      <p><a href="http://www.not-external.com">internal link</a></p>
+
+      <div class="call-to-action">
+      <p>Click here to start the tool</p>
+      </div>}
+  end
+
   test_given_govspeak "
     1. rod
     2. jane

data/test/govspeak_test_helper.rb

@@ -5,14 +5,15 @@ module GovspeakTestHelper
   end
 
   class GovspeakAsserter
-    def initialize(testcase, govspeak, images = [])
+    def initialize(testcase, govspeak, images = [], options = {})
       @testcase = testcase
       @govspeak = remove_indentation(govspeak)
       @images = images
+      @options = options
     end
 
     def document
-      Govspeak::Document.new(@govspeak).tap do |doc|
+      Govspeak::Document.new(@govspeak, @options).tap do |doc|
         doc.images = @images
       end
     end
@@ -59,15 +60,15 @@ module GovspeakTestHelper
     end
   end
 
-  def given_govspeak(govspeak, images=[], &block)
-    asserter = GovspeakAsserter.new(self, govspeak, images)
+  def given_govspeak(govspeak, images=[], options = {}, &block)
+    asserter = GovspeakAsserter.new(self, govspeak, images, options)
     asserter.instance_eval(&block)
   end
 
   module ClassMethods
-    def test_given_govspeak(govspeak, &block)
+    def test_given_govspeak(govspeak, images=[], options = {}, &block)
       test "Given #{govspeak}" do
-        given_govspeak(govspeak, &block)
+        given_govspeak(govspeak, images, options, &block)
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: govspeak
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors: 
 - Ben Griffiths
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-14 00:00:00 Z
+date: 2012-11-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: kramdown
@@ -130,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2266013611251793811
+      hash: 1267404848853148486
       segments: 
       - 0
       version: "0"
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2266013611251793811
+      hash: 1267404848853148486
       segments: 
       - 0
       version: "0"