editor_js 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e86cd6d867f3751fae7644a529b9a81940189acff184a7a9d57c835603c1a10c
-  data.tar.gz: e8650afadb86745553ae949f67b26766e866d4213f4f2da49a1fb3b8a27b6f8d
+  metadata.gz: 3331b44289e858fff9fe9dff634c67c385c355f54f26a671ca32caf0b2736c2a
+  data.tar.gz: 3a6690dad7bf834d108855d1bf80de681c285ccec755ca7f0e9b799dff7a3c76
 SHA512:
-  metadata.gz: 39595b63e56f1f8d68ef2ca9ab3b83daf5539c87a88a5456f278444739c0705b8bb2ce3290f284e0ed13f84271c47ee0b0a851e8004be3d36082395017b0fefd
-  data.tar.gz: 70d3d7bfb418837f95d1e8140197a68daf1a2225e7fa1076f164991d6698decfcf83d515ff3dc280e2304141674ede9cf9cf3f70affa995511a64d64cc8801d8
+  metadata.gz: ad9f9f867736e7bc0db5497d64f8253d4c381088c1e2b65dc6d6747c508809a901e609868fa354733b137d217ef49ab43f27ddc2d40d27d7fe8243b856d16da9
+  data.tar.gz: '09dd651215451db432c4c3ef27a772db470fd6dba5b4d216b592fef2373b5dfec6b12c5efdda3b69be94c20f82b2f76c719eb2f732db80a33b2c96650848e113'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    editor_js (0.2.2)
+    editor_js (0.3.1)
       actionview (>= 4)
       activesupport (>= 4)
       coderay (~> 1.1, >= 1.1.2)
@@ -13,18 +13,18 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (6.0.2.1)
-      activesupport (= 6.0.2.1)
+    actionview (6.0.3.1)
+      activesupport (= 6.0.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.0.2.1)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.0)
@@ -42,13 +42,13 @@ GEM
     json (2.3.0)
     json-schema (2.8.1)
       addressable (>= 2.4)
-    loofah (2.4.0)
+    loofah (2.5.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
-    minitest (5.13.0)
-    nokogiri (1.10.7)
+    minitest (5.14.1)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.2)
       nokogiri (~> 1.8, >= 1.8.4)
@@ -58,14 +58,14 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (4.0.1)
+    public_suffix (4.0.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (13.0.1)
     redcarpet (3.5.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -98,7 +98,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.0)
     zeitwerk (2.2.2)
@@ -110,10 +110,10 @@ DEPENDENCIES
   bundler (~> 2.0)
   editor_js!
   pry (~> 0.12.2)
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 0.77.0)
   simplecov (~> 0.17.1)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/editor_js.gemspec

@@ -33,6 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'redcarpet', '~> 3.5'
   spec.add_dependency 'coderay', '~> 1.1', '>= 1.1.2'
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/editor_js.rb

@@ -24,6 +24,7 @@ require 'editor_js/blocks/paragraph_block'
 require 'editor_js/blocks/qiniu_image_block'
 require 'editor_js/blocks/quote_block'
 require 'editor_js/blocks/table_block'
+require 'editor_js/blocks/attaches_block'
 require 'editor_js/document'
 
 module EditorJs

