liveblog 1.2.14 → 1.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 326aff2e31618de243f1e2e5c7b2a67fadb921da
-  data.tar.gz: 5a219afcb69a1fa7a929e29dba8fe1da2185bb73
+  metadata.gz: b37f3a4fe03cfa954df793abda82c38a973040f7
+  data.tar.gz: 480991d35f504d88f0185d029bbb80f6ab7673bf
 SHA512:
-  metadata.gz: 8ad4736a23d890f37fc374e48f2c5189cbac65c1b2eacabd5d547b8db2334b0a838995c5e4f461620209ee22fdb88895ab9cd08bfcb9d07fb024db90ec633909
-  data.tar.gz: bd857980878f48857ce388672e23a503b1c4fa25c7723a5153effd51816b59615c706ccbf5c8a2231c4f59ea35f9bda3279940f3fa54b4fb4d27240b5a6704c7
+  metadata.gz: 49b6cd0357a81941e91808dd37f33159eef174b3e62600ac9ebdc861837ba21e8a99588431d2947fac8bed1b240cbcd43768a664d05867a6f04a3eef1cfff0d3
+  data.tar.gz: a9bbc5f3a140f07a64754d9cd287ac02c7673bf79b0f68627136ddf834b88cbe2d161da75bd00332261d1faf9f9013a3d45584f7b9b875cb2a2f82683bfaa12f

data/lib/liveblog.rb

@@ -14,14 +14,11 @@ class LiveBlog
 
   # the config can either be a hash, a config filepath, or nil
   #
-  def initialize(x=nil, config: nil, datetoday: Date.today, plugins: {}, logpath: '')
+  def initialize(x=nil, config: nil, datetoday: Date.today, plugins: {}, log: nil)
     
-    @log = nil
+    @log = log
     
-    if logpath.length > 0
-      @log = Logger.new logpath, 'daily'
-      @log.debug 'inside initialize'
-    end
+    log.info 'LiveBlog: inside initialize' if @log
     
     config = if x or config then
     
@@ -165,6 +162,10 @@ class LiveBlog
     
     new_file()
     link_today()
+    
+    if @log then
+      @log.info 'LiveBlog/new_day: before [plugins]#on_new_day'
+    end        
 
     @plugins.each do |x|
       
@@ -177,17 +178,18 @@ class LiveBlog
       end
       
     end      
-    @log.debug 'inside new_day' if @log
+    @log.info 'LiveBlog: inside new_day' if @log
     
     'new_day() successful'
   end
 
   def new_file(x=nil)
     
-    @log.debug 'inside new_file' if @log
+    @log.info 'LiveBlog/new_file: inside new_file()' if @log
     s = nil
     s, _ = RXFHelper.read(x) if x
-    @log.debug 's: ' + s.inspect  if @log
+    @log.info 'LiveBlog/new_file: s: ' + s.inspect  if @log
+    
 s ||= <<EOF    
 <?dynarex schema="sections[title]/section(x)"?>
 title: #{@title} #{ordinalize(@d.day) + @d.strftime(" %B %Y")}
@@ -216,7 +218,7 @@ EOF
     s.gsub!(/(?:^|\s)!tc\z/, "*completed #{time(t)}*")
     s.gsub!(/(?:^|\s)!t\s/,  '\1' + time(t))
 
-    @log.debug 'before mkdir_p: ' + path().inspect  if @log
+    @log.info 'LiveBLog/new_file: before mkdir_p: ' + path().inspect  if @log
     FileUtils.mkdir_p File.join(@dir, path())
 
     @dx = Dynarex.new
@@ -231,7 +233,7 @@ EOF
     end
     
     @dx.instance_variable_set :@dirty_flag, true
-    @log.debug 'about to save new_file'  if @log
+    @log.info 'LiveBlog/new_file: about to save new_file'  if @log
 
     save()
     
@@ -294,6 +296,10 @@ EOF
       
       record_found.x = sanitise raw_entry
       save()
+      
+      if @log then
+        @log.info 'LiveBlog/update_entry: before [plugins]#on_update_entry'
+      end          
 
       @plugins.each do |x|
         
@@ -333,6 +339,11 @@ EOF
     entry = sanitise raw_entry.chomp
     rec.x += "\n\n" + entry + "\n"
     
+    if @log then
+      @log.info 'LiveBlog/add_section_entry: before ' + 
+          '[plugins]#on_new_section_entry'
+    end
+    
     @plugins.each do |x|
 
       if x.respond_to? :on_new_section_entry then
@@ -357,7 +368,11 @@ EOF
 
     @dx.create({x: raw_entry.sub(/(#\w+)$/){|x| x.downcase}}, \
                            id: hashtag.downcase, custom_attributes: {uid: uid})
-    
+
+    if @log then
+      @log.info 'LiveBlog/add_section: before [plugins]#on_new_section'
+    end
+        
     @plugins.each do |x|
       
         x.on_new_section(raw_entry, hashtag) if x.respond_to? :on_new_section
@@ -544,9 +559,27 @@ EOF
         
       doc.root.add related_links
     end
+    
+    if @log then
+      @log.info 'LiveBlog/save_html: before [plugins]#on_doc_update'
+    end
+        
 
     @plugins.each do |x| 
-       x.on_doc_update(doc) if x.respond_to? :on_doc_update 
+      
+      if x.respond_to? :on_doc_update then
+        
+        begin
+          x.on_doc_update(doc) 
+        rescue
+          if @log then
+            @log.debug "LiveBlog/save_html/error: %s#on_doc_update %s" % \
+                [x.class.to_s, ($!)]
+          end
+        end
+        
+      end
+      
     end
 
     render_html doc, xsl: @xsl_today_path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liveblog
 version: !ruby/object:Gem::Version
-  version: 1.2.14
+  version: 1.2.15
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   Pa3Oua4kplXh4chiXeKSmDf1kgQML6il1F/Lc7p0dgRDB7gHh+cqR/GSt6/44MoB
   /PQO/0DfLVBu1A==
   -----END CERTIFICATE-----
-date: 2017-10-17 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dxsectionx