mymedia-pages 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c090792550a9c690e5c798257f4e750070236fdcec48c9be467a8fb463aefb83
-  data.tar.gz: 15c98cd42e3fa859737c1529d58e2a240f546e170d635d19c36ba941d4f7a2f0
+  metadata.gz: 66a2ada0b7a67d7608dd498a0a7c5e93d0161aa4217be023892999a5235aa32d
+  data.tar.gz: ba7827eade00588b91c0a0c3d3b48ff48dd6e36304d82c27a69210669277bbab
 SHA512:
-  metadata.gz: 1401804769832c5b3e006051fc3df5e8fcf7800845816afe00b86e94fd28cf76fae4ed782e20454fec52274e81595c361a903c753d7594426b0a2690dd15d903
-  data.tar.gz: fc928b7156eaf1ea0a8495efe815d77d7bcbf801c5c2522561c5e1b0cf2b981993fa6a1746ade38921b9e843d906357a4b326954dbc0262868271573db20e75b
+  metadata.gz: 0b0b25653c2467a0ff887895933652ddd07d62094b63191ac913217948eea87e72d9a17801a50a2b301a4cb063e07d98423e899dc42c6de9548022d5d22cd658
+  data.tar.gz: 5199bc65006de434dfdbb596a70a39e69c24eae36ad7922d64413f0396a73ff4a7e23b64109162f6d6f8262fc3d42d21d29769f6a66da97becd58763e3406d42

data/lib/mymedia-pages.rb

@@ -16,7 +16,7 @@ module PageReader
   #
   def read(raw_filename)
 
-    filename = raw_filename.gsub(/ +/,'_')#.gsub(/'/,'%27')
+    filename = escape(raw_filename)
     FileX.read File.join(@media_src, filename)
 
   end
@@ -27,15 +27,19 @@ module PageReader
 
     filepath = if s.count('/') > 1 then
       # archived file
-      File.join(@home, @www, @public_type,  s + '.html')
+      File.join(@home, @www, @public_type,  s.sub(/\.html$/,'') + '.html')
     else
       # static file
-      File.join(@home, @public_type, s)
+      File.join(@home, @www, @public_type, s.sub(/\.html$/,'') + '.html')
     end
 
     FileX.read(filepath)
   end
 
+  def escape(s)
+    s.gsub(/ +/,'_')#.gsub(/'/,'%27')
+  end
+
 end
 
 class MyMediaPagesError < Exception
@@ -48,31 +52,34 @@ class MyMediaPages < MyMedia::Base
   def initialize(media_type: media_type='pages',
        public_type: @public_type=media_type, ext: '.(html|md|txt)',
                  config: nil, log: nil, debug: false)
-
+    
+    raise MyMediaPagesError, 'Missing config' unless config
+    
     super(media_type: media_type, public_type: @public_type=media_type,
                             ext: '.(html|md|txt)', config: config, log: log)
 
     @target_ext = '.html'
     @static_html = true
     @debug = debug
-
-  end
-
+    
+  end  
+  
   def copy_publish(filename, raw_msg='')
 
     @log.info 'MyMediaPagesinside copy_publish' if @log
     @filename = filename
-    src_path = File.join(filename)
+    #jr2022-10-09 src_path = File.join(@media_src, filename)
+    src_path = filename
 
-    if File.basename(src_path)[/[a-z]\d{6}T\d{4}\.(?:html)/] then
+    if File.basename(src_path)[/[a-z]\d{6}T\d{4}\.(?:html)/] then      
       return file_publish(src_path, raw_msg)
     end
 
     file_publish(src_path, raw_msg) do |destination, raw_destination|
 
       ext = File.extname(src_path)
-
-      if ext[/\.(?:md|txt)/] then
+      
+      if ext[/\.(?:md|txt)/] then      
 
         raw_dest_xml = raw_destination.sub(/html$/,'xml')
         dest_xml = destination.sub(/html$/,'xml')
@@ -80,7 +87,7 @@ class MyMediaPages < MyMedia::Base
 
         puts "src: %s dest: %s" % [src_path, x_destination] if @debug
         FileX.cp src_path, x_destination