data/lib/editor_js/blocks/attaches_block.rb

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+module EditorJs
+  module Blocks
+    class AttachesBlock < Base
+      include ActiveSupport::NumberHelper
+
+      def schema
+        YAML.safe_load(<<~YAML)
+          type: object
+          additionalProperties: false
+          properties:
+            file:
+              type: object
+              additionalProperties: false
+              properties:
+                url:
+                  type: string
+                name:
+                  type: string
+                type:
+                  type: string
+                size:
+                  type: number
+            title:
+              type: string
+          required:
+          - file
+        YAML
+      end
+
+      EXTENSIONS = {
+        'doc' => '#3e74da',
+        'docx' => '#3e74da',
+        'odt' => '#3e74da',
+        'pdf' => '#d47373',
+        'rtf' => '#656ecd',
+        'tex' => '#5a5a5b',
+        'txt' => '#5a5a5b',
+        'pptx' => '#e07066',
+        'ppt' => '#e07066',
+        'mp3' => '#eab456',
+        'mp4' => '#f676a6',
+        'xls' => '#3f9e64',
+        'html' => '#2988f0',
+        'htm' => '#2988f0',
+        'png' => '#f676a6',
+        'jpg' => '#f67676',
+        'jpeg' => '#f67676',
+        'gif' => '#f6af76',
+        'zip' => '#4f566f',
+        'rar' => '#4f566f',
+        'exe' => '#e26f6f',
+        'svg' => '#bf5252',
+        'key' => '#e07066',
+        'sketch' => '#df821c',
+        'ai' => '#df821c',
+        'psd' => '#388ae5',
+        'dmg' => '#e26f6f',
+        'json' => '#2988f0',
+        'csv' => '#3f9e64'
+      }
+
+      ICONS = {
+        file_icon: '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="40"><path d="M17 0l15 14V3v34a3 3 0 0 1-3 3H3a3 3 0 0 1-3-3V3a3 3 0 0 1 3-3h20-6zm0 2H3a1 1 0 0 0-1 1v34a1 1 0 0 0 1 1h26a1 1 0 0 0 1-1V14H17V2zm2 10h7.926L19 4.602V12z"></path></svg>',
+        custom_file_icon: '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="40"><g fill="#A8ACB8" fill-rule="evenodd"><path fill-rule="nonzero" d="M17 0l15 14V3v34a3 3 0 0 1-3 3H3a3 3 0 0 1-3-3V3a3 3 0 0 1 3-3h20-6zm0 2H3a1 1 0 0 0-1 1v34a1 1 0 0 0 1 1h26a1 1 0 0 0 1-1V14H17V2zm2 10h7.926L19 4.602V12z"></path><path d="M7 22h18v2H7zm0 4h18v2H7zm0 4h18v2H7z"></path></g></svg>',
+        download_icon: '<svg xmlns="http://www.w3.org/2000/svg" width="17pt" height="17pt" viewBox="0 0 17 17"><path d="M9.457 8.945V2.848A.959.959 0 0 0 8.5 1.89a.959.959 0 0 0-.957.957v6.097L4.488 5.891a.952.952 0 0 0-1.351 0 .952.952 0 0 0 0 1.351l4.687 4.688a.955.955 0 0 0 1.352 0l4.687-4.688a.952.952 0 0 0 0-1.351.952.952 0 0 0-1.351 0zM3.59 14.937h9.82a.953.953 0 0 0 .953-.957.952.952 0 0 0-.953-.953H3.59a.952.952 0 0 0-.953.953c0 .532.425.957.953.957zm0 0" fill-rule="evenodd"></path></svg>'
+      }
+
+      def render(_options = {})
+        file_info = data['file']
+        title = data['title']
+        extension = file_info['name']&.split('.')&.last
+        extension = '' unless EXTENSIONS.key?(extension)
+
+        content_tag :div, class: css_name do
+          html_str = content_tag :div, class: "#{css_name}__file-icon", data: {extension: extension}, style: "color: #{EXTENSIONS[extension]};" do
+            (EXTENSIONS[extension] ? ICONS[:file_icon] : ICONS[:custom_file_icon]).html_safe
+          end
+
+          html_str += content_tag :div, class: "#{css_name}__file-info" do
+            [
+              content_tag(:div, title, class: "#{css_name}__title"),
+              content_tag(:div, number_to_human_size(file_info['size']), class: "#{css_name}__size")
+            ].join().html_safe
+          end
+
+          html_str += content_tag :a, class: "#{css_name}__download-button", href: file_info['url'], target: '_blank', rel: 'nofollow noindex noreferrer' do
+            ICONS[:download_icon].html_safe
+          end
+          html_str.html_safe
+        end
+      end
+
+      def sanitize!
+        data['title'] = Sanitize.fragment(data['title'], remove_contents: true).strip
+        file_info = data['file'] || {}
+        file_info.each do |key, val|
+          break if key == 'size'
+
+          file_info[key] = Sanitize.fragment(val, remove_contents: true).strip
+        end
+        data['file'] = file_info
+      end
+
+      def plain
+        decode_html data['title'].strip
+      end
+    end
+  end
+end

