jekyll-ical-tag 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 138258ebd3c243d7029b59499ed3efb4b26aacbeada1a965e5775f0df4d8ef19
-  data.tar.gz: c5085b894aa91497fdec2a0505138a5acacbe5e47e0934491fb9f79311371e36
+  metadata.gz: 0e12845744cce14e1ec5537ff8441fa364e001443c396a66dbc85a16f03bbfac
+  data.tar.gz: afbefb0515a7b9f5fc4c2b8f998488e3da03bfa8b03591b53944b41559848947
 SHA512:
-  metadata.gz: 0deebc23d524101ca2e1ec02c1351316228f1d94533fc5646c4886ad979be920add4ffcdd58831bd654b2ae09669c51fa6bc939ee7ccae200c3a0f61e3329343
-  data.tar.gz: a02c429cb649bfd8e9abb70499d711e2417d0c35eb24a477ade046c1f95083cda9f90e1afcdc9b95bb10028746e3b68759f98ed71f7c99bdb453f716ae3ac5aa
+  metadata.gz: 2cacc0f5a846afab872099b0681c784c831eef23e09606e2e9bb989feaf527539cbcca91fe087c906d253ef7481a1a24ccd422ea6f3e5554a67e634f729ca2ec
+  data.tar.gz: a30558531827aab593381b88b0e3b943c0405d2993c1abeb5605930566de7665be5f77854a1080305aa0b74f7e57403d99e7e11181478ee32a8a9d62e81f123e

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'jekyll', require: false
 
 gem 'api_cache'
-gem 'icalendar'
+gem 'icalendar', "~> 2.10.1"
 gem 'activesupport'
 
 group :development, :test do

data/Gemfile.lock

