jekyll-ical-tag 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d234777e1efb40a2d7a4d2c3ece936a21a9b22521f691db615cbefa693e94f9
-  data.tar.gz: 27ec683fdeb6598ccc15604e3426e101efc94d210dd030d075a1fb90bf907853
+  metadata.gz: f0aa8b610c5113e232c010134e97b4ba1af55e07f92bba29cd820f1c2daaa0e1
+  data.tar.gz: fe4a3829d1a32311f773ab8c3825de673dec80586f2e49a569a57748d5475ff4
 SHA512:
-  metadata.gz: 47e65509012af13fe385cbdba02675819d1ba82ff361e9be6aa23dd26f587f9b17a13b8e2d5f82c5b08bbf8e0cf0cc6a348a9039e6e3c3f199bebadee6bb3444
-  data.tar.gz: 8efcb4b61f6589721b242595b855992478985ec57b3915da68d5e9c09056991066039ed22485b8ac1b35f9469a2598aacc97e45e6929b723331064646ce4a1ed
+  metadata.gz: 5848157e8929d51d128d372dd1d037f997ec74240ccf437bfe593deb70ec41b9299ef9364555dd2a290d235f984d413c9621706d012b38ab720e5f6aae9aeba3
+  data.tar.gz: ee10e4e946fd367ee92ae463f44a8873d7d834b60b1eb8b27f939e3acb2296077440992db42967f84658d854ce7832da40d974745903a9da9bca8832fb8d4413

data/_plugins/ical_tag.rb

@@ -46,6 +46,8 @@ class CalendarLimiter
       parser.events.select do |event|
         event.dtstart.to_time < options[:before_date]
       end
+    when options[:limit]
+      parser.events.first(options[:limit].to_i)
     else
       parser.events
     end
@@ -150,8 +152,7 @@ module Jekyll
       only_past = @attributes["only_past"] == "true"
 
       raise "Set only_future OR only_past, not both" if only_future && only_past
-      @only =
-        case
+      @only = case
         when only_future
           :future
         when only_past
@@ -162,8 +163,7 @@ module Jekyll
     end
 
     def set_before_date!
-      @before_date =
-        begin
+      @before_date = begin
           if @attributes["before_date"]
             Time.parse(@attributes["before_date"])
           end
@@ -173,8 +173,7 @@ module Jekyll
     end
 
     def set_after_date!
-      @after_date =
-        begin
+      @after_date = begin
           if @attributes["after_date"]
             Time.parse(@attributes["after_date"])
           end

data/jekyll-ical-tag.gemspec

@@ -3,17 +3,17 @@
 lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require 'jekyll'
+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"
+  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.
@@ -25,12 +25,12 @@ Gem::Specification.new do |spec|
 
   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.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", "~> 4"
+  spec.add_dependency "jekyll", "~> 3"
   spec.add_dependency "api_cache"
   spec.add_dependency "activesupport"
   spec.add_dependency "icalendar"

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

@@ -31,6 +31,8 @@ module Jekyll
           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

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

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

data/lib/jekyll-ical-tag.rb

@@ -3,7 +3,6 @@
 
 require "jekyll"
 require "jekyll-ical-tag/version"
-require "pry"
 
 module Jekyll
   class IcalTag < Liquid::Block
@@ -31,16 +30,19 @@ module Jekyll
 
       result = []
 
+      set_url_from_assigned_value!(context)
+      set_url_from_page_attributes!(context)
+
+      raise "No URL provided or in innapropriate form '#{@url}'" unless has_valid_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
-      if @limit
-        events = events.first(@limit)
-      end
       length = events.length
 
       context.stack do
@@ -84,6 +86,30 @@ module Jekyll
 
     private
 
+    def has_valid_url?
+      !!(@url =~ URI::regexp)
+    end
+
+    def set_url_from_page_attributes!(context)
+      return if has_valid_url?
+
+      # 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?
+      if dug_result = context.registers.dig(*dig_attrs)
+        @url = dug_result
+      end
+    end
+
+    def set_url_from_assigned_value!(context)
+      return if has_valid_url?
+      return unless context.scopes.first[@url]
+
+      # Dereference the URL if we were passed a variable name.
+      @url = context.scopes.first[@url]
+    end
+
     def as_utf8(str)
       return unless str
 
@@ -98,11 +124,8 @@ module Jekyll
     end
 
     def set_limit!
-      if @attributes["limit"]
-        @limit = @attributes["limit"].to_i
-      else
-        @limit = nil
-      end
+      @limit = nil
+      @limit = @attributes["limit"].to_i if @attributes["limit"]
     end
 
     def set_reverse!
@@ -111,7 +134,6 @@ module Jekyll
 
     def set_url!
       @url = @attributes["url"]
-      raise "No URL provided" unless @url
     end
 
     def set_only!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-ical-tag
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Ricky Chilcott
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: api_cache
   requirement: !ruby/object:Gem::Requirement