govspeak 0.8.12 → 0.8.13

data/README.md

@@ -20,7 +20,7 @@ then create a new document
 
 # Extensions
 
-In addition to the [standard Markdown syntax](http://daringfireball.net/projects/markdown/syntax "Markdown syntax"), we have added our own extensions. 
+In addition to the [standard Markdown syntax](http://daringfireball.net/projects/markdown/syntax "Markdown syntax"), we have added our own extensions.
 
 ## Callouts
 
@@ -30,8 +30,8 @@ In addition to the [standard Markdown syntax](http://daringfireball.net/projects
 
 creates a callout with an info (i) icon.
 
-    <div class="application-notice info-notice"> 
-    	<p>This is an information callout</p> 
+    <div class="application-notice info-notice">
+    	<p>This is an information callout</p>
     </div>
 
 ### Warning callouts
@@ -40,8 +40,8 @@ creates a callout with an info (i) icon.
 
 creates a callout with a warning or alert (!) icon
 
-    <div class="application-notice help-notice"> 
-    	<p>This is a warning callout</p> 
+    <div class="application-notice help-notice">
+    	<p>This is a warning callout</p>
     </div>
 
 ### Example callout
@@ -51,7 +51,7 @@ creates a callout with a warning or alert (!) icon
     $E
 
 creates an example box
-    
+
     <div class="example">
     <p><strong>Example:</strong> Open the pod bay doors</p>
     </div>
@@ -66,7 +66,7 @@ highlights the enclosed text in yellow
 
     <h3 class="advisory">
     	<span>This is a very important message or warning</span>
-    </h3> 
+    </h3>
 
 ### Answer
 
@@ -85,8 +85,8 @@ creates a large pink highlight box with optional preamble text and giant text de
 ### Contact
 
     $C
-    **Student Finance England**  
-    **Telephone:** 0845 300 50 90  
+    **Student Finance England**
+    **Telephone:** 0845 300 50 90
     **Minicom:** 0845 604 44 34
     $C
 
@@ -108,8 +108,8 @@ creates an address box
 
     <div class="address vcard"><div class="adr org fn"><p>
     Hercules House
-    <br>Hercules Road  
-    <br>London SE1 7DU   
+    <br>Hercules Road
+    <br>London SE1 7DU
     <br></p></div></div>
 
 ## Downloads

data/lib/govspeak.rb

@@ -9,7 +9,7 @@ module Govspeak
     @@extensions = []
 
     attr_accessor :images
-    
+
     def self.to_html(source, options = {})
       new(source, options).to_html
     end
@@ -25,7 +25,7 @@ module Govspeak
       @kramdown_doc ||= Kramdown::Document.new(preprocess(@source), @options)
     end
     private :kramdown_doc
-    
+
     def to_html
       kramdown_doc.to_html
     end
@@ -46,7 +46,7 @@ module Govspeak
       end
       source
     end
-    
+
     def encode(text)
       HTMLEntities.new.encode(text)
     end
@@ -72,8 +72,8 @@ module Govspeak
         content = parser ? parser.new("#{body.strip}\n").to_html : body.strip
         %{<div class="#{class_name}">\n#{content}</div>\n}
       }
-    end           
-    
+    end
+
     def insert_strong_inside_p(body, parser=Kramdown::Document)
       parser.new(body.strip).to_html.sub(/^<p>(.*)<\/p>$/,"<p><strong>\\1</strong></p>")
     end
@@ -107,7 +107,7 @@ module Govspeak
     extension('map_link', surrounded_by("((", "))")) { |body|
       %{<div class="map"><iframe width="200" height="200" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="#{body.strip}&output=embed"></iframe><br /><small><a href="#{body.strip}">View Larger Map</a></small></div>}
     }
-    
+
     extension('attached-image', /^!!([0-9]+)/) do |image_number|
       image = images[image_number.to_i - 1]
       if image
@@ -117,7 +117,7 @@ module Govspeak
         ""
       end
     end
-    
+
     def render_image(url, alt_text, caption = nil)
       lines = []
       lines << '<figure class="image embedded">'

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "0.8.12"
+  VERSION = "0.8.13"
 end

data/test/govspeak_test.rb

@@ -11,7 +11,7 @@ require 'govspeak_test_helper'
 
 class GovspeakTest < Test::Unit::TestCase
   include GovspeakTestHelper
-  
+
   test "simple smoke-test" do
     rendered =  Govspeak::Document.new("*this is markdown*").to_html
     assert_equal "<p><em>this is markdown</em></p>\n", rendered
@@ -31,7 +31,7 @@ class GovspeakTest < Test::Unit::TestCase
     rendered =  Govspeak::Document.new("this \n{::highlight-answer}Lead in to *BIG TEXT*\n{:/highlight-answer}").to_html
     assert_equal %Q{<p>this </p>\n\n<div class="highlight-answer">\n<p>Lead in to <em>BIG TEXT</em></p>\n</div>\n}, rendered
   end
-  
+
   test "extracts headers with text, level and generated id" do
     document =  Govspeak::Document.new %{
 # Big title
@@ -94,7 +94,7 @@ Teston
       </div>}
     assert_text_output "The following is very informational I am very informational"
   end
-  
+
   test_given_govspeak "^ I am very informational" do
     assert_html_output %{
       <div class="application-notice info-notice">
@@ -102,14 +102,14 @@ Teston
       </div>}
     assert_text_output "I am very informational"
   end
-  
+
   test_given_govspeak "@ I am very important @" do
     assert_html_output %{
       <div class="advisory"><p><strong>I am very important</strong></p>
       </div>}
     assert_text_output "I am very important"
   end
-  
+
   test_given_govspeak "
     The following is very important
     @ I am very important @
@@ -121,7 +121,7 @@ Teston
       </div>}
     assert_text_output "The following is very important I am very important"
   end
-  
+
   test_given_govspeak "% I am very helpful %" do
     assert_html_output %{
       <div class="application-notice help-notice">
@@ -129,7 +129,7 @@ Teston
       </div>}
     assert_text_output "I am very helpful"
   end
-  
+
   test_given_govspeak "The following is very helpful\n% I am very helpful %" do
     assert_html_output %{
       <p>The following is very helpful</p>
@@ -139,7 +139,7 @@ Teston
       </div>}
     assert_text_output "The following is very helpful I am very helpful"
   end
-  
+
   test_given_govspeak "## Hello ##\n\n% I am very helpful %\r\n### Young Workers ###\n\n" do
     assert_html_output %{
       <h2 id="hello">Hello</h2>
@@ -151,7 +151,7 @@ Teston
       <h3 id="young-workers">Young Workers</h3>}
     assert_text_output "Hello I am very helpful Young Workers"
   end
-  
+
   test_given_govspeak "% I am very helpful" do
     assert_html_output %{
       <div class="application-notice help-notice">
@@ -159,17 +159,17 @@ Teston
       </div>}
     assert_text_output "I am very helpful"
   end
-  
+
   test_given_govspeak "This is a [link](http://www.google.com) isn't it?" do
     assert_html_output '<p>This is a <a href="http://www.google.com">link</a> isn&rsquo;t it?</p>'
     assert_text_output "This is a link isn’t it?"
   end
-  
+
   test_given_govspeak "This is a [link with an at sign in it](http://www.google.com/@dg/@this) isn't it?" do
     assert_html_output '<p>This is a <a href="http://www.google.com/@dg/@this">link with an at sign in it</a> isn&rsquo;t it?</p>'
     assert_text_output "This is a link with an at sign in it isn’t it?"
   end
-  
+
   test_given_govspeak "
     HTML
 
@@ -177,12 +177,12 @@ Teston
     assert_html_output %{<p><abbr title="Hyper Text Markup Language">HTML</abbr></p>}
     assert_text_output "HTML"
   end
-  
+
   test_given_govspeak "x[a link](http://rubyforge.org)x" do
     assert_html_output '<p><a href="http://rubyforge.org" rel="external">a link</a></p>'
     assert_text_output "a link"
   end
-  
+
   # Regression test - the surrounded_by helper doesn't require the closing x
   # so 'xaa' was getting picked up by the external link helper above
   # TODO: review whether we should require closing symbols for these extensions
@@ -202,7 +202,7 @@ Teston
       </div>}
     assert_text_output "rainbow"
   end
-  
+
   test_given_govspeak "$C help, send cake $C" do
     assert_html_output %{
       <div class="contact">
@@ -210,7 +210,7 @@ Teston
       </div>}
     assert_text_output "help, send cake"
   end
-  
+
   test_given_govspeak "
     $A
     street
@@ -222,7 +222,7 @@ Teston
       </p></div></div>}
     assert_text_output "street road"
   end