@@ -1,28 +1,38 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4.2)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     api_cache (0.3.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.6)
     colorator (1.1.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
     diff-lcs (1.5.0)
+    drb (2.2.0)
+      ruby2_keywords
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
     ffi (1.15.5)
     forwardable-extended (2.6.0)
-    google-protobuf (3.22.0)
+    google-protobuf (3.23.3)
     http_parser.rb (0.8.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    icalendar (2.8.0)
+    icalendar (2.10.1)
       ice_cube (~> 0.16)
     ice_cube (0.16.4)
     jekyll (4.3.2)
@@ -54,38 +64,40 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
-    mini_portile2 (2.8.1)
-    minitest (5.17.0)
-    nokogiri (1.14.2)
-      mini_portile2 (~> 2.8.0)
+    mini_portile2 (2.8.2)
+    minitest (5.22.2)
+    mutex_m (0.2.0)
+    nokogiri (1.15.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (5.0.1)
-    racc (1.6.2)
+    racc (1.7.1)
     rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
-    rouge (4.1.0)
+    rouge (4.1.2)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
+    ruby2_keywords (0.0.5)
     safe_yaml (1.0.5)
-    sass-embedded (1.58.3)
-      google-protobuf (~> 3.21)
-      rake (>= 10.0.0)
+    sass-embedded (1.63.6)
+      google-protobuf (~> 3.23)
+      rake (>= 13.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     tzinfo (2.0.6)
@@ -99,10 +111,10 @@ PLATFORMS
 DEPENDENCIES
   activesupport
   api_cache
-  icalendar
+  icalendar (~> 2.10.1)
   jekyll
   nokogiri
   rspec
 
 BUNDLED WITH
-   2.3.10
+   2.1.4

data/jekyll-ical-tag.gemspec

@@ -32,8 +32,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "jekyll", "> 3"
   spec.add_dependency "api_cache"
-  spec.add_dependency "activesupport"
-  spec.add_dependency "icalendar"
+  spec.add_dependency "activesupport", "~> 7.1"
+  spec.add_dependency "icalendar", "~> 2.10.1"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rspec", "~> 3.5"

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

@@ -3,6 +3,7 @@
 
 require "uri"
 require "active_support"
+require "active_support/core_ext/object/blank"
 
 module Jekyll
   class IcalTag
@@ -80,7 +81,7 @@ module Jekyll
           props.transform_values! do |value|
             new_value =
               case value
-              when Array, Icalendar::Values::Array
+              when Array, Icalendar::Values::Helpers::Array
                 value.join("\n").force_encoding("UTF-8")
               when String, Icalendar::Values::Text
                 value.force_encoding("UTF-8")

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-ical-tag
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ricky Chilcott
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-03 00:00:00.000000000 Z
+date: 2024-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -42,30 +42,30 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: icalendar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.10.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -107,22 +107,6 @@ files:
 - Gemfile
 - Gemfile.lock
 - README.md
-- _site/README.md
-- _site/bin/build-and-publish-gem
-- _site/bin/rspec
-- _site/jekyll-ical-tag.gemspec
-- _site/lib/jekyll-ical-tag.rb
-- _site/lib/jekyll-ical-tag/calendar_feed_coordinator.rb
-- _site/lib/jekyll-ical-tag/calendar_fetcher.rb
-- _site/lib/jekyll-ical-tag/calendar_limiter.rb
-- _site/lib/jekyll-ical-tag/calendar_parser.rb
-- _site/lib/jekyll-ical-tag/event.rb
-- _site/lib/jekyll-ical-tag/version.rb
-- _site/spec/calendar_feed_coordinator_spec.rb
-- _site/spec/spec_helper.rb
-- _site/spec/support/basic.ics
-- _site/spec/support/italian.ics
-- _site/spec/support/sesh.ics
 - bin/build-and-publish-gem
 - bin/rspec
 - jekyll-ical-tag.gemspec
@@ -153,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: A Jekyll plugin to pull ICS feed and provide a for-like loop of calendar

data/_site/README.md

@@ -1,64 +0,0 @@
-# Jekyll ical tag
-
-Author: Ricky Chilcott https://www.rakefire.io
-
-Description: Pull ICS feed and provide a for-like loop of calendar events
-
-## Installation
-
-To your Gemfile:
-
-`gem 'jekyll-ical-tag'`
-
-To your `_config.yml`
-
-```yml
-plugins:
-  - jekyll-ical-tag
-```
-
-## Syntax
-
-```html
-  {% ical url: https://space.floern.com/launch.ics reverse: true only_future: true %}
-    {{ event.summary }}
-    {{ event.description }}
-    {{ event.simple_html_description }}
-    {{ event.start_time }}
-    {{ event.end_time }}
-    {{ event.url }}
-    {{ event.attendees }}
-  {% endical %}
-```
-
-## Options
-
-- `reverse` - Defaults to 'false', ordering events by start_time (or reverse start_time).
-- `only_past` - Defaults to 'false', limits returned events to start_times before now.
-- `only_future` - Defaults to 'false', limits returned events to start_time after now.
-
-- `before_date` - limits returned events to dates before a specific date. This gets parsed with Ruby's Time.parse (e.g. 01-01-2018)
-- `after_date` - limits returned events to dates before a specific date. This gets parsed with Ruby's Time.parse (e.g. 01-01-2018).
-- `limit` - limits the number of returned events to the first N events matching the specified criteria. For example, `{% ical url: https://example.com/events.ics only_future:true limit:5 %}` returns the first five future events.
-
-## Event Attributes:
-
-All RFC 5545 properties are supported, examples:
-
-- `dtstart` - start time of event
-- `dtend` - end time of event
-- `summary` - Title or name of event
-- `description` - Notes/description of event
-- `location` - Location of event
-- `url` - url of event, if provided, if not, take the first url from the description.
-
-A few helper properties are also supported:
-
-- `attendees` - [Array] of attendees names/emails
-- `simple_html_description` - Notes/description of event with urls auto-linked
-- `start_time` - start time of event
-- `end_time` - end time of event
-
-# Special Thanks
-
-Special thanks to the following contributors: @marchehab98 @meitar

data/_site/bin/build-and-publish-gem

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-rm -f *.gem
-bundle exec gem build jekyll-ical-tag.gemspec
-bundle exec gem push jekyll-ical-tag-*.gem

data/_site/bin/rspec

@@ -1,29 +0,0 @@
-#!/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/_site/jekyll-ical-tag.gemspec

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-lib = File.expand_path("lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require "jekyll"
-require "jekyll-ical-tag/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "jekyll-ical-tag"
-  spec.version = Jekyll::IcalTag::VERSION
-  spec.authors = ["Ricky Chilcott"]
-  spec.email = ["ricky@rakefire.io"]
-  spec.summary = "A Jekyll plugin to pull ICS feed and provide a for-like loop of calendar events"
-  spec.homepage = "https://github.com/rakefire/jekyll-ical-tag"
-  spec.license = "MIT"
-
-  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
-  # delete this section to allow pushing this gem to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata["allowed_push_host"] = "https://rubygems.org"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  end
-
-  spec.required_ruby_version = ">= 2.3.0"
-
-  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r!^(test|spec|features)/!) }
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r!^exe/!) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "jekyll", "> 3"
-  spec.add_dependency "api_cache"
-  spec.add_dependency "activesupport"
-  spec.add_dependency "icalendar"
-
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rspec", "~> 3.5"
-end

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

@@ -1,40 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-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/_site/lib/jekyll-ical-tag/calendar_fetcher.rb

@@ -1,30 +0,0 @@
-# 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/_site/lib/jekyll-ical-tag/calendar_limiter.rb

@@ -1,46 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-module Jekyll
-  class IcalTag
-    class CalendarLimiter
-      def initialize(parser, options = {})
-        @parser = parser
-        @options = options
-      end
-
-      def events
-        case
-        when options[:only] == :future
-          now = Time.now
-          parser.events.select do |event|
-            event.dtstart.to_time >= now
-          end
-        when options[:only] == :past
-          now = Time.now
-          parser.events.select do |event|
-            event.dtstart.to_time < now
-          end
-        when options[:reverse]
-          parser.events.reverse
-        when options[:after_date]
-          parser.events.select do |event|
-            event.dtstart.to_time >= options[:after_date]
-          end
-        when options[:before_date]
-          parser.events.select do |event|
-            event.dtstart.to_time < options[:before_date]
-          end
-        when options[:limit]
-          parser.events.first(options[:limit])
-        else
-          parser.events
-        end
-      end
-
-      private
-
-      attr_reader :parser, :options
-    end
-  end
-end

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

@@ -1,26 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-require "active_support"
-require "icalendar"
-
-module Jekyll
-  class IcalTag
-    class CalendarParser
-      def initialize(raw_feed)
-        @raw_feed = raw_feed
-      end
-
-      def events
-        @events ||= parsed_feed.sort { |event1, event2| event1.dtstart <=> event2.dtstart }
-                               .map { |event| Jekyll::IcalTag::Event.new(event) }
-      end
-
-      private
-
-      def parsed_feed
-        Icalendar::Event.parse(@raw_feed)
-      end
-    end
-  end
-end

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

@@ -1,111 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-require "uri"
-require "active_support"
-
-module Jekyll
-  class IcalTag
-    class Event
-      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
-
-      def initialize(ical_event)
-        @ical_event = ical_event
-        setup_all_properties!
-        setup_property_accessor_methods!
-      end
-
-      attr_reader :all_properties
-
-      def simple_html_description
-        @simple_html_description ||= begin
-          description.clone.tap do |description|
-            description_urls.each do |url|
-              description.gsub! url, %(<a href='#{url}'>#{url}</a>)
-            end
-          end
-        end
-      end
-
-      def attendees
-        ical_event.attendee.map(&:to_s).map { |a| a.slice!("mailto:"); a }
-      end
-
-      def description_urls
-        return [] unless description
-
-        @description_urls ||= description.scan(URL_REGEX).to_a
-      end
-
-      private
-
-      attr_reader :ical_event
-
-      def setup_all_properties!
-        @all_properties ||= begin
-          props = {}
-
-          # RFC 5545 Properties
-          ical_event.class.properties.each do |property|
-            props[property] = ical_event.property(property)
-          end
-
-          # custom properties
-          props = props.merge(ical_event.custom_properties)
-
-          # Ensure all arrays get flattened to utf8 encoded strings
-          # Ensure all event values are utf8 encoded strings
-          # Ensure times (from dates)
-          # Ensure present
-          props.transform_values! do |value|
-            new_value =
-              case value
-              when Array, Icalendar::Values::Array
-                value.join("\n").force_encoding("UTF-8")
-              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
-
-            new_value.presence
-          end
-
-          props
-        end
-      end
-
-      def setup_property_accessor_methods!
-        all_properties.each do |prop, value|
-          define_singleton_method prop do
-            all_properties[prop]
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Jekyll
-  class IcalTag < Liquid::Block
-    VERSION = "1.3.3"
-  end
-end