liveblog 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be1541c9d152db180eff5c136d6c7671027da863
-  data.tar.gz: 867e2f844fc141685fd8b963d760d4966a77a662
+  metadata.gz: 3fde61ea41e1d4fde7ee12cb61de65f01223144b
+  data.tar.gz: d77d295303fc0d78e9ccf12de833a8363f9cbfcf
 SHA512:
-  metadata.gz: c6c2b7759be86330494593bca3ec7309a92d27bfe6585d9230259b592d892013caa1ccbeed06bab465b3c5efadaffb505aa582ae22d4286f90d3550947d1ea50
-  data.tar.gz: 806621711e447cc376032c3bdc47076dde73952c5e0460ec15224a0028b597bfcdcb8cceadb989357b293e1aec92217d6fc2cdba9564629ead850b4c9b4cdecb
+  metadata.gz: 07ede8db0a20b6e91a6409fe8d34e343c81aa6053e233da0678357923c0ba4487ff3380d1766e906126047d043badad3c5c44a2049721d7870186143f6528bf5
+  data.tar.gz: 16b8ef8d5de82cf7d6ef98a67278efd4ca7893a363c78f198abea7fb579b14d3bd0272ec007ab3b61ff77c65a526d3dfc004a31889889a3709551a61c6f91287

data/lib/liveblog.css

@@ -118,7 +118,7 @@ article {
 
 article strong{
   background-color: transparent;
-  font-size: 1.27em;
+  font-size: 1.1em;
   padding: 0.1em 0.1em;
 }
 details ol li {
@@ -149,6 +149,12 @@ section {
     margin: 0.4em 0.4em; padding: 0.6em 0.7em;
   }
 
+    section p>code{
+      background-color: rgba(170,130,100,0.2);
+      color: #486;
+      padding: 0.1em 0.3em;
+    }
+
   section a {
     background-color: transparent;
     color: #8E32C3;
@@ -219,6 +225,7 @@ aside ul {
       background-color: transparent;
       color: #eee;
       text-decoration: none;
+
     }
 
       aside ul li a:hover {

data/lib/liveblog.rb

@@ -7,6 +7,7 @@ require 'dynarex'
 require 'fileutils'
 require 'martile'
 require 'simple-config'
+require 'rexle-diff'
 
 class LiveBlog
 
@@ -51,7 +52,7 @@ class LiveBlog
       
     when /#\w+$/ then 
       
-      entry.gsub!(/(?:^|\s)!t\z/, time())
+      entry.gsub!(/(?:^|\s)!t\s/, '\1' + time())
       add_section_entry entry, hashtag      
       
     else 
@@ -115,7 +116,7 @@ EOF
     
     s.gsub!(/(?:^|\s)ts\z/, "*started #{time(t)}*")
     s.gsub!(/(?:^|\s)!tc\z/, "*completed #{time(t)}*")
-    s.gsub!(/(?:^|\s)!t\z/,  time(t))
+    s.gsub!(/(?:^|\s)!t\s/,  '\1' + time(t))
 
 
     FileUtils.mkdir_p File.join(path())
@@ -145,7 +146,7 @@ EOF
   
   def add_section(raw_entry)
 
-    @dx.create({x: raw_entry})    
+    @dx.create({x: raw_entry.sub(/(#\w+)$/){|x| x.downcase}})    
     [true, 'section added']
   end  
     
@@ -171,10 +172,11 @@ EOF
   end  
   
   def save_html()
+     
+    newfilepath2 = File.join(path(), 'formatted2.xml')
+    FileUtils.cp File.join(path(), 'index.xml'), newfilepath2
     
-    newfilepath = File.join(path(), 'formatted.xml')
-    FileUtils.cp File.join(path(), 'index.xml'), newfilepath    
-    doc = Rexle.new File.read(newfilepath)
+    doc = Rexle.new File.read(newfilepath2)
     
     summary = doc.root.element('summary')
 
@@ -224,7 +226,7 @@ EOF
       "title='XSL_formatting' type='text/xsl' href='#{@xsl_url}'"
     ]
     
-    File.write newfilepath, doc.xml(pretty: true)
+    File.write newfilepath2, doc.xml(pretty: true)
     
     render_html doc
     
@@ -234,6 +236,39 @@ EOF
                                                                  'liveblog.css'
     end
     
+    # create the new timestamps for formatted.xml
+    
+    newfilepath = File.join(path(), 'raw_formatted.xml')  
+    newfilepath3 = File.join(path(), 'formatted.xml')    
+    
+    (FileUtils.cp newfilepath2, newfilepath; return) unless File.exists? newfilepath
+
+    doc = RexleDiff.new(File.read(newfilepath), File.read(newfilepath2))\
+                                                                        .to_doc    
+    File.write newfilepath, doc.xml(pretty: true)
+    
+    doc.root.xpath('records/section/section').each do |node|
+
+      node.attributes[:created] ||= Time.now.to_s
+      t = Time.parse(node.attributes[:created]) 
+      element = Rexle::Element.new('time', value: t.strftime("%-I:%M%P"), \
+                                                 attributes: {class: 'border'})
+
+      node.element('details/summary').add element
+      
+      node.xpath('//p').each do |e|
+
+        e.attributes[:created] ||= Time.now.to_s
+        t = Time.parse(e.attributes[:created])
+        element = Rexle::Element.new('time', value: t.strftime("%-I:%M%P"), \
+                                                 attributes: {class: 'border'})
+        e.prepend element
+
+      end      
+    end
+
+    File.write newfilepath3, doc.xml(pretty: true)
+    
   end
 
   def ordinalize(n)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liveblog
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   WoOSxvsTN7qoA8F0W4mkDpf+HhHxBOLTPykcHMIlx2gILLnNraaZ1rJlZAqWABGj
   v8lGgeeqqjd5QA==
   -----END CERTIFICATE-----
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -113,6 +113,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.4
+- !ruby/object:Gem::Dependency
+  name: rexle-diff
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  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.1
 description: 
 email: james@r0bertson.co.uk
 executables: []