activity-logger 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ced3849f6d18699f5ddd6d27c2065b93ce46a68e
-  data.tar.gz: f84118d7be663e9f5f0526c0d8c89bc681445e35
+  metadata.gz: 7c0f042f9d56c7ff8b76d47ee808a96541483c53
+  data.tar.gz: 8ce08b317021b4661e58a96ca4104c0464d195ae
 SHA512:
-  metadata.gz: 3fa024b202510fa2906714517830653e2208202c779bd8cbe6c91b95f6ad0c1069f35ceb85d07d4d0c82c5651f66d36b3d56d8443dd66ace1b28ecea4137bb57
-  data.tar.gz: 38fe15d52f0f0b23caa243888bbaa9857533e027e4b42470627c967ffdea45165e57f02bb3d247e369aff391f0e61bf12ef59ecece62ca2d7b1a5b16d0954a53
+  metadata.gz: 09dbc30e20a3f84f27e15e65848e08410e5622babd26455ab42fb7fc38669758c32cd9b661c069947fa42b5522004f73154384b50a29fad0cb1aec0622843210
+  data.tar.gz: 9da7ecc76803e661e3954e61c59bbefbb6b05cedefa91008e7b140b849139a01f82b45ed8297c40126fbd83dccebf2432e3ca4bc0d18e557489d0f01dd628656

data/lib/activity-logger.rb

@@ -19,7 +19,7 @@ class ActivityLogger
       
       h = SimpleConfig.new(config).to_h
       dir, @urlbase, @edit_url, @css_url, @xsl_path = \
-                       %i(dir urlbase edit_url css_url, xsl_path).map{|x| h[x]}
+                       %i(dir urlbase edit_url css_url xsl_path).map{|x| h[x]}
       @publish_html = true
     end
     
@@ -29,12 +29,11 @@ class ActivityLogger
   def create(desc='', time=Time.now)
 
     ddaily = DynarexDaily.new(nil, @options)
-    ddaily.default_key = 'uid' # adds an auto id
+    
     ddaily.xml_instruction = @xml_instruction
-
     ddaily.create(time: time.to_s, desc: desc)
     ddaily.save
-    
+
     if @publish_html then
       File.write 'index.txt', ddaily.to_s
       save_html() 
@@ -61,12 +60,19 @@ class ActivityLogger
   
   def render_html(doc)
     
-    #lib = File.exists?('notices.xsl') ? '.' : File.dirname(__FILE__)
-    #xslt_buffer = File.read(File.join(lib,'notices.xsl'))
-    xslt_buffer = File.read @xsl_path
+    xslt_buffer = if @xsl_path then
+    
+      buffer, _ = RXFHelper.read @xsl_path
+      buffer
+      
+    else
+      
+      lib = File.exists?('notices.xsl') ? '.' : File.dirname(__FILE__)
+      File.read(File.join(lib,'notices.xsl'))
+    end
 
     xslt  = Nokogiri::XSLT(xslt_buffer)
-    out = xslt.transform(Nokogiri::XML(doc.xml))
+    out = xslt.transform(Nokogiri::XML(doc.xml))    
     File.write 'index.html', out    
   end
   
@@ -78,8 +84,10 @@ class ActivityLogger
     
     summary = doc.root.element('summary')
 
-    add summary, 'edit_url', "%s/index.txt" % [@edit_url]
-    add summary, 'date',      Date.today.strftime("%d-%b-%Y").upcase
+    date = Date.today.strftime("%d-%b-%Y").upcase
+    add summary, 'title',     date + ' Notices'
+    add summary, 'edit_url',  @edit_url
+    summary.element('date').text = date
     add summary, 'css_url',   @css_url
     add summary, 'published', Time.now.strftime("%d-%m-%Y %H:%M")    
     
@@ -87,10 +95,20 @@ class ActivityLogger
       
       e = entry.element('time')
       e.text = Time.parse(e.text).strftime("%-l:%M%P")
+      desc = entry.element('desc')
+      desc.add  Rexle.new("<span>%s</span>" % desc.text.unescape).root
+      desc.text = ''      
     end
     
     File.write newfile, doc.xml(pretty: true)    
     render_html doc
+    
+    # save the related CSS file locally if the file doesn't already exist
+
+    if not File.exists? 'notices.css' then
+      FileUtils.cp File.join(File.dirname(__FILE__), 'notices.css'),\
+                                                              'notices.css'
+    end    
   end
 
-end
+end

data/lib/notices.css

