liveblog 0.7.5 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d96398f0aa49154552843c326d16ce6efa8c913a
-  data.tar.gz: 5827683e8b4ca1996822dbddd0f060b0f2773b3c
+  metadata.gz: 358e69b707fae031126bb00f028d7d82fe313859
+  data.tar.gz: 014819ed04a17097ef30ecd318a9a9e75b62f7be
 SHA512:
-  metadata.gz: 91f0358914a2986b6ba18a45b91d55102fdf89a8d0a9c0f07ef4b3a5e90949863f16814c7ceaffc5bd2b5c7c29359007f0658853f6528aea9a0855435399d932
-  data.tar.gz: 3f155f79a3d4d1301c5492ed4a82ac01a252bb807cc60907c6e5da0c36b9619e500575f301dd9de5969553b229c983c904fe26b94a9d52a2bd163a876502d8c6
+  metadata.gz: 71ff00459b818b4648070eb08ef86614cc9a02afbc6002a934673e54bfd8e2a3f975c184d20aab03dda0016f16e2d903fd1cc091f0677e8bbb143f6743880c0d
+  data.tar.gz: 178137083c31ef0fbf33ca8538aa52c3b73a067529cce11f9e8234526344eccd59ee83512c1b5416a94da91618c151e745126c08b7c248388a9bc1f9b2de96e2

data/lib/liveblog.css

