daily_notices 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d29cfb2e116756c7657e573834d48753642668d988d8f1445f2d557e05225e6
-  data.tar.gz: 105253e156c300d52f96f7f4a37714927e32b3c38ae19872102c738fab069f42
+  metadata.gz: a93fc95ef818bf423cff6739c54fc21e2209be3d502e2074c7099edc21944334
+  data.tar.gz: f5424396c72252e53689f70a590a82b08cdab56eb88d71562e3425c9a1974fbe
 SHA512:
-  metadata.gz: b67265385e875a1e06298a942184287493117e490390e8e562769e7dcc9055b2362bf7a957e80e1763c75aa01aa89c00bdb20816ffd6913d940b6f5f227741de
-  data.tar.gz: a97e40f82b5b09ecca4d821e40f1d2e422007087548f4ea96c7a9874204aed7ff8488f75294cdd8fde477db67ea765f789354e7f959ba8611ece4818a0bf4a12
+  metadata.gz: b3446e333d86c3fb26100a208c6820a3436f9ea2a08e1ed96e0b6513d80086a6faa1d90fd1dfd8b8c303c8dcfd8b279cd1fb2342c7972d94ffdc351542373fbe
+  data.tar.gz: 92bb88b4aef1af8c5e32663bc8bc0d5fc56eba096c004dd3221ec5b549f4a1a054c2b95bab4d2d0c4efb576e99ed74a6b8f025685c4214ab860b7c9d01a19d4b

data/lib/daily_notices.rb

@@ -5,43 +5,44 @@
 
 require 'dx_sliml'
 require 'rx_sliml'
-require 'fileutils'
 require 'rss_creator'
+require 'rxfreadwrite'
 
 
 class DailyNotices
-  
+  include RXFReadWriteModule
+
   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', log: nil, 
+  def initialize(filepath='', url_base: 'http:/127.0.0.1/', identifier: '',
+                        dx_xslt: '', rss_xslt: '', target_page: :recordset,
+                        target_xslt: '', title: 'daily notices', log: nil,
                         debug: false)
-    
+
     @filepath, @url_base, @dx_xslt, @rss_xslt, @target_page, @target_xslt,  \
           @identifier, @log, @debug = filepath, url_base, dx_xslt, rss_xslt, \
           target_page, target_xslt, identifier, log, debug
 
-    
+
     # note: card is intended for storing meta data in JSON format
-    
-    @schema ||= 'items[title, identifier, image]/item(title, description, ' +
-        'card, time, link)'
-    @default_key ||= 'uid'
-    
+
+    @schema = 'items[title, identifier, image, bio, location, website,' +
+        ' banner_image]/item(title, description, card, time, link)'
+    @default_key = 'uid'
+
     if dx_xslt.nil? then
 
       subdir = File.basename filepath
       dir = url_base[/http:\/\/[^\/]+\/(.*)/,1]
 
       dxxsltfilename = "dx#{Time.now.to_i.to_s}.xsl"
-      dxxsltfilepath = '/' + [dir, subdir, dxxsltfilename].join('/')      
-      File.write File.join(filepath, dxxsltfilename), \
+      dxxsltfilepath = '/' + [dir, subdir, dxxsltfilename].join('/')
+      FileX.write File.join(filepath, dxxsltfilename), \
                                              DxSliml.new(dx: @schema).to_xslt
-      
+
       @dx_xslt = dxxsltfilepath
     end
-    
+
     if rss_xslt.nil? then
 
       subdir = File.basename filepath
@@ -49,97 +50,124 @@ class DailyNotices
 
       rssxsltfilename = "rssx#{Time.now.to_i.to_s}.xsl"
       rssxsltfilepath = '/' + [dir, subdir, rssxsltfilename].join('/')
-      File.write File.join(filepath, rssxsltfilename), \
+      FileX.write File.join(filepath, rssxsltfilename), \
                                              RssSliml.new().to_xslt
-      
+
       @rss_xslt = rssxsltfilepath
-    end    
-    
+    end
+
     @day = Time.now.day
     @title = title
     new_day()
-    
+
     # open the Dynarex file or create a new Dynarex file
 
     @rssfile = File.join(@filepath, 'rss.xml')
 
-    if File.exists? @rssfile then
-      @rss = RSScreator.new @rssfile, dx_xslt: @rss_xslt, 
-          custom_fields: ['topic']
+    if FileX.exists? @rssfile then
+      @rss = RSScreator.new @rssfile, dx_xslt: @rss_xslt,
+          custom_fields: ['topic'], log: @log
     else
 
-      @rss = RSScreator.new @rssfile, dx_xslt: @rss_xslt, 
-          custom_fields: ['topic']
+      @rss = RSScreator.new @rssfile, dx_xslt: @rss_xslt,
+          custom_fields: ['topic'], log: @log
+
       @rss.xslt = @rss_xslt
       @rss.title = @title || identifier.capitalize + ' daily notices'
       @rss.description = 'Generated using the daily_notices gem'
       @rss.link = @url_base
-    end    
-    
+    end
+
     # :recordset or : record
     @target_page = target_page
   end
