liveblog 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d574eca2cd80707277fb9f226580027004d61060
-  data.tar.gz: 8689a3244cd648c04a4a803dfc0dd356f1ba9b77
+  metadata.gz: 3029f6644f23406e0156b91ae824ee9746741978
+  data.tar.gz: 676335b6951e0543ec1309fb86c92f569bc94283
 SHA512:
-  metadata.gz: c7f87bcf5b845e0a0a43c87ac70c92f42184436e7788f3c208c708b6481d1ea1c2325be511a5ff867fb4957be659fdf0aea5abf67a4f85c22ba2b86b52260335
-  data.tar.gz: 42baed27cfab64c6be46b1364c5ea02d062683295bd94e562749950aef5ca4c0721d952f5df18c32e8140c7e6d3f96484e2d322001ff0dc55b4b8f296df72956
+  metadata.gz: 02b916db6d70cb73ba141e091681b93ffc443223ebeebdc39422d2c32eff36451034e4aaecbd3145b7acd4a2871f4f2f34177c5b1307fe31a9578119d53aa573
+  data.tar.gz: b6937f0fec40ec6e649fef264ec2cb0662111d3585492a6184bb58a163f8eb7e3a9078f3990ed8282d26906d8d6a4280aab7aa5c6ac7087bc16f7f74c9c9c1f0

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-8mwf�kBo�֣��\�qȻ���T��ۅ��*|�$0��覀��q�:Cܘ��D����������ɛ��)s�w?��e"h���On�d��ҥO�������e.���2ޠ��3n�,���41NX������
-����\0%��Xw����c��/�}���a7ݢ
+�
����bY+�q��
+`���%}.;���~�+�k��DF���фO�UHp��]eL^�WgHX�{�b#��O��lS�K!�h4aF?�)�`��j�qH[�"�O6����Kp��5d�Hv#
�	C�#}c�@���C�*vJ��~�%.u1

data/lib/liveblog.rb

@@ -183,7 +183,8 @@ EOF
     FileUtils.mkdir_p File.join(path())
 
     @dx = Dynarex.new
-    @dx.import s
+
+    @dx.import(s) {|x| sanitise x } 
     
     @dx.xpath('records/section').each do |rec|
       
@@ -213,15 +214,15 @@ EOF
 
   end      
   
-  def update_entry(entry)
+  def update_entry(raw_entry)
     
-    hashtag = entry.lines.first[/#(\w+)$/,1]
+    hashtag = raw_entry.lines.first[/#(\w+)$/,1]
                                 
     record_found = find_hashtag hashtag
     
     if record_found then
       
-      record_found.x = entry
+      record_found.x = sanitise entry
       save()
 
       @plugins.each do |x|
@@ -247,11 +248,12 @@ EOF
     rec = @dx.find hashtag
     
     return [false, 'rec not found'] unless rec
-          
-    rec.x += "\n\n" + raw_entry.chomp + "\n"
+
+    entry = sanitise raw_entry.chomp
+    rec.x += "\n\n" + entry + "\n"
     
     @plugins.each do |x|
-      
+
       if x.respond_to? :on_new_section_entry then
         x.on_new_section_entry(raw_entry, hashtag) 
       end
@@ -281,6 +283,28 @@ EOF
     
     [true, 'section added']
   end  
+  
+  # used by the sanitise method
+  #
+  def code2indent(s2)
+
+    # find the beginning
+    x1 = s2 =~ /^```/    
+    return s2 unless x1
+
+    # find the end
+    x2 = s2[x1+3..-1] =~ /^```/
+    return s2 unless x2
+    
+    codeblock = s2[x1+3..x1+x2+2]
+
+    s3 = s2[0..x1-1] + codeblock.lines.map{|x| x.prepend(' ' * 4)}.join + \
+        "\n" + s2[x1+x2+6..-1]
+
+    return code2indent(s3)
+
+  end
+  
     
   def new_config()
 
@@ -319,6 +343,16 @@ EOF
   def static_urlpath(d=@d)      
     @urlbase.sub(/[^\/]$/,'\0/') + urlpath(d)
   end
+  
+  def sanitise(raw_s)
+    
+    # Transform any code encapsulated within 3 backticks to the 
+    # 4 spaces indented style. This prevents Ruby comments being 
+    # wrongfully identified as a sectionx heading.
+    
+    code2indent(raw_s)
+
+  end
       
   def save_html()
 
@@ -550,4 +584,4 @@ EOF
       nil
     end
   end 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liveblog
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   5s8qc8N6iJi3jGcarS1hVkhlWGshAZx1T0n/Q27m1S0GoVUebJYFJxqaZqL5FO/v
   NonZ4ByUi+SaTg==
   -----END CERTIFICATE-----
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2016-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dxsectionx