daily_notices 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d725b45ca1730c335edf68833584b02478233d4e
-  data.tar.gz: 853261a2c6961ec11103e308e1e10af77f19509b
+SHA256:
+  metadata.gz: be073789390a9bc4b8ee8f1355b359c43a03db7b39d4a1092811c5a0df281275
+  data.tar.gz: 2152532d8674c8486b50fce13a6329337c08994b7cd264bc11025a12d2259db0
 SHA512:
-  metadata.gz: e15707a65b1dd40e4ef5c6a20951d40d5ef6c41cff4a6084fe83237cfe248ac241b2d77534057201a075be080f5fd29ba093b2a35a783300c84f9e31c9068b4e
-  data.tar.gz: 6e5664b4a662bb57afa68f699308032a34ba4bfd678ef7e0a986efafd39ff01474dff1bfd1a99f805c3d876f1e1c4fa989aba347857af4c56e6a4bfc903a48d6
+  metadata.gz: 6ed7f49c33b34620f0a34c6f68fd0774e474e9de64f0890de135a1af8c26a8e34637398a0babee927259850ccbb9ca0ba791dc069d2a21fcf404a69f289b3294
+  data.tar.gz: ac0743f609fb732536bd2e2a5b03ff60c2a29f624b92cc2e9bb2cfd9f61f59bd49017c89aabeda9958a73037c1403415166095730a44ad5d3d1e62ba41af0090

data/lib/daily_notices.rb

@@ -9,18 +9,18 @@ require 'fileutils'
 require 'rss_creator'
 
 
-
 class DailyNotices
   
   attr_accessor :title, :description, :link, :dx_xslt, :rss_xslt
 
   def initialize(filepath='', url_base: 'http:/127.0.0.1/', identifier: '', 
                         dx_xslt: '', rss_xslt: '', target_page: :recordset, 
-                        target_xslt: '', title: 'daily notices')
+                        target_xslt: '', title: 'daily notices', log: nil, 
+                        debug: false)
     
     @filepath, @url_base, @dx_xslt, @rss_xslt, @target_page, @target_xslt,  \
-          @identifier = filepath, url_base, dx_xslt, rss_xslt, target_page, \
-          target_xslt, identifier
+          @identifier, @log, @debug = filepath, url_base, dx_xslt, rss_xslt, \
+          target_page, target_xslt, identifier, log, debug
 
     
     @schema ||= 'items[title, identifier]/item(title, description, time, link)'
@@ -78,14 +78,15 @@ class DailyNotices
   end
   
   def create(id: Time.now.to_i.to_s, 
-            item: {time: Time.now.strftime('%H:%M %p - %d %b %Y'), title: nil})  
+            item: {time: Time.now.strftime('%H:%M %p - %d %b %Y'), title: nil})
 
+    @log.info 'daily_notices/create: item: ' + item.inspect if @log
     h = item
 
     new_day() if @day != Time.now.day
 
     if @dx.all.any? and 
-        @dx.all.first.description == CGI.unescape(h[:description]) then
+        @dx.all.first.description == CGI.unescape(h[:description].to_s) then
 
       return :duplicate
 
@@ -97,35 +98,12 @@ class DailyNotices
     h[:time] ||= Time.now.strftime('%H:%M %p - %d %b %Y')    
 
     #@dx.create({description: description, time: time}, id: id)
+    puts 'before @dx.create' if @debug
     @dx.create(h, id: id)        
+    puts 'after @dx.create' if @debug
     @dx.save @indexpath
     
-    if @target_page == :recordset then
-      File.write  File.join(@filepath, @archive_path, 'index.html'), \
-                                                 @dx.to_html(domain: @url_base)
-    else
-
-      target_path = File.join(@filepath, @archive_path, id, 'index.html')
-      FileUtils.mkdir_p File.dirname(target_path)
-
-      rx = @dx.find(id)
-
-      kvx = rx.to_kvx
-      yield kvx if block_given? 
-
-      rxdoc = Rexle.new(kvx.to_xml)
-      rxdoc.instructions  << ['xml-styelsheet',\
-          "title='XSL_formatting' type='text/xsl' href='#{@target_xslt}'"]
-      File.write target_path.sub(/\.html$/,'.xml', ), rxdoc.xml(pretty: true)
-      
-      unless File.exists? @target_xslt then
-        File.write @target_xslt, 
-            RxSliml.new(fields: %i(description time)).to_xslt 
-      end
-      
-      File.write  target_path, rx.to_html(xslt: @target_xslt)
-
-    end
+    render_html_files(id)
 
     # Add it to the RSS document
 
