govspeak 1.6.2 → 2.0.0

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.0.0
+
+* Upgrade sanitize dependency to 2.1.0
+  * Now allows `address`, `bdi`, `hr` and `summary` elements by default.
+  * Allows colons in IDs
+  * BREAKING CHANGE: This changes the validation rules of HtmlSanitizer.
+* Stop duplicate entries in the sanitization config
+
 ## 1.6.2
 
 * Fix a bug with parsing of `$LegislativeList` and `$PriorityList` with `\r\n`

data/lib/govspeak/html_sanitizer.rb

@@ -1,6 +1,9 @@
 require 'sanitize'
+require 'with_deep_merge'
 
 class Govspeak::HtmlSanitizer
+  include WithDeepMerge
+
   def initialize(dirty_html)
     @dirty_html = dirty_html
   end
@@ -16,10 +19,12 @@ class Govspeak::HtmlSanitizer
   end
 
   def sanitize_config
-    config = Sanitize::Config::RELAXED.dup
-    config[:attributes][:all].push("id", "class")
-    config[:attributes]["a"].push("rel")
-    config[:elements].push("div", "hr")
-    config
+    deep_merge(Sanitize::Config::RELAXED, {
+      attributes: {
+        :all => Sanitize::Config::RELAXED[:attributes][:all] + [ "id", "class" ],
+        "a"  => Sanitize::Config::RELAXED[:attributes]["a"] + [ "rel" ],
+      },
+      elements: Sanitize::Config::RELAXED[:elements] + [ "div" ],
+    })
   end
-end
+end

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "1.6.2"
+  VERSION = "2.0.0"
 end

data/lib/with_deep_merge.rb

@@ -0,0 +1,11 @@
+module WithDeepMerge
+  def deep_merge(base_object, other_object)
+    if base_object.is_a?(Hash) && other_object.is_a?(Hash)
+      base_object.merge(other_object) { |_, base_value, other_value|
+        deep_merge(base_value, other_value)
+      }
+    else
+      other_object
+    end
+  end
+end

data/test/with_deep_merge_test.rb

@@ -0,0 +1,18 @@
+require 'with_deep_merge'
+
+class WithDeepMergeTest < Test::Unit::TestCase
+  include WithDeepMerge
+
+  def test_simple_merge
+    base_hash = { "a" => "b" }
+    other_hash = { "c" => "d" }
+    assert_equal({ "a" => "b", "c" => "d" }, deep_merge(base_hash, other_hash))
+  end
+
+  def test_recursive_merge
+    base_hash = { "a" =>  { "b" => "c", "d" => "e" } }
+    other_hash = { "a" => { "b" => "z", "f" => "g" } }
+    assert_equal({ "a" => { "b" => "z", "d" => "e", "f" => "g" } },
+      deep_merge(base_hash, other_hash))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +151,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/kramdown/parser/kramdown_with_automatic_external_links.rb
+- lib/with_deep_merge.rb
 - lib/govspeak.rb
 - lib/govspeak/html_validator.rb
 - lib/govspeak/kramdown_overrides.rb
@@ -163,6 +164,7 @@ files:
 - Gemfile
 - Rakefile
 - test/govspeak_test_helper.rb
+- test/with_deep_merge_test.rb
 - test/html_validator_test.rb
 - test/govspeak_test.rb
 - test/html_sanitizer_test.rb
@@ -182,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3676938548072228722
+      hash: 3723599467826747284
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -191,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3676938548072228722
+      hash: 3723599467826747284
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -200,6 +202,7 @@ specification_version: 3
 summary: Markup language for single domain
 test_files:
 - test/govspeak_test_helper.rb
+- test/with_deep_merge_test.rb
 - test/html_validator_test.rb
 - test/govspeak_test.rb
 - test/html_sanitizer_test.rb