liveblog 0.6.0 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b133828166d745da0a359b1460a83237fe6a7c1
-  data.tar.gz: 3a430a375412bd5ff52bd1d66b599b843179433b
+  metadata.gz: 47ed6ce1c583163577780604dc5b4a84c33e7e86
+  data.tar.gz: 2ce3b6d3f6e4526f4b9f7861ba05a1383148cd48
 SHA512:
-  metadata.gz: 9ba310329a870d91014432c2b438e15f73a01c71bd8ee3e0f914ed66853ac04d904d8b8f0812a3af5ff677202828ddc3566d39db94940dc8de459a68f2787888
-  data.tar.gz: 1a721c5e0ac215a13a61e09c5726ccfc143de87ca9914661baebe9e599bebe72a56879c6027fc01bc270a92a05ae7efc67957cb52390a661f0de42d5809f305e
+  metadata.gz: 1a92ca1c18ab779e3b7ec9052631b811d5322ecbc3a1d08f8cebf725f0a5d9e82deabb36a068925822fe0a9e8f21e27132d0a05e998d60964cd01a555a5c1f1d
+  data.tar.gz: dd563e8754115d84fcb03c3c0033342b46b31125268390e9a96c55180e66fa48f31b09e21e7a0c69939dfafb3627efd8bd747d3d217a5eaefa5019a2db17f6e0

data/lib/liveblog.css

@@ -39,41 +39,73 @@ body { background-color: #c48f33;}
   max-width: 620px;
 }
 
-#summary ul {
-  background-color: #D5A95D;
-  list-style-type: square;
-  margin: 1.4em; padding: 1.8em;
-}
+  #summary ul {
+    background-color: #D5A95D;
+    list-style-type: square;
+    margin: 1.4em; padding: 1.8em;
+  }
 
-#summary ul li {
-  background-color: #D5A95D;
-  font-family: arial, verdana;
-  font-size: 1.4em;
-  margin: 0.2em 2em; padding: 0.8em;
-}
+    #summary ul li {
+      background-color: #D5A95D;
+      font-family: arial, verdana;
+      font-size: 1.4em;
+      margin: 0.2em 2em; padding: 0.8em;
+    }
+
+      #summary ul li a {
+        background-color: transparent;
+        color: #8E32C3;
+        text-decoration: none;
+        padding: 0.4em;
+      }
+
+        #summary ul li a:link {
+          background-color: transparent;
+        }
+
+        #summary ul li a:visited {
+          background-color: rgba(100,100,100,0.1);
+        }
+
+        #summary ul li a:hover {
+          background-color: transparent;
+          color: #C332AF;
+        }
 
-#summary ul li a {
+.arrow {
+  background-color: #444;
   background-color: transparent;
-  color: #8E32C3;
-  text-decoration: none;
-  padding: 0.4em;
+  font-size: 3em;
 }
-#summary ul li a:link {
+.arrow:first-child {
   background-color: transparent;
-}
 
-#summary ul li a:visited {
-  background-color: rgba(100,100,100,0.1);
+}
+.arrow:last-child {
+  background-color: transparent;
+  float: right;
 }
 
-#summary ul li a:hover {
+.arrow:link {
+  background-color: transparent;
+  color: rgba(100,200,100, 0.3);
+}
+.arrow:hover {
   background-color: transparent;
-  color: #C332AF;
+  color: rgba(255,255,255, 0.8)
 }
 
+
+
 article {
   background-color: #AFC332;
 }
