govspeak 1.0.1 → 1.1.0

data/lib/govspeak.rb

@@ -1,6 +1,7 @@
 require 'kramdown'
 require 'govspeak/header_extractor'
 require 'govspeak/html_validator'
+require 'govspeak/html_sanitizer'
 require 'kramdown/parser/kramdown_with_automatic_external_links'
 require 'htmlentities'
 

data/lib/govspeak/html_sanitizer.rb

@@ -0,0 +1,19 @@
+require 'sanitize'
+
+class Govspeak::HtmlSanitizer
+  def initialize(dirty_html)
+    @dirty_html = dirty_html
+  end
+
+  def sanitize
+    Sanitize.clean(@dirty_html, sanitize_config)
+  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
+  end
+end

data/lib/govspeak/html_validator.rb

@@ -1,5 +1,3 @@
-require 'sanitize'
-
 class Govspeak::HtmlValidator
   attr_reader :string
 
@@ -13,7 +11,7 @@ class Govspeak::HtmlValidator
 
   def valid?
     dirty_html = govspeak_to_html
-    clean_html = sanitize_html(dirty_html)
+    clean_html = Govspeak::HtmlSanitizer.new(dirty_html).sanitize
     normalise_html(dirty_html) == normalise_html(clean_html)
   end
 
@@ -25,16 +23,4 @@ class Govspeak::HtmlValidator
   def govspeak_to_html
     Govspeak::Document.new(string).to_html
   end
-
-  def sanitize_html(dirty_html)
-    Sanitize.clean(dirty_html, sanitize_config)
-  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
-  end
 end

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -2,7 +2,7 @@
 name: govspeak
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Ben Griffiths
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-06 00:00:00 Z
+date: 2012-09-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: kramdown
@@ -104,6 +104,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/govspeak/version.rb
+- lib/govspeak/html_sanitizer.rb
 - lib/govspeak/header_extractor.rb
 - lib/govspeak/html_validator.rb
 - lib/govspeak.rb
@@ -128,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3025037898440193908
+      hash: 2687403366774857492
       segments: 
       - 0
       version: "0"
@@ -137,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3025037898440193908
+      hash: 2687403366774857492
       segments: 
       - 0
       version: "0"