-
+        
         source = x_destination[/\/r\/#{@public_type}.*/]
         s = @website + source
 
@@ -96,15 +103,15 @@ class MyMediaPages < MyMedia::Base
         @log.info 'mymedia_pages/copy_publish: after modify_xml' if @log
 
         FileX.write raw_destination,
-            xsltproc(File.join(@home, 'r', 'xsl', @public_type + '.xsl'),
+            xsltproc(File.join(@home, @www, 'r', 'xsl', @public_type + '.xsl'),
                      raw_dest_xml)
         FileX.write destination,
             xsltproc(File.join(@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')
 
         FileX.mkdir_p File.dirname(File.join(File.dirname(destination),
@@ -117,59 +124,77 @@ class MyMediaPages < MyMedia::Base
         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'),
+        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
 
 
       else
-
+        
         html_filename = basename(src_path)
-
+        
         if html_filename =~ /\// then
           FileX.mkdir_p File.dirname(html_filename)
-        end
-
+        end        
+        
         FileX.cp src_path, destination
         FileX.cp src_path, raw_destination
-
+        
         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
-        FileX.mkdir_p File.dirname(@home + "/#{@public_type}/" + html_filename)
-        FileX.cp destination, @home + "/#{@public_type}/" + html_filename
+
+        html_filepath = File.join(@home, @www, @public_type, html_filename)
+        FileX.mkdir_p File.dirname(html_filepath)
+        FileX.cp destination, html_filepath
 
         if xml_filename then
-          FileUtils.cp dest_xml, @home + "/#{@public_type}/" + xml_filename
+          xml_filepath = File.join(@home, @www, @public_type,  xml_filename)
+          FileUtils.cp dest_xml, xml_filepath
         end
 
-        static_filepath = @home + "/#{@public_type}/static.xml"
-        x_filename = @static_html == true ? html_filename : xml_filename
-        target_url = [@website, @public_type, x_filename].join('/')
-
+        static_filepath = File.join(@home, @www, @public_type, 'static.xml')
+        x_filename = @static_html == true ? html_filename : xml_filename        
+        
         if @log then
           @log.info 'MyMediaPages::copy_publish ->file_publish ' +
               'before publish_dynarex'
         end
-
+        
+        target_url = File.join(@website,  @public_type, x_filename)
         target_url.sub!(/\.html$/,'') if @omit_html_ext
-        publish_dynarex(static_filepath, {title: raw_msg, url: target_url })
+        publish_dynarex(static_filepath, {title: raw_msg, url: target_url })                  
 
       end
 
       [raw_msg, target_url]
-    end
+    end    
+
+  end
 
+  def escape(s)
+    s.gsub(/ +/,'_')#.gsub(/'/,'%27')
   end
 
+  def writecopy_publish(raws, filename=nil)
 
-  private
+    s = raws.strip.gsub(/\r/,'')
+
+    title = escape(s.lines[0].chomp)
+    filename ||= title + '.txt'
+    FileX.write File.join(@media_src, filename), s
 
+    copy_publish File.join(@media_src, filename)
+  end
+
+  
+  private
+  
   def htmlize(raw_buffer)
 
     buffer = Martile.new(raw_buffer, ignore_domainlabel: @domain).to_s
@@ -187,7 +212,7 @@ class MyMediaPages < MyMedia::Base
     html = Kramdown::Document.new(s).to_html
     [raw_title, raw_tags, html]
 
-  end
+  end  
 
   def microblog_title(doc)
 
@@ -195,7 +220,7 @@ class MyMediaPages < MyMedia::Base
 
     title = summary.text('title')
     tags = summary.xpath('tags/tag/text()').map{|x| '#' + x}.join(' ')
-
+    
     url = "%s/%s/yy/mm/dd/hhmmhrs.html" % [@website, @media_type]
     full_title = (url + title + ' ' + tags)
 
@@ -206,9 +231,9 @@ class MyMediaPages < MyMedia::Base
 
     title + ' ' + tags
 
-  end
-
-
+  end   
+  
+  
   def modify_xml(docx, filepath, xslpath='r/')
 
     if @debug then
@@ -218,9 +243,9 @@ class MyMediaPages < MyMedia::Base
     if @log then
       @log.info 'mymedia_pages: inside modify_xml: docx.xml: ' + docx.xml.inspect
     end
-
+    
     doc = Rexle.new docx.xml pretty: false
-
+    
     if @log then
       @log.info 'doc.xml:  ' + doc.xml.inspect if @log
     end
@@ -233,7 +258,7 @@ class MyMediaPages < MyMedia::Base
     yield(doc) if block_given?
     FileX.write filepath, doc.xml(declaration: true, pretty: false)
   end
-
+  
   def xml(raw_buffer, filename, original_file)
 
     begin
@@ -242,12 +267,12 @@ class MyMediaPages < MyMedia::Base
       raw_title, raw_tags, html = htmlize(raw_buffer)
       puts 'after htmlize'
 
-      doc = Rexle.new("<body>%s</body>" % html)
+      doc = Rexle.new("<body>%s</body>" % html)    
 
       doc.root.xpath('//a').each do |x|
 
         next unless x.attributes[:href] and x.attributes[:href].empty?
-
+        
         new_link = x.text.gsub(/\s/,'_')
 
         x.attributes[:href] = "#{@dynamic_website}/do/#{@public_type}/new/" \
@@ -255,18 +280,18 @@ class MyMediaPages < MyMedia::Base
         x.attributes[:class] = 'new'
         x.attributes[:title] = x.text + ' (page does not exist)'
       end
-
+      
       body = doc.root.children.join
 
-      # A special tag can be used to represent a metatag which indicates if
-      # the document access is to be made public. The special tag can either
+      # A special tag can be used to represent a metatag which indicates if 
+      # the document access is to be made public. The special tag can either 
       # be a 'p' or 'public'
 
       access = raw_tags.last[/^(?:p|public)$/] ? raw_tags.pop : nil
-
+      
       xml = RexleBuilder.new
-
-      a = xml.page do
+      
+      a = xml.page do 
         xml.summary do
           xml.title raw_title
           xml.tags { raw_tags.each {|tag| xml.tag tag }}
@@ -277,20 +302,20 @@ class MyMediaPages < MyMedia::Base
           xml.published Time.now.strftime("%d-%m-%Y %H:%M")
           xml.filetitle original_file[/.*(?=\.\w+$)/]
         end
-
+        
         xml.body body
       end
-
-
+            
+    
     rescue
       raise MyMediaPagesError, 'xml(): ' + ($!).inspect
     end
 
     return Rexle.new(a)
-  end
-
-  def xsltproc(xslpath, xmlpath)
-
+  end  
+  
+  def xsltproc(xslpath, xmlpath)    
+    
     if not FileX.exists? xslpath then
       raise MyMediaPagesError, 'Missing file - ' + xslpath
     end

data.tar.gz.sig

@@ -1,2 +1,3 @@
-�����	�	����_��:W+��S�w�8������K**��M�JS��+tQ���S��沐l�|��7����M%�#���‘
J;¼��^��O�8�gK�nHUȚ�>��b���G����!A
-cg;�h5�:~NwȒmX��ꭼ�&۶�^�
+L���l;� �Mh|�/ΜU��8��-���x�|N��w�;�*�e�c�6�`��v�GkF�zU���i��3��X��q.lrB�yѷ���)�9��Bqp!�c@:��jUT��|�w_�
�E�.��W;�-�o�bw��,���2�Q�l�;��ӊ�٦�nK���i=����O��N���-��M�L�6��6�:��yea�����/CG�"۬�w}p�9�ڍ�Z�5�̏��YS׳S,X�~�0�&t����L5�[Q0?�y
�

+0�oi?qz�T�Xĕm�x�1�Ǵ��>�R*��]b�vX�eI$���(�y��{
+������k�c�I�0�Tl̓�i|D��S��PjG+:�����z*_����"�F���X�H�`�[�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia-pages
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - James Robertson
@@ -10,32 +10,33 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjExMjEzMjMyNTE5WhcN
-  MjIxMjEzMjMyNTE5WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDZkvpq
-  V5NXgRqy4VQgEbVJKXEuya2MM0Fof84MFz6CGAlgbEJPO66bdDgr5WEO+of44j0S
-  9G2eoeTbCia3nWdDtz3jZXPyUnqJHnq8Pvm7b3SjWhYBUn/GLoFeVSk5Nd++Q8j6
-  wXgKTAIrlSyhPJp5BvqHsImO1l+v0ngDtGvPrMxqweMocxgITYVfaLDnJBwXn/xC
-  tFCweX4o8SMZm0TXJgvpP2T/f+j6Hk8lkhjD62IctmoDdXyHCowgIXsIuioaoldO
-  CF80CL4d1lGWcoCtmMxpZiJSNMPoMmOxiq23S6s9U4GiipwpgpzQKGwX/+3FqrHE
-  MGD/QS6bs43Agme7DK8xhPa5RoXNeEVMTZyX/GjrwQ4tqrfkaw24nS2CXjTROh3Q
-  Leu0FmxmEGDJcODXguDHZgiQsO1/vTqrPF8lfv4vNxzw9As8uNCH2AMe/ZlbiLJ1
-  VQQT/ApcmpZWwYHj+iDXdiEP6zAH7OzAcq3IOgnDdJcLqfUJWBY+E3BM/J0CAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUi6RPI2tJ
-  vKeubmfzc8d/QhR/dJAwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
-  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAqePoqXrgvPVoMgh+2yZ9phtDp7EAvzSP+iJajj4m
-  /hjZFbamopfDpnsfb8Tr/OZ+H+0CZY/+hLiVq7yLIjB/KMk998/bqNN5upyQBrTr
-  5HaPY3mClTa+o5X7HjfUChpT10zTKbaMPtrF7oBC168J7FhYSvVQXhvKX9s7z1Ev
-  FpS15aQ6JYBn9Sj1drVt5/fL8JDDHMr9+0EWBBGH+YKjbfWhpFFYdrKCqLXBem/t
-  tytUs6a4PO15DZnfH6efHcWuKw6XeTeDZrTvw+qHtpWyfqTtza3R+uberWTFzUgs
-  I71XvkAuSTjMMfuE19pCw+/0Aonol4M+RmQuziQp9OI9qxEXWz05qSRsg2LDk1LK
-  XJKeOH2mtbm+ZqzL6UDvP/kGpBhw3CMeOgkwllzNSXhoEvBxuFewYMsNANPup8qZ
-  jSG8iFV4kJofCyHyfW6zyZy0d22o23Syxam2rIESaal2RPL7gADDTc8XBe/sFeWr
-  A7Ido2/5qg5YDVloSOHTfzZj
+  MIIEljCCAv6gAwIBAgIBATANBgkqhkiG9w0BAQsFADBIMRIwEAYDVQQDDAlnZW1t
+  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
+  8ixkARkWAmV1MB4XDTIzMDIyMTE2MTUwNloXDTI0MDIyMTE2MTUwNlowSDESMBAG
+  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
+  EjAQBgoJkiaJk/IsZAEZFgJldTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoC
+  ggGBALbR+uY8Oo3fZCsufvicOAAr1/qPySuDheNENOTld2pVEgG6AbnUk5GiRGoL
+  MOObAU0hxvrL1C/Y8oz7ExfaPPZ23tSy6qx5INsAeJRABEftzSrQGdJiTfr8OxQZ
+  W15kKATzpxQJm8SYfDpjIWmT3kSw03pTC6QRJWc39CpnBlpyYPqsLncBhrw022SE
+  1foO0ybxWAtYnAiov+kkJsseDnsVO1Hg4C/sOwXuh7RO8ehAvHSUAy+KPLVm4aX4
+  r/UwV70dbV1DZZzmpWBPSm7UPXg27yCTn4KGwAHT4eLz74cyt7B9NZ9cO45xFGCf
+  6Hf4jCb5DD6xn5LNnLtvrs/tqWXX35VAEKXBpbou4Ufe9pAo82hhpT+nZEkQZZXk
+  ysrRD1FngqZtZ5ujy/pH03enbcsVzerBc0x2FqkjqXZdfI4nsinpq+TfGVUxo7rO
+  Ll9BT3tydPNJ33E7kb8l8Q6snKcATCTklenC8raI4z/gYzi4a/kZgD7llwWX4S6F
+  a5OtKwIDAQABo4GKMIGHMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBTO10cGGIh/ETBnCKMw5dkIaE5OHjAmBgNVHREEHzAdgRtnZW1tYXN0ZXJAamFt
+  ZXNyb2JlcnRzb24uZXUwJgYDVR0SBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MA0GCSqGSIb3DQEBCwUAA4IBgQCy1qflp5WM3c27wqkJa9BQty37R5+z
+  382k7twdaIcOrk66Yb7H5R6KV3ysEVKgR98tEL+JefXyei/a9bM+NYQ/3k/QBCAn
+  39Gp1gem4/4A3/kNxpwQQOW1edTz9bu1qZ7ktpKHlVQSKErvQX3/b0oSfqO2xv+M
+  CotJDFOtipit0+WBfZSrVuVZFgg8tJnAqMmdJt+zdn5YD1V65IXiY0KNIy+WEFVG
+  iAAoDhhci/sLwgcGlmb6rclSLGLavn+CLd8eSunc8qFWKpKfiLvSEuevV+vJGcQi
+  6D0W3ZONRUTEN4nQdkyLCyXrwdCmSlgzo3ojRoza48uwsQmUyo/FtQ8SZEdwWmOH
+  /c8NuOCfmVbR19NAejS3CdlkIRQaYJAd6sdGjq6fQER/LZ81aTvFe2IE/uILLjv/
+  ngT+/RQQOTNmhN3XBRq8VfcVGUw+w5jm4emNDe1pzTATNmzyadOHF0Rokv0B2T4u
+  txMWqrBuLISsGTO4DRqpDmR09caoN5dRM6k=
   -----END CERTIFICATE-----
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mymedia
@@ -46,7 +47,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,47 +57,47 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: martile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 2.4.0
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -123,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.4
 signing_key: 
 specification_version: 4
 summary: A MyMedia gem to publish a basic web page