parliament-utils 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a93c4e7d7614401ed2be2cce1d75216064cb8a05
-  data.tar.gz: 6d4483d22db5f03fdbf05d93e1f9d8aee233b45c
+  metadata.gz: 5882bc351a1078a537fd3c4520c013dec4cac64b
+  data.tar.gz: fa074c337d4dbcb3a5189b2162386663892c0e3e
 SHA512:
-  metadata.gz: 5ee2a42fb6a4f7bc3c03ed3f2c8be735a82a280adbe1f7f2a3a77a9f1fa0efe4d164de7dfdb82933cbcf8afeed1ebc932040cb27611443feac6a734054e6936d
-  data.tar.gz: bf8f28a614588820653311e0a56c0ad51a53acfc6f87001798e0f8497b6482bb89248f196e43ceacd5be3326c0fa8c3f24066212271f8ad480bea20ffc667f92
+  metadata.gz: 52bfd09da89a9aaf9f2a8065f49ac64b409bbf8b530525dd6e4081e112496908f46adfa944e3cf303f2d0d1298e43475d4b8f631648471a89fe2ecccb7b88bdb
+  data.tar.gz: 7f9f2b866fb35691c7dfb2203c75fcba8acda74d08486d5e7452545d41998e812437e6b9fe4c395b080a2b9935bea2233bb4c8516092aaf8d5ae3103d8790e00

data/.gitignore

@@ -14,4 +14,4 @@
 # rspec failure tracking
 .rspec_status
 
-spec/dummy/log/*
+spec/dummy/log/*.log

data/lib/parliament/utils.rb

@@ -1,6 +1,6 @@
 require 'parliament/utils/version'
 require 'parliament/utils/helpers'
-require 'parliament/utils/services'
+require 'parliament/utils/services' if defined?(Rails)
 require 'parliament/utils/config/initializers/bandiera'
 require 'parliament/utils/test_helpers'
 require 'parliament/utils/railtie' if defined?(Rails)

data/lib/parliament/utils/helpers/markdown_helper.rb

@@ -15,9 +15,11 @@ module Parliament
           parliament_renderer = Parliament::Utils::Services::ParliamentMarkdownRenderer
           parliament_scrubber = Parliament::Utils::Services::ParliamentMarkdownScrubber.new
 
-          markdown = Redcarpet::Markdown.new(parliament_renderer, tables: true, autolink: true)
-          html = markdown.render(ActionController::Base.helpers.sanitize(template, scrubber: parliament_scrubber))
+          markdown = Redcarpet::Markdown.new(parliament_renderer, tables: true, autolink: true, lax_spacing: true)
+
+          html = markdown.render(template)
           ActionController::Base.helpers.sanitize(html, scrubber: parliament_scrubber).html_safe
+          html.html_safe
         end
       end
     end

data/lib/parliament/utils/services/markdown_converter.rb

@@ -41,11 +41,8 @@ module Parliament
             url << 'audioOnly=False&autoStart=False&statsEnabled=False'
           end
 
-          # Escape special characters in HTML
-          video_url = CGI.escapeHTML(video_url)
-
           # Return the video player
-          %(<div class="video-wrap"><iframe src="#{video_url}" name="UKPPlayer" title="UK Parliament Player" seamless="seamless" frameborder="0" allowfullscreen style="width: 100%; height: 100%"></iframe></div>)
+          %(<div class="video-wrap"><iframe src="#{video_url}" name="UKPPlayer" title="UK Parliament Player" seamless="seamless" frameborder="0" allowfullscreen style="width: 100%; height: 100%;"></iframe></div>)
         end
       end
     end

data/lib/parliament/utils/services/markdown_scrubber.rb

@@ -5,12 +5,13 @@ module Parliament
         # Overrides default sanitization allowing Parliament tags and/or attributes
         def initialize
           super
+
           self.tags = %w[p div h1 h2 h3 h4 h5 h6 span a ol li ul strong em i itag strike del u sup sub blockquote cite table thead tbody tfoot tr th td iframe image pre code dl dt dd hr br]
           self.attributes = %w[class href src name title allowfullscreen seamless frameborder style]
         end
 
         def skip_node?(node)
-          node.text?
+          node.text? || node.name === 'iframe'
         end
       end
     end

data/lib/parliament/utils/version.rb

@@ -1,5 +1,5 @@
 module Parliament
   module Utils
-    VERSION = '0.8.5'.freeze
+    VERSION = '0.8.6'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parliament-utils
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Rebecca Appleyard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2018-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parliament-ruby