kielce 2.0.0 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38341d1480aea6176a4d3d289f543a82c6846464268057cce43704b0c04fe811
-  data.tar.gz: 711eca88ec683a63c017c326ff9169e5c14f8456cc91a499cac68ce77071b79c
+  metadata.gz: 96a898ef151c47cbb2c8e00cfacd36f8cca6df75cc885afe42c5933aa151ad34
+  data.tar.gz: fdbaf02fc59ebc75166ed85934263239ecbf172cb078b5eff8c7ce5a5f6f22f2
 SHA512:
-  metadata.gz: 9359354d455c3e81e46d57f5a59da179137d60c016544cf57887677f67f5da578ccccf2e720a1c007703ddeaab093cd8c1403f417c947775220386722c9311ea
-  data.tar.gz: b62f1d98c6309e32e4b97f26337c4538b8ed6e4b750bd399fc61d925768ce0e4f1b451f3542c40d9d3c92f69afc9807e972d7a177a2611137d2b5bfdd31757d6
+  metadata.gz: 865f0d9d6fecd8be05748c45dd043c79306d2edf43ff8bfa336a162fde9d3bb8c43ee650be3662580a30bc8648c669c5df2829697786947e30d9c5ee8b15e39c
+  data.tar.gz: 98967e3125f061543661fc30277854f9bb3764cf618544c04da18a9770134e09ba28db31cc9c976ece6db24f78573af3904d8db3d0a4f66e1aabaea2205f41ce

data/lib/kielce/kielce.rb

@@ -38,7 +38,7 @@ module Kielce
     #
     # This could be a class method.  We make it
     # an instance method so it can be used using the "$k.link" syntax.
-    def link(url, text_param = nil, code: nil, classes: nil)
+    def link(url, text_param = nil, code: nil, classes: nil, target: nil)
       class_list = classes.nil? ? "" : " class='#{classes}'"
 
       # Make the text the same as the URL if no text given
@@ -47,7 +47,15 @@ module Kielce
       # use <code> if either (1) user requests it, or (2) no text_param given and no code param given
       text = "<code>#{text}</code>" if code || (text_param.nil? && code.nil?)
 
-      "<a href='#{url}'#{class_list}>#{text}</a>"
+      if target.nil?
+        target_str = ''
+      else
+        target = "_#{target.to_s}" if target.is_a?(Symbol)
+        # NOTE:  Space at the end of target_str is important
+        target_str = "target='#{target}' " unless target.nil?
+      end 
+    
+      "<a #{target_str}href='#{url}'#{class_list}>#{text}</a>"
     end
 
     # Load +file+ and run ERB.  The binding parameter determines

data/lib/kielce.rb

@@ -14,7 +14,12 @@ require "kielce/kielce"
 ##############################################################################################
 
 module Kielce
-  VERSION = "2.0.0"
+  VERSION = "2.0.4"
+
+  # Changelog
+  #
+  # 2.0.4:  Added a "target" option to "link", and made the timeline links open in a new tab.
+
 
   def self.run
 

data/lib/kielce_plugins/schedule/assignment.rb

@@ -51,8 +51,8 @@ module KielcePlugins
         end
 
         # build a link, if a link provided
-        (linked && !@link.nil?) ?  "<a href='#{@link}'>#{text}</a>" : text
-      end
-    end
-  end
-end
+        (linked && !@link.nil?) ?  "<a target='_blank' href='#{@link}'>#{text}</a>" : text
+      end # title
+    end # class Assignment
+  end # module Schedule
+end # module KielcePlugins

data/lib/kielce_plugins/schedule/schedule.rb

@@ -13,7 +13,7 @@ module KielcePlugins
 
       attr_accessor :assignments, :schedule_days
 
-      def initialize(filename)
+      def initialize(filename)       
         workbook = RubyXL::Parser.parse(filename)
         @assignments = build_assignments(build_rows(workbook['Assignments'], Assignment::ASSIGNMENT_KEYS))
         @schedule_days = build_schedule_days(build_rows(workbook['Schedule'], SCHEDULE_KEYS))
@@ -24,10 +24,10 @@ module KielcePlugins
           # Replace link markup
           value.gsub!(/\[\[([^\s]+)(\s+(\S.*)|\s*)\]\]/) do
             text = $3.nil? ? "<code>#{$1}</code>" : $3
-            "<a href='#{$1}'>#{text}</a>"
+            "<a target='_blank' href='#{$1}'>#{text}</a>"
           end
 
-          value.gsub!(/<<(assign|due)\s+(\S.+)>>/) do
+          value.gsub!(/<<(assign|due|ref)\s+(\S.+?)>>/) do
             #$stderr.puts "Found assignment ref #{$1} --- #{$2} -- #{@assignments[$2].inspect}"
             $stderr.puts "Assignment #{$2} not found" unless @assignments.has_key?($2)
 
@@ -36,6 +36,8 @@ module KielcePlugins
               "Assign #{text}"
             elsif $1 == 'due'
               "<b>Due</b> #{text}"
+            elsif $1 == 'ref'
+              text
             else
               $stderr.puts "Unexpected match #{$1}"
             end
@@ -50,13 +52,13 @@ module KielcePlugins
                 param = $2
              
                 method = 'default' if method.empty?  
-                #$stderr.puts "Found link rule  =>#{method}<= #{method.empty?} =>#{param}<="
+                # $stderr.puts "Found link rule  =>#{method}<= #{method.empty?} =>#{param}<="
 
                 link = $d.course.notesTemplates.method_missing(method, param)                
               else
                 link = link_rule
               end                            
-              "(<a href='#{link}'>#{text}</a>)"
+              "(<a target='_blank' href='#{link}'>#{text}</a>)"
           end # end gsub
 
         end # end if value is string

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: kielce
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.4
 platform: ruby
 authors:
 - Zachary Kurmas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies: []
 description: 'An ERB-based templating engine for generating course documents. '
-email: 
+email:
 executables:
 - kielce
 extensions: []
@@ -31,7 +31,7 @@ homepage: https://github.com/kurmasz/KielceRB
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -46,8 +46,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: An ERB-based templating engine for generating course documents.
 test_files: []