jekyll-ical-tag 1.2.5 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91c6e8bb4e6260b727de3f135494c7abe007d6136cb62d959ba142e885727964
-  data.tar.gz: 4f21845ffef36b8004af8d408d65fc4da36f342826032a397564662806388d3f
+  metadata.gz: 21b56f384e8ebf764e98c667f0c5d1def0bf4a15242d69d9faf7c7aa4c0aa91d
+  data.tar.gz: c7f6c97e3befba9801001ecf3f323323e140f20b4d7035eca117a518970b3e37
 SHA512:
-  metadata.gz: 7616ae73da4c128dd77b3538d593f2961f260f06928164ca5b1ffa2c05999f1573203a38cdc065762452466a3e4c70cdcff405fc589d98959495e45d37be79b7
-  data.tar.gz: e2322a1d26c1f695e4e2b7031ff35be8804074f8d0b224f7c35ef81ee4e4c9559982cd7ba373f917fce8dcfe911444841a06916a53676c73aff2f238f3b7e35f
+  metadata.gz: 4b526819666063d9643194de143026532777dd3e40883aee04a0e49a17413fa8e14bef518b7bd01e74241ce498d12a09d75c1f45401ebd7c0a3da9ea9456b2a9
+  data.tar.gz: 9ae1b75c37b044f2352fa2c20bf26de4a085675abe0f9acd83674d57fb47e783bd2230ab8769b8403fd6067db79866bdca6b409972620e3c043543b5773bc88d

data/.gitignore

@@ -1,3 +1,5 @@
 .DS_Store
 .bundle
-*.gem
+*.gem
+
+spec/examples.txt

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/lib/jekyll-ical-tag.rb

@@ -36,7 +36,11 @@ module Jekyll
       context.stack do
         url = get_dereferenced_url(context) || @url
 
-        calendar_feed_coordinator = CalendarFeedCoordinator.new(url: url)
+        calendar_feed_coordinator = CalendarFeedCoordinator.new(
+          url: url, only: @only, reverse: @reverse,
+          before_date: @before_date, after_date: @after_date,
+          limit: @limit
+        )
         events = calendar_feed_coordinator.events
         event_count = events.length
 

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

@@ -1,9 +1,6 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-require "cgi"
-require "api_cache"
-
 module Jekyll
   class IcalTag
     class CalendarFeedCoordinator

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

@@ -1,7 +1,6 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-require "api_cache"
 require "active_support"
 require "icalendar"
 

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

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require "uri"
+require "active_support"
 
 module Jekyll
   class IcalTag