+
+article strong{
+  background-color: transparent;
+  font-size: 1.27em;
+  padding: 0.1em 0.1em;
+}
 details ol li {
   background-color: #AFC332;
   background-color: transparent;
@@ -87,38 +119,39 @@ section {
   max-width: 500px
 }
 
-section h1 {
-  background-color: #D5A95D;
-  /*color: #C34532;*/
-  margin: 0.4em 0em 1.2em 0em;
-  padding: 1em 1.5em;
-}
+  section h1 {
+    background-color: #D5A95D;
+    /*color: #C34532;*/
+    margin: 0.4em 0em 1.2em 0em;
+    padding: 1em 1.5em;
+  }
 
-section p {
+  section p {
+    background-color: #ee3;
+    background-color: transparent;
+    margin: 0.4em 0.4em; padding: 0.6em 1.5em;
+  }
 
-  background-color: #ee3;
-  background-color: transparent;
-  margin: 0.4em 0.4em; padding: 0.6em 1.5em;
-}
-section a {
-  background-color: transparent;
-  color: #8E32C3;
-  text-decoration: none;
-}
-section a:link {
-  background-color: transparent;
-  color: #911;
-}
+  section a {
+    background-color: transparent;
+    color: #8E32C3;
+    text-decoration: none;
+  }
 
-section a:hover {
-  background-color: transparent;
-  color: #C33267;
-}
+    section a:link {
+      background-color: transparent;
+      color: #911;
+    }
 
-section a:active {
-  background-color: #ddd;
-  color: #C33267;
-}
+    section a:hover {
+      background-color: transparent;
+      color: #C33267;
+    }
+
+    section a:active {
+      background-color: #ddd;
+      color: #C33267;
+    }
 
 
 
@@ -137,30 +170,32 @@ aside ul {
   padding: 0.6em 0.9em;
 }
 
-aside ul li {
-  background-color: #e33;
-  background-color: transparent;
-  font-family: helvetica, arial;
-  font-size: 2.6em;
-  font-weight: 900;
+  aside ul li {
+    background-color: transparent;
+    background-color: #e33;
 
-  margin: 0.4em; 
-  padding: 0.9em;
-}
+    font-family: helvetica, arial;
+    font-size: 2.6em;
+    font-weight: 900;
 
-aside ul li a{
-  background-color: transparent;
-  color: #eee;
-  text-decoration: none;
-}
+    margin: 0.4em; 
+    padding: 0.9em;
+    text-align: center;
+  }
 
-aside ul li a:hover {
-  background-color: rgba(100, 100, 100, 0.5);
-  color: #eee;
-  text-decoration: none;
-}
+    aside ul li a{
+      background-color: transparent;
+      color: #eee;
+      text-decoration: none;
+    }
+
+      aside ul li a:hover {
+        background-color: rgba(100, 100, 100, 0.5);
+        color: #eee;
+        text-decoration: none;
+      }
 
-article>footer{
+article>footer, aside ul li{
     background-color: rgba(255,255,255,0.2);
 }
 
@@ -201,4 +236,4 @@ article>footer{
           float: left;
           padding: 0em 0.5em  0 0;
           margin: 0em;
-        }
+        }

data/lib/liveblog.rb

@@ -6,19 +6,33 @@ require 'time'
 require 'dynarex'
 require 'fileutils'
 require 'martile'
+require 'simple-config'
 
 class LiveBlog
 
-  def initialize(liveblogfilepath='.', urlbase: '/liveblog', edit_url: '/', \
-                                             css_url: '/liveblog/liveblog.css')
+  def initialize(config: nil)
+
+
+    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.chdir liveblogfilepath
     
-    @urlbase, @edit_url, @css_url = urlbase, edit_url, css_url
-    @t = Time.now
+    Dir.chdir dir    
+
+    @d = Date.today
     dxfile = File.join(path(), 'index.xml')
 
-    File.exists?(dxfile) ? @dx = Dynarex.new(dxfile) : new_file()      
+    if File.exists? dxfile then 
+    
+      @dx = Dynarex.new(dxfile)
+      @d = Date.parse @dx.title
+      
+    else
+      
+      new_file()
+      
+    end
       
   end
   
@@ -39,22 +53,32 @@ 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/%s" % [entry, @urlbase, path(), hashtag]]
-  end    
+    [true, "%s %s%s" % [entry, static_urlpath(), hashtag]]
+  end
+  
+  # Use with yesterday's liveblog; Ideally suited for running from a cron job
+  #
+  def link_today()
+    
+    newfilepath = File.join(path(@d-1), 'formatted.xml')
+    FileUtils.cp File.join(path(@d-1), 'index.xml'), newfilepath
+    
+    doc = Rexle.new File.read(newfilepath)    
+    doc.root.element('summary/next_day').text = static_urlpath()
+    File.write newfilepath, doc.xml(pretty: true)
+    
+  end
 
   def new_file(s=nil)
 
 s ||= <<EOF    
-<?dynarex schema="sections[title, edit_url, date, css_url]/section(x)" order='descending'?>
-title: LiveBlog #{ordinalize(@t.day) + @t.strftime(" %B %Y")}
-edit_url: #{@edit_url}
-date: #{Date.today}
-css_url: #{@css_url}
+<?dynarex schema="sections[title]/section(x)" order='descending'?>
+title: LiveBlog #{ordinalize(@d.day) + @d.strftime(" %B %Y")}
 --#
 
 EOF
 
-    FileUtils.mkdir_p path()
+    FileUtils.mkdir_p File.join(path())
 
     @dx = Dynarex.new 
     @dx.import s
@@ -86,12 +110,19 @@ EOF
   end  
     
   
-  def path
-
-    File.join [@t.year.to_s, Date::MONTHNAMES[@t.month].downcase[0..2], \
-                                                                @t.day.to_s]
+  def path(d=@d)
+    [d.year.to_s, Date::MONTHNAMES[d.month].downcase[0..2], d.day.to_s]
+  end
+  
+  def urlpath(d=@d)
+    path(d).join('/') + '/'
+  end
+  
+  def static_urlpath(d=@d)
+    @urlbase.sub(/[^\/]$/,'\0/') + urlpath(d)
   end
   
+    
   def save()
     
     @dx.save File.join(path(), 'index.xml')
@@ -102,15 +133,17 @@ EOF
   def save_html()
     
     newfilepath = File.join(path(), 'formatted.xml')
-    FileUtils.cp File.join(path(), 'index.xml'), newfilepath
-    
+    FileUtils.cp File.join(path(), 'index.xml'), newfilepath    
     doc = Rexle.new File.read(newfilepath)
     
     summary = doc.root.element('summary')
-    summary.element('edit_url').text += "%s/%s/index.txt" % [@url_edit, path()]
-    date = summary.element('date')
-    date.text = Date.parse(date.text).strftime("%d-%b-%Y").upcase
-    summary.add Rexle::Element.new('published').add_text Time.now.strftime("%d-%m-%Y %H:%M")
+
+    add summary, 'edit_url', "%s/%sindex.txt" % [@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")
+    add summary, 'prev_day',  static_urlpath(@d-1)
+    add summary, 'next_day', @d == Date.today ? '' : static_urlpath(@d+1)
   
     tags = Rexle::Element.new('tags')
     
@@ -120,7 +153,6 @@ EOF
     
     summary.add tags
 
-
     doc.root.xpath('records/section/x') do |x|
 
       s = "=%s\n%s\n=" % [x.text.lines.first[/#\w+$/], x.text.unescape]
@@ -163,5 +195,9 @@ EOF
     n.to_s + ( (10...20).include?(n) ? 'th' : 
               %w{ th st nd rd th th th th th th }[n % 10] )
   end  
+
+  def add(summary, name, s)
+    summary.add Rexle::Element.new(name).add_text s
+  end
   
 end

data/lib/liveblog.xsl

@@ -36,6 +36,7 @@
   <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/edit_url}" rel="nofollow">edit</a>
     </li>      

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liveblog
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.3
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   WoOSxvsTN7qoA8F0W4mkDpf+HhHxBOLTPykcHMIlx2gILLnNraaZ1rJlZAqWABGj
   v8lGgeeqqjd5QA==
   -----END CERTIFICATE-----
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -42,7 +42,7 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.7
+        version: 1.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.7
+        version: 1.5.8
 - !ruby/object:Gem::Dependency
   name: martile
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +73,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.2
+- !ruby/object:Gem::Dependency
+  name: simple-config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -94,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -102,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Uses the Dynarex gem to create a daily live blog. Convenient for grouping