@@ -141,6 +119,34 @@ class DailyNotices
   
   alias add create
   
+  
+  def delete(id)
+        
+    [@dx, @rss].each {|x| x.delete(id.to_s); x.save}
+
+    archive_path = Time.at(id.to_i).strftime("%Y/%b/%-d").downcase
+    indexpath = File.join(@filepath, archive_path, id.to_s)    
+
+    FileUtils.rm_rf indexpath    
+    
+    id.to_s + ' deleted'
+    
+  end
+  
+  def description()
+    @rss.description
+  end
+  
+  def description=(val)
+    @rss.description = val
+  end
+
+  def image=(val)
+    image_url, target_url = val.split
+    @rss.image_url = image_url
+    @rss.image_target_url = target_url
+  end  
+  
   def title()
     @rss.title
   end
@@ -156,14 +162,7 @@ class DailyNotices
   def link=(val)
     @rss.link = val
   end
-  
-  def description()
-    @rss.description
-  end
-  
-  def description=(val)
-    @rss.description = val
-  end
+
   
   # If you wish override this method or use it in block form to add a  
   #  notifier, callback routine or webhook, whenever a new record is added.
@@ -178,6 +177,10 @@ class DailyNotices
     @rss.save @rssfile    
   end
   
+  def to_dx()
+    Dynarex.new @dx.to_xml
+  end
+  
   private 
   
   def create_link(id)
@@ -188,6 +191,8 @@ class DailyNotices
   #
   def new_day()
     
+    puts 'inside new_day' if @debug
+    
     @archive_path = Time.now.strftime("%Y/%b/%-d").downcase
     
     @indexpath = File.join(@filepath, @archive_path, 'index.xml')
@@ -197,7 +202,9 @@ class DailyNotices
     if File.exists? @indexpath then
       @dx = Dynarex.new @indexpath
     else
-      @dx = Dynarex.new @schema
+      
+      puts 'creating a new dx file' if @debug
+      @dx = Dynarex.new @schema, debug: @debug
       @dx.order = 'descending'
       @dx.default_key = @default_key
       @dx.xslt = @dx_xslt
@@ -205,6 +212,46 @@ class DailyNotices
       @dx.identifier = @identifier
     end    
     
