qiita-markdown 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff3cf2974ec3776febf776a8509ea134b7e6b94d
-  data.tar.gz: 16d059b677b0cf622be0d3c85e4ad9e293ffcdef
+  metadata.gz: 16c43409c5b2bdceefb568344cf9280e7d1e50b2
+  data.tar.gz: f4225f554071f1e8c8c339248f08b3ef5253be46
 SHA512:
-  metadata.gz: ab3e0be1351d8872fc3cc8d75502a3f8bd95f24a9870af84c164676b52e84f0ee34a72f7321db28c3889d133d167ec14c1ef32d0de9da3a918b0f4cdc4c43496
-  data.tar.gz: b91800c0d2282cc001d7fa9df45f1688f721c47d82ab5a01b62e656a10f2ccb7d8a18901076261bbc0ef88945ba87f042fd9cc54001b2638def2ebbfa83fe47e
+  metadata.gz: 5a9edc2d4826bfefd294ad32cf556fbb6985ac94d4e91a435a9513f6aec51c1a58bc435eebd45350e275ad1e5314c188c0e56bd3d56bc6130d9fcbe18f72ba6e
+  data.tar.gz: 2da9ab1ee70db812a391875522e53606991f177d1f66b7da80192b9db1bbda9cc83d101cb6b01fd292c6dc405b35ccac4cc01a694d7f872b9e7ae5b01bc19155

data/.rubocop_todo.yml

@@ -52,12 +52,13 @@ Style/FileName:
 # Cop supports --auto-correct.
 Style/MutableConstant:
   Exclude:
+    - 'lib/qiita/markdown/embed/code_pen.rb'
+    - 'lib/qiita/markdown/embed/tweet.rb'
     - 'lib/qiita/markdown/filters/checkbox.rb'
     - 'lib/qiita/markdown/filters/code_block.rb'
     - 'lib/qiita/markdown/filters/sanitize.rb'
     - 'lib/qiita/markdown/filters/simplify.rb'
     - 'lib/qiita/markdown/filters/syntax_highlight.rb'
-    - 'lib/qiita/markdown/code_pen.rb'
     - 'lib/qiita/markdown/processor.rb'
     - 'lib/qiita/markdown/summary_processor.rb'
     - 'lib/qiita/markdown/version.rb'

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Unreleased
 
+## 0.23.0
+
+- Support embed Tweet
+
 ## 0.22.0
 
 - Support embed CodePen

data/lib/qiita/markdown.rb

@@ -7,7 +7,8 @@ require "nokogiri"
 require "pygments"
 require "sanitize"
 
-require "qiita/markdown/code_pen"
+require "qiita/markdown/embed/code_pen"
+require "qiita/markdown/embed/tweet"
 require "qiita/markdown/transformers/filter_attributes"
 require "qiita/markdown/transformers/filter_script"
 require "qiita/markdown/transformers/strip_invalid_node"

data/lib/qiita/markdown/embed/code_pen.rb

@@ -0,0 +1,10 @@
+module Qiita
+  module Markdown
+    module Embed
+      module CodePen
+        SCRIPT_URL = "https://production-assets.codepen.io/assets/embed/ei.js"
+        ATTRIBUTES = %w[class data-embed-version data-slug-hash]
+      end
+    end
+  end
+end

data/lib/qiita/markdown/embed/tweet.rb

@@ -0,0 +1,10 @@
+module Qiita
+  module Markdown
+    module Embed
+      module Tweet
+        SCRIPT_URL = "https://platform.twitter.com/widgets.js"
+        CLASS_NAME = %w[twitter-tweet]
+      end
+    end
+  end
+end

data/lib/qiita/markdown/filters/final_sanitizer.rb

@@ -41,7 +41,7 @@ module Qiita
               "itemscope",
               "itemtype",
             ],