data/lib/editor_js/blocks/checklist_block.rb

@@ -28,7 +28,7 @@ module EditorJs
           data['items'].map do |item|
             content_tag(:div, class: css_name('__warrper')) do
               html_str = content_tag(:input, nil, type: 'checkbox', disabled: true, checked: item['checked'])
-              html_str += content_tag(:label, item['text'])
+              html_str += content_tag(:label, item['text'].html_safe)
               html_str.html_safe
             end.html_safe
           end.join.html_safe
@@ -36,8 +36,21 @@ module EditorJs
       end
 
       def sanitize!
+        safe_tags = {
+          'b' => nil,
+          'i' => nil,
+          'a' => ['href'],
+          'mark' => ['class'],
+          'code' => ['class']
+        }
+
         data['items'].each do |item|
-          item['text'] = Sanitize.fragment(item['text'], remove_contents: true).strip
+          item['text'] = Sanitize.fragment(
+            item['text'],
+            elements: safe_tags.keys,
+            attributes: safe_tags.select {|k, v| v},
+            remove_contents: true
+          )
         end
       end
 

data/lib/editor_js/blocks/embed_block.rb

@@ -42,8 +42,12 @@ module EditorJs
       end
 
       def sanitize!
-        %w(caption embed height service source width).each do |key|
-          data[key] = Sanitize.fragment(data[key], remove_contents: true).strip
+        %w[caption embed height service source width].each do |key|
+          str = Sanitize.fragment(data[key], remove_contents: true).strip
+          if %w[embed service source].include?(key)
+            str.gsub!('&', '&')
+          end
+          data[key] = str
         end
       end
 

data/lib/editor_js/blocks/image_block.rb

@@ -44,7 +44,13 @@ module EditorJs
       end
 
       def sanitize!
-        data['caption'] = Sanitize.fragment(data['caption'], remove_contents: true)
+        %w[caption url].each do |key|
+          str = Sanitize.fragment(data[key], remove_contents: true).strip
+          if key == 'url'
+            str.gsub!('&', '&')
+          end
+          data[key] = str
+        end
       end
 
       def plain

data/lib/editor_js/blocks/quote_block.rb

@@ -34,7 +34,8 @@ module EditorJs
           'i' => nil,
           'a' => ['href'],
           'mark' => ['class'],
-          'code' => ['class']
+          'code' => ['class'],
+          'br' => nil
         }
 
         %w(text caption).each do |key|
@@ -42,7 +43,7 @@ module EditorJs
             data[key],
             elements: safe_tags.keys,
             attributes: safe_tags.select {|k, v| v},
-            remove_contents: true
+            remove_contents: false
           )
         end
         data['alignment'] = Sanitize.fragment(data['alignment'], remove_contents: true)

data/lib/editor_js/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EditorJs
-  VERSION = '0.2.2'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: editor_js
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - xiaohui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -140,14 +140,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +182,7 @@ files:
 - bin/setup
 - editor_js.gemspec
 - lib/editor_js.rb
+- lib/editor_js/blocks/attaches_block.rb
 - lib/editor_js/blocks/base.rb
 - lib/editor_js/blocks/checklist_block.rb
 - lib/editor_js/blocks/code_block.rb
@@ -219,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Ruby gem for editorjs.io text editor