mymedia-pages 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f1212494cddb465a2992c38cf493903ca6228e9e0852d358953207de7cc2c27
-  data.tar.gz: b19b7b29329da34d44863aa1025d6206c4ecc684beb264b2085101ccdeb828e6
+  metadata.gz: c090792550a9c690e5c798257f4e750070236fdcec48c9be467a8fb463aefb83
+  data.tar.gz: 15c98cd42e3fa859737c1529d58e2a240f546e170d635d19c36ba941d4f7a2f0
 SHA512:
-  metadata.gz: 9404f5def759be60fd1ea4f75c9d37f117065cc4a7ba1adf041d1dce78c61296b64655f36c9553616fd5039eabaadbe63f3870cb1cbae7e0a81c3ff151ced51a
-  data.tar.gz: 849e0bdc4d0d70909d33a486910609574a324913d997b7bb7d341d6958af1f8e6539948f307d507abb845362223f4ab78927f4b59acf6a2f1cc444d26ee7ad45
+  metadata.gz: 1401804769832c5b3e006051fc3df5e8fcf7800845816afe00b86e94fd28cf76fae4ed782e20454fec52274e81595c361a903c753d7594426b0a2690dd15d903
+  data.tar.gz: fc928b7156eaf1ea0a8495efe815d77d7bcbf801c5c2522561c5e1b0cf2b981993fa6a1746ade38921b9e843d906357a4b326954dbc0262868271573db20e75b

data/lib/mymedia-pages.rb

@@ -14,14 +14,26 @@ module PageReader
 
   # read the source file
   #
-  def read(filename)
-    FileX.read File.join(@media_src, escape(filename))
+  def read(raw_filename)
+
+    filename = raw_filename.gsub(/ +/,'_')#.gsub(/'/,'%27')
+    FileX.read File.join(@media_src, filename)
+
   end
 
   # view the published file
   #
-  def view(filename)
-    FileX.read File.join(@home, @public_type, filename)
+  def view(s)
+
+    filepath = if s.count('/') > 1 then
+      # archived file
+      File.join(@home, @www, @public_type,  s + '.html')
+    else
+      # static file
+      File.join(@home, @public_type, s)
+    end
+
+    FileX.read(filepath)
   end
 
 end
@@ -50,7 +62,7 @@ class MyMediaPages < MyMedia::Base
 
     @log.info 'MyMediaPagesinside copy_publish' if @log
     @filename = filename
-    src_path = File.join(@media_src, filename)
+    src_path = File.join(filename)
 
     if File.basename(src_path)[/[a-z]\d{6}T\d{4}\.(?:html)/] then
       return file_publish(src_path, raw_msg)
@@ -66,7 +78,7 @@ class MyMediaPages < MyMedia::Base
         dest_xml = destination.sub(/html$/,'xml')
         x_destination = raw_destination.sub(/\.html$/,ext)
 
-
+        puts "src: %s dest: %s" % [src_path, x_destination] if @debug
         FileX.cp src_path, x_destination
 
         source = x_destination[/\/r\/#{@public_type}.*/]
@@ -84,13 +96,13 @@ class MyMediaPages < MyMedia::Base
         @log.info 'mymedia_pages/copy_publish: after modify_xml' if @log
 
         FileX.write raw_destination,
-            xsltproc("#{@home}/r/xsl/#{@public_type}.xsl", raw_dest_xml)
-
+            xsltproc(File.join(@home, 'r', 'xsl', @public_type + '.xsl'),
+                     raw_dest_xml)
         FileX.write destination,
-            xsltproc("#{@home}/#{@www}/xsl/#{@public_type}.xsl", dest_xml)
+            xsltproc(File.join(@home, @www, 'xsl', @public_type + '.xsl'),
+                     dest_xml)
 
-        html_filename = basename(@media_src, src_path)\
-            .sub(/(?:md|txt)$/,'html')
+        html_filename = basename(@media_src, src_path).sub(/(?:md|txt)$/,'html')
 
 
         xml_filename = html_filename.sub(/html$/,'xml')
@@ -114,7 +126,7 @@ class MyMediaPages < MyMedia::Base
 
       else
 
-        html_filename = basename(@media_src, src_path)
+        html_filename = basename(src_path)
 
         if html_filename =~ /\// then
           FileX.mkdir_p File.dirname(html_filename)
@@ -199,6 +211,10 @@ class MyMediaPages < MyMedia::Base
 
   def modify_xml(docx, filepath, xslpath='r/')
 
+    if @debug then
+      'mymedia_pages: inside modify_xml: docx.xml: ' + docx.xml.inspect
+    end
+
     if @log then
       @log.info 'mymedia_pages: inside modify_xml: docx.xml: ' + docx.xml.inspect
     end
@@ -257,7 +273,7 @@ class MyMediaPages < MyMedia::Base
           xml.access access if access
           xml.source_url filename
           xml.source_file File.basename(filename)
-          xml.original_file original_file
+          xml.original_file File.basename(original_file)
           xml.published Time.now.strftime("%d-%m-%Y %H:%M")
           xml.filetitle original_file[/.*(?=\.\w+$)/]
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia-pages
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   jSG8iFV4kJofCyHyfW6zyZy0d22o23Syxam2rIESaal2RPL7gADDTc8XBe/sFeWr
   A7Ido2/5qg5YDVloSOHTfzZj
   -----END CERTIFICATE-----
-date: 2022-03-19 00:00:00.000000000 Z
+date: 2022-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mymedia