From 4e4762e3a1c3f7b6cdc5de09528b79ab1ea3a5b5 Mon Sep 17 00:00:00 2001
From: Helmi Hidzir <35652467+helmihidzir@users.noreply.github.com>
Date: Thu, 21 Nov 2019 02:36:51 +0800
Subject: [PATCH] Add - to support dash character in JSitor liquid tag (#4830)
 [deploy]

* Add - to support dash character in JSitor liquid tag

* Edit spec/liquid_tags/jsitor_tag_spec.rb

* Add support for link with hyphen id in jsitor liquid tag
---
 app/liquid_tags/jsitor_tag.rb       |  4 ++--
 spec/liquid_tags/jsitor_tag_spec.rb | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/liquid_tags/jsitor_tag.rb b/app/liquid_tags/jsitor_tag.rb
index 4a0ae10a2..392663c1c 100644
--- a/app/liquid_tags/jsitor_tag.rb
+++ b/app/liquid_tags/jsitor_tag.rb
@@ -1,7 +1,7 @@
 class JsitorTag < LiquidTagBase
   PARTIAL = "liquids/jsitor".freeze
-  URL_REGEXP = /\A(https|http):\/\/jsitor\.com\/embed\/\w+[?a-zA-Z&]*\Z/.freeze
-  ID_REGEXP = /\A[\w&?]+\Z/.freeze
+  URL_REGEXP = /\A(https|http):\/\/jsitor\.com\/embed\/\w+[-?a-zA-Z&]*\Z/.freeze
+  ID_REGEXP = /\A[\w&?-]+\Z/.freeze
 
   def initialize(tag_name, link, token)
     super
diff --git a/spec/liquid_tags/jsitor_tag_spec.rb b/spec/liquid_tags/jsitor_tag_spec.rb
index 571f05f34..b9a23a413 100644
--- a/spec/liquid_tags/jsitor_tag_spec.rb
+++ b/spec/liquid_tags/jsitor_tag_spec.rb
@@ -53,6 +53,20 @@ RSpec.describe JsitorTag, type: :liquid_tag do
       end.not_to raise_error(StandardError)
     end
 
+    it "accepts jsitor link with hyphen id" do
+      link = "https://jsitor.com/embed/2o-syYxmi"
+      expect do
+        create_jsitor_liquid_tag(link)
+      end.not_to raise_error(StandardError)
+    end
+
+    it "accepts jsitor id with hyphen" do
+      link = "2o-syYxmi"
+      expect do
+        create_jsitor_liquid_tag(link)
+      end.not_to raise_error(StandardError)
+    end
+
     it "doesnt accepts jsitor link with a / at the end" do
       link = "https://jsitor.com/embed/1QgJVmCam/"
       expect do