@@ -0,0 +1,173 @@
+body { background-color: #c48f33;}
+
+
+  header{
+    background-color: rgba(200,200,200,0.1);
+    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;
+  }
+
+  header>nav:first-child>ul{
+    background-color: transparent;
+    list-style-type: none;
+    margin: 0.2em; padding: 0.3em;
+  }
+    header>nav:first-child>ul>li {
+      background-color: transparent;
+      color: #392;
+      display: inline;
+      font-family: Verdana, Arial;
+      font-size: 1em;
+    }
+
+    header>nav:first-child>ul>li~li:before {
+      background-color: transparent; color: rgba(100,150,100,0.6);
+      content: "> ";
+    }
+  header>nav>ul>li>a {background-color: tansparent; color: #494;}
+  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;}
+
+div {
+  background-color: #AFC332;
+  background-color: transparent;
+  background-color: rgba(255,255,255,0.2);
+  float: left;
+  min-height: 200px;
+  margin: 2em; 0.3em;
+}
+
+div ul {
+
+
+  background-color: #ee2;
+  background-color: transparent;
+  color: rgba(100,100,100,0.9);
+  list-style-type: none;
+  margin: 0.2em; padding: 0.5em;
+}
+
+div ul li{
+
+  background-color: #443;
+  background-color: rgba(255,255,255,0.2);
+  margin: 0.5em;
+  padding: 1em;
+  overflow: hidden;
+}
+
+div ul li time, div ul li span {
+
+  background-color: transparent;
+}
+
+div ul li time {
+
+  background-color: transparent;
+background-color: rgba(255,255,255,0.2);
+  float: right;
+  margin: 0.3em; padding: 0.2em; 0.6em;
+  margin-top: 2em;
+
+
+}
+
+div ul li span {
+
+  background-color: transparent;
+  font-size: 1.4em;
+  float: left;
+  margin: 0.3em; padding: 0.6em;
+}
+
+
+
+aside {
+
+  background-color: transparent;
+  background-color: rgba(255,255,255,0.2);
+  float: left;
+  margin: 3em;
+  
+}
+
+aside ul {
+  background-color: transparent;
+  list-style-type: none;
+  margin: 0.4em 0.7em;
+  padding: 0.6em 0.9em;
+  color: #c48f33;
+}
+
+  aside ul li {
+    background-color: transparent;
+
+
+    font-family: helvetica, arial;
+    font-size: 1.6em;
+    font-weight: 900;
+
+    margin: 0.4em; 
+    padding: 0.9em;
+    text-align: center;
+  }
+
+    aside ul li a{
+      background-color: transparent;
+        color: rgba(100,100,100,0.4);
+      text-decoration: none;
+    }
+
+      aside ul li a:hover {
+        background-color: rgba(100, 100, 100, 0.5);
+        color: #eee;
+        text-decoration: none;
+      }
+
+
+footer{
+    background-color: rgba(255,255,255,0.2);
+  clear: both;
+}
+
+  footer>dl#info{
+    background-color: transparent;
+
+    margin: 1.9em 0 0 0; padding: 2em;
+    width: 33em;
+    overflow: hidden;
+  }
+
+  footer>dl#info{
+    background-color: transparent;
+    margin: 4.1em 0 0.1em 0;
+  }
+    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;
+    }
+    footer>dl#info dd{
+      background-color: transparent;
+      float: left;
+      margin: 0.1em 0; padding: 0.2em 0.2em;
+      width: 27em;
+    }
+      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/notices.xsl

@@ -0,0 +1,58 @@
+<?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>
+  
+  <header>
+    <nav>
+      <ul>
+        <li>
+          <a href="/">home</a>
+        </li>
+        <li>
+          <a href="/notices">notices</a>
+        </li>
+      </ul>
+    </nav>
+  </header>
+    
+  <div>
+  <ul>
+  <xsl:for-each select="records/entry">
+    <li>
+     <xsl:copy-of select='desc/span'/>
+     <time><xsl:value-of select='time'/></time>
+    </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>  
+
+  <footer>
+    <dl id="info">
+      <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>  
+  
+  </body>
+</html>
+  </xsl:template>
+</xsl:stylesheet>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activity-logger
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   rOfBKWCXu0KP485R2A3y2ObqyYihhDjXF9hQVVvQ+nXiOv/HBLL1nFLCKE7iBKWk
   zy/1qi4eXuuy7Q==
   -----END CERTIFICATE-----
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex-daily
@@ -42,7 +42,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.13
+        version: 0.1.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.13
+        version: 0.1.14
 - !ruby/object:Gem::Dependency
   name: simple-config
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/activity-logger.rb
+- lib/notices.css
+- lib/notices.xsl
 homepage: https://github.com/jrobertson/activity-logger
 licenses:
 - MIT