liveblog 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16b9a2c95d507d7c72338f3217fb615776ca6add
-  data.tar.gz: 78912e7acad0b24715b235abf4f379eb324db8bf
+  metadata.gz: c9b4c601782793ef79622d878d4629196b163e34
+  data.tar.gz: 19e0a307826c4c5e28e5ccd78a4b1f3fe8aeeea6
 SHA512:
-  metadata.gz: 5aca5be1503e67a99373d49fdf5947516f6790a31092ac8fd057c8e2eb34b94e73f4cbcf92297d2a43b67801e63351dbdcc48d022806306a3497c31c3449eabe
-  data.tar.gz: c43195fb17ad32ab0210c146add4bdc75eba5f3a0f8d59dc1b4f395a5059663b78c2309014258ade199347bf11799c21a32f17bb4122bfd774b97caf826b18be
+  metadata.gz: c94f74a5a3bf8ac1b5cd4585f278afe3bab31e30843e6581968d59b66e35ef2f67442328523bd3c3d7b7b8d234aefe08fe0a0c1e7a26fc1dae85b5d1454824d1
+  data.tar.gz: 7e35c014f8988fdcd0ccc33dc4c83e1ac253bb98712d37d5a5f9f5d0d10781f2a6f3b5b76d15a48b0967885ccd88a612ee74fc8d43e36b5c28a583cddbd44a29

data/lib/liveblog.rb

@@ -43,7 +43,7 @@ class LiveBlog
     Dir.chdir @dir    
 
     @d = date
-    dxfile = File.join(path(), 'index.xml')
+    dxfile = File.join(@dir, path(), 'index.xml')
     
     @plugins = initialize_plugins(plugins || [])
 
@@ -128,7 +128,7 @@ class LiveBlog
   #
   def link_today()
     
-    raw_formatted_filepath = File.join(path(@d-1), 'formatted.xml')
+    raw_formatted_filepath = File.join(@dir, path(@d-1), 'formatted.xml')
 
     return unless File.exists? raw_formatted_filepath
 
@@ -148,7 +148,7 @@ class LiveBlog
   def new_day(date: Date.today)
     
     @d = date
-    dxfile = File.join(path(), 'index.xml')
+    dxfile = File.join(@dir, path(), 'index.xml')
     
     new_file()
     link_today()
@@ -157,7 +157,7 @@ class LiveBlog
       
       if x.respond_to? :on_new_day then
         
-        yesterdays_index_file = File.join(path(@d-1), 'index.xml')
+        yesterdays_index_file = File.join(@dir, path(@d-1), 'index.xml')
 
         x.on_new_day(yesterdays_index_file, urlpath(@d-1))
         
@@ -168,7 +168,7 @@ class LiveBlog
 
   def new_file(x=nil)
     
-    s, _ = RXFHelper.read(x)
+    s, _ = RXFHelper.read(x) if x
 
 s ||= <<EOF    
 <?dynarex schema="sections[title]/section(x)"?>
@@ -199,7 +199,7 @@ EOF
     s.gsub!(/(?:^|\s)!t\s/,  '\1' + time(t))
 
 
-    FileUtils.mkdir_p File.join(path())
+    FileUtils.mkdir_p File.join(@dir, path())
 
     @dx = Dynarex.new
 
@@ -227,14 +227,14 @@ EOF
   
   def save()
 
-    @dx.save File.join(path(), 'index.xml')
+    @dx.save File.join(@dir, path(), 'index.xml')
 
-    File.write File.join(path(), 'index.txt'), @dx.to_s
+    File.write File.join(@dir, path(), 'index.txt'), @dx.to_s
     save_html()
     save_rss()
     save_frontpage()
-    FileUtils.cp File.join(path(),'raw_formatted.xml'), \
-                                    File.join(path(),'raw_formatted.xml.bak')
+    FileUtils.cp File.join(@dir, path(),'raw_formatted.xml'), \
+                                    File.join(@dir, path(),'raw_formatted.xml.bak')
 
   end      
   
@@ -386,8 +386,8 @@ EOF
       
   def save_html()
 
-    formatted2_filepath = File.join(path(), 'formatted2.xml')
-    FileUtils.cp File.join(path(), 'index.xml'), formatted2_filepath
+    formatted2_filepath = File.join(@dir, path(), 'formatted2.xml')
+    FileUtils.cp File.join(@dir, path(), 'index.xml'), formatted2_filepath
     
     doc = Rexle.new File.read(formatted2_filepath)
     
@@ -430,8 +430,8 @@ EOF
                                                                  'liveblog.css'
     end
         
-    raw_formatted_filepath = File.join(path(), 'raw_formatted.xml')  
-    formatted_filepath = File.join(path(), 'formatted.xml')    
+    raw_formatted_filepath = File.join(@dir, path(), 'raw_formatted.xml')  
+    formatted_filepath = File.join(@dir, path(), 'formatted.xml')    
     
     unless File.exists? raw_formatted_filepath then
 
@@ -479,7 +479,7 @@ EOF
       end      
     end
     
-    related_links_filepath = File.join(path(), 'related_links.xml')  
+    related_links_filepath = File.join(@dir, path(), 'related_links.xml')  
     
     if File.exists? related_links_filepath then
       
@@ -533,7 +533,7 @@ EOF
   
   def save_rss()
     
-    buffer = File.read File.join(path(), 'raw_formatted.xml')  
+    buffer = File.read File.join(@dir, path(), 'raw_formatted.xml')  
     doc = Rexle.new buffer
 
     summary = doc.root.element 'summary'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liveblog
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   5s8qc8N6iJi3jGcarS1hVkhlWGshAZx1T0n/Q27m1S0GoVUebJYFJxqaZqL5FO/v
   NonZ4ByUi+SaTg==
   -----END CERTIFICATE-----
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dxsectionx