liveblog 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33c53e82127667a413e45929401e58109ff74124
-  data.tar.gz: 9930c0e34ab16183448268038141a08e539966d4
+  metadata.gz: a535773752c869700d81744cdb4d70246def089c
+  data.tar.gz: c6180a6a1833f4525c31b87d51d4172acd1e73c7
 SHA512:
-  metadata.gz: 1b216c8fe6e62cbb61b929a22762fa9baca399efa038e9242775f0cc8bed6418426133dcae9c8b192ee1dd93bed27ab5133d657882fec89bf4c56c085403326b
-  data.tar.gz: 68c10823048b75b103ffa8979f48299db547e99ffc1fd22e91bc93613cf9ba98adb2ccad26048dcbc2061c7f5ef3b5004f996c68b8506d51ecbaf78040364940
+  metadata.gz: c8f8e87cf159c0227e3afeb662416807957c5d0370aff95b3c61f81b2b512b7b1fcf2f3162021f9d325d2ee48cb17c3b64f8e179b3ef5c6e47c9793d29090760
+  data.tar.gz: 1c0ecc6cb5648956190cb83767853cef2b4de1c3b50940422e476341969f67f3c9442b839626462197d90ee34a1ad369e6904e622034f2a92adfc54c3ae4b42a

data/lib/liveblog.rb

@@ -13,12 +13,11 @@ class LiveBlog
 
   # the config can either be a hash, a config filepath, or nil
   #
-  def initialize(config: nil)
-
-
-    config = if config then
+  def initialize(x=nil, config: nil)
+    
+    config = if x or config then
     
-      config
+      x || config
     else
       
       if File.exists? 'liveblog.conf' then 
@@ -33,10 +32,12 @@ class LiveBlog
     h = SimpleConfig.new(config).to_h
 
     dir, @urlbase, @edit_url, @css_url, @xsl_path, \
-                          @xsl_url, @bannertext, @rss_title = \
-     %i(dir urlbase edit_url css_url xsl_path xsl_url bannertext rss_title)\
-                                                                 .map{|x| h[x]}
+                       @xsl_url, @bannertext, @title, @rss_title, @rss_lang = \
+     (%i(dir urlbase edit_url css_url xsl_path xsl_url bannertext)\
+                                  + %i(title rss_title rss_lang)).map{|x| h[x]}
 
+    @title ||= 'LiveBlog'
+    @rss_lang ||= 'en-gb'
     
     Dir.chdir dir    
 
@@ -59,19 +60,19 @@ class LiveBlog
   
   def add_entry(raw_entry)
 
