mymedia-pages 0.5.2 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0207dc7910117c8f75b7cd43fa8bfd135c4307e717a0fb58ceadfdf33c6c64d7
-  data.tar.gz: c723f97a07d4b524ff04433153a0d8974863f77960828fe3eb1a6cb36dbfbb06
+  metadata.gz: af918e4dae17e35a6a4c9576e81070f6f26ab5f7820a9bcf273fe4e31a0795b8
+  data.tar.gz: e12380cea62d949ad9c0a31b7d1fb3df23ac4a253bb5eb5f8eeb2c5e03b78941
 SHA512:
-  metadata.gz: 976f130bd9311dd2b2c58306f925741ac1647feee540304d2b30980269ee028e25049dff2e350186bd6e222169ac04f8e2592137bfef05dd1b0b2f3f917890f8
-  data.tar.gz: 8fd25e04e36bbb4da21e6b63bc12e880b09fcca664e2a8b4fbe8ac3d4d909b41f20365969bdf2f12db6c7161c4ee48d068065126296c4cf3bc9a22d3a01060ea
+  metadata.gz: 3302c9c4f33b356a242f668b110778f434ee3fb7f12f0dea3bce3958a0b30f7129c02904bed193208e2d02384f115966e075cffd5765523e09af1212aa221596
+  data.tar.gz: cd97a612da7945a8523d61ef5cc60b163f9893a742567d607950fa00cc0eea89772a9ef7dd22c57dfe53ba841e1510f281a3708afa351f83b54e9dc4fb0508d4

data/lib/mymedia-pages.rb

@@ -14,14 +14,30 @@ module PageReader
 
   # read the source file
   #
-  def read(filename)
-    FileX.read File.join(@media_src, escape(filename))
+  def read(raw_filename)
+
+    filename = escape(raw_filename)
+    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.sub(/\.html$/,'') + '.html')
+    else
+      # static file
+      File.join(@home, @public_type, s.sub(/\.html$/,'') + '.html')
+    end
+
+    FileX.read(filepath)
+  end
+
+  def escape(s)
+    s.gsub(/ +/,'_')#.gsub(/'/,'%27')
   end
 
 end
@@ -50,7 +66,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 +82,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 +100,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 +130,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 +161,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
@@ -154,6 +171,9 @@ class MyMediaPages < MyMedia::Base
 
   end
 
+  def escape(s)
+    s.gsub(/ +/,'_')#.gsub(/'/,'%27')
+  end
 
   private
 
@@ -198,6 +218,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 +280,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

data.tar.gz.sig

@@ -1 +1,3 @@
-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?
+~E�����H�X�K�4Vr�\Z�È���K�����j�������\��Yv�g�f�d�v|�7y~��+i�{7G�8�\�/%R�b:+���e���<|�n��Jea6���kSF�Q4+�7�f��"�1�����0`���m�Mu�\>�ގԘ��,�4��X��Ȏ{z��Xzulm��h�$��-��/�JbsR������3��X��CaR�@S���ù�̅�ti�����S�]�m�b\i�
+(�H"�yݭ��i
+g���Y��/��M�*&;��f���y0�g��>=��C�6R�.�Zw��vF�s+��\���

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia-pages
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.5
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   jSG8iFV4kJofCyHyfW6zyZy0d22o23Syxam2rIESaal2RPL7gADDTc8XBe/sFeWr
   A7Ido2/5qg5YDVloSOHTfzZj
   -----END CERTIFICATE-----
-date: 2022-03-06 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mymedia
@@ -46,7 +46,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: martile
   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: []