-  
-  def create(id: Time.now.to_i.to_s, 
-            item: {time: Time.now.strftime('%H:%M %p - %d %b %Y'), title: nil})
+
+  def create(id: Time.now.to_i.to_s,
+            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 
+    if @dx.all.any? and
         @dx.all.first.description == CGI.unescape(h[:description].to_s) then
 
       return :duplicate
 
     end
 
-    h[:link] ||= create_link(id)    
+    h[:link] ||= create_link(id)
     h[:title] ||= h[:description]
         .split(/\n/,2).first.gsub(/\<\/?\w+[^>]*>/,'')[0..140]
-    h[:time] ||= Time.now.strftime('%H:%M %p · %b %d %Y')    
+    h[:time] ||= Time.now.strftime('%H:%M %p · %b %d %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
+    @log.info 'daily_notices/create: before' if @log
+
+    # deep clone the Hash object
+    h3 = Marshal.load( Marshal.dump(h) )
+    h[:card] = h[:card].to_json if h[:card] and h[:card].is_a? Hash
+
+    @dx.create(h, id: id)
+    @log.info 'daily_notices/create: after' if @log
+    #puts 'after @dx.create' if @debug
+
     @dx.save @indexpath
-    
+
     render_html_files(id)
 
     # Add it to the RSS document
 
-    
-    @rss.add(item: h, id: id)
+    if h3[:card] and h3[:card].is_a? Hash then
+
+      card = h3[:card]
+      h2 = card[card.keys.first]
+
+      content = case card.keys.first
+      when :summary_large_image
+       "\n<h1>%s</h1><p>%s</p>" % [h2[:title], h2[:desc]]
+      end
+
+      h3[:title] += h2[:title] if h3[:title].empty?
+      h3[:description] += content
+
+    end
+
+    @log.debug 'daily_notices/create: h3: ' + h3.inspect if @log
+    @rss.add(item: h3, id: id)
     @rss.save @rssfile
-    
+    # open up the RSS file and fill in the title and description fields
+
     on_add(@indexpath, id)
-    
+
     return true
 
   end
-  
+
   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)    
+    indexpath = File.join(@filepath, archive_path, id.to_s)
+
+    FileX.rm_rf indexpath
 
-    FileUtils.rm_rf indexpath    
-    
     id.to_s + ' deleted'
-    
+
   end
-  
+
   def description()
     @rss.description
   end
-  
+
   def description=(val)
     @rss.description = val
   end
@@ -148,64 +176,64 @@ class DailyNotices
     image_url, target_url = val.split
     @rss.image_url = image_url
     @rss.image_target_url = target_url
-  end  
-  
+  end
+
   def title()
     @rss.title
   end
-  
+
   def title=(val)
     @rss.title = val
   end
-  
+
   def link()
     @rss.link
   end
-  
+
   def link=(val)
     @rss.link = val
   end
 
-  
-  # If you wish override this method or use it in block form to add a  
+
+  # 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.
   #
   def on_add(xmlpath, id)
-    
+
     yield(xmlpath, id) if block_given?
-    
-  end  
-  
+
+  end
+
   def save()
-    @rss.save @rssfile    
+    @rss.save @rssfile
   end
-  
+
   def to_dx()
     Dynarex.new @dx.to_xml
   end
-  
-  private 
-  
+
+  private
+
   def create_link(id)
     [File.join(@url_base, File.basename(@filepath), 'status', id)].join('/')
   end
-  
+
   # configures the target page (using a Dynarex document) for a new day
   #
   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')
-    FileUtils.mkdir_p File.dirname(@indexpath)
-    
-        
-    if File.exists? @indexpath then
+    FileX.mkdir_p File.dirname(@indexpath)
+
+
+    if FileX.exists? @indexpath then
       @dx = Dynarex.new @indexpath
     else
-      
+
       puts 'creating a new dx file' if @debug
       @dx = Dynarex.new @schema, debug: @debug
       @dx.order = 'descending'
@@ -213,48 +241,48 @@ class DailyNotices
       @dx.xslt = @dx_xslt
       @dx.title = @title
       @dx.identifier = @identifier
-    end    
-    
+    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'), \
+      FileX.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)
+      FileX.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? 
+
+      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
+      FileX.write target_path.sub(/\.html$/,'.xml', ), rxdoc.xml(pretty: true)
 
-        File.write @target_xslt, 
+      unless FileX.exists? @target_xslt then
+
+        FileX.write @target_xslt,
             RxSliml.new(fields: %i(description time)).to_xslt
       end
-      
-      File.write  target_path, rx.to_html(xslt: @target_xslt)
 
-    end    
+      FileX.write  target_path, rx.to_html(xslt: @target_xslt)
+
+    end
 
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daily_notices
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   mq989lGt58a/Y5CLIB7CrHXwKhKPrMrl9wrNJQaGhmKCpC48MvGPzmGUKYO3OTRK
   QCT4F3Esm7/YTYtL3CQJWI1T
   -----END CERTIFICATE-----
-date: 2021-03-19 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rss_creator
@@ -43,20 +43,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: dx_sliml
   requirement: !ruby/object:Gem::Requirement
@@ -101,22 +101,22 @@ dependencies:
   name: rss_sliml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -143,8 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: A public facing noticeboard which is centered around an RSS feed.