-  
+
   test_given_govspeak "
     $P
     $I
@@ -232,7 +232,7 @@ Teston
     assert_html_output %{<div class="place">\n<div class="information">\n<p>help</p>\n</div>\n</div>}
     assert_text_output "help"
   end
-  
+
   test_given_govspeak "
     $D
     can you tell me how to get to...
@@ -243,7 +243,7 @@ Teston
       </div>}
     assert_text_output "can you tell me how to get to…"
   end
-  
+
   test_given_govspeak "
     1. rod
     2. jane
@@ -251,14 +251,14 @@ Teston
     assert_html_output "<ol>\n  <li>rod</li>\n  <li>jane</li>\n  <li>freddy</li>\n</ol>"
     assert_text_output "rod jane freddy"
   end
-  
+
   test_given_govspeak "
 ((http://maps.google.co.uk/maps?q=Winkfield+Rd,+Windsor,+Berkshire+SL4+4AY&hl=en&sll=53.800651,-4.064941&sspn=17.759517,42.055664&vpsrc=0&z=14))
 " do
     assert_html_output %{<div class="map"><iframe width="200" height="200" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="http://maps.google.co.uk/maps?q=Winkfield+Rd,+Windsor,+Berkshire+SL4+4AY&amp;hl=en&amp;sll=53.800651,-4.064941&amp;sspn=17.759517,42.055664&amp;vpsrc=0&amp;z=14&amp;output=embed"></iframe><br /><small><a href="http://maps.google.co.uk/maps?q=Winkfield+Rd,+Windsor,+Berkshire+SL4+4AY&amp;hl=en&amp;sll=53.800651,-4.064941&amp;sspn=17.759517,42.055664&amp;vpsrc=0&amp;z=14">View Larger Map</a></small></div>}
     assert_text_output "View Larger Map"
   end
-  
+
   test_given_govspeak "
     s1. zippy
     s2. bungle
@@ -275,7 +275,7 @@ Teston
       </ol>}
     assert_text_output "zippy bungle george"
   end
-  
+
   test_given_govspeak ":scotland: I am very devolved\n and very scottish \n:scotland:" do
     assert_html_output '
       <div class="devolved-content scotland">
@@ -285,15 +285,15 @@ Teston
       </div>
       </div>
       '
-  end         
+  end
 
   test_given_govspeak "@ Message with [a link](http://foo.bar/)@" do
     assert_html_output %{
       <div class="advisory"><p><strong>Message with <a href="http://foo.bar/">a link</a></strong></p>
       </div>
-      }  
+      }
   end
