liveblog 1.2.12 → 1.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d2388279c7fb342a93d76b994538b9cc69ab903
-  data.tar.gz: 3b77698b422d22a8d5d0dd4c1539aec39e5701b3
+  metadata.gz: a4c9a249c3de12156df464813319e5a4ec93c24f
+  data.tar.gz: 874aa1432af8c1ecccf7dbb9a7b2e7392d9a8cf6
 SHA512:
-  metadata.gz: 32626a0e67b3be8e5f8408d98846e3a3769210544615fa42ab4182f125c71c37204c0ee32d0838774f2fd1fb8a70e7ad183b654088296ffadd4f2984800d4575
-  data.tar.gz: cb46a881f25fe1e879469b56463ad7eafb14cd72516c3f46f427e46cb5b24ac4850095e0aacbec2d351527a18adfb375665f261c7704982bffaa57bf8b68052f
+  metadata.gz: 98dec21b66cb1312741e9162e688b41b0cda3f7724e6f0f66ada2af76e82ab500fb7fa4942390da5c42953be983b6bf3fa75318b94e91692dbd6130ccf15b5bb
+  data.tar.gz: d89ddb9b7d61a00e4b0c6e83914d7042410ba0580453cc2b7c041167e53d69bb8718515597f7be402652399a281084a9f34a88b87af75092f4e7980d330942c0

data/lib/liveblog.rb

@@ -8,16 +8,20 @@ require 'dxsectionx'
 require 'simple-config'
 require 'rexle-diff'
 
+
 class LiveBlog
   
 
-
   # the config can either be a hash, a config filepath, or nil
   #
-  def initialize(x=nil, config: nil, date: Date.today, plugins: {})        
+  def initialize(x=nil, config: nil, date: Date.today, plugins: {}, logpath: '')
     
-    @logger = Logger.new '/tmp/liveblog.log', 'daily'
-    @logger.debug 'inside initialize'
+    @log = nil
+    
+    if logpath.length > 0
+      @log = Logger.new logpath, 'daily'
+      @log.debug 'inside initialize'
+    end
     
     config = if x or config then
     
@@ -37,10 +41,10 @@ class LiveBlog
 
     @dir, @urlbase, @edit_url, @css_url, @xsl_path, @xsl_today_path, \
             @xsl_url, @bannertext, @title, @rss_title, @rss_lang, \
-            @hyperlink_today, plugins = \
+            @hyperlink_today, plugins, @photo_upload_url = \
      (%i(dir urlbase edit_url css_url xsl_path xsl_today_path xsl_url) \
               + %i( bannertext title rss_title rss_lang hyperlink_today ) \
-              + %i(plugins)).map{|x| h[x]}
+              + %i(plugins photo_upload_url)).map{|x| h[x]}
 
     @title ||= 'LiveBlog'
     @rss_lang ||= 'en-gb'
@@ -171,17 +175,17 @@ class LiveBlog
       end
       
     end      
-    @logger.debug 'inside new_day'
+    @log.debug 'inside new_day' if @log
     
     'new_day() successful'
   end
 
   def new_file(x=nil)
     
-    @logger.debug 'inside new_file1'
+    @log.debug 'inside new_file' if @log
     s = nil
     s, _ = RXFHelper.read(x) if x
-    @logger.debug 's: ' + s.inspect
+    @log.debug 's: ' + s.inspect  if @log
 s ||= <<EOF    
 <?dynarex schema="sections[title]/section(x)"?>
 title: #{@title} #{ordinalize(@d.day) + @d.strftime(" %B %Y")}
@@ -210,7 +214,7 @@ EOF
     s.gsub!(/(?:^|\s)!tc\z/, "*completed #{time(t)}*")
     s.gsub!(/(?:^|\s)!t\s/,  '\1' + time(t))
 
-    @logger.debug 'before mkdir_p: ' + path().inspect
+    @log.debug 'before mkdir_p: ' + path().inspect  if @log
     FileUtils.mkdir_p File.join(@dir, path())
 
     @dx = Dynarex.new
@@ -225,7 +229,7 @@ EOF
     end
     
     @dx.instance_variable_set :@dirty_flag, true
-    @logger.debug 'about to save new_file'
+    @log.debug 'about to save new_file'  if @log
 
     save()
     
@@ -253,7 +257,24 @@ EOF
     FileUtils.cp File.join(@dir, path(),'raw_formatted.xml'), \
                                     File.join(@dir, path(),'raw_formatted.xml.bak')
     'save() successful'
-  end      
+  end
+  
+  def tags()
+
+    file = @dir + Date.today.to_time.strftime("%Y/%b/%-d/formatted2.xml").downcase
+    
+    if File.exists? file then
+
+      Rexle.new(File.read file).root
+            .xpath('summary/tags/tag/text()').map{|x| x.to_s}
+      
+    else
+      
+      []
+      
+    end    
+    
+  end
   
   def update(val)
     self.method(val[/^<\?dynarex/] ? :import : :update_entry).call val
@@ -290,29 +311,12 @@ EOF
   
   def valid_entry?(entry)
     