+   end
+  
+  def render_html_files(id)
+    
+    puts 'inside render_html_files' if @debug
+    
+    if @target_page == :recordset then
+      File.write  File.join(@filepath, @archive_path, 'index.html'), \
+                                                 @dx.to_html(domain: @url_base)
+    else
+
+      target_path = File.join(@filepath, @archive_path, id, 'index.html')
+      FileUtils.mkdir_p File.dirname(target_path)
+
+      rx = @dx.find(id)
+
+      puts 'rx: ' + rx.inspect if @debug
+      kvx = rx.to_kvx
+      
+      yield kvx if block_given? 
+      puts 'before kvx.to_xml' if @debug
+      puts 'kvx.to_xml : ' + kvx.to_xml.inspect
+      puts 'before 2 kvx.to_xml' if @debug
+      rxdoc = Rexle.new(kvx.to_xml)
+      puts 'after kvx.to_xml' if @debug
+      
+      rxdoc.instructions  << ['xml-styelsheet',\
+          "title='XSL_formatting' type='text/xsl' href='#{@target_xslt}'"]
+      File.write target_path.sub(/\.html$/,'.xml', ), rxdoc.xml(pretty: true)
+      
+      unless File.exists? @target_xslt then
+
+        File.write @target_xslt, 
+            RxSliml.new(fields: %i(description time)).to_xslt
+      end
+      
+      File.write  target_path, rx.to_html(xslt: @target_xslt)
+
+    end    
+
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daily_notices
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MTExMjE4MjMwOFoXDTE3MTExMjE4MjMwOFowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAN/1BcxutxrU9edYSqrP6O3pPpH/G1u2vibUnPIYfaMj8p2wUlzNp7Z7rH5K
-  Q1e2ILBaEwx48x+fgd1wXqCv5+dyiEaUC9THNUCGluRDs56rXXWdPd5tW0p53Q1F
-  i8pFwGMVle+wZ18/XVYhhGoLlpuFkBk1PKBXOxk6MLDJFxb5a451xAtbwpRkF/Ze
-  jQXl15pHDnCBCsUaMs+kkPE3qjn5GFPScVvOhIPPERpiRIeT3zvQENnrXuEP6eKj
-  SOB1c3BrZuUD6W84K7q1W7bYw1ian7hrD6G9hDD6mD3OwDK0aAMXA7lsu2uFsgM5
-  EVbGp+1uN07r/emN3ctFOUh5n4kCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUNgnoUSu+we+fhkcQsAAZZM5fWXcwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAAy2H3A1O
-  qiilNUTDnZ7l7FH2R68rT/ixu0A+tgDxIO4xWW0FacBYjSJ9FG8/ogIcbBZ+1psc
-  p/ztWPercXClXMC5RKajkQA2fsBfhHAtKw7Kn8Jb3jQxF98R6c6/l3NKxTFheJHD
-  MAZ26TlLYXrNlKBoSHeSZeCuSdgn1haaUPgzePVmC41gX7+YRvrezwf0FakFtlNL
-  KpWSb1Kst6fM7s501Upx5VvOrlmPu3FOVSjO+JE1g0XL8NpOqDXYPS0GxubZAlI0
-  8he6uWzjGUd5dEdL/ASnQ9lBbvl0TStzNEnsGNBV94H/6fnjx7MHQ/CWQE/M877s
-  zcuMgGZau1C2mg==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwMjI0MTMyOTM2WhcN
+  MjIwMjI0MTMyOTM2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDJvsa6
+  TnHpX2TYC4DnR82ZR2GNtpA1dNtRlwr/Z21VmkZxSq0YgpbNvGNLZHQFm03egVwR
+  KHj7RifsC3RBlzLNZTBvUkmQSJiOZvXB7tWWT3kA5HCwjyMkGuLPxOVDY7HyvEVF
+  kxFZgylN+66aJWV6gPSQ347jihF6WXIBfUYlDg8s4Bkl9KI8huzPTrP2UTXjK6Tz
+  mXBvLf5nv9FvL+TwQBOXwxreGW9zUJWRrtIpvqu+QFPVBSu4Ov4XDdik9jH2e5RZ
+  s1z1lSmsYiP10o3KbOaVZ4wjEDu626a+N1sjS4YU18CvHOwgESOaFqEpWjOsWKep
+  +6tjWbYVKSi2vfU+a/jNPEA0ssvqFieFIO00Jv1LyZFD/U3q8ZTDkMHucz4E8f80
+  mUJacvaFG3DTYiMDkIU9BuNy4vvIf+AoeTR5AhsoZBMSTU1A0EnH5mh790wkJab8
+  uY1GBwbmxeWl4OGD675ygAJSL2tQJAQBDMNKi+fB73/GWBsQAXBBR3LN5z0CAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUjkgH/7j1
+  kSzWPoe0UDHGVZGJPbEwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAi0SDZ62eIMvbMY5FSXEY30wSVmiq+JhcIBjfHGXL
+  hQkhYqAnpzXD7oq0c3USmZtTGn4N8Cy1Sm0WR3RUvbYF6Dta2o1UKQ0vIko/i0kj
+  cNcvG6LcQkUt1mPhEMWAVoWvBL7xySN6yU9Ls7YmpW9Y+62v74NwGqx8c6N2VZKL
+  Vw24Rh4OC9e5cIjO+SR0KRI4+YFm86SnPsVXycqaHvMO8rNBgxGqR1FfFYrNUn0I
+  jafFtIcshyvSFoAaYK5GbPD8Xw/vZ/Red1SXdjmC4+j5ZtAx2c+vgK1lErjGqsYp
+  /XJl7PJxLwoAHYtYjensYXkRw8RZ7Re+HsW4IAmq1IQtBEYjjgWUwEhry56jQ/1A
+  ovxhAIUn9BlZdnsefgTYj2Cy+7z0VyGgWOwrxb1WmGNqjIvZtlFEQzm2yGelNIB2
+  mq989lGt58a/Y5CLIB7CrHXwKhKPrMrl9wrNJQaGhmKCpC48MvGPzmGUKYO3OTRK
+  QCT4F3Esm7/YTYtL3CQJWI1T
   -----END CERTIFICATE-----
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rss_creator
@@ -39,20 +43,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: dx_sliml
   requirement: !ruby/object:Gem::Requirement
@@ -62,7 +66,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,49 +76,49 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.8
 - !ruby/object:Gem::Dependency
   name: rx_sliml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rss_sliml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -140,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: A public facing noticeboard which is centered around an RSS feed.