daily_notices 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 353e3bdad29518178624bf3ea0b24418e0d2959f
-  data.tar.gz: 159c643c037d2e894d48fb6970df4405a9187fc6
+  metadata.gz: d01fea12c246c2066ece1f6d310df696fddf7ed8
+  data.tar.gz: 440f7c003c6be5a065097e43ddb8dc72caa64205
 SHA512:
-  metadata.gz: 0a34945600ffb313350ccb98d473ecac2df4c47bf2dc93e095f0b70ef22eb0d7608a2e4f1bf1d0dbc1a816990e7cf2910b7a13ca772c5cf62eac10202e5296c9
-  data.tar.gz: 8b035e7400edb371f7627bd9c56f05a95021978a9a3e7da0fa998981e6778080dff9713cd81c629ea172e1d9e569eeeb287fa736b9449c7e37ac41878c2d81f6
+  metadata.gz: 8e0a74aa6927357ce7c72e48abb9e612766d83b4c23ce67bfa2bfea5b1491e8fef1dae06705a2fc46913ca1efe5a9e059f615bc7a9de3c6afba68e5c2010e6c6
+  data.tar.gz: 0bc3dd1a61a68befcc5c058002033b2e74046decf46c708d0f1c984c02ad25164a0b3dd240b629ec3392840f3073cde924790b40b11d37e4dd73caca5dee16f4

data/lib/daily_notices.rb

@@ -17,6 +17,10 @@ class DailyNotices
     @filepath, @url_base, @dx_xslt, @rss_xslt, @target_page, @target_xslt = \
                 filepath, url_base, dx_xslt, rss_xslt, target_page, target_xslt
 
+    
+    @schema ||= 'items/item(description, time)'
+    @default_key ||= 'uid'
+    
     @day = Time.now.day
     new_day()
     
@@ -38,32 +42,53 @@ class DailyNotices
     @target_page = target_page
   end
   
-  def create(description, time=Time.now, title: nil, \
-                                id: Time.now.strftime('%H%M%S'))
+  def create(x, time=Time.now, title: nil, \
+                     id: Time.now.strftime('%H%M%S'), description: nil)
 
     new_day() if @day != Time.now.day
+        
+    if x.is_a? String then
+
+      description = x
+      @dx.create({description: description, time: time}, id: id)
+
+    elsif x.is_a? Hash
+
+      @dx.create(x, id: id)
+      
+    end
     
-    @dx.create({description: description, time: time}, 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
-      File.write  File.join(@filepath, @archive_path, id, 'index.html'), \
-                                       @dx.find(id).to_html(xslt: @target_xslt)
+
+      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-stylsheet',\
+          "title='XSL_formatting' type='text/xsl' href='#{@target_xslt}'"]
+      
+      File.write target_path.sub(/\.html$/,'.xml', ), rxdoc.xml(pretty: true)
+      File.write  target_path, rx.to_html(xslt: @target_xslt)
     end
     
     # Add it to the RSS document
     title ||= description.split(/\n/,2).first[0..140]
     link = [File.join(@url_base, File.basename(@filepath), \
-                                            @archive_path, '#' + id)].join('/')
+                                            @archive_path, id)].join('/')
     @rss.add( {title: title, link: link, description: description}, id: id)
     @rss.save @rssfile
     
     on_add(@indexpath, id)
 
-
   end
   
   alias add create
@@ -103,6 +128,8 @@ class DailyNotices
   
   private 
   
+  # configures the target page (using a Dynarex document) for a new day
+  #
   def new_day()
     
     @archive_path = Time.now.strftime("%Y/%b/%d").downcase
@@ -110,15 +137,13 @@ class DailyNotices
     @indexpath = File.join(@filepath, @archive_path, 'index.xml')
     FileUtils.mkdir_p File.dirname(@indexpath)
     
-    schema = 'items/item(description, time)'
-    default_key = 'uid'
         
     if File.exists? @indexpath then
       @dx = Dynarex.new @indexpath
     else
-      @dx = Dynarex.new schema
+      @dx = Dynarex.new @schema
       @dx.order = 'descending'
-      @dx.default_key = default_key
+      @dx.default_key = @default_key
       @dx.xslt = @dx_xslt
     end    
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daily_notices
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   6KZopP6uiDZcPfIWtD5QSbhxe2cyGqlu4Xnb4imiAb9DWj8g5YP45vWTp1a71ytC
   TGdJpNvN31W5+w==
   -----END CERTIFICATE-----
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rss_creator