govspeak 3.2.0 → 3.3.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.3.0
+
+* Relax Nokogiri dependency to `1.5.x` rather than `1.5.10`. This allows
+  Govspeak to work with Rails 4.2 and greater.
+
 ## 3.2.0
 
 * `span` elements are now allowed through the sanitization process.

data/README.md

@@ -30,7 +30,7 @@ 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">
+    <div role="note" aria-label="Information" class="application-notice info-notice">
     	<p>This is an information callout</p>
     </div>
 
@@ -40,7 +40,7 @@ creates a callout with an info (i) icon.
 
 creates a callout with a warning or alert (!) icon
 
-    <div class="application-notice help-notice">
+    <div role="note" aria-label="Help" class="application-notice help-notice">
     	<p>This is a warning callout</p>
     </div>
 
@@ -64,7 +64,7 @@ creates an example box
 
 highlights the enclosed text in yellow
 
-    <h3 class="advisory">
+    <h3 role="note" aria-label="Important" class="advisory">
     	<span>This is a very important message or warning</span>
     </h3>
 

data/lib/govspeak.rb

@@ -24,8 +24,8 @@ module Govspeak
 
     def initialize(source, options = {})
       @source = source ? source.dup : ""
+      @images = options.delete(:images) || []
       @options = {input: PARSER_CLASS_NAME, entity_output: :symbolic}.merge(options)
-      @images = []
     end
 
     def kramdown_doc
@@ -116,16 +116,16 @@ module Govspeak
     }
 
     extension('informational', surrounded_by("^")) { |body|
-      %{\n\n<div class="application-notice info-notice">
+      %{\n\n<div role="note" aria-label="Information" class="application-notice info-notice">
 #{Govspeak::Document.new(body.strip).to_html}</div>\n}
     }
 
     extension('important', surrounded_by("@")) { |body|
-      %{\n\n<div class="advisory">#{insert_strong_inside_p(body)}</div>\n}
+      %{\n\n<div role="note" aria-label="Important" class="advisory">#{insert_strong_inside_p(body)}</div>\n}
     }
 
     extension('helpful', surrounded_by("%")) { |body|
-      %{\n\n<div class="application-notice help-notice">\n#{Govspeak::Document.new(body.strip).to_html}</div>\n}
+      %{\n\n<div role="note" aria-label="Help" class="application-notice help-notice">\n#{Govspeak::Document.new(body.strip).to_html}</div>\n}
     }
 
     extension('attached-image', /^!!([0-9]+)/) do |image_number|

data/lib/govspeak/html_sanitizer.rb

@@ -42,7 +42,7 @@ class Govspeak::HtmlSanitizer
   def sanitize_config
     deep_merge(Sanitize::Config::RELAXED, {
       attributes: {
-        :all => Sanitize::Config::RELAXED[:attributes][:all] + [ "id", "class" ],
+        :all => Sanitize::Config::RELAXED[:attributes][:all] + [ "id", "class", "role", "aria-label" ],
         "a"  => Sanitize::Config::RELAXED[:attributes]["a"] + [ "rel" ],
       },
       elements: Sanitize::Config::RELAXED[:elements] + [ "div", "span" ],

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "3.2.0"
+  VERSION = "3.3.0"
 end

data/test/govspeak_test.rb

@@ -82,7 +82,7 @@ Teston
 
   test_given_govspeak("^ I am very informational ^") do
     assert_html_output %{
-      <div class="application-notice info-notice">
+      <div role="note" aria-label="Information" class="application-notice info-notice">
       <p>I am very informational</p>
       </div>}
     assert_text_output "I am very informational"
@@ -98,7 +98,7 @@ Teston
     assert_html_output %{
       <p>The following is very informational</p>
 
-      <div class="application-notice info-notice">
+      <div role="note" aria-label="Information" class="application-notice info-notice">
       <p>I am very informational</p>
       </div>}
     assert_text_output "The following is very informational I am very informational"
@@ -106,7 +106,7 @@ Teston
 
   test_given_govspeak "^ I am very informational" do
     assert_html_output %{
-      <div class="application-notice info-notice">
+      <div role="note" aria-label="Information" class="application-notice info-notice">
       <p>I am very informational</p>
       </div>}
     assert_text_output "I am very informational"
@@ -114,7 +114,7 @@ Teston
 
   test_given_govspeak "@ I am very important @" do
     assert_html_output %{
-      <div class="advisory"><p><strong>I am very important</strong></p>
+      <div role="note" aria-label="Important" class="advisory"><p><strong>I am very important</strong></p>
       </div>}
     assert_text_output "I am very important"
   end
@@ -126,14 +126,14 @@ Teston
     assert_html_output %{
       <p>The following is very important</p>
 
-      <div class="advisory"><p><strong>I am very important</strong></p>
+      <div role="note" aria-label="Important" class="advisory"><p><strong>I am very important</strong></p>
       </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">
+      <div role="note" aria-label="Help" class="application-notice help-notice">
       <p>I am very helpful</p>
       </div>}
     assert_text_output "I am very helpful"
@@ -143,7 +143,7 @@ Teston
     assert_html_output %{
       <p>The following is very helpful</p>
 
-      <div class="application-notice help-notice">
+      <div role="note" aria-label="Help" class="application-notice help-notice">
       <p>I am very helpful</p>
       </div>}
     assert_text_output "The following is very helpful I am very helpful"
@@ -153,7 +153,7 @@ Teston
     assert_html_output %{
       <h2 id="hello">Hello</h2>
 
-      <div class="application-notice help-notice">
+      <div role="note" aria-label="Help" class="application-notice help-notice">
       <p>I am very helpful</p>
       </div>
 
@@ -163,7 +163,7 @@ Teston
 
   test_given_govspeak "% I am very helpful" do
     assert_html_output %{
-      <div class="application-notice help-notice">
+      <div role="note" aria-label="Help" class="application-notice help-notice">
       <p>I am very helpful</p>
       </div>}
     assert_text_output "I am very helpful"
@@ -533,7 +533,7 @@ $CTA
 
   test_given_govspeak "@ Message with [a link](http://foo.bar/)@" do
     assert_html_output %{
-      <div class="advisory"><p><strong>Message with <a rel="external" href="http://foo.bar/">a link</a></strong></p>
+      <div role="note" aria-label="Important" class="advisory"><p><strong>Message with <a rel="external" href="http://foo.bar/">a link</a></strong></p>
       </div>
       }
   end

data/test/govspeak_test_helper.rb

@@ -13,9 +13,7 @@ module GovspeakTestHelper
     end
 
     def document
-      Govspeak::Document.new(@govspeak, @options).tap do |doc|
-        doc.images = @images
-      end
+      Govspeak::Document.new(@govspeak, @options.merge(:images => @images))
     end
 
     def assert_text_output(raw_expected)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.10
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.10
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1030204254121178856
+      hash: 4296798786801736357
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -193,10 +193,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1030204254121178856
+      hash: 4296798786801736357
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: Markup language for single domain