liveblog 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf7de5e564c79d0a6c6d2ebb7052d60f238f6aaa
-  data.tar.gz: e6884d8cac4029545abd337429337a67b91d30a5
+  metadata.gz: d574eca2cd80707277fb9f226580027004d61060
+  data.tar.gz: 8689a3244cd648c04a4a803dfc0dd356f1ba9b77
 SHA512:
-  metadata.gz: 6ff85502925f72f7232b09cb49dd2c5a6ef404a3324f3224c1117d1ed63756516d689ac380dd992493ec4d4e21cde906aba78fbcce9ad4b310cccdd11c07ba01
-  data.tar.gz: 68c001e1114f7c4f0862f21e8cc6313610e220a36f612aad9fdc6bb85ed311306b6f392267898a68178c7bcfa1be8b6f824b9bdbadb43bc670b5345a5e37dff7
+  metadata.gz: c7f87bcf5b845e0a0a43c87ac70c92f42184436e7788f3c208c708b6481d1ea1c2325be511a5ff867fb4957be659fdf0aea5abf67a4f85c22ba2b86b52260335
+  data.tar.gz: 42baed27cfab64c6be46b1364c5ea02d062683295bd94e562749950aef5ca4c0721d952f5df18c32e8140c7e6d3f96484e2d322001ff0dc55b4b8f296df72956

checksums.yaml.gz.sig

