jekyll-ical-tag 1.1.0 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdb49ea6fd0b6d006435344649a8a7d30f19155f7e1424683d8774b59e9bdcf2
-  data.tar.gz: e323590a17d904763e2169446a2152b24eeb90629fd4f88bba0adbac1bde523c
+  metadata.gz: 56b34cd54ee295b4125928f2d1c0ab010fc73073f013afcd485d3f94f2f7d1e7
+  data.tar.gz: 6c04c4593314888e2f9f4dfbf13f9b3bd980d0739d5661bbf41243d1d8834cc8
 SHA512:
-  metadata.gz: 6b3abd193f1de3eea850f2218ad8f42b7186e889b9915335a5da89418d59913898e09dc84e9f1d5fcf858eff2e9f49d4e0b960494fa2d930e3e2cfe75ff941a6
-  data.tar.gz: 93db87869c4f8d9b8c0e019a0e6c9bdd201d30a6b1edae8a0f1b1c3a68beeaa3fe1940435fbefb78cb521b2364b9955492657fb0f3f93278253e60232bb2c833
+  metadata.gz: 69a6fd90da57c3b2b2a26065f83d4197d82e8e8fcba655acaba83485e56dd26a23dfda4b5353491027146045f740649ce01897552e9a433292fe45f9b88aa0bc
+  data.tar.gz: dbdbb209e8fdfed7653383ffac23c45b00579a4384789c8e11d01110de3f62fe92dae6701eb8dd231e8ab4f4d48a1979f563474b22895b1b5388b8d148004b2f

data/Gemfile

@@ -7,7 +7,6 @@ gem 'icalendar'
 gem 'activesupport'
 
 group :development, :test do
-  gem 'pry'
   gem 'rspec'
   gem 'nokogiri'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (5.2.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -9,9 +9,8 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     api_cache (0.3.0)
-    coderay (1.1.2)
     colorator (1.1.0)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
@@ -20,7 +19,7 @@ GEM
     ffi (1.12.2)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
-    i18n (1.1.1)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     icalendar (2.5.0)
       ice_cube (~> 0.16)
@@ -44,7 +43,8 @@ GEM
       sassc (> 2.0.1, < 3.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.1.0)
+    kramdown (2.3.0)
+      rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
@@ -52,20 +52,17 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    method_source (0.9.0)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.14.1)
     nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
     public_suffix (4.0.3)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    rexml (3.2.4)
     rouge (3.17.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -86,7 +83,7 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
 
@@ -99,7 +96,6 @@ DEPENDENCIES
   icalendar
   jekyll
   nokogiri
-  pry
   rspec
 
 BUNDLED WITH

data/jekyll-ical-tag.gemspec

@@ -30,11 +30,10 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r!^exe/!) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "jekyll", "~> 3"
+  spec.add_dependency "jekyll", "> 3"
   spec.add_dependency "api_cache"
   spec.add_dependency "activesupport"
   spec.add_dependency "icalendar"
-  spec.add_dependency "pry"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rspec", "~> 3.5"

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

@@ -6,7 +6,27 @@ require "uri"
 module Jekyll
   class IcalTag
     class Event
-      URL_REGEX = /(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?/
+      URL_REGEX = /
+        (?:(?:https?|ftp):\/\/) # Allowable schemes
+        (?:\S+(?::\S*)?@)?      # username:password, which is optional
+        (?:                     # Domain part follows; non-capturing
+          # These IP addresses are valid domain values
+          (?!10(?:\.\d{1,3}){3})
+          (?!127(?:\.\d{1,3}){3})
+          (?!169\.254(?:\.\d{1,3}){2})
+          (?!192\.168(?:\.\d{1,3}){2})
+          (?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})
+          (?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])
+          (?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}
+          (?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))
+          |
+          (?:(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)
+          (?:\.(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)*
+          (?:\.(?:[a-z\u00a1-\uffff]{2,}))
+        )
+        (?::\d{2,5})?           # Optional port number
+        (?:\/[^\s"]*)?          # Anything that is not a space or a double quote
+        /x
       extend Forwardable
 
       def initialize(event)
@@ -35,7 +55,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 +66,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.4"
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-ical-tag
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.4
 platform: ruby
 authors:
 - Ricky Chilcott
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +94,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
-description: 
+description:
 email:
 - ricky@rakefire.io
 executables: []
@@ -132,7 +118,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -148,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A Jekyll plugin to pull ICS feed and provide a for-like loop of calendar
   events