-  
+
   test "can reference attached images using !!n" do
     images = [OpenStruct.new(alt_text: 'my alt', url: "http://example.com/image.jpg")]
     given_govspeak "!!1", images do
@@ -319,7 +319,7 @@ Teston
   test "silently ignores an image attachment if the referenced image is missing" do
     doc = Govspeak::Document.new("!!1")
     doc.images = []
-    
+
     assert_equal %Q{\n}, doc.to_html
   end
 
@@ -334,7 +334,7 @@ Teston
         }
     end
   end
-  
+
   test "ignores a blank caption" do
     images = [OpenStruct.new(alt_text: "my alt", url: "http://example.com/image.jpg", caption: '  ')]
     given_govspeak "!!1", images do

data/test/govspeak_test_helper.rb

@@ -3,32 +3,32 @@ module GovspeakTestHelper
   def self.included(base)
     base.extend(ClassMethods)
   end
-    
+
   class GovspeakAsserter
     def initialize(testcase, govspeak, images = [])
       @testcase = testcase
       @govspeak = remove_indentation(govspeak)
       @images = images
     end
-    
+
     def document
       Govspeak::Document.new(@govspeak).tap do |doc|
         doc.images = @images
       end
     end
-    
+
     def assert_text_output(raw_expected)
       expected = remove_indentation(raw_expected)
       actual = document.to_text
       @testcase.assert expected == actual, describe_error(@govspeak, expected, actual)
     end
-    
+
     def assert_html_output(raw_expected)
       expected = remove_indentation(raw_expected)
       actual = document.to_html.strip
       @testcase.assert expected.strip == actual, describe_error(@govspeak, expected.strip, actual)
     end
-    
+
     def remove_indentation(raw)
       lines = raw.split("\n")
       if lines.first.empty?
@@ -45,11 +45,11 @@ module GovspeakTestHelper
         raw
       end
     end
-    
+
     def describe_error(govspeak, expected, actual)
       "Expected:\n#{govspeak}\n\nto produce:\n#{show_linenumbers(expected)}\n\nbut got:\n#{show_linenumbers(actual)}\n"
     end
-    
+
     def show_linenumbers(text)
       lines = text.split "\n"
       digits = Math.log10(lines.size + 2).ceil
@@ -63,7 +63,7 @@ module GovspeakTestHelper
     asserter = GovspeakAsserter.new(self, govspeak, images)
     asserter.instance_eval(&block)
   end
-  
+
   module ClassMethods
     def test_given_govspeak(govspeak, &block)
       test "Given #{govspeak}" do
@@ -71,4 +71,4 @@ module GovspeakTestHelper
       end
     end
   end
-end
+end

data/test/test_helper.rb

@@ -11,10 +11,10 @@ class Test::Unit::TestCase
      clean_name = name.gsub(/\s+/,'_')
      method = "test_#{clean_name.gsub(/\s+/,'_')}".to_sym
      already_defined = instance_method(method) rescue false
-     raise "#{method} exists" if already_defined   
+     raise "#{method} exists" if already_defined
      define_method(method, &block)
     end
   end
 end
 
-require 'govspeak'
+require 'govspeak'

metadata

@@ -2,7 +2,7 @@
 name: govspeak
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.12
+  version: 0.8.13
 platform: ruby
 authors: 
 - Ben Griffiths
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-11 00:00:00 Z
+date: 2012-05-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: kramdown
@@ -58,7 +58,7 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 description: |-
-  A set of extensions to markdown layered on top of the kramdown 
+  A set of extensions to markdown layered on top of the kramdown
   library for use in the UK Government Single Domain project
 email: 
 - ben@alphagov.co.uk
@@ -92,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 530935927851704938
+      hash: -2168654671078793304
       segments: 
       - 0
       version: "0"
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 530935927851704938
+      hash: -2168654671078793304
       segments: 
       - 0
       version: "0"