parliament-utils 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47e6ded2c67344e025266b6e20656e2175d9923b
-  data.tar.gz: 4a76564a1c8350b01c7e12e9697ccac84c68a5cb
+  metadata.gz: b173f819cf1d473df8cb3e8bdbe2f7baa1c07d77
+  data.tar.gz: 31fec4b9ad307c3da159a8a32067f5448ceb259a
 SHA512:
-  metadata.gz: 698da1551e3038c7bf4796fc9f74733cdd909e9bf44cd4eb741361ca6426aa543f2b90b7302216a2f34234b2ac75bf79df91d881e462553376a1b9148c7b2e86
-  data.tar.gz: d367656e31ff77254bc8182a72a1422b7a1401f673cffb1881f5b8254e43e4ecef8d84146c47e381cffe47384a4c39c884ee63152fb158a723997f87d59b9d10
+  metadata.gz: 7fa9ac42aa1f5e817e4136637030c231b902d723a1bb168fd42993391c50283d3ca63d8fdc8dd252a56d87e33a6edf106c655e43a60d6c45fc87f8a7e129d1b2
+  data.tar.gz: e7ca04377b71a343146b21324f94c7ca50b02eb54727fb99d95cbbc2d814d2d263ee2e3ec880f6ef00d28942a62d445365155ca1fe5469a637ccb6e559c158f6

data/lib/parliament/utils/config/initializers/mime_types.rb

@@ -2,7 +2,6 @@
 
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
-
 Parliament::Utils::Helpers::ApplicationHelper::API_MIME_TYPE_CONFIG.each do |mime_type|
   primary = mime_type.shift
   alternatives = mime_type

data/lib/parliament/utils/config/initializers.rb

@@ -12,5 +12,5 @@ require 'parliament/utils/config/initializers/filter_parameter_logging'
 require 'parliament/utils/config/initializers/inflections'
 require 'parliament/utils/config/initializers/mime_types'
 require 'parliament/utils/config/initializers/session_store'
-require 'parliament/utils/config/initializers/timeout'
+require 'parliament/utils/config/initializers/timeout' if defined?(Rack::Timeout)
 require 'parliament/utils/config/initializers/wrap_parameters'

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

@@ -0,0 +1,25 @@
+require_relative '../services/markdown_converter'
+require_relative '../services/markdown_scrubber'
+require 'redcarpet'
+
+module Parliament
+  module Utils
+    module Helpers
+      module MarkdownHelper
+        # Uses redcarpet gem to convert markdown into HTML, with chosen HTML extensions
+        # Uses custom Parliament::Utils::Services::ParliamentMarkdownRenderer to override default autolink behaviour of redcarpet gem
+        # Uses custom Parliament::Utils::Services::ParliamentMarkdownScrubber to allow additional HTML tags and attributes
+        #
+        # @return template [String] Template as HTML
+        def self.markdown(template)
+          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))
+          ActionController::Base.helpers.sanitize(html, scrubber: parliament_scrubber).html_safe
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 require 'i18n'
-require 'parliament/utils/helpers/translation_helper' unless defined?(::Rails)
+require 'parliament/utils/helpers/translation_helper'
 
 # attr [String] previous_path the path to redirect back to in the case of an error.
 module Parliament
@@ -7,7 +7,7 @@ module Parliament
     module Helpers
       module PostcodeHelper
 
-        include Parliament::Utils::Helpers::TranslationHelper unless defined?(::Rails)
+        include Parliament::Utils::Helpers::TranslationHelper
 
         attr_accessor :previous_path
 

data/lib/parliament/utils/helpers.rb

@@ -1,18 +1,18 @@
 require_relative './helpers/application_helper'
+require_relative './helpers/filter_helper'
 require_relative './helpers/flag_helper'
 require_relative './helpers/houses_helper'
+require_relative './helpers/markdown_helper' if defined?(Rails)
 require_relative './helpers/parliament_helper'
 require_relative './helpers/postcode_helper'
 require_relative './helpers/request_helper'
 require_relative './helpers/v_card_helper'
-require_relative './helpers/filter_helper'
 
 require 'parliament/grom/decorator'
 
 module Parliament
   module Utils
     module Helpers
-
     end
   end
 end

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

