mymedia-pages 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0c08643b6ed8f8d1d995683aaa991064cd2257a3f1dec07025f26d0536e281d
-  data.tar.gz: 1e75399e2f80fef5212540d456e7ac905cd91a14de65ed77d6d401d0bc83db2c
+  metadata.gz: d4fda1001262e23054bd48053370ba0577692694e721cf0eccb8b81ca0f118ac
+  data.tar.gz: e53e008532a3885c05856a59857690b068643b60ea2dece53fc87aa4321cf850
 SHA512:
-  metadata.gz: 23195bd7994a9f2cdb40c2eab3373c89e8e20708e4f5ff055fa0def6ff7c93f178ba426aa1374a07cc5ca217e04d0905e9416d0e523611fae2c87ee989a9045a
-  data.tar.gz: 5acb6b674ce42dd2857d4316918c979ab5fab6ce419aee51b0ce15b321cd0c8a9320cb8719104577a4a1f072d5cfb9c9c8cc238e5da8ff068c0adcd2feb1eb5e
+  metadata.gz: c03f7c0dacd88b16b08b2b7ae235529c13f3f1a22de2fec257e68bf9262a7fa14610c968861bb760d9edb8f233cac9a2e25986adfc9a114ae2ea39df42e7c872
+  data.tar.gz: a0b539bdfd82ac378893397d3f4c5abb1106c6449c131d28a0c097f6998b6b35c6f53b6d43c37b5a3a0272e14d4fb4f8a6d4c4a6fcaea1b2ab3bf9b65bdef8f6

data/lib/mymedia-pages.rb

@@ -9,17 +9,18 @@ require 'kramdown'
 
 
 module PageReader
+  include RXFHelperModule
 
   # read the source file
   #
   def read(filename)
-    File.read File.join(@media_src, escape(filename))
+    FileX.read File.join(@media_src, escape(filename))
   end
 
   # view the published file
   #
   def view(filename)
-    File.read File.join(@home, @public_type, filename)
+    FileX.read File.join(@home, @public_type, filename)
   end
 
 end
@@ -28,6 +29,7 @@ class MyMediaPagesError < Exception
 end
 
 class MyMediaPages < MyMedia::Base
+  include RXFHelperModule
   include MyMedia::IndexReader
   include PageReader
 
@@ -65,13 +67,13 @@ class MyMediaPages < MyMedia::Base
         x_destination = raw_destination.sub(/\.html$/,ext)
 
 
-        FileUtils.cp src_path, x_destination
+        FileX.cp src_path, x_destination
 
         source = x_destination[/\/r\/#{@public_type}.*/]
         s = @website + source
 
         relative_path = s[/https?:\/\/[^\/]+([^$]+)/,1]
-        src_content = File.read src_path
+        src_content = FileX.read src_path
         doc = xml(src_content, relative_path, filename)
 
         return unless doc
@@ -81,20 +83,20 @@ class MyMediaPages < MyMedia::Base
 
         @log.info 'mymedia_pages/copy_publish: after modify_xml' if @log
 
-        File.write raw_destination, xsltproc("#{@home}/r/xsl/#{@public_type}.xsl", raw_dest_xml)
+        FileX.write raw_destination, xsltproc("#{@home}/r/xsl/#{@public_type}.xsl", raw_dest_xml)
 
-        File.write destination, xsltproc("#{@home}/#{@www}/xsl/#{@public_type}.xsl", dest_xml)
+        FileX.write destination, xsltproc("#{@home}/#{@www}/xsl/#{@public_type}.xsl", dest_xml)
 
         html_filename = basename(@media_src, src_path).sub(/(?:md|txt)$/,'html')
 
 
         xml_filename = html_filename.sub(/html$/,'xml')
 
-        FileUtils.mkdir_p File.dirname(File.join(File.dirname(destination), html_filename))
-        FileUtils.cp destination, File.join(File.dirname(destination), html_filename)
+        FileX.mkdir_p File.dirname(File.join(File.dirname(destination), html_filename))
+        FileX.cp destination, File.join(File.dirname(destination), html_filename)
 
-        FileUtils.mkdir_p File.dirname( File.join(File.dirname(dest_xml), xml_filename))
-        FileUtils.cp dest_xml, File.join(File.dirname(dest_xml), xml_filename)
+        FileX.mkdir_p File.dirname( File.join(File.dirname(dest_xml), xml_filename))
+        FileX.cp dest_xml, File.join(File.dirname(dest_xml), xml_filename)
 
         tags = doc.root.xpath('summary/tags/tag/text()')
         raw_msg = "%s %s" % [doc.root.text('summary/title'),
@@ -109,11 +111,11 @@ class MyMediaPages < MyMedia::Base
         html_filename = basename(@media_src, src_path)
 
         if html_filename =~ /\// then
-          FileUtils.mkdir_p File.dirname(html_filename)
+          FileX.mkdir_p File.dirname(html_filename)
         end
 
-        FileUtils.cp src_path, destination
-        FileUtils.cp src_path, raw_destination
+        FileX.cp src_path, destination
+        FileX.cp src_path, raw_destination
 
         raw_msg = File.read(destination)[/<title>([^<]+)<\/title>/,1]
       end
@@ -121,8 +123,8 @@ class MyMediaPages < MyMedia::Base
       if not File.basename(src_path)[/[a-z]\d{6}T\d{4}\.(?:html|md|txt)/] then
 
         @log.info 'MyMediaPages::copy_publish before FileUtils' if @log
-        FileUtils.mkdir_p File.dirname(@home + "/#{@public_type}/" + html_filename)
-        FileUtils.cp destination, @home + "/#{@public_type}/" + html_filename
+        FileX.mkdir_p File.dirname(@home + "/#{@public_type}/" + html_filename)
+        FileX.cp destination, @home + "/#{@public_type}/" + html_filename
 
         if xml_filename then
           FileUtils.cp dest_xml, @home + "/#{@public_type}/" + xml_filename
@@ -206,7 +208,7 @@ class MyMediaPages < MyMedia::Base
                           + ["href='#{@website}/#{xslpath}xsl/#{@public_type}.xsl'"]
 
     yield(doc) if block_given?
-    File.write filepath, doc.xml(declaration: true, pretty: false)
+    FileX.write filepath, doc.xml(declaration: true, pretty: false)
   end
 
   def xml(raw_buffer, filename, original_file)
@@ -266,6 +268,6 @@ class MyMediaPages < MyMedia::Base
   def xsltproc(xslpath, xmlpath)
 
     Nokogiri::XSLT(File.open(xslpath))\
-              .transform(Nokogiri::XML(File.open(xmlpath))).to_xhtml(indent: 0)
+            .transform(Nokogiri::XML(FileX.read(xmlpath))).to_xhtml(indent: 0)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia-pages
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   jSG8iFV4kJofCyHyfW6zyZy0d22o23Syxam2rIESaal2RPL7gADDTc8XBe/sFeWr
   A7Ido2/5qg5YDVloSOHTfzZj
   -----END CERTIFICATE-----
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mymedia
@@ -43,20 +43,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: martile
   requirement: !ruby/object:Gem::Requirement