-    entry, hashtag = raw_entry.split(/\s*(?=#\w+$)/)
+    entry, hashtag = raw_entry.split(/\s*#(?=\w+$)/)
     hashtag.downcase!
     
     success, msg = case raw_entry
     
     when /^#\s*\w.*#\w+$/ then
       
-      add_section raw_entry
+      add_section raw_entry, hashtag
       
     when /#\w+$/ then 
       
       entry.gsub!(/(?:^|\s)!t\s/, '\1' + time())
-      add_section_entry entry, hashtag      
+      add_section_entry entry, hashtag
       
     else 
       [false, 'no valid entry found']
@@ -90,6 +91,12 @@ class LiveBlog
     [true, message]
   end
   
+  # returns a RecordX object for a given hashtag
+  #
+  def find_hashtag(hashtag)    
+    @dx.find hashtag[/\w+$/]
+  end
+  
   # Use with yesterday's liveblog; 
   #
   def link_today()
@@ -107,10 +114,10 @@ class LiveBlog
   end
 
   def new_file(s=nil)
-
+    
 s ||= <<EOF    
 <?dynarex schema="sections[title]/section(x)"?>
-title: LiveBlog #{ordinalize(@d.day) + @d.strftime(" %B %Y")}
+title: #{@title} #{ordinalize(@d.day) + @d.strftime(" %B %Y")}
 --#
 
 EOF
@@ -141,7 +148,6 @@ EOF
 
     @dx = Dynarex.new 
     @dx.import s
-    @dx.default_key = 'uid'
     
     save()
     
@@ -149,71 +155,21 @@ EOF
   
   alias import new_file  
   
-  def save_rss()
-    
-    buffer = File.read File.join(path(), 'raw_formatted.xml')  
-    doc = Rexle.new buffer
-    
-    summary = doc.root.element 'summary'
-
-    dx = Dynarex.new 'liveblog[title,desc,link, pubdate, '\
-        +  'lastbuild_date, lang]/entry(title, desc, created_at, uri, guid)'
-    
-    dx.title = @rss_title || 'LiveBlog'
-    dx.desc = 'Latest LiveBlog posts fetched from ' + @urlbase
-    dx.link = @urlbase
-    dx.order = 'descending'
-    dx.pubdate = rss_timestamp(summary.text('published'))
-    dx.lastbuild_date = Time.now.strftime("%a, %-d %b %Y %H:%M:%S %Z")
-    dx.lang = 'en-gb'
-
-    doc.root.xpath('records/section/section/details').each do |x|
-
-      a = x.elements.to_a
-      h1 = a.shift.element('h1')
-      hashtag = h1.text[/#\w+$/]
-      created_at = rss_timestamp(h1.attributes[:created])
-
-      a.each do |node|
-
-        node.attributes.delete :created
-        node.attributes.delete :last_modified
-        
-        node.traverse do |x| 
-          
-          x.attributes.delete :created
-          x.attributes.delete :last_modified
-
-        end
-      end
-
-      uri = doc.root.element('summary/link/text()') + hashtag
-      
-      record = {
-        title: h1.text,
-        desc: a.map(&:xml).join("\n"),
-        created_at: created_at,
-        uri: uri,
-        guid: uri
-      }
-      
-      dx.create record
-    end
-
-    dx.xslt_schema = 'channel[title:title,description:desc,link:link,'\
-        + 'pubDate:pubdate,lastBuildDate:lastbuild_date,language:lang]/'\
-        + 'item(title:title,link:uri,description:desc,pubDate:created_at,'\
-        + 'guid:guid)'
-    File.write 'rss.xml', dx.to_rss
+  def save()
     
-  end    
+    @dx.save File.join(path(), 'index.xml')
+    File.write File.join(path(), 'index.txt'), @dx.to_s
+    save_html()
+    save_rss()
+  end      
+  
   
   private
 
   
   def add_section_entry(raw_entry, hashtag)
     
-    rec = @dx.all.find {|section| section.x.lstrip.lines.first =~ /#{hashtag}/i}
+    rec = @dx.find hashtag
     
     return [false, 'rec not found'] unless rec
           
@@ -221,9 +177,9 @@ EOF
     [true, 'entry added to section ' + hashtag]
   end
   
-  def add_section(raw_entry)
+  def add_section(raw_entry, hashtag)
 
-    @dx.create({x: raw_entry.sub(/(#\w+)$/){|x| x.downcase}})    
+    @dx.create({x: raw_entry.sub(/(#\w+)$/){|x| x.downcase}}, hashtag.downcase)
     [true, 'section added']
   end  
     
@@ -239,14 +195,22 @@ EOF
       xsl_path: File.join(dir, 'liveblog.xsl'),
       xsl_url: '/liveblog/liveblog.xsl',
       bannertext: '',
-      rss_title: "John Smith's LiveBlog"
+      title: "John Smith's LiveBlog",
+      rss_title: "John Smith's LiveBlog",
+      rss_lang: 'en_gb'
     }
   end
   
+  # returns an array with a fractured date in the format [YYYY,mmm,dd]
+  # e.g. #=> ['2015','apr','11']
+  #
   def path(d=@d)
     [d.year.to_s, Date::MONTHNAMES[d.month].downcase[0..2], d.day.to_s]
   end
-  
+
+  # returns a string representing a date within a directory path
+  # e.g. #=> 2015/apr/11/
+  #  
   def urlpath(d=@d)
     path(d).join('/') + '/'
   end
@@ -254,16 +218,7 @@ EOF
   def static_urlpath(d=@d)      
     @urlbase.sub(/[^\/]$/,'\0/') + urlpath(d)
   end
-  
-    
-  def save()
-    
-    @dx.save File.join(path(), 'index.xml')
-    File.write File.join(path(), 'index.txt'), @dx.to_s
-    save_html()
-    save_rss()
-  end  
-  
+      
   def save_html()
      
     formatted2_filepath = File.join(path(), 'formatted2.xml')
@@ -278,6 +233,7 @@ EOF
     add summary, 'edit_url', "%s/%s" % [@edit_url, urlpath()]
     add summary, 'date',      @d.strftime("%d-%b-%Y").upcase
     add summary, 'day',   @d.strftime("%A")
+    add summary, 'date_uri',   urlpath()
     add summary, 'css_url',   @css_url
     add summary, 'published', Time.now.strftime("%d-%m-%Y %H:%M")
     add summary, 'prev_day',  static_urlpath(@d-1)
@@ -410,4 +366,65 @@ EOF
     Time.parse(s).strftime("%a, %-d %b %Y %H:%M:%S %Z")
   end
   
+  def save_rss()
+    
+    buffer = File.read File.join(path(), 'raw_formatted.xml')  
+    doc = Rexle.new buffer
+    
+    summary = doc.root.element 'summary'
+
+    dx = Dynarex.new 'liveblog[title,desc,link, pubdate, '\
+        +  'lastbuild_date, lang]/entry(title, desc, created_at, uri, guid)'
+    
+    dx.title = @rss_title || 'LiveBlog'
+    dx.desc = 'Latest LiveBlog posts fetched from ' + @urlbase
+    dx.link = @urlbase
+    dx.order = 'descending'
+    dx.pubdate = rss_timestamp(summary.text('published'))
+    dx.lastbuild_date = Time.now.strftime("%a, %-d %b %Y %H:%M:%S %Z")
+    dx.lang = @rss_lang
+
+    doc.root.xpath('records/section/section/details').each do |x|
+
+      next if x.elements.empty?
+      a = x.elements.to_a
+      h1 = a.shift.element('h1')
+      hashtag = h1.text[/#\w+$/]
+      created_at = rss_timestamp(h1.attributes[:created])
+
+      a.each do |node|
+
+        node.attributes.delete :created
+        node.attributes.delete :last_modified
+        
+        node.traverse do |x| 
+          
+          x.attributes.delete :created
+          x.attributes.delete :last_modified
+
+        end
+      end
+
+      uri = doc.root.element('summary/link/text()') + hashtag
+      
+      record = {
+        title: h1.text,
+        desc: a.map(&:xml).join("\n"),
+        created_at: created_at,
+        uri: uri,
+        guid: uri
+      }
+      
+      dx.create record
+    end
+
+    dx.xslt_schema = 'channel[title:title,description:desc,link:link,'\
+        + 'pubDate:pubdate,lastBuildDate:lastbuild_date,language:lang]/'\
+        + 'item(title:title,link:uri,description:desc,pubDate:created_at,'\
+        + 'guid:guid)'
+    File.write 'rss.xml', dx.to_rss
+    
+  end    
+  
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liveblog
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   WoOSxvsTN7qoA8F0W4mkDpf+HhHxBOLTPykcHMIlx2gILLnNraaZ1rJlZAqWABGj
   v8lGgeeqqjd5QA==
   -----END CERTIFICATE-----
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex

metadata.gz.sig

@@ -1 +1 @@
-���j�	00��^���ɖwtf�|�=?g�
+�mY�o��+'qd8��a�{�?�_n��������\��\��!�m?�݊��$��:����oV�!‹�Ƙ��]���;���E��O7\�_� E��A�����'�×���
���C�ݖ!0[@ s.�!e