liveblog 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47ed6ce1c583163577780604dc5b4a84c33e7e86
-  data.tar.gz: 2ce3b6d3f6e4526f4b9f7861ba05a1383148cd48
+  metadata.gz: c5e9005cd31c0e22ce0aecc425667a71c7c53913
+  data.tar.gz: b5e3467e36d490f34ec83245c6bfdb4d77b53a6b
 SHA512:
-  metadata.gz: 1a92ca1c18ab779e3b7ec9052631b811d5322ecbc3a1d08f8cebf725f0a5d9e82deabb36a068925822fe0a9e8f21e27132d0a05e998d60964cd01a555a5c1f1d
-  data.tar.gz: dd563e8754115d84fcb03c3c0033342b46b31125268390e9a96c55180e66fa48f31b09e21e7a0c69939dfafb3627efd8bd747d3d217a5eaefa5019a2db17f6e0
+  metadata.gz: 3faa4bbefbbe421e01e547161bda656ceff0ee64a01d84794e0c0b3e30b9b8f8f2b83754605e19ab69745ca63d15ccf5bed0cc532c5795cdb94079a2f4ef3cc0
+  data.tar.gz: 5f2aefc8a7e834fcf7750b7e18afd6bffa6eab60db74c5a55d4486fd02fe76518ae7f15683f2cc2e51afc3e3459800664974c181ab6fcbbe6075f43539352323

data/lib/liveblog.css

@@ -72,28 +72,33 @@ body { background-color: #c48f33;}
           color: #C332AF;
         }
 
-.arrow {
+.arrow, .deadarrow {
   background-color: #444;
   background-color: transparent;
   font-size: 3em;
 }
-.arrow:first-child {
-  background-color: transparent;
+  .arrow:first-child {
+    background-color: transparent;
 
-}
-.arrow:last-child {
-  background-color: transparent;
-  float: right;
-}
+  }
+  .arrow:last-child, .deadarrow:last-child {
+    background-color: transparent;
+    float: right;
+  }
 
-.arrow:link {
-  background-color: transparent;
-  color: rgba(100,200,100, 0.3);
-}
-.arrow:hover {
-  background-color: transparent;
-  color: rgba(255,255,255, 0.8)
-}
+  .arrow:link {
+    background-color: transparent;
+    color: rgba(100,200,100, 0.6);
+  }
+
+  .deadarrow:link {
+    background-color: transparent;
+    color: rgba(100,200,100, 0.2);
+  }
+  .arrow:hover {
+    background-color: transparent;
+    color: rgba(255,255,255, 0.8)
+  }
 
 
 
@@ -237,3 +242,8 @@ article>footer, aside ul li{
           padding: 0em 0.5em  0 0;
           margin: 0em;
         }
+
+pre, output {
+  background-color: rgba(200,200,200,0.4);
+  font-size: 0.6em;
+}

data/lib/liveblog.rb

@@ -31,6 +31,7 @@ class LiveBlog
     else
       
       new_file()
+      link_today()
       
     end
       
@@ -53,20 +54,25 @@ class LiveBlog
     # we reserve 30 characters for the link
     len = (140 - 30 - hashtag.length)
     entry = raw_entry.length > len ? "%s... %s" % [raw_entry.slice(0, len), hashtag] : raw_entry
-    [true, "%s %s%s" % [entry, static_urlpath(), hashtag]]
+    message = "%s %s%s" % [entry, static_urlpath(), hashtag]
+    
+    [true, message]
   end
   
-  # Use with yesterday's liveblog; Ideally suited for running from a cron job
+  # Use with yesterday's liveblog; 
   #
   def link_today()
     
     newfilepath = File.join(path(@d-1), 'formatted.xml')
-    FileUtils.cp File.join(path(@d-1), 'index.xml'), newfilepath
-    
+
+    return unless File.exists? newfilepath
+
     doc = Rexle.new File.read(newfilepath)    
     doc.root.element('summary/next_day').text = static_urlpath()
     File.write newfilepath, doc.xml(pretty: true)
     
+    render_html doc, @d-1
+    
   end
 
   def new_file(s=nil)
@@ -95,7 +101,7 @@ EOF
   
   def add_section_entry(raw_entry, hashtag)
     
-    rec = @dx.all.find {|section| section.x.lstrip.lines.first =~ /#{hashtag}/}
+    rec = @dx.all.find {|section| section.x.lstrip.lines.first =~ /#{hashtag}/i}
     
     return [false, 'rec not found'] unless rec
           
@@ -138,7 +144,7 @@ EOF
     
     summary = doc.root.element('summary')
 
-    add summary, 'edit_url', "%s/%sindex.txt" % [@edit_url, urlpath()]
+    add summary, 'edit_url', "%s/%s" % [@edit_url, urlpath()]
     add summary, 'date',      @d.strftime("%d-%b-%Y").upcase
     add summary, 'css_url',   @css_url
     add summary, 'published', Time.now.strftime("%d-%m-%Y %H:%M")
@@ -176,17 +182,12 @@ EOF
 
     File.write newfilepath, doc.xml(pretty: true)
     
-    lib = File.exists?('liveblog.xsl') ? '.' : File.dirname(__FILE__)
-    xslt_buffer = File.read(File.join(lib,'liveblog.xsl'))
-
-    xslt  = Nokogiri::XSLT(xslt_buffer)
-    out = xslt.transform(Nokogiri::XML(doc.xml))
-    File.write File.join(path(), 'index.html'), out
+    render_html doc
     
     # save the related CSS file locally if the file doesn't already exist
     if not File.exists? 'liveblog.css' then
       FileUtils.cp File.join(File.dirname(__FILE__), 'liveblog.css'),\
-                            'liveblog.css' if not File.exists? 'liveblog.css'
+                                                                 'liveblog.css'
     end
     
   end
@@ -199,5 +200,15 @@ EOF
   def add(summary, name, s)
     summary.add Rexle::Element.new(name).add_text s
   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  = Nokogiri::XSLT(xslt_buffer)
+    out = xslt.transform(Nokogiri::XML(doc.xml))
+    File.write File.join(path(d), 'index.html'), out    
+  end  
   
 end

data/lib/liveblog.xsl

@@ -36,7 +36,21 @@
   <aside>
   <ul>
     <li><xsl:value-of select='summary/date'/></li>
-    <li><a href='{summary/prev_day}' class='arrow'>&#8592;</a><a href='{summary/next_day}' class='arrow'>&#8594;</a></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>      
@@ -62,6 +76,8 @@
           </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>  
@@ -70,4 +86,4 @@
   </body>
 </html>
   </xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liveblog
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   WoOSxvsTN7qoA8F0W4mkDpf+HhHxBOLTPykcHMIlx2gILLnNraaZ1rJlZAqWABGj
   v8lGgeeqqjd5QA==
   -----END CERTIFICATE-----
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex