liveblog 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5e9005cd31c0e22ce0aecc425667a71c7c53913
-  data.tar.gz: b5e3467e36d490f34ec83245c6bfdb4d77b53a6b
+  metadata.gz: d96398f0aa49154552843c326d16ce6efa8c913a
+  data.tar.gz: 5827683e8b4ca1996822dbddd0f060b0f2773b3c
 SHA512:
-  metadata.gz: 3faa4bbefbbe421e01e547161bda656ceff0ee64a01d84794e0c0b3e30b9b8f8f2b83754605e19ab69745ca63d15ccf5bed0cc532c5795cdb94079a2f4ef3cc0
-  data.tar.gz: 5f2aefc8a7e834fcf7750b7e18afd6bffa6eab60db74c5a55d4486fd02fe76518ae7f15683f2cc2e51afc3e3459800664974c181ab6fcbbe6075f43539352323
+  metadata.gz: 91f0358914a2986b6ba18a45b91d55102fdf89a8d0a9c0f07ef4b3a5e90949863f16814c7ceaffc5bd2b5c7c29359007f0658853f6528aea9a0855435399d932
+  data.tar.gz: 3f155f79a3d4d1301c5492ed4a82ac01a252bb807cc60907c6e5da0c36b9619e500575f301dd9de5969553b229c983c904fe26b94a9d52a2bd163a876502d8c6

data/lib/liveblog.css

@@ -1,4 +1,7 @@
-body { background-color: #c48f33;}
+body { 
+  background-color: #c48f33;
+  max-width: 1000px;
+}
 
 
   header{
@@ -35,21 +38,21 @@ body { background-color: #c48f33;}
   background-color: transparent;
   color: #AFC332;
   float: left;
-  margin: 1em 2em;
-  max-width: 620px;
+  margin: 1em 1em;
+  max-width: 560px;
 }
 
   #summary ul {
     background-color: #D5A95D;
     list-style-type: square;
-    margin: 1.4em; padding: 1.8em;
+    margin: 0.9em; padding: 1.3em;
   }
 
     #summary ul li {
       background-color: #D5A95D;
       font-family: arial, verdana;
-      font-size: 1.4em;
-      margin: 0.2em 2em; padding: 0.8em;
+      font-size: 1.3em;
+      margin: 0.2em 1.4em; padding: 0.5em;
     }
 
       #summary ul li a {
@@ -120,7 +123,8 @@ section {
   background-color: #E2C38D;
   color: #4532C3;
   font-size: 1.2em;
-  margin: 1.7em 0.7em 1.7em 1.7em; padding: 2.0em 4.6em;
+  margin: 1.7em 0.7em 1.7em 1.7em; padding: 2.0em 2.0em 2.0em 2.0em;
+  padding-bottom: 5em;
   max-width: 500px
 }
 
@@ -134,7 +138,8 @@ section {
   section p {
     background-color: #ee3;
     background-color: transparent;
-    margin: 0.4em 0.4em; padding: 0.6em 1.5em;
+    font-size: 1.1em;
+    margin: 0.4em 0.4em; padding: 0.6em 0.7em;
   }
 
   section a {
@@ -180,7 +185,7 @@ aside ul {
     background-color: #e33;
 
     font-family: helvetica, arial;
-    font-size: 2.6em;
+    font-size: 2.0em;
     font-weight: 900;
 
     margin: 0.4em; 
@@ -245,5 +250,8 @@ article>footer, aside ul li{
 
 pre, output {
   background-color: rgba(200,200,200,0.4);
-  font-size: 0.6em;
+  font-size: 0.7em;
+  margin: 0.4em; padding: 0.6em;
+  overflow-x: scroll;
+
 }

data/lib/liveblog.rb

@@ -39,12 +39,22 @@ class LiveBlog
   
   def add_entry(raw_entry)
 
-    entry, hashtag = raw_entry.split(/\s*(?=#\w+$)/)    
+    entry, hashtag = raw_entry.split(/\s*(?=#\w+$)/)
+    hashtag.downcase!
     
     success, msg = case raw_entry
-    when /^#\s*\w.*#\w+$/ then add_section raw_entry
-    when /#\w+$/ then add_section_entry entry, hashtag      
-    else [false, 'no valid entry found']
+    
+    when /^#\s*\w.*#\w+$/ then
+      
+      add_section raw_entry
+      
+    when /#\w+$/ then 
+      
+      entry.gsub!(/\B!t\b/, time())
+      add_section_entry entry, hashtag      
+      
+    else 
+      [false, 'no valid entry found']
     end
     
     return [false, msg] unless success
@@ -53,6 +63,7 @@ class LiveBlog
     
     # we reserve 30 characters for the link
     len = (140 - 30 - hashtag.length)
+    raw_entry.gsub!(/\B!t\b/,'')
     entry = raw_entry.length > len ? "%s... %s" % [raw_entry.slice(0, len), hashtag] : raw_entry
     message = "%s %s%s" % [entry, static_urlpath(), hashtag]
     
@@ -84,6 +95,28 @@ title: LiveBlog #{ordinalize(@d.day) + @d.strftime(" %B %Y")}
 
 EOF
 
+    t = Time.now
+    # keyword substitions
+    # a !t becomes the Time.now.strftime("%-I:%M%P") #=> 4:27pm
+    s.gsub!(/\B\*started\s+<time>(\d+:\d+[ap]m)<\/time>\*\B\s*!tc/) do |x|
+
+      raw_start_time = $1
+
+      start_time = Time.parse raw_start_time
+      seconds = t - start_time
+      list = Subunit.new(units={minutes:60, hours:60}, seconds: seconds )\
+                                                                     .to_h.to_a
+      n = list.find {|_,v| v > 0 }
+      duration = list[list.index(n)..-2].map {|x|"%d %s" % x.reverse}\
+                                                                    .join(', ')
+      "*completed %s; duration: %s*" % [time(t), duration]
+    end
+    
+    s.gsub!(/\B!ts\b/, "*started #{time(t)}*")
+    s.gsub!(/\B!tc\b/, "*completed #{time(t)}*")
+    s.gsub!(/\B!t\b/,  time(t))
+
+
     FileUtils.mkdir_p File.join(path())
 
     @dx = Dynarex.new 
@@ -154,7 +187,8 @@ EOF
     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]
+      tags.add Rexle::Element.new('tag').add_text x.lines.first[/#(\w+)$/,1]\
+                                                                      .downcase
     end
     
     summary.add tags
@@ -209,6 +243,10 @@ EOF
     xslt  = Nokogiri::XSLT(xslt_buffer)
     out = xslt.transform(Nokogiri::XML(doc.xml))
     File.write File.join(path(d), 'index.html'), out    
-  end  
+  end
+  
+  def time(t=Time.now)
+    t.strftime "<time>%-I:%M%P</time>"
+  end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liveblog
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - James Robertson