daily_notices 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d725b45ca1730c335edf68833584b02478233d4e
-  data.tar.gz: 853261a2c6961ec11103e308e1e10af77f19509b
+  metadata.gz: 74cbff972f98cacf123eb9544164e3f07f1ca9f9
+  data.tar.gz: 0710c12fbc0e7c45c46c2eda5735a59ef769fb6c
 SHA512:
-  metadata.gz: e15707a65b1dd40e4ef5c6a20951d40d5ef6c41cff4a6084fe83237cfe248ac241b2d77534057201a075be080f5fd29ba093b2a35a783300c84f9e31c9068b4e
-  data.tar.gz: 6e5664b4a662bb57afa68f699308032a34ba4bfd678ef7e0a986efafd39ff01474dff1bfd1a99f805c3d876f1e1c4fa989aba347857af4c56e6a4bfc903a48d6
+  metadata.gz: 9f6da00f0f2682b1d4ce96d0e506ef3638bd3311080895b0f4e40b88d2c669eb95cc2eade4d331fdae5721ddf7e2ad4a0c9ec6621832fad1ffb2802b37c9bdde
+  data.tar.gz: 1c21377e8adb07dd27a8e0e3b562b2d0de3bd3b0176f424f38cc55ccae00b9330874ca418a03573495072a786f3c95756b9c9f3ce48126252ad69d6a180dcad0

data/lib/daily_notices.rb

@@ -85,7 +85,7 @@ class DailyNotices
     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
 
@@ -100,32 +100,7 @@ class DailyNotices
     @dx.create(h, id: id)        
     @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_files(id)
 
     # Add it to the RSS document
 
@@ -141,6 +116,29 @@ 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    
+    render_html_files(id.to_s)
+    
+    id.to_s + ' deleted'
+    
+  end
+  
+  def description()
+    @rss.description
+  end
+  
+  def description=(val)
+    @rss.description = val
+  end  
+  
   def title()
     @rss.title
   end
@@ -156,14 +154,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 +169,10 @@ class DailyNotices
     @rss.save @rssfile    
   end
   
+  def to_dx()
+    Dynarex.new @dx.to_xml
+  end
+  
   private 
   
   def create_link(id)
@@ -207,4 +202,36 @@ class DailyNotices
     
   end
   
+  def render_html_files(id)
+    
+    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    
+
+  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.6.3
 platform: ruby
 authors:
 - James Robertson