jekyll-ical-tag 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdb49ea6fd0b6d006435344649a8a7d30f19155f7e1424683d8774b59e9bdcf2
-  data.tar.gz: e323590a17d904763e2169446a2152b24eeb90629fd4f88bba0adbac1bde523c
+  metadata.gz: a3390276b35fd0dd3b56ad571b8f780d2a34392d9bc2bf96e8598bc60a6ee2b8
+  data.tar.gz: 419bf7845e4bf1eafee30201c2a601676511b1938b5e4f277af6197eef7c7c80
 SHA512:
-  metadata.gz: 6b3abd193f1de3eea850f2218ad8f42b7186e889b9915335a5da89418d59913898e09dc84e9f1d5fcf858eff2e9f49d4e0b960494fa2d930e3e2cfe75ff941a6
-  data.tar.gz: 93db87869c4f8d9b8c0e019a0e6c9bdd201d30a6b1edae8a0f1b1c3a68beeaa3fe1940435fbefb78cb521b2364b9955492657fb0f3f93278253e60232bb2c833
+  metadata.gz: e63cf230c1b23a6e75b2c4aeb7806bb0d4f6627cbf8b3bc72940f858f0f9f8328ca40227c4e0983664bb54989280a8043bd7c616456640d2dab0e7ff86d83cbb
+  data.tar.gz: bcab893dac34848a1da83809417ce24974f73ad629fe121016d8b18d3e76d94e3f72a7172e9ceead74bccda95dc68019596dca9a05de37be97c2c7d8fd4244df

data/lib/jekyll-ical-tag.rb

@@ -31,8 +31,7 @@ module Jekyll
       result = []
 
       context.stack do
-        url = get_url_from_assigned_value(context) ||
-              get_url_from_page_attributes(context) ||
+        url = get_dereferenced_url(context) ||
               @url
 
         raise "No URL provided or in innapropriate form '#{url}'" unless is_valid_url?(url)
@@ -79,6 +78,8 @@ module Jekyll
                 value.force_encoding("UTF-8")
               when Date, Icalendar::Values::DateTime
                 value.to_time
+              when Icalendar::Values::Uri
+                value.to_s
               else
                 value
               end
@@ -115,19 +116,10 @@ module Jekyll
       !!(url =~ URI::regexp)
     end
 
-    def get_url_from_page_attributes(context)
-      # Dereference url from something like "page.calender_url" to the page's calendar_url
-      dig_attrs = @url.split(".")
-      dig_attrs[0] = dig_attrs[0].to_sym if dig_attrs[0].present?
+    def get_dereferenced_url(context)
+      return unless context.key?(@url)
 
-      context.registers.dig(*dig_attrs) # will return result or nil (if not found)
-    end
-
-    def get_url_from_assigned_value(context)
-      return unless scope = context.scopes.find { |scope| scope[@url] }
-
-      # Dereference the URL if we were passed a variable name.
-      scope[@url]
+      context[@url]
     end
 
     def scan_attributes!

data/lib/jekyll-ical-tag/event.rb

@@ -35,7 +35,7 @@ module Jekyll
         @simple_html_description ||= begin
             description&.clone.tap do |d|
               description_urls.each do |url|
-                d.gsub! url, %(<a href='#{url}'>#{url}</a>)
+                d.force_encoding("UTF-8").gsub! url, %(<a href='#{url}'>#{url}</a>)
               end
             end
           end
@@ -46,7 +46,7 @@ module Jekyll
       end
 
       def description_urls
-        @description_urls ||= description.to_s.scan(URL_REGEX).to_a
+        @description_urls ||= description.to_s.force_encoding("UTF-8").scan(URL_REGEX).to_a
       end
 
       private

data/lib/jekyll-ical-tag/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   class IcalTag < Liquid::Block
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-ical-tag
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ricky Chilcott
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll