jekyll-ical-tag 1.2.0 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3390276b35fd0dd3b56ad571b8f780d2a34392d9bc2bf96e8598bc60a6ee2b8
-  data.tar.gz: 419bf7845e4bf1eafee30201c2a601676511b1938b5e4f277af6197eef7c7c80
+  metadata.gz: 91c6e8bb4e6260b727de3f135494c7abe007d6136cb62d959ba142e885727964
+  data.tar.gz: 4f21845ffef36b8004af8d408d65fc4da36f342826032a397564662806388d3f
 SHA512:
-  metadata.gz: e63cf230c1b23a6e75b2c4aeb7806bb0d4f6627cbf8b3bc72940f858f0f9f8328ca40227c4e0983664bb54989280a8043bd7c616456640d2dab0e7ff86d83cbb
-  data.tar.gz: bcab893dac34848a1da83809417ce24974f73ad629fe121016d8b18d3e76d94e3f72a7172e9ceead74bccda95dc68019596dca9a05de37be97c2c7d8fd4244df
+  metadata.gz: 7616ae73da4c128dd77b3538d593f2961f260f06928164ca5b1ffa2c05999f1573203a38cdc065762452466a3e4c70cdcff405fc589d98959495e45d37be79b7
+  data.tar.gz: e2322a1d26c1f695e4e2b7031ff35be8804074f8d0b224f7c35ef81ee4e4c9559982cd7ba373f917fce8dcfe911444841a06916a53676c73aff2f238f3b7e35f

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/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

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

@@ -6,15 +6,18 @@ require "jekyll-ical-tag/version"
 
 module Jekyll
   class IcalTag < Liquid::Block
-    require_relative "jekyll-ical-tag/event"
-    require_relative "jekyll-ical-tag/calendar_parser"
+    require_relative "jekyll-ical-tag/calendar_feed_coordinator"
+    require_relative "jekyll-ical-tag/calendar_fetcher"
     require_relative "jekyll-ical-tag/calendar_limiter"
+    require_relative "jekyll-ical-tag/calendar_parser"
+    require_relative "jekyll-ical-tag/event"
 
     include Convertible
 
     def initialize(tag_name, markup, parse_context)
       super
       @markup = markup
+      @attributes = {}
 
       scan_attributes!
       set_limit!
@@ -31,22 +34,11 @@ module Jekyll
       result = []
 
       context.stack do
-        url = get_dereferenced_url(context) ||
-              @url
-
-        raise "No URL provided or in innapropriate form '#{url}'" unless is_valid_url?(url)
-
-        puts "Fetching #{url}"
+        url = get_dereferenced_url(context) || @url
 
-        parser = CalendarParser.new(url)
-        parser = CalendarLimiter.new(parser, only: @only)
-        parser = CalendarLimiter.new(parser, reverse: @reverse)
-        parser = CalendarLimiter.new(parser, before_date: @before_date)
-        parser = CalendarLimiter.new(parser, after_date: @after_date)
-        parser = CalendarLimiter.new(parser, limit: @limit)
-
-        events = parser.events
-        length = events.length
+        calendar_feed_coordinator = CalendarFeedCoordinator.new(url: url)
+        events = calendar_feed_coordinator.events
+        event_count = events.length
 
         events.each_with_index do |event, index|
           # Init
@@ -69,32 +61,15 @@ module Jekyll
           context["event"]["end_time"] = context["event"]["dtend"]
           context["event"]["start_time"] = context["event"]["dtstart"]
 
-          # Ensure all event values are utf8 encoded strings
-          # Ensure times (from dates)
-          # Ensure present
-          context["event"].transform_values! do |value|
-            v = case value
-              when String, Icalendar::Values::Text
-                value.force_encoding("UTF-8")
-              when Date, Icalendar::Values::DateTime
-                value.to_time
-              when Icalendar::Values::Uri
-                value.to_s
-              else
-                value
-              end
-            v.presence
-          end
-
           context["forloop"] = {
             "name" => "ical",
-            "length" => length,
+            "length" => event_count,
             "index" => index + 1,
             "index0" => index,
-            "rindex" => length - index,
-            "rindex0" => length - index - 1,
+            "rindex" => event_count - index,
+            "rindex0" => event_count - index - 1,
             "first" => (index == 0),
-            "last" => (index == length - 1),
+            "last" => (index == event_count - 1),
           }
 
           result << nodelist.map do |n|
@@ -112,10 +87,6 @@ module Jekyll
 
     private
 
-    def is_valid_url?(url)
-      !!(url =~ URI::regexp)
-    end
-
     def get_dereferenced_url(context)
       return unless context.key?(@url)
 
@@ -123,7 +94,6 @@ module Jekyll
     end
 
     def scan_attributes!
-      @attributes = {}
       @markup.scan(Liquid::TagAttributes) do |key, value|
         @attributes[key] = value
       end
@@ -147,10 +117,11 @@ module Jekyll
       only_past = @attributes["only_past"] == "true"
 
       raise "Set only_future OR only_past, not both" if only_future && only_past
-      @only = case
-        when only_future
+
+      @only =
+        if only_future
           :future
-        when only_past
+        elsif only_past
           :past
         else
           :all
@@ -158,21 +129,19 @@ module Jekyll
     end
 
     def set_before_date!
-      @before_date = begin
-          if @attributes["before_date"]
-            Time.parse(@attributes["before_date"])
-          end
-        rescue => e
+      @before_date =
+        begin
+          Time.parse(@attributes["before_date"])
+        rescue
           nil
         end
     end
 
     def set_after_date!
-      @after_date = begin
-          if @attributes["after_date"]
-            Time.parse(@attributes["after_date"])
-          end
-        rescue => e
+      @after_date =
+        begin
+          Time.parse(@attributes["after_date"])
+        rescue
           nil
         end
     end

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

@@ -0,0 +1,43 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+require "cgi"
+require "api_cache"
+
+module Jekyll
+  class IcalTag
+    class CalendarFeedCoordinator
+      def initialize(url:, only: nil, reverse: nil, before_date: nil, after_date: nil, limit: nil)
+        @url = url
+        @only = only
+        @reverse = reverse
+        @before_date = before_date
+        @after_date = after_date
+        @limit = limit
+      end
+
+      def events
+        parser.events
+      end
+
+      private
+
+      attr_reader :url, :only, :reverse, :before_date, :after_date, :limit
+
+      def raw_ical
+        @raw_ical ||= CalendarFetcher.new(url).fetch
+      end
+
+      def parser
+        @parser ||= begin
+          parser = CalendarParser.new(raw_ical)
+          parser = CalendarLimiter.new(parser, only: only)
+          parser = CalendarLimiter.new(parser, reverse: reverse)
+          parser = CalendarLimiter.new(parser, before_date: before_date)
+          parser = CalendarLimiter.new(parser, after_date: after_date)
+          CalendarLimiter.new(parser, limit: limit)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+require "cgi"
+require "api_cache"
+
+module Jekyll
+  class IcalTag
+    class CalendarFetcher
+      def initialize(url)
+        @url = CGI.unescape(url)
+
+        raise "No URL provided or in innapropriate form '#{url}'" unless is_valid_url?
+      end
+
+      def fetch
+        puts "Fetching #{url}"
+        @fetch ||= APICache.get(url)
+      end
+
+      private
+
+      attr_reader :url
+
+      def is_valid_url?
+        !!(url =~ URI::regexp)
+      end
+    end
+  end
+end

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

@@ -8,22 +8,19 @@ require "icalendar"
 module Jekyll
   class IcalTag
     class CalendarParser
-      def initialize(url)
-        @url = URI.unescape(url)
+      def initialize(raw_feed)
+        @raw_feed = raw_feed
       end
 
       def events
-        @events ||= begin
-          Icalendar::Event.parse(ics_feed)
-                          .sort { |e1, e2| e1.dtstart <=> e2.dtstart }
-                          .map { |e| Jekyll::IcalTag::Event.new(e) }
-        end
+        @events ||= parsed_feed.sort { |event1, event2| event1.dtstart <=> event2.dtstart }
+                               .map { |event| Jekyll::IcalTag::Event.new(event) }
       end
 
       private
 
-      def ics_feed
-        @ics_feed ||= APICache.get(@url)
+      def parsed_feed
+        Icalendar::Event.parse(@raw_feed)
       end
     end
   end

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)
@@ -17,25 +37,46 @@ module Jekyll
 
       def all_properties
         @props ||= begin
-            props = {}
+          props = {}
 
-            # RFC 5545 Properties
-            event.class.properties.each do |property|
-              props[property] = event.property(property)
-            end
+          # RFC 5545 Properties
+          event.class.properties.each do |property|
+            props[property] = event.property(property)
+          end
+
+          # custom properties
+          props = props.merge(event.custom_properties)
 
-            # custom properties
-            props = props.merge(event.custom_properties)
+          # Ensure all event values are utf8 encoded strings
+          # Ensure times (from dates)
+          # Ensure present
+          props.transform_values! do |value|
+            new_value =
+              case value
+              when String, Icalendar::Values::Text
+                value.force_encoding("UTF-8")
+              when Date, Icalendar::Values::DateTime
+                value.to_time
+              when Icalendar::Values::Uri
+                value.to_s
+              else
+                value
+              end
 
-            props
+            new_value.presence
           end
+
+          props
+        end
       end
 
       def simple_html_description
         @simple_html_description ||= begin
-            description&.clone.tap do |d|
+            description&.clone.tap do |description|
+              description = description.join("\n") if description.is_a?(Icalendar::Values::Array)
+
               description_urls.each do |url|
-                d.force_encoding("UTF-8").gsub! url, %(<a href='#{url}'>#{url}</a>)
+                description.force_encoding("UTF-8").gsub! url, %(<a href='#{url}'>#{url}</a>)
               end
             end
           end

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

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

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-ical-tag
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.5
 platform: ruby
 authors:
 - Ricky Chilcott
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-11-28 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: []
@@ -121,8 +107,11 @@ files:
 - README.md
 - _plugins/ical_tag.rb
 - bin/build-and-publish-gem
+- bin/rspec
 - jekyll-ical-tag.gemspec
 - lib/jekyll-ical-tag.rb
+- lib/jekyll-ical-tag/calendar_feed_coordinator.rb
+- lib/jekyll-ical-tag/calendar_fetcher.rb
 - lib/jekyll-ical-tag/calendar_limiter.rb
 - lib/jekyll-ical-tag/calendar_parser.rb
 - lib/jekyll-ical-tag/event.rb
@@ -132,7 +121,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -148,7 +137,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