mymedia-pages 0.5.1 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0eea23c92c39a299c87722eb15a8718d64d16ff45a499b54668c1a9d0c4a3da6
-  data.tar.gz: 3b41298e25a327ca15924d186f21e81436f1a50147f5035bf7a060d5aa36c885
+  metadata.gz: c090792550a9c690e5c798257f4e750070236fdcec48c9be467a8fb463aefb83
+  data.tar.gz: 15c98cd42e3fa859737c1529d58e2a240f546e170d635d19c36ba941d4f7a2f0
 SHA512:
-  metadata.gz: 5bdc93280a0eb6f2a81efe740f80facc0d0834302c13b1539d42b680b6065368fa27c387a4d47afc2924848f6097e0ce230ec45f5b465e82b6aecd1783dc6ee4
-  data.tar.gz: 67c5499fc6648907ff873ed42662c3b4625694390e7dec85a6bceb5a9b7e9fa4788b402ff49a7d937dcb0743156ae56b527238d95be87ba764cf122ae52930cd
+  metadata.gz: 1401804769832c5b3e006051fc3df5e8fcf7800845816afe00b86e94fd28cf76fae4ed782e20454fec52274e81595c361a903c753d7594426b0a2690dd15d903
+  data.tar.gz: fc928b7156eaf1ea0a8495efe815d77d7bcbf801c5c2522561c5e1b0cf2b981993fa6a1746ade38921b9e843d906357a4b326954dbc0262868271573db20e75b

data/lib/mymedia-pages.rb

@@ -6,21 +6,34 @@
 require 'mymedia'
 require 'martile'
 require 'kramdown'
+require 'rxfileio'
 
 
 module PageReader
-  include RXFHelperModule
+  include RXFRead
 
   # 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
@@ -29,7 +42,6 @@ class MyMediaPagesError < Exception
 end
 
 class MyMediaPages < MyMedia::Base
-  include RXFHelperModule
   include MyMedia::IndexReader
   include PageReader
 
@@ -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)
@@ -145,6 +157,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
@@ -198,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
@@ -256,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
@@ -274,6 +291,10 @@ class MyMediaPages < MyMedia::Base
 
   def xsltproc(xslpath, xmlpath)
 
+    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia-pages
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.4
 platform: ruby
 authors:
 - James Robertson
@@ -35,48 +35,48 @@ cert_chain:
   jSG8iFV4kJofCyHyfW6zyZy0d22o23Syxam2rIESaal2RPL7gADDTc8XBe/sFeWr
   A7Ido2/5qg5YDVloSOHTfzZj
   -----END CERTIFICATE-----
-date: 2022-02-12 00:00:00.000000000 Z
+date: 2022-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mymedia
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
     - - "~>"
       - !ruby/object:Gem::Version
         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.5.0
     - - "~>"
       - !ruby/object:Gem::Version
         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