-            "p" => CodePen::ATTRIBUTES,
+            "p" => Embed::CodePen::ATTRIBUTES,
             "script" => [
               "async",
               "src",
@@ -191,7 +191,7 @@ module Qiita
         SCRIPTABLE_RULE = RULE.dup.tap do |rule|
           rule[:attributes] = RULE[:attributes].dup
           rule[:attributes][:all] = rule[:attributes][:all] + [:data]
-          rule[:elements] = RULE[:elements] + ["iframe", "script", "video"]
+          rule[:elements] = RULE[:elements] + ["iframe", "video"]
           rule[:transformers] = rule[:transformers] - [Transformers::FilterScript]
         end
 

data/lib/qiita/markdown/filters/user_input_sanitizer.rb

@@ -24,7 +24,7 @@ module Qiita
             "img"        => %w[alt height src title width],
             "ins"        => %w[cite datetime],
             "li"         => %w[id],
-            "p"          => CodePen::ATTRIBUTES,
+            "p"          => Embed::CodePen::ATTRIBUTES,
             "q"          => %w[cite],
             "script"     => %w[async src],
             "sup"        => %w[id],

data/lib/qiita/markdown/transformers/filter_attributes.rb

@@ -9,7 +9,7 @@ module Qiita
             "rev" => %w[footnote],
           },
           "blockquote" => {
-            "class" => %w[twitter-tweet],
+            "class" => Embed::Tweet::CLASS_NAME,
           },
           "div" => {
             "class" => %w[footnotes],

data/lib/qiita/markdown/transformers/filter_script.rb

@@ -3,7 +3,8 @@ module Qiita
     module Transformers
       class FilterScript
         WHITE_LIST = [
-          CodePen::SCRIPT_URL,
+          Embed::CodePen::SCRIPT_URL,
+          Embed::Tweet::SCRIPT_URL,
         ].freeze
 
         def self.call(*args)

data/lib/qiita/markdown/version.rb

@@ -1,5 +1,5 @@
 module Qiita
   module Markdown
-    VERSION = "0.22.0"
+    VERSION = "0.23.0"
   end
 end

data/spec/qiita/markdown/processor_spec.rb

@@ -1312,7 +1312,7 @@ describe Qiita::Markdown::Processor do
       end
     end
 
-    shared_examples_for "override codepen attributes" do |allowed:|
+    shared_examples_for "override embed code attributes" do |allowed:|
       context "with HTML embed code for CodePen" do
         let(:markdown) do
           <<-EOS.strip_heredoc
@@ -1337,6 +1337,31 @@ describe Qiita::Markdown::Processor do
           end
         end
       end
+
+      context "with embed code for Tweet" do
+        let(:markdown) do
+          <<-EOS.strip_heredoc
+            <blockquote class="twitter-tweet" data-cards="hidden" data-conversation="none">foo</blockquote>
+            <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
+          EOS
+        end
+
+        if allowed
+          it "does not sanitize embed code" do
+            should eq <<-EOS.strip_heredoc
+              <blockquote class="twitter-tweet" data-cards="hidden" data-conversation="none">foo</blockquote>\n
+              <script async src="https://platform.twitter.com/widgets.js"></script>
+            EOS
+          end
+        else
+          it "sanitizes attributes except `twitter-tweet` class" do
+            should eq <<-EOS.strip_heredoc
+              <blockquote class="twitter-tweet">foo</blockquote>\n
+              <script async src="https://platform.twitter.com/widgets.js"></script>
+            EOS
+          end
+        end
+      end
     end
 
     context "without script and strict context" do
@@ -1352,7 +1377,7 @@ describe Qiita::Markdown::Processor do
       include_examples "data-attributes", allowed: false
       include_examples "class attribute", allowed: true
       include_examples "background-color", allowed: true
-      include_examples "override codepen attributes", allowed: false
+      include_examples "override embed code attributes", allowed: false
     end
 
     context "with script context" do
@@ -1368,7 +1393,7 @@ describe Qiita::Markdown::Processor do
       include_examples "data-attributes", allowed: true
       include_examples "class attribute", allowed: true
       include_examples "background-color", allowed: true
-      include_examples "override codepen attributes", allowed: true
+      include_examples "override embed code attributes", allowed: true
     end
 
     context "with strict context" do
@@ -1384,7 +1409,7 @@ describe Qiita::Markdown::Processor do
       include_examples "data-attributes", allowed: false
       include_examples "class attribute", allowed: false
       include_examples "background-color", allowed: false
-      include_examples "override codepen attributes", allowed: false
+      include_examples "override embed code attributes", allowed: false
     end
 
     context "with script and strict context" do
@@ -1400,7 +1425,7 @@ describe Qiita::Markdown::Processor do
       include_examples "data-attributes", allowed: false
       include_examples "class attribute", allowed: false
       include_examples "background-color", allowed: false
-      include_examples "override codepen attributes", allowed: false
+      include_examples "override embed code attributes", allowed: false
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiita-markdown
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-21 00:00:00.000000000 Z
+date: 2017-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemoji
@@ -256,7 +256,8 @@ files:
 - lib/qiita-markdown.rb
 - lib/qiita/markdown.rb
 - lib/qiita/markdown/base_processor.rb
-- lib/qiita/markdown/code_pen.rb
+- lib/qiita/markdown/embed/code_pen.rb
+- lib/qiita/markdown/embed/tweet.rb
 - lib/qiita/markdown/filters/checkbox.rb
 - lib/qiita/markdown/filters/code_block.rb
 - lib/qiita/markdown/filters/emoji.rb

data/lib/qiita/markdown/code_pen.rb

@@ -1,8 +0,0 @@
-module Qiita
-  module Markdown
-    module CodePen
-      SCRIPT_URL = "https://production-assets.codepen.io/assets/embed/ei.js"
-      ATTRIBUTES = %w[class data-embed-version data-slug-hash]
-    end
-  end
-end