liveblog 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fde61ea41e1d4fde7ee12cb61de65f01223144b
-  data.tar.gz: d77d295303fc0d78e9ccf12de833a8363f9cbfcf
+  metadata.gz: b943c8e0010380870eca6cdfbb4287bda20585f0
+  data.tar.gz: 4ab0000d020ecdc8f512d31cbbd58edd7ed17604
 SHA512:
-  metadata.gz: 07ede8db0a20b6e91a6409fe8d34e343c81aa6053e233da0678357923c0ba4487ff3380d1766e906126047d043badad3c5c44a2049721d7870186143f6528bf5
-  data.tar.gz: 16b8ef8d5de82cf7d6ef98a67278efd4ca7893a363c78f198abea7fb579b14d3bd0272ec007ab3b61ff77c65a526d3dfc004a31889889a3709551a61c6f91287
+  metadata.gz: e0b88cd6c955cb3ebb166b02a1391b5c78664f8d3a75a1ae1f03c005fc207f5771f3ea08cfabe586b4055c65d647d5c6c4eb9cb315e9ab7fbfcb1890bc491ccb
+  data.tar.gz: 2ff7297c0d2953d504b8a88a373c035c7cb3c56487860e6d2200e3255eb733cbe5bf9d72d56be77c54670530208a68de79e4cf3454f90ef589b8144ed67ae429

data.tar.gz.sig

@@ -1,2 +1,3 @@
-\�]
-^ �+�� ��F+�]=9�?��¸)�.�X��P:����}�$��|�5H�����D�O�G�̢�h��a��\%�9�>Xg��P�<���d��R��ŽkX�̯�G�ޗ,���[��f�рn����A�^N~n��5�&]�N*n�u��K�dva��3�z����;���adgh*��C�Rw���>�
V���^��?(d|���D�Y�%�
+�	��O"��
+)�^H��2 D�}�
+�(�4v�	��n˯Đ�*��Nj�5 �㬠X�z�;{�X`��	�:��H+�2�&�������{�

data/lib/liveblog.css

@@ -132,21 +132,38 @@ section {
   font-size: 1.2em;
   margin: 1.7em 0.7em 1.7em 1.7em; padding: 2.0em 2.0em 2.0em 2.0em;
   padding-bottom: 5em;
-  max-width: 500px
+  max-width: 600px
 }
 
   section h1 {
     background-color: #D5A95D;
     /*color: #C34532;*/
-    margin: 0.4em 0em 1.2em 0em;
-    padding: 1em 1.5em;
+    margin: 0.4em 2.6em 1.0em 3.3em;
+    padding: 1em 1em 1em 1.4em;
+  }
+
+  section h1~time.border,  section p time.border {
+    background-color: rgba(160,160,140, 0.2);
+    color: rgba(90, 140, 90, 0.9);
+    padding: 0.2em 0.6em;
+  }
+  section h1~time.border {
+    font-size: 0.9em;
+    margin: 0.1em; padding: 0.4em;
+    position: relative;
+    left: -20px; top: -71px;
   }
 
   section p {
     background-color: #ee3;
     background-color: transparent;
     font-size: 1.1em;
-    margin: 0.4em 0.4em; padding: 0.6em 0.7em;
+    margin: 0.2em 1.95em 0.2em 1.55em; padding: 0.3em 2.2em 0.3em 3.6em;
+  }
+
+  section p time.border {
+    font-size: 0.8em;
+    margin: 0.1em 1.3em 0.4em -6.0em;
   }
 
     section p>code{
@@ -154,6 +171,16 @@ section {
       color: #486;
       padding: 0.1em 0.3em;
     }
+  section ul {
+    background-color: transparent;
+    font-size: 1.0em;
+    margin: 0.4em 1em 0.4em 3em;
+    padding: 0.7em 1em 0.7em 3.5em;
+  }
+    section ul li {
+      background-color: transparent;
+    }
+
 
   section a {
     background-color: transparent;

data/lib/liveblog.rb

@@ -76,13 +76,13 @@ class LiveBlog
   #
   def link_today()
     
-    newfilepath = File.join(path(@d-1), 'formatted.xml')
+    raw_formatted_filepath = File.join(path(@d-1), 'formatted.xml')
 
-    return unless File.exists? newfilepath
+    return unless File.exists? raw_formatted_filepath
 
-    doc = Rexle.new File.read(newfilepath)    
+    doc = Rexle.new File.read(raw_formatted_filepath)    
     doc.root.element('summary/next_day').text = static_urlpath()
-    File.write newfilepath, doc.xml(pretty: true)
+    File.write raw_formatted_filepath, doc.xml(pretty: true)
     
     render_html doc, @d-1
     
@@ -173,12 +173,14 @@ EOF
   
   def save_html()
      
-    newfilepath2 = File.join(path(), 'formatted2.xml')
-    FileUtils.cp File.join(path(), 'index.xml'), newfilepath2
+    formatted2_filepath = File.join(path(), 'formatted2.xml')
+    FileUtils.cp File.join(path(), 'index.xml'), formatted2_filepath
     
-    doc = Rexle.new File.read(newfilepath2)
+    doc = Rexle.new File.read(formatted2_filepath)
     
     summary = doc.root.element('summary')
+    
+    summary.element('recordx_type').delete
 
     add summary, 'edit_url', "%s/%s" % [@edit_url, urlpath()]
     add summary, 'date',      @d.strftime("%d-%b-%Y").upcase
@@ -226,27 +228,36 @@ EOF
       "title='XSL_formatting' type='text/xsl' href='#{@xsl_url}'"
     ]
     
-    File.write newfilepath2, doc.xml(pretty: true)
+    File.write formatted2_filepath, doc.xml(pretty: true)
     
-    render_html doc
+
     
     # save the related CSS file locally if the file doesn't already exist
     if not File.exists? 'liveblog.css' then
       FileUtils.cp File.join(File.dirname(__FILE__), 'liveblog.css'),\
                                                                  'liveblog.css'
     end
+        
+    raw_formatted_filepath = File.join(path(), 'raw_formatted.xml')  
+    formatted_filepath = File.join(path(), 'formatted.xml')    
     
-    # 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
+    unless File.exists? raw_formatted_filepath then
+
+      doc2 = doc.root.deep_clone
 
-    doc = RexleDiff.new(File.read(newfilepath), File.read(newfilepath2))\
+      doc2.root.traverse do |node|
+        node.attributes[:created] = Time.now.to_s
+      end
+      
+      File.write raw_formatted_filepath, doc2.xml(pretty: true)
+      
+      return 
+    end
+
+    doc = RexleDiff.new(File.read(raw_formatted_filepath), File.read(formatted2_filepath))\
                                                                         .to_doc    
-    File.write newfilepath, doc.xml(pretty: true)
-    
+    File.write raw_formatted_filepath, doc.xml(pretty: true)
+
     doc.root.xpath('records/section/section').each do |node|
 
       node.attributes[:created] ||= Time.now.to_s
@@ -267,7 +278,8 @@ EOF
       end      
     end
 
-    File.write newfilepath3, doc.xml(pretty: true)
+    render_html doc
+    File.write formatted_filepath, doc.xml(pretty: true)
     
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liveblog
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - James Robertson
@@ -122,7 +122,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -132,7 +132,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
 description: 
 email: james@r0bertson.co.uk
 executables: []