-    return false unless entry =~ /#\w+/
-    
-    def hashtag_exists?(tag)
-
-      file = @dir + Date.today.to_time.strftime("%Y/%b/%-d/formatted2.xml").downcase
-      
-      if File.exists? file then
-
-        doc = Rexle.new(File.read file)
-        tags = doc.root.xpath('summary/tags/tag/text()')
-        return true if tags.include? tag
-      end
-
-      return false
-    end      
-    
-    tag = entry[/#(\w+)$/,1]
+    return false unless entry =~ /#\w+/    
     
-    entry.lstrip[/^#\s+/] or (tag and hashtag_exists?(tag)) ? true : false
+    tag = entry[/#(\w+)$/,1]    
+    entry.lstrip[/^#\s+/] or (tag and tags().include?(tag)) ? true : false
   
   end
-
-
   
   
   private
@@ -391,6 +395,7 @@ EOF
       dir: dir,
       urlbase: 'http://www.yourwebsitehere.org/liveblog/',
       edit_url: 'http://www.yourwebsitehere.org/do/liveblog/edit',
+      photo_upload_url: 'http://www.yourwebsitehere.org/do/liveblog/upload',
       css_url: '/liveblog/liveblog.css',
       xsl_path: File.join(dir, 'liveblog.xsl'),
       xsl_today_path: File.join(dir, 'liveblog_today.xsl'),
@@ -443,6 +448,7 @@ EOF
     summary.element('recordx_type').delete
 
     add summary, 'edit_url', "%s/%s" % [@edit_url, urlpath()]
+    add summary, 'photo_upload_url', "%s/%s" % [@photo_upload_url, urlpath()]
     add summary, 'date',      @d.strftime("%d-%b-%Y").upcase
     add summary, 'day',   @d.strftime("%A")
     add summary, 'date_uri',   urlpath()
@@ -663,4 +669,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.12
+  version: 1.2.13
 platform: ruby
 authors:
 - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MDQxMjIyMzk0MFoXDTE3MDQxMjIyMzk0MFowSDESMBAG
+  8ixkARkWAmV1MB4XDTE3MDcwMzE1NTM1NloXDTE4MDcwMzE1NTM1NlowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAKUY1C/wbrLRiR7VAjBrqruC7uhYHaPBs7rEaXtgyBJ5cZfj4OFmEK0tVzM1
-  SUtGCQ8SBKb+swAhbsXnK9uWsg4iu8qxBpLkl/AoRj7PMNnSKi18ms32lySxRDdh
-  MvWZppYgcHqDCzMO7Eo+Nxgt5BYmTjtOy5l5YkwKFJFv+O03QVKfBBVZgaPzottO
-  6yuqMQJjTKOFeVibzlHlnqcvWvkhMtjuhS7JKVXt2+Lg5GFwH74h5y6bFEwWCg2N
-  4ctY7vphUjxe658gVb4/X3mFf80iRU6tVVz/RzADAMnPSBazy7+3rQ2whTi1KaNT
-  srakzJh59uy9rKVhQ8qhnhMTkskCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUblDA17El9gauUp4ox/rPnFP+f6QwJgYDVR0RBB8w
+  ggEBANuIjBtEDd/Nc4jPEDAyiN+nR7lfsknVDqmgR/O8w6UoR8IrvXsKRorDVvVo
+  /u98/Jw6PdtWwDrFtKTyyBesaoN6LGhJULahFrLSYmBhxbPjjcYacbW8Os3BHCzX
+  VKWEeK4SUB3lYK+hwBX7pbnksak+yiqWuIWqPZDX/Vz33HoSRgJzojrBeP5vCExL
+  hA5FsikdrEo7Ho0yiAR7heHW5e7zGpXRxOTRU8RiyVZN1nAPPxo2K/+2GR18kuwC
+  umulPA1aISbRUBMg585QUw5lSPYzMeRwAKgurmNBbwZz24AKi/Uw13eyBdnMtQek
+  cgsW80HTuYudn85Uklx+apNusncCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUiDP9xGJeCGGKzhK03BpdNV5Czx4wJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAPTMiNq4e
-  G72U1QlR+OnW/r4VkHqw6a1rpBemobSPq/MPRZhARN7+naQkqnMT5DkyngfLDI40
-  phtLlIGwTEcXvlG8Z2nH4zA2nZzGVQBz/0NoR/DQLwffvRbzH2kxJYAZbqoUGDMa
-  SsKvFTgzX7vCRA9W6k5rpPhHumOyFfQYDd2QSUq0fuPHSi5+8ZAoc5EdA1zAinvP
-  MAU3Il7QDXe+XCkKh618hi4rzpBRIN/CETZ1bc+nCyQ3pQPZ5rFuHOtqj6Wx1TQi
-  5s8qc8N6iJi3jGcarS1hVkhlWGshAZx1T0n/Q27m1S0GoVUebJYFJxqaZqL5FO/v
-  NonZ4ByUi+SaTg==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAdNu1Apc5
+  ievsuMAafoSOox6wad1ln34Od4f/OaSBrCNZNCGBPabh9sdCv3bQL0dx6pouXdFV
+  j4/x4HFCzihwHKPKpZWwo9VEwybHrIvqkYtfuEmq79fSesMZnteTUQhpIH9TY4E+
+  WK2ysnPfqv8wmsrR4X4m8+tbh3juG4o2eA0yh+yl55NfTzrR3J6U8/U1+lIxFEmE
+  YXQ1k8NebmLSYx1N4j5nRfl2Cu0NsejQBeCgSkq2EpbhTW4O45b+JVxp48t6QK+N
+  Pa3Oua4kplXh4chiXeKSmDf1kgQML6il1F/Lc7p0dgRDB7gHh+cqR/GSt6/44MoB
+  /PQO/0DfLVBu1A==
   -----END CERTIFICATE-----
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dxsectionx