mymedia-pages 0.5.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4fda1001262e23054bd48053370ba0577692694e721cf0eccb8b81ca0f118ac
-  data.tar.gz: e53e008532a3885c05856a59857690b068643b60ea2dece53fc87aa4321cf850
+  metadata.gz: 3f1212494cddb465a2992c38cf493903ca6228e9e0852d358953207de7cc2c27
+  data.tar.gz: b19b7b29329da34d44863aa1025d6206c4ecc684beb264b2085101ccdeb828e6
 SHA512:
-  metadata.gz: c03f7c0dacd88b16b08b2b7ae235529c13f3f1a22de2fec257e68bf9262a7fa14610c968861bb760d9edb8f233cac9a2e25986adfc9a114ae2ea39df42e7c872
-  data.tar.gz: a0b539bdfd82ac378893397d3f4c5abb1106c6449c131d28a0c097f6998b6b35c6f53b6d43c37b5a3a0272e14d4fb4f8a6d4c4a6fcaea1b2ab3bf9b65bdef8f6
+  metadata.gz: 9404f5def759be60fd1ea4f75c9d37f117065cc4a7ba1adf041d1dce78c61296b64655f36c9553616fd5039eabaadbe63f3870cb1cbae7e0a81c3ff151ced51a
+  data.tar.gz: 849e0bdc4d0d70909d33a486910609574a324913d997b7bb7d341d6958af1f8e6539948f307d507abb845362223f4ab78927f4b59acf6a2f1cc444d26ee7ad45

data/lib/mymedia-pages.rb

@@ -6,10 +6,11 @@
 require 'mymedia'
 require 'martile'
 require 'kramdown'
+require 'rxfileio'
 
 
 module PageReader
-  include RXFHelperModule
+  include RXFRead
 
   # read the source file
   #
@@ -29,7 +30,6 @@ class MyMediaPagesError < Exception
 end
 
 class MyMediaPages < MyMedia::Base
-  include RXFHelperModule
   include MyMedia::IndexReader
   include PageReader
 
@@ -83,19 +83,25 @@ 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)
+        FileX.write raw_destination,
+            xsltproc("#{@home}/r/xsl/#{@public_type}.xsl", raw_dest_xml)
 
-        FileX.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')
 
-        FileX.mkdir_p File.dirname(File.join(File.dirname(destination), html_filename))
-        FileX.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)
 
-        FileX.mkdir_p File.dirname( 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()')
@@ -103,7 +109,7 @@ class MyMediaPages < MyMedia::Base
                 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
@@ -117,7 +123,7 @@ class MyMediaPages < MyMedia::Base
         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
@@ -139,6 +145,7 @@ class MyMediaPages < MyMedia::Base
               'before publish_dynarex'
         end
 
+        target_url.sub!(/\.html$/,'') if @omit_html_ext
         publish_dynarex(static_filepath, {title: raw_msg, url: target_url })
 
       end
@@ -227,7 +234,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
@@ -267,7 +275,11 @@ class MyMediaPages < MyMedia::Base
 
   def xsltproc(xslpath, xmlpath)
 
-    Nokogiri::XSLT(File.open(xslpath))\
+    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia-pages
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,48 +35,48 @@ cert_chain:
   jSG8iFV4kJofCyHyfW6zyZy0d22o23Syxam2rIESaal2RPL7gADDTc8XBe/sFeWr
   A7Ido2/5qg5YDVloSOHTfzZj
   -----END CERTIFICATE-----
-date: 2022-02-04 00:00:00.000000000 Z
+date: 2022-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mymedia
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.2
 - !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
@@ -86,7 +86,7 @@ dependencies:
         version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ dependencies:
         version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.3.2
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -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