activity-logger 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fb54d81677b731631afc50608648f02514e3982
-  data.tar.gz: 865e2600203b73b6dc91a473c77e426bc4a63f44
+  metadata.gz: ced4bead49fa1dbceb6eeffd66bc028fcba498fd
+  data.tar.gz: 6d525f54e508bef9a963cbde60f7c8a6568804ac
 SHA512:
-  metadata.gz: 89fc176a3897f7535d775680fca6d0131eeb8ab60a80db122746db860935ee5b4e2506303260fc97d7d7dc4b16a5d0b0c04c4f99c8f0d26f1a618c9c17b66514
-  data.tar.gz: 1b6c42571a0534f6bfd7801c8620ee0bae8a69a18742afc524d528e08597d47e8fc777a9a1f96efcc34b11d575263ce89b4038e21e15fdbd2c1be61c1693968c
+  metadata.gz: 221583b8eb00d7ae5ec20891a140af7f9604cdeaf0f49c05e832fff791dd7bd0fbb9db5a1a775b6f6467482d9a6a54167011e81a4ab334fbf02262aec8145f5c
+  data.tar.gz: 753a1776441a42161d9d87998c7cdde731864639c55b8793a4ccb6def1217c6ff90eb85726aac21989342f42ca7aa651ff95011102af350e6731889c28370a03

data/lib/activity-logger.rb

@@ -5,12 +5,22 @@
 require 'dynarex-daily'
 require 'simple-config'
 
+
+module Library
+
+  def fetch_file(filename)
+
+    lib = File.dirname(__FILE__)
+    File.read File.join(lib,'..','stylesheet',filename)
+
+  end
+end
+
 class ActivityLogger
 
-  attr_writer :xml_instruction
   
   def initialize(dir: nil, options: {}, config: nil)
-    
+
     @options = options
     @publish_html = false
 
@@ -28,9 +38,8 @@ class ActivityLogger
 
   def create(desc='', time=Time.now)
 
-    ddaily = DynarexDaily.new(nil, @options)
+    ddaily = DynarexDaily.new(nil, options: @options)
     
-    ddaily.xml_instruction = @xml_instruction
     ddaily.create(time: time.to_s, desc: desc)
     ddaily.save
 
@@ -44,12 +53,14 @@ class ActivityLogger
   # Returns true if the time from the last entry exceeds 45 minutes.
   #
   def expired?()
+    
     records = DynarexDaily.new.to_h
     if records and !records.empty? then
       (Time.now - Time.parse(records.last[:time])) / 60 >= 45  
     else
       true
     end
+    
   end
   
   private
@@ -67,8 +78,8 @@ class ActivityLogger
       
     else
       
-      lib = File.exists?('notices.xsl') ? '.' : File.dirname(__FILE__)
-      File.read(File.join(lib,'notices.xsl'))
+      fetch_file('notices.xsl')
+      
     end
 
     xslt  = Nokogiri::XSLT(xslt_buffer)
@@ -106,9 +117,8 @@ class ActivityLogger
     # 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'
+      File.write 'notices.css', fetch_file('notices.css')
     end    
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activity-logger
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   rOfBKWCXu0KP485R2A3y2ObqyYihhDjXF9hQVVvQ+nXiOv/HBLL1nFLCKE7iBKWk
   zy/1qi4eXuuy7Q==
   -----END CERTIFICATE-----
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex-daily
@@ -80,8 +80,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/activity-logger.rb
-- lib/notices.css
-- lib/notices.xsl
 homepage: https://github.com/jrobertson/activity-logger
 licenses:
 - MIT

data/lib/notices.css

@@ -1,173 +0,0 @@
-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

@@ -1,58 +0,0 @@
-<?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>