@@ -1,4 +1,2 @@
-�Q���������Cw�
-��O`��6�B�[�
-�qG7�]��A�3K�ts����M;��C�������q+ً�T㮝+��ո�pNb{���A����%�Q��1���6�mi���������o3e�J|�\c��|�O��J��?[Bf��{g�!֞����x���4�Z��0?%OYw��Do�,��C(��(�cr��M^���#�ڞR�����	@L,���4c1��Ѝ�)����M�q"v
-*�mߵ�+�
+8mwf�kBo�֣��\�qȻ���T��ۅ��*|�$0��覀��q�:Cܘ��D����������ɛ��)s�w?��e"h���On�d��ҥO�������e.���2ޠ��3n�,���41NX������
+����\0%��Xw����c��/�}���a7ݢ

data/lib/liveblog.css

@@ -82,6 +82,19 @@ body {
           color: #C332AF;
         }
 
+#gotoday {
+    color: #431;
+    font-size: 1.5em;
+    position: absolute;
+    right: 20px;
+    top: 137px;
+ text-decoration: none;
+}
+
+  #gotoday:hover {
+      color: #ee3;
+  }
+  
 .arrow, .deadarrow {
   background-color: #444;
   background-color: transparent;

data/lib/liveblog.rb

@@ -30,10 +30,12 @@ class LiveBlog
     
     h = SimpleConfig.new(config).to_h
 
-    @dir, @urlbase, @edit_url, @css_url, @xsl_path, \
-            @xsl_url, @bannertext, @title, @rss_title, @rss_lang, plugins = \
-     (%i(dir urlbase edit_url css_url xsl_path xsl_url bannertext)\
-                          + %i(title rss_title rss_lang plugins)).map{|x| h[x]}
+    @dir, @urlbase, @edit_url, @css_url, @xsl_path, @xsl_today_path, \
+            @xsl_url, @bannertext, @title, @rss_title, @rss_lang, \
+            @hyperlink_today, plugins = \
+     (%i(dir urlbase edit_url css_url xsl_path xsl_today_path xsl_url) \
+              + %i( bannertext title rss_title rss_lang hyperlink_today ) \
+              + %i(plugins)).map{|x| h[x]}
 
     @title ||= 'LiveBlog'
     @rss_lang ||= 'en-gb'
@@ -290,7 +292,9 @@ EOF
       edit_url: 'http://www.yourwebsitehere.org/do/liveblog/edit',
       css_url: '/liveblog/liveblog.css',
       xsl_path: File.join(dir, 'liveblog.xsl'),
+      xsl_today_path: File.join(dir, 'liveblog_today.xsl'),
       xsl_url: '/liveblog/liveblog.xsl',
+      hyperlink_today: 'http://yourwebsite.org/go_to_today',
       bannertext: '',
       title: "John Smith's LiveBlog",
       rss_title: "John Smith's LiveBlog",
@@ -337,6 +341,7 @@ EOF
     add summary, 'next_day', @d == Date.today ? '' : static_urlpath(@d+1)
     add summary, 'bannertext',   @bannertext
     add summary, 'link',  static_urlpath(@d)
+    add summary, 'hyperlink_today',  @hyperlink_today
   
     tags = Rexle::Element.new('tags')
     
@@ -422,8 +427,8 @@ EOF
     end
 
     @plugins.each {|x| x.on_doc_update(doc) if x.respond_to? :on_doc_update }
-    
-    render_html doc
+
+    render_html doc, xsl: @xsl_today_path
     File.write formatted_filepath, doc.xml(pretty: true)
     
   end
@@ -436,11 +441,11 @@ EOF
   def add(summary, name, s)
     summary.add Rexle::Element.new(name).add_text s
   end
+  
+  def render_html(doc, d=@d, xsl: @xsl_path)
 
-  def render_html(doc, d=@d)
-
-    xslt_buffer = if @xsl_path then
-      buffer, _ = RXFHelper.read @xsl_path
+    xslt_buffer = if xsl then
+      buffer, _ = RXFHelper.read xsl
       buffer
     else
       lib = File.exists?('liveblog.xsl') ? '.' : File.dirname(__FILE__)
@@ -545,4 +550,4 @@ EOF
       nil
     end
   end 
-end
+end

data/lib/liveblog.xsl

@@ -22,6 +22,7 @@ xml version="1.0" encoding="utf-8"?>
         </li>
       </ul>
     </nav>
+    <a href='{summary/hyperlink_today}'  id='gotoday'>today &#8594;</a>
   </header>
   
   <xsl:if test='summary/bannertext'>

data/lib/today.xsl

@@ -0,0 +1,97 @@
+xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="html" encoding="utf-8" indent="yes" />
+
+  <xsl:template match="*">
+<xsl:text disable-output-escaping='yes'>&lt;!DOCTYPE html></xsl:text>
+<html>
+  <head>
+    <title><xsl:value-of select='summary/title'/></title>
+    <link rel='stylesheet' type='text/css' href='{summary/css_url}' media='screen, projection, tv, print'/>
+  </head>
+  <body>
+  <div id="wrap">
+  <header>
+    <nav>
+      <ul>
+        <li>
+          <a href="/">home</a>
+        </li>
+        <li>
+          <a href="/liveblog">liveblog</a>
+        </li>
+      </ul>
+    </nav>
+  </header>
+  
+  <xsl:if test='summary/bannertext'>
+    <p><xsl:value-of select='summary/bannertext'/></p>
+  </xsl:if>
+  
+  <div id='summary'>
+  <ul>
+  <xsl:for-each select="records/section">
+    <!--<xsl:sort select='../@id' order='descending'/>-->
+     <li><a href='#{@id}'><xsl:value-of select='details/summary/h1'/></a></li>
+  </xsl:for-each>  
+  </ul>
+  </div>
+  <aside>
+  <ul>
+    <li>
+      <xsl:value-of select='summary/date'/>      
+    </li>
+    <li>
+      <xsl:value-of select='summary/day'/>
+    </li>    
+    <li>
+      <a href='{summary/prev_day}' class='arrow'>&#8592;</a>
+      <xsl:element name="a">
+        <xsl:choose>
+        <xsl:when test="summary/next_day != ''">
+          <xsl:attribute name="class">arrow</xsl:attribute>
+         </xsl:when>
+         <xsl:otherwise>
+           <xsl:attribute name="class">deadarrow</xsl:attribute>
+         </xsl:otherwise>
+         </xsl:choose>
+        <xsl:attribute name="href"><xsl:value-of select="summary/next_day"/></xsl:attribute>
+         &#8594;
+      </xsl:element>
+    </li>    
+    <li>
+      <a href="{summary/edit_url}" rel="nofollow">edit</a>
+    </li>      
+    </ul>
+  </aside>  
+  <article>  
+  <div style='clear:both'/>
+  <xsl:for-each select="records/section">
+     <!--<xsl:sort select='@id' order='descending'/>-->
+     <xsl:copy-of select='.'/>
+
+  </xsl:for-each>
+
+      <footer>
+        <dl id="info">
+          <dt>Tags:</dt>
+          <dd>
+          <ul>
+          <xsl:for-each select="summary/tags/*">
+            <li><xsl:value-of select="."/></li>
+          </xsl:for-each>
+          </ul>
+          </dd>
+          <dt>Source:</dt>
+          <dd><a href="index.txt">index.txt</a></dd>
+          <dt>XML:</dt>
+          <dd><a href="formatted.xml">formatted.xml</a></dd>          
+          <dt>Published:</dt><dd><xsl:value-of select="summary/published"/></dd>
+        </dl>
+      </footer>  
+  </article>
+  </div>
+  </body>
+</html>
+  </xsl:template>
+</xsl:stylesheet>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liveblog
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   5s8qc8N6iJi3jGcarS1hVkhlWGshAZx1T0n/Q27m1S0GoVUebJYFJxqaZqL5FO/v
   NonZ4ByUi+SaTg==
   -----END CERTIFICATE-----
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dxsectionx
@@ -122,6 +122,7 @@ files:
 - lib/liveblog.css
 - lib/liveblog.rb
 - lib/liveblog.xsl
+- lib/today.xsl
 homepage: https://github.com/jrobertson/liveblog
 licenses:
 - MIT
@@ -142,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Uses the Dynarex gem to create a daily live blog. Convenient for grouping