liveblog 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07c2d324bf12fdf6e1e724c5d0995cda117eda39
-  data.tar.gz: ac47bcb00f5c5bcd912b4866f5528297bc644929
+  metadata.gz: 5b133828166d745da0a359b1460a83237fe6a7c1
+  data.tar.gz: 3a430a375412bd5ff52bd1d66b599b843179433b
 SHA512:
-  metadata.gz: 0dfd3e16ea4465f56ab7cfba777bdc9fa2807bf08131573dd53c6bb645d60983dd23f123723dfba6a868b3ea14219e0c0673e2f209a184f19a2a23f9c2e191fc
-  data.tar.gz: 748e5a9ea4e3a3e9684cedf963094836e0a8bb70aa508e149bfa2b145b60f5a09afe9309710254b0bbd8f80f510698f6acdbf31b3b3d1f0f8c42e2d9afb3ff68
+  metadata.gz: 9ba310329a870d91014432c2b438e15f73a01c71bd8ee3e0f914ed66853ac04d904d8b8f0812a3af5ff677202828ddc3566d39db94940dc8de459a68f2787888
+  data.tar.gz: 1a721c5e0ac215a13a61e09c5726ccfc143de87ca9914661baebe9e599bebe72a56879c6027fc01bc270a92a05ae7efc67957cb52390a661f0de42d5809f305e

data/lib/liveblog.css

@@ -6,7 +6,7 @@ body { background-color: #c48f33;}
     border-top: 1px solid rgba(100,150,100,0.4);
     border-bottom: 1px solid rgba(100,150,100,0.4);
     overflow: hidden
-    margin: 0.3em;  padding: 0.3em 0.1em;
+    margin: 0.3em; padding: 0.3em 0.1em;
   }
 
   header>nav:first-child>ul{
@@ -30,15 +30,58 @@ body { background-color: #c48f33;}
   header>nav>ul>li>a:hover {background-color: transparent; color: #272;}
   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;}
+
+#summary {
+  background-color: transparent;
+  color: #AFC332;
+  float: left;
+  margin: 1em 2em;
+  max-width: 620px;
+}
+
+#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 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;
+}
+
 article {
   background-color: #AFC332;
-
-  overflow: hidden;
+}
+details ol li {
+  background-color: #AFC332;
+  background-color: transparent;
+  margin: 0.3em; padding: 0.6em;
 }
 section {
   background-color: #E2C38D;
   color: #4532C3;
-  float: left;
   font-size: 1.2em;
   margin: 1.7em 0.7em 1.7em 1.7em; padding: 2.0em 4.6em;
   max-width: 500px
@@ -79,7 +122,8 @@ section a:active {
 
 
 
-article aside {
+aside {
+  background-color: #eee;
   background-color: transparent;
   color: #c48f33;
   float: right;
@@ -115,3 +159,46 @@ aside ul li a:hover {
   color: #eee;
   text-decoration: none;
 }
+
+article>footer{
+    background-color: rgba(255,255,255,0.2);
+}
+
+  article>footer>dl#info{
+    background-color: transparent;
+
+    margin: 1.9em 0 0 0; padding: 2em;
+    width: 33em;
+    overflow: hidden;
+  }
+
+  article>footer>dl#info{
+    background-color: transparent;
+    margin: 4.1em 0 0.1em 0;
+  }
+    article>footer>dl#info dt{
+      background-color: transparent;
+      float: left;
+      font:15px arial,sans-serif;
+      padding: 0.2em 0;
+      margin: 0.1em 0 0.1em 0;
+      text-align: left;
+      width: 4.8em;
+    }
+    article>footer>dl#info dd{
+      background-color: transparent;
+      float: left;
+      margin: 0.1em 0; padding: 0.2em 0.2em;
+      width: 27em;
+    }
+      article>footer>dl#info ul{
+        background-color: transparent;    
+        list-style-type: none;        
+        margin: 0 0em; padding: 0 0em;
+      }
+        dl#info ul li {
+          background-color: transparent;
+          float: left;
+          padding: 0em 0.5em  0 0;
+          margin: 0em;
+        }

data/lib/liveblog.rb

@@ -45,7 +45,7 @@ class LiveBlog
   def new_file(s=nil)
 
 s ||= <<EOF    
-<?dynarex schema="sections[title, edit_url, date, css_url]/section(x)"?>
+<?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}
@@ -110,10 +110,20 @@ EOF
     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")
+  
+    tags = Rexle::Element.new('tags')
+    
+    doc.root.xpath('records/section/x/text()').each do |x| 
+      tags.add Rexle::Element.new('tag').add_text x.lines.first[/#(\w+)$/,1]
+    end
+    
+    summary.add tags
+
 
     doc.root.xpath('records/section/x') do |x|
 
-      s = "=%s\n%s\n=" % [x.text.lines.first[/#\w+$/], x.text]
+      s = "=%s\n%s\n=" % [x.text.lines.first[/#\w+$/], x.text.unescape]
       html = Martile.new(s).to_html
 
       e = x.parent

data/lib/liveblog.xsl

@@ -7,6 +7,7 @@
 <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>
   
@@ -22,21 +23,49 @@
       </ul>
     </nav>
   </header>
-  <div>
-    <ul>
-      <li>
-        <a href="{summary/edit_url}">edit</a>
-      </li>
-    </ul>
-  </div>
   
-  <h1><xsl:value-of select='summary/date'/></h1>
   
+  <div id='summary'>
+  <ul>
   <xsl:for-each select="records/section/section">
-
-     <xsl:copy-of select='.'/>
+    <!--<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>
+      <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='section'/>
 
   </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>Published:</dt><dd><xsl:value-of select="summary/published"/></dd>
+        </dl>
+      </footer>  
+  </article>
+  
   </body>
 </html>
   </xsl:template>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liveblog
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   WoOSxvsTN7qoA8F0W4mkDpf+HhHxBOLTPykcHMIlx2gILLnNraaZ1rJlZAqWABGj
   v8lGgeeqqjd5QA==
   -----END CERTIFICATE-----
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-03-16 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.5
+        version: 1.5.7
   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.5
+        version: 1.5.7
 - !ruby/object:Gem::Dependency
   name: martile
   requirement: !ruby/object:Gem::Requirement