mymedia-pages 0.4.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0c08643b6ed8f8d1d995683aaa991064cd2257a3f1dec07025f26d0536e281d
-  data.tar.gz: 1e75399e2f80fef5212540d456e7ac905cd91a14de65ed77d6d401d0bc83db2c
+  metadata.gz: 0207dc7910117c8f75b7cd43fa8bfd135c4307e717a0fb58ceadfdf33c6c64d7
+  data.tar.gz: c723f97a07d4b524ff04433153a0d8974863f77960828fe3eb1a6cb36dbfbb06
 SHA512:
-  metadata.gz: 23195bd7994a9f2cdb40c2eab3373c89e8e20708e4f5ff055fa0def6ff7c93f178ba426aa1374a07cc5ca217e04d0905e9416d0e523611fae2c87ee989a9045a
-  data.tar.gz: 5acb6b674ce42dd2857d4316918c979ab5fab6ce419aee51b0ce15b321cd0c8a9320cb8719104577a4a1f072d5cfb9c9c8cc238e5da8ff068c0adcd2feb1eb5e
+  metadata.gz: 976f130bd9311dd2b2c58306f925741ac1647feee540304d2b30980269ee028e25049dff2e350186bd6e222169ac04f8e2592137bfef05dd1b0b2f3f917890f8
+  data.tar.gz: 8fd25e04e36bbb4da21e6b63bc12e880b09fcca664e2a8b4fbe8ac3d4d909b41f20365969bdf2f12db6c7161c4ee48d068065126296c4cf3bc9a22d3a01060ea

data/lib/mymedia-pages.rb

@@ -6,20 +6,22 @@
 require 'mymedia'
 require 'martile'
 require 'kramdown'
+require 'rxfileio'
 
 
 module PageReader
+  include RXFRead
 
   # 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
@@ -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,27 +83,33 @@ 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')
+        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'),
                 tags.map {|x| "#%s" % x }.join(' ')]
 
 
-        @log.info "msg: %s tags: %s" % [raw_msg, tags.inspect]if @log
+        @log.info "msg: %s tags: %s" % [raw_msg, tags.inspect] if @log
 
 
       else
@@ -109,20 +117,20 @@ 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]
+        raw_msg = FileX.read(destination)[/<title>([^<]+)<\/title>/,1]
       end
 
       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 +214,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)
@@ -225,7 +233,8 @@ class MyMediaPages < MyMedia::Base
 
         new_link = x.text.gsub(/\s/,'_')
 
-        x.attributes[:href] = "#{@dynamic_website}/do/#{@public_type}/new/" + new_link
+        x.attributes[:href] = "#{@dynamic_website}/do/#{@public_type}/new/" \
+            + new_link
         x.attributes[:class] = 'new'
         x.attributes[:title] = x.text + ' (page does not exist)'
       end
@@ -265,7 +274,11 @@ class MyMediaPages < MyMedia::Base
 
   def xsltproc(xslpath, xmlpath)
 
-    Nokogiri::XSLT(File.open(xslpath))\
-              .transform(Nokogiri::XML(File.open(xmlpath))).to_xhtml(indent: 0)
+    if not FileX.exists? xslpath then
+      raise MyMediaPagesError, 'Missing file - ' + xslpath
+    end
+
+    Nokogiri::XSLT(FileX.read(xslpath))\
+            .transform(Nokogiri::XML(FileX.read(xmlpath))).to_xhtml(indent: 0)
   end
 end

data.tar.gz.sig

@@ -1,2 +1 @@
-�7��-��ҽ� !����LM�Br�y
-� ��'C>2�u�؎Q��Zb�h�xMc�[{+�l��mo"/b�q�l��x�qkG��L�	y�ށk�
+6����3]8GmQ�dMjO6�H����:�~���?sDA�*m�y__f�2.��G���ެ�P4���j|��5��h�O�c����4�{5�}�s�z�?(�]��X�G!("~N>#��Ž�΅>�#Jz՞Hx������\V�r'�y��l����D�d�s���8�����l�d������jlv�;vD�[�%�7i����h�
ꧽ?�6n
�sc
?R�s�*)ߘ#�״Ã<9x�9 �f�N��(Wӝ�ܓ�����ޗ;꺮su��Z���رy�#�Y��IE�ehe�s�f��
"5�']���()�U��LJ�+O=$��}CAeΠ�\ܸlL9uY}o>s��ml�i7ةL��>&9�a��-�cm�8"��9?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia-pages
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,48 +35,48 @@ cert_chain:
   jSG8iFV4kJofCyHyfW6zyZy0d22o23Syxam2rIESaal2RPL7gADDTc8XBe/sFeWr
   A7Ido2/5qg5YDVloSOHTfzZj
   -----END CERTIFICATE-----
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mymedia
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: martile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -123,8 +123,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 MyMedia gem to publish a basic web page