@@ -27,32 +28,60 @@ module Jekyll
         (?::\d{2,5})?           # Optional port number
         (?:\/[^\s"]*)?          # Anything that is not a space or a double quote
         /x
-      extend Forwardable
 
-      def initialize(event)
-        @event = event
+      def initialize(ical_event)
+        @ical_event = ical_event
+        setup_all_properties!
+        setup_property_accessor_methods!
       end
 
-      def_delegators :event, :dtstart, :dtend
+      attr_reader :all_properties
 
-      def all_properties
-        @props ||= begin
+      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
-          event.class.properties.each do |property|
-            props[property] = event.property(property)
+          ical_event.class.properties.each do |property|
+            props[property] = ical_event.property(property)
           end
 
           # custom properties
-          props = props.merge(event.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
@@ -70,30 +99,13 @@ module Jekyll
         end
       end
 
-      def simple_html_description
-        @simple_html_description ||= begin
-            description&.clone.tap do |description|
-              description = description.join("\n") if description.is_a?(Icalendar::Values::Array)
-
-              description_urls.each do |url|
-                description.force_encoding("UTF-8").gsub! url, %(<a href='#{url}'>#{url}</a>)
-              end
-            end
+      def setup_property_accessor_methods!
+        all_properties.each do |prop, value|
+          define_singleton_method prop do
+            all_properties[prop]
           end
+        end
       end
-
-      def attendees
-        attendee.map(&:to_s).map { |a| a.slice!("mailto:"); a }
-      end
-
-      def description_urls
-        @description_urls ||= description.to_s.force_encoding("UTF-8").scan(URL_REGEX).to_a
-      end
-
-      private
-
-      def_delegators :event, :description, :attendee
-      attr_reader :event
     end
   end
 end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-ical-tag
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: '1.3'
 platform: ruby
 authors:
 - Ricky Chilcott
@@ -102,10 +102,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - README.md
-- _plugins/ical_tag.rb
 - bin/build-and-publish-gem
 - bin/rspec
 - jekyll-ical-tag.gemspec

data/_plugins/ical_tag.rb

@@ -1,187 +0,0 @@
-require "api_cache"
-require "active_support"
-require "icalendar"
-
-class CalendarParser
-  def initialize(url)
-    @url = URI.unescape(url)
-  end
-
-  def events
-    @events ||= Icalendar::Event.parse(ics_feed).sort { |e1, e2| e1.dtstart <=> e2.dtstart }
-  end
-
-  private
-
-  def ics_feed
-    @ics_feed ||= APICache.get(@url)
-  end
-end
-
-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].to_i)
-    else
-      parser.events
-    end
-  end
-
-  private
-
-  attr_reader :parser, :options
-end
-
-module Jekyll
-  class CalendarTag < Liquid::Block
-    include Convertible
-
-    def initialize(tag_name, markup, parse_context)
-      super
-
-      @markup = markup
-
-      scan_attributes!
-      set_reverse!
-      set_url!
-      set_only!
-      set_before_date!
-      set_after_date!
-    end
-
-    def render(context)
-      context.registers[:ical] ||= Hash.new(0)
-
-      result = []
-
-      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)
-
-      events = parser.events
-      length = events.length
-
-      context.stack do
-        events.each_with_index do |event, index|
-          attendees = event.attendee.map(&:to_s).map { |a| a.slice!("mailto:"); a }
-
-          context["event"] = {
-            "index" => index,
-            "uid" => event.uid,
-            "summary" => event.summary,
-            "description" => event.description,
-            "location" => event.location,
-            "url" => event.url&.to_s,
-            "start_time" => event.dtstart&.to_time,
-            "end_time" => event.dtend&.to_time,
-            "attendees" => attendees,
-          }
-
-          context["forloop"] = {
-            "name" => "calendar",
-            "length" => length,
-            "index" => index + 1,
-            "index0" => index,
-            "rindex" => length - index,
-            "rindex0" => length - index - 1,
-            "first" => (index == 0),
-            "last" => (index == length - 1),
-          }
-
-          result << nodelist.map do |n|
-            if n.respond_to? :render
-              n.render(context)
-            else
-              n
-            end
-          end.join
-        end
-      end
-
-      result
-    end
-
-    private
-
-    def scan_attributes!
-      @attributes = {}
-      @markup.scan(Liquid::TagAttributes) do |key, value|
-        @attributes[key] = value
-      end
-    end
-
-    def set_reverse!
-      @reverse = @attributes["order"] == "reverse"
-    end
-
-    def set_url!
-      @url = @attributes["url"]
-      raise "No URL provided" unless @url
-    end
-
-    def set_only!
-      only_future = @attributes["only_future"] == "true"
-      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
-          :future
-        when only_past
-          :past
-        else
-          :all
-        end
-    end
-
-    def set_before_date!
-      @before_date = begin
-          if @attributes["before_date"]
-            Time.parse(@attributes["before_date"])
-          end
-        rescue => e
-          nil
-        end
-    end
-
-    def set_after_date!
-      @after_date = begin
-          if @attributes["after_date"]
-            Time.parse(@attributes["after_date"])
-          end
-        rescue => e
-          nil
-        end
-    end
-  end
-end
-
-Liquid::Template.register_tag("ical", Jekyll::CalendarTag)