@@ -0,0 +1,52 @@
+require 'uri'
+require 'redcarpet'
+
+module Parliament
+  module Utils
+    module Services
+      class ParliamentMarkdownRenderer < Redcarpet::Render::HTML
+        # Overrides default autolink behaviour of redcarpet gem for instances such as video embeds
+        #
+        # @param link [String] The link
+        # @param link_type [Symbol] The link type
+        # @return template [String] Original link text or HTML string replacement
+        #
+        def autolink(link, link_type)
+          if link_type == :url
+            return parliament_live_video_embed(link) if link.match(/parliamentlive.tv\/event\/index\/[a-z0-9-]{36}/i)
+          end
+
+          link # call super instead if we actually want autolinking
+        end
+
+        private
+
+        # Takes a parliamentlive.tv embed or video link and returns HTML for video embed
+        #
+        # @private
+        #
+        # @param link [String] The URL for a parliamentlive.tv embed or video
+        # @return template [String] The parliamentlive.tv video embed code
+        #
+        def parliament_live_video_embed(link)
+          uri = URI.parse(link)
+
+          # Generate video URL
+          video_url = 'https://videoplayback.parliamentlive.tv/Player/Index'.tap do |url|
+            # Add video ID
+            url << "/#{uri.path.split('/').last}?"
+            # Add original query if present, and not an empty string
+            url << "#{uri.query}&" if uri.query&.size
+            # Add player options
+            url << 'audioOnly=False&amp;autoStart=False&amp;statsEnabled=False'
+          end
+
+          # 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>)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Parliament
+  module Utils
+    module Services
+      class ParliamentMarkdownScrubber < Rails::Html::PermitScrubber
+        # 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?
+        end
+      end
+    end
+  end
+end

data/lib/parliament/utils/services.rb

@@ -0,0 +1,9 @@
+require_relative './services/markdown_converter'
+require_relative './services/markdown_scrubber'
+
+module Parliament
+  module Utils
+    module Services
+    end
+  end
+end

data/lib/parliament/utils/test_helpers.rb

@@ -1,4 +1,4 @@
-require_relative './test_helpers/rails_helper' if defined?(::Rails)
+require_relative './test_helpers/rails_helper' if defined?(Rails)
 require_relative './test_helpers/rspec_helper'
 require_relative './test_helpers/simplecov_helper'
 require_relative './test_helpers/vcr_helper'
@@ -8,7 +8,7 @@ require_relative './test_helpers/bandiera_helper'
 module Parliament
   module Utils
     module TestHelpers
-      include Parliament::Utils::TestHelpers::RailsHelper if defined?(::Rails)
+      include Parliament::Utils::TestHelpers::RailsHelper if defined?(Rails)
       include Parliament::Utils::TestHelpers::RSpecHelper
       include Parliament::Utils::TestHelpers::SimpleCovHelper
       include Parliament::Utils::TestHelpers::VCRHelper

data/lib/parliament/utils/version.rb

@@ -1,5 +1,5 @@
 module Parliament
   module Utils
-    VERSION = '0.7.3'.freeze
+    VERSION = '0.8.0'.freeze
   end
 end

data/lib/parliament/utils.rb

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

data/parliament-utils.gemspec

@@ -31,12 +31,15 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'bandiera-client'
   spec.add_dependency 'pugin'
   spec.add_dependency 'haml'
+  spec.add_dependency 'redcarpet', '~> 3.0'
 
   spec.add_development_dependency 'parliament-ruby', '~> 0.10'
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rails', '~> 5.1'
+  spec.add_development_dependency 'rspec-rails', '~> 3.6'
   spec.add_development_dependency 'vcr', '~> 3.0'
   spec.add_development_dependency 'simplecov', '~> 0.12'
+  spec.add_development_dependency 'sqlite3', '~> 1.3'
   spec.add_development_dependency 'webmock', '~> 2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parliament-utils
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Rebecca Appleyard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parliament-ruby
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: parliament-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -193,19 +207,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +262,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -293,12 +335,16 @@ files:
 - lib/parliament/utils/helpers/filter_helper.rb
 - lib/parliament/utils/helpers/flag_helper.rb
 - lib/parliament/utils/helpers/houses_helper.rb
+- lib/parliament/utils/helpers/markdown_helper.rb
 - lib/parliament/utils/helpers/parliament_helper.rb
 - lib/parliament/utils/helpers/postcode_helper.rb
 - lib/parliament/utils/helpers/request_helper.rb
 - lib/parliament/utils/helpers/translation_helper.rb
 - lib/parliament/utils/helpers/v_card_helper.rb
 - lib/parliament/utils/railtie.rb
+- lib/parliament/utils/services.rb
+- lib/parliament/utils/services/markdown_converter.rb
+- lib/parliament/utils/services/markdown_scrubber.rb
 - lib/parliament/utils/test_helpers.rb
 - lib/parliament/utils/test_helpers/bandiera_helper.rb
 - lib/parliament/utils/test_helpers/rails_helper.rb