devcenter 0.0.8 → 0.0.9

data/devcenter.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('excon', '~>0.15.4')
   gem.add_runtime_dependency('launchy', '~>2.1.0')
   gem.add_runtime_dependency('maruku', '~>0.6.1')
+  gem.add_runtime_dependency('sanitize', '~>2.0.3')
   gem.add_runtime_dependency('nokogiri', '~>1.5.5')
   gem.add_runtime_dependency('coderay', '~>1.0.8')
   gem.add_runtime_dependency('thin', '~>1.5.0')

data/lib/devcenter/gem_version_checker.rb

@@ -1,22 +1,18 @@
 require_relative 'version'
 
-module Devcenter
+module Devcenter::GemVersionChecker
 
-  module GemVersionChecker
-
-    def self.new_version_available?
-      remote = last_remote_version
-      remote && (Gem::Version.new(remote) > Gem::Version.new(Devcenter::VERSION))
-    end
-
-    def self.last_remote_version
-      json = Excon.get('https://rubygems.org/api/v1/versions/devcenter.json').body
-      versions = JSON.parse(json).map{ |v| v['number'] }
-      versions.sort{ |a,b| Gem::Version.new(a) <=> Gem::Version.new(b) }.last
-    rescue
-      nil
-    end
+  def self.new_version_available?
+    remote = last_remote_version
+    remote && (Gem::Version.new(remote) > Gem::Version.new(Devcenter::VERSION))
+  end
 
+  def self.last_remote_version
+    json = Excon.get('https://rubygems.org/api/v1/versions/devcenter.json').body
+    versions = JSON.parse(json).map{ |v| v['number'] }
+    versions.sort{ |a,b| Gem::Version.new(a) <=> Gem::Version.new(b) }.last
+  rescue
+    nil
   end
 
 end

data/lib/devcenter/md_parser.rb

@@ -2,11 +2,52 @@
 require 'maruku'
 require 'nokogiri'
 require 'coderay'
+require 'sanitize'
 
 module Devcenter::MdParser
   class InvalidMarkdownError < Exception; end
   class InvalidRawHTMLError < Exception; end
 
+  def self.to_html(markdown)
+    html = to_unsanitized_html(markdown)
+    html = sanitize(html)
+    highlight(html)
+  end
+
+  def self.to_unsanitized_html(markdown)
+    html = Maruku.new(markdown, :on_error => :raise).to_html
+    html = Nokogiri::HTML::DocumentFragment.parse(html).to_html(:encoding => 'utf-8')
+    verify_raw_html(html)
+    html = underscores_to_dashes_in_subheader_anchors(html)
+  rescue InvalidRawHTMLError => e
+    raise InvalidMarkdownError, e.message
+  rescue => e
+    raise InvalidMarkdownError, parse_maruku_error(e.message)
+  end
+
+  def self.sanitize(html)
+    Sanitize.clean(html, sanitize_config)
+  end
+
+  def self.sanitize_config
+    return @@sanitize_config if defined?(@@sanitize_config)
+    config = Sanitize::Config::RELAXED
+    config[:attributes][:all] += %w{ id class style name width height border align }
+    config[:attributes]['a'] += %w{ target }
+    config[:elements] += %w{ div span hr tt }
+
+    # embedded videos
+    config[:attributes][:all] += %w{ value src type allowscriptaccess allowfullscreen }
+    config[:elements] += %w{ object param embed }
+    config[:add_attributes] = {
+      'object' => {'allowscriptaccess' => 'never'},
+      'embed' => {'allowscriptaccess' => 'never'},
+      'param' => {'allowscriptaccess' => 'never'}
+    }
+
+    @@sanitize_config = config.merge({remove_contents: true, allow_comments: true})
+  end
+
   def self.highlight(html)
     element = "pre>code"
     pattern = /\A\s*:::(\w+)\s*\n/i
@@ -37,19 +78,9 @@ module Devcenter::MdParser
     end
   end
 
-  def self.to_html(markdown)
-    html = Maruku.new(markdown, :on_error => :raise).to_html
-    verify_raw_html(html)
-    html = underscores_to_dashes_in_subheader_anchors(html)
-    highlight(html)
-  rescue InvalidRawHTMLError => e
-    raise InvalidMarkdownError, e.message
-  rescue => e
-    raise InvalidMarkdownError, parse_maruku_error(e.message)
-  end
-
   def self.underscores_to_dashes_in_subheader_anchors(html)
     doc = Nokogiri::HTML::DocumentFragment.parse(html)
+
     doc.css("h2,h3,h4,h5,h6").each do |node|
       if node.attributes['id'] && node.attributes['id'].value
         node.attributes['id'].value = node.attributes['id'].value.gsub(/_+/,'-')

data/lib/devcenter/version.rb

@@ -1,3 +1,3 @@
 module Devcenter
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devcenter
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -108,6 +108,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.1
+- !ruby/object:Gem::Dependency
+  name: sanitize
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement