govspeak 0.8.7 → 0.8.8

data/lib/govspeak.rb

@@ -49,9 +49,9 @@ module Govspeak
       open = Regexp::escape(open)
       if close
         close = Regexp::escape(close)
-        %r+(?:\r|\n|^)#{open}(.*?)#{close}(\r|\n|$)?+m
+        %r+(?:\r|\n|^)#{open}(.*?)#{close} *(\r|\n|$)?+m
       else
-        %r+(?:\r|\n|^)#{open}(.*?)#{open}?(\r|\n|$)+m
+        %r+(?:\r|\n|^)#{open}(.*?)#{open}? *(\r|\n|$)+m
       end
     end
 

data/test/govspeak_test.rb

@@ -54,6 +54,16 @@ class GovspeakTest < Test::Unit::TestCase
     assert_equal "foo bar baz", doc.to_text
   end
 
+  test "trailing space after the address should not prevent parsing" do
+    input = %{$A
+123 Test Street
+Testcase Cliffs
+Teston
+0123 456 7890 $A    }
+    doc = Govspeak::Document.new(input)
+    assert_equal %{<div class="address vcard"><div class="adr org fn"><p>\n123 Test Street<br />Testcase Cliffs<br />Teston<br />0123 456 7890 \n</p></div></div>\n}, doc.to_html
+  end
+
   test "govspark extensions" do
     markdown_regression_tests = [
 {

metadata

@@ -1,59 +1,64 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: govspeak
-version: !ruby/object:Gem::Version
-  version: 0.8.7
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.8.8
 platform: ruby
-authors:
+authors: 
 - Ben Griffiths
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-17 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: kramdown
-  requirement: &20300980 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.13.3
   type: :runtime
   prerelease: false
-  version_requirements: *20300980
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: htmlentities
-  requirement: &20299900 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '4'
+      - !ruby/object:Gem::Version 
+        version: "4"
   type: :runtime
   prerelease: false
-  version_requirements: *20299900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &20299160 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
+      - !ruby/object:Gem::Version 
+        version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *20299160
-description: ! "A set of extensions to markdown layered on top of the kramdown \nlibrary
-  for use in the UK Government Single Domain project"
-email:
+  version_requirements: *id003
+description: |-
+  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
 - james.stewart@digital.cabinet-office.gov.uk
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/govspeak/header_extractor.rb
 - lib/govspeak.rb
 - Gemfile
@@ -62,28 +67,37 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/alphagov/govspeak
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -776524915
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -776524915
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Markup language for single domain
-test_files:
+test_files: 
 - test/govspeak_test.rb
 - test/test_helper.rb