@@ -34,6 +34,13 @@ body {
   header>nav>ul>li>a:focus {background-color: #161; color: #fff;}
   header>nav>ul>li>a:active {background-color: rgba(200,200,200,0.4); color: #5a5;}
 
+#wrap > p {
+  background-color: rgba(50,50,50,0.2); 
+  color: #fff;  
+  font-size: 1.2em;
+  padding: 2em 4em;
+}
+
 #summary {
   background-color: transparent;
   color: #AFC332;
@@ -150,12 +157,12 @@ section {
 
     section a:link {
       background-color: transparent;
-      color: #911;
+      color: #917;
     }
 
     section a:hover {
       background-color: transparent;
-      color: #C33267;
+      color: #815;
     }
 
     section a:active {
@@ -163,7 +170,22 @@ section {
       color: #C33267;
     }
 
+section a~span {
+  background-color: transparent;
+  color: #444;
+  font-size: 0.8em;
+  margin-left: 0;
+  padding: 0.2em;
+}
 
+time {
+  background-color: transparent;
+  background-color: rgba(150,170,150,0.15);
+  color: #348;
+  font-family: courier;
+  font-size: 0.9em;
+  padding: 0.1em 0.3em;
+}
 
 aside {
   background-color: #eee;

data/lib/liveblog.rb

@@ -15,7 +15,8 @@ class LiveBlog
 
     config ||= 'liveblog.conf' 
     h = SimpleConfig.new(config).to_h
-    dir, @urlbase, @edit_url, @css_url = %i(dir urlbase edit_url css_url).map{|x| h[x]}
+    dir, @urlbase, @edit_url, @css_url, @xsl_path, @xsl_url, @bannertext = \
+     %i(dir urlbase edit_url css_url xsl_path xsl_url bannertext).map{|x| h[x]}
 
     
     Dir.chdir dir    
@@ -50,7 +51,7 @@ class LiveBlog
       
     when /#\w+$/ then 
       
-      entry.gsub!(/\B!t\b/, time())
+      entry.gsub!(/(?:^|\s)!t\b/, time())
       add_section_entry entry, hashtag      
       
     else 
@@ -63,7 +64,7 @@ class LiveBlog
     
     # we reserve 30 characters for the link
     len = (140 - 30 - hashtag.length)
-    raw_entry.gsub!(/\B!t\b/,'')
+    raw_entry.gsub!(/(?:^|\s)!t\b/,'')
     entry = raw_entry.length > len ? "%s... %s" % [raw_entry.slice(0, len), hashtag] : raw_entry
     message = "%s %s%s" % [entry, static_urlpath(), hashtag]
     
@@ -114,7 +115,7 @@ EOF
     
     s.gsub!(/\B!ts\b/, "*started #{time(t)}*")
     s.gsub!(/\B!tc\b/, "*completed #{time(t)}*")
-    s.gsub!(/\B!t\b/,  time(t))
+    s.gsub!(/(?:^|\s)!t\b/,  time(t))
 
 
     FileUtils.mkdir_p File.join(path())
@@ -157,7 +158,7 @@ EOF
     path(d).join('/') + '/'
   end
   
-  def static_urlpath(d=@d)
+  def static_urlpath(d=@d)      
     @urlbase.sub(/[^\/]$/,'\0/') + urlpath(d)
   end
   
@@ -179,10 +180,12 @@ EOF
 
     add summary, 'edit_url', "%s/%s" % [@edit_url, urlpath()]
     add summary, 'date',      @d.strftime("%d-%b-%Y").upcase
+    add summary, 'day',   Date::DAYNAMES[@d.cwday]
     add summary, 'css_url',   @css_url
     add summary, 'published', Time.now.strftime("%d-%m-%Y %H:%M")
     add summary, 'prev_day',  static_urlpath(@d-1)
     add summary, 'next_day', @d == Date.today ? '' : static_urlpath(@d+1)
+    add summary, 'bannertext',   @bannertext    
   
     tags = Rexle::Element.new('tags')
     
@@ -192,11 +195,13 @@ EOF
     end
     
     summary.add tags
+    
+    domain = @urlbase[/https?:\/\/([^\/]+)/,1].split('.')[-2..-1].join('.')
 
     doc.root.xpath('records/section/x') do |x|
 
       s = "=%s\n%s\n=" % [x.text.lines.first[/#\w+$/], x.text.unescape]
-      html = Martile.new(s).to_html
+      html = Martile.new(s, ignore_domainlabel: domain).to_html
 
       e = x.parent
       x.delete
@@ -213,7 +218,12 @@ EOF
       doc2.root.add details
       e.add doc2.root
     end
-
+    
+    doc.instructions << [
+      'xml-stylesheet',
+      "title='XSL_formatting' type='text/xsl' href='#{@xsl_url}'"
+    ]
+    
     File.write newfilepath, doc.xml(pretty: true)
     
     render_html doc
@@ -236,9 +246,14 @@ EOF
   end
 
   def render_html(doc, d=@d)
-    
-    lib = File.exists?('liveblog.xsl') ? '.' : File.dirname(__FILE__)
-    xslt_buffer = File.read(File.join(lib,'liveblog.xsl'))
+
+    xslt_buffer = if @xsl_path then
+      buffer, _ = RXFHelper.read @xsl_path
+      buffer
+    else
+      lib = File.exists?('liveblog.xsl') ? '.' : File.dirname(__FILE__)
+      File.read(File.join(lib,'liveblog.xsl'))
+    end
 
     xslt  = Nokogiri::XSLT(xslt_buffer)
     out = xslt.transform(Nokogiri::XML(doc.xml))

data/lib/liveblog.xsl

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+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" />
 
@@ -10,7 +10,7 @@
     <link rel='stylesheet' type='text/css' href='{summary/css_url}' media='screen, projection, tv, print'/>
   </head>
   <body>
-  
+  <div id="wrap">
   <header>
     <nav>
       <ul>
@@ -24,6 +24,9 @@
     </nav>
   </header>
   
+  <xsl:if test='summary/bannertext'>
+    <p><xsl:value-of select='summary/bannertext'/></p>
+  </xsl:if>
   
   <div id='summary'>
   <ul>
@@ -35,7 +38,12 @@
   </div>
   <aside>
   <ul>
-    <li><xsl:value-of select='summary/date'/></li>
+    <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">
@@ -82,7 +90,7 @@
         </dl>
       </footer>  
   </article>
-  
+  </div>
   </body>
 </html>
   </xsl:template>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liveblog
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   WoOSxvsTN7qoA8F0W4mkDpf+HhHxBOLTPykcHMIlx2gILLnNraaZ1rJlZAqWABGj
   v8lGgeeqqjd5QA==
   -----END CERTIFICATE-----
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -93,6 +93,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: subunit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.4
 description: 
 email: james@r0bertson.co.uk
 executables: []