jekyll-ical-tag 1.3.3 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7d1dce12392f01bb0a4d092684ffcec0dd51dd099a5c4d84634c2a4f5873785
-  data.tar.gz: 3bea7aac7663335f7df8928a10cff12bdc45a0ed0d59dc98530e18f35ca302ce
+  metadata.gz: bd9aae8578b4e747ceb38bae139ef9a7b900a9ab15c4b7ddd8b86c2bc4e1d63d
+  data.tar.gz: b9b8f3f424cd86baee95a8ecff82ec7e5a9423f2118e4a70d949d8689f8a10c9
 SHA512:
-  metadata.gz: 422e9632764d6c14a00aabab84592fde181f66782870de1d9eeaee7bdfa2c7531cf262c00ec16d25c13951490a8a937edfc746cd55387870169aebb3687cc58c
-  data.tar.gz: 6cc3cb90d9c76cfb50768522dc6c0205fdeab97baf621fe9be7983185724cbd1c79773f5c5027fb5fe527995706b25b186d97327b08399fb45a5caa3ae26fd8f
+  metadata.gz: 34dc052e75be4eac928d6b4d0e6eaa4ab2bb80cae1d12770cad69079fbb37815c668df61584a1b735ccb71c6adae9b1d7220e6b45504aa81b6e476d51c414a7b
+  data.tar.gz: 6071a16177cdbcdb4e508d3e8974b25af01cc59f8f4511ea122734ca18b2d00d5aa83e695abcfe6912f79d52dd97f97ff350ec46936db078972c55aee16c4639

data/.tool-versions

@@ -0,0 +1 @@
+ruby system

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,93 +1,97 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.3)
+    activesupport (7.0.5.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
     api_cache (0.3.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    em-websocket (0.5.1)
+    concurrent-ruby (1.2.2)
+    diff-lcs (1.5.0)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
+      http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.12.2)
+    ffi (1.15.5)
     forwardable-extended (2.6.0)
-    http_parser.rb (0.6.0)
-    i18n (1.8.2)
+    google-protobuf (3.23.3)
+    http_parser.rb (0.8.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    icalendar (2.5.0)
+    icalendar (2.10.1)
       ice_cube (~> 0.16)
-    ice_cube (0.16.3)
-    jekyll (4.0.0)
+    ice_cube (0.16.4)
+    jekyll (4.3.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (>= 0.9.5, < 2)
-      jekyll-sass-converter (~> 2.0)
+      i18n (~> 1.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.1)
+      kramdown (~> 2.3, >= 2.3.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (~> 3.0)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 1.8)
-    jekyll-sass-converter (2.1.0)
-      sassc (> 2.0.1, < 3.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.3.1)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.2.1)
+    liquid (4.0.4)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.3.6)
-    mini_portile2 (2.5.0)
-    minitest (5.14.1)
-    nokogiri (1.11.0)
-      mini_portile2 (~> 2.5.0)
+    mercenary (0.4.0)
+    mini_portile2 (2.8.2)
+    minitest (5.18.1)
+    nokogiri (1.15.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.3)
-    racc (1.5.2)
-    rb-fsevent (0.10.3)
+    public_suffix (5.0.1)
+    racc (1.7.1)
+    rake (13.0.6)
+    rb-fsevent (0.11.2)
     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)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rexml (3.2.5)
+    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.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
     safe_yaml (1.0.5)
-    sassc (2.2.1)
-      ffi (~> 1.9)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.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)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.4.2)
+    webrick (1.8.1)
 
 PLATFORMS
   ruby
@@ -95,7 +99,7 @@ PLATFORMS
 DEPENDENCIES
   activesupport
   api_cache
-  icalendar
+  icalendar (~> 2.10.1)
   jekyll
   nokogiri
   rspec

data/jekyll-ical-tag.gemspec

@@ -33,7 +33,7 @@ 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 "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

@@ -80,7 +80,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.3.3"
+    VERSION = "1.5"
   end
 end

data/lib/jekyll-ical-tag.rb

@@ -22,10 +22,7 @@ module Jekyll
       scan_attributes!
       set_limit!
       set_reverse!
-      set_url!
       set_only!
-      set_before_date!
-      set_after_date!
     end
 
     def render(context)
@@ -34,11 +31,13 @@ module Jekyll
       result = []
 
       context.stack do
-        url = get_dereferenced_url(context) || @url
+        url = dereferenced_liquid_val(context, "url")
+        before_date = before_date_from(context)
+        after_date = after_date_from(context)
 
         calendar_feed_coordinator = CalendarFeedCoordinator.new(
           url: url, only: @only, reverse: @reverse,
-          before_date: @before_date, after_date: @after_date,
+          before_date: before_date, after_date: after_date,
           limit: @limit
         )
         events = calendar_feed_coordinator.events
@@ -91,10 +90,35 @@ module Jekyll
 
     private
 
-    def get_dereferenced_url(context)
-      return unless context.key?(@url)
+    def after_date_from(context)
+      safely_cast_to_time(
+        dereferenced_liquid_val(context, "after_date")
+      )
+    end
+
+    def before_date_from(context)
+      safely_cast_to_time(
+        dereferenced_liquid_val(context, "before_date")
+      )
+    end
+
+    def safely_cast_to_time(val)
+      case val
+      when String
+        Time.parse(val)
+      when Date, DateTime, Time
+        val
+      when NilClass
+        # Do nothing
+      else
+        raise "Cannot cast to Time: #{val}"
+      end
+    end
 
-      context[@url]
+    def dereferenced_liquid_val(context, variable_name)
+      raw_value = @attributes[variable_name]
+
+      context.key?(raw_value) ? context[raw_value] : raw_value
     end
 
     def scan_attributes!
@@ -112,10 +136,6 @@ module Jekyll
       @reverse = @attributes["reverse"] == "true"
     end
 
-    def set_url!
-      @url = @attributes["url"]
-    end
-
     def set_only!
       only_future = @attributes["only_future"] == "true"
       only_past = @attributes["only_past"] == "true"
@@ -131,24 +151,6 @@ module Jekyll
           :all
         end
     end
-
-    def set_before_date!
-      @before_date =
-        begin
-          Time.parse(@attributes["before_date"])
-        rescue
-          nil
-        end
-    end
-
-    def set_after_date!
-      @after_date =
-        begin
-          Time.parse(@attributes["after_date"])
-        rescue
-          nil
-        end
-    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-ical-tag
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: '1.5'
 platform: ruby
 authors:
 - Ricky Chilcott
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-03 00:00:00.000000000 Z
+date: 2024-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -56,16 +56,16 @@ dependencies:
   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
@@ -103,6 +103,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".tool-versions"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -136,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+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