mymedia-pages 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af918e4dae17e35a6a4c9576e81070f6f26ab5f7820a9bcf273fe4e31a0795b8
-  data.tar.gz: e12380cea62d949ad9c0a31b7d1fb3df23ac4a253bb5eb5f8eeb2c5e03b78941
+  metadata.gz: 0030ca25c7cd349733b8dce14aa5305c277847cf348fbac301802ef781b93d90
+  data.tar.gz: 52da1b2a29051d4a2bc9a5104e1dde3472d0c5421e75404b0a31a6f5b63fd27e
 SHA512:
-  metadata.gz: 3302c9c4f33b356a242f668b110778f434ee3fb7f12f0dea3bce3958a0b30f7129c02904bed193208e2d02384f115966e075cffd5765523e09af1212aa221596
-  data.tar.gz: cd97a612da7945a8523d61ef5cc60b163f9893a742567d607950fa00cc0eea89772a9ef7dd22c57dfe53ba841e1510f281a3708afa351f83b54e9dc4fb0508d4
+  metadata.gz: 2ffa05fc30a5c69b2c5a8960eacaf3f1cf63d35a4096670033c7fcb297984b0a07d3493b23567dcb2ba63aa52ed6701ad822bbe944c82f758782d6867782b46f
+  data.tar.gz: aa385bdafe4d7d79a42a3d0fe1010d65dd60b6ddf3f3dc23d692e7d852335f91c7fc56537c6dfab930ea066ea64ff45585b880ed0fb96bc1381148ba615c2829

data/lib/mymedia-pages.rb

@@ -30,7 +30,7 @@ module PageReader
       File.join(@home, @www, @public_type,  s.sub(/\.html$/,'') + '.html')
     else
       # static file
-      File.join(@home, @public_type, s.sub(/\.html$/,'') + '.html')
+      File.join(@home, @www, @public_type, s.sub(/\.html$/,'') + '.html')
     end
 
     FileX.read(filepath)
@@ -52,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')
@@ -84,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
 
@@ -100,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),
@@ -121,53 +124,56 @@ 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
 
@@ -175,8 +181,20 @@ class MyMediaPages < MyMedia::Base
     s.gsub(/ +/,'_')#.gsub(/'/,'%27')
   end
 
-  private
+  def writecopy_publish(raws, filename=nil)
+
+    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
@@ -194,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)
 
@@ -202,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)
 
@@ -213,9 +231,9 @@ class MyMediaPages < MyMedia::Base
 
     title + ' ' + tags
 
-  end
-
-
+  end   
+  
+  
   def modify_xml(docx, filepath, xslpath='r/')
 
     if @debug then
@@ -225,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
@@ -240,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
@@ -249,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/" \
@@ -262,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 }}
@@ -284,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
@@ -306,3 +324,80 @@ class MyMediaPages < MyMedia::Base
             .transform(Nokogiri::XML(FileX.read(xmlpath))).to_xhtml(indent: 0)
   end
 end
+
+module PagesTestSetup
+  include RXFileIOModule
+  
+  def set_paths(cur_dir, www_dir, media_dir)
+    
+    @cur_dir = cur_dir
+    @dir, @www_dir, @media_dir = @public_type, www_dir, media_dir
+    
+  end
+
+  def cleanup()
+
+    # remove the previous test files
+    #
+    FileX.rm_r @www_dir + '/*', force: true
+    puts "Previous #{@www_dir} files now removed!"
+    
+    FileX.rm_r @media_dir + '/*', force: true
+    puts "Previous #{@media_dir} files now removed!"
+    
+  end
+  
+  def prep()
+    
+    # create the template files and directories
+    #
+    xsl_file = @public_type + '.xsl'
+    xsl_src = File.join(@cur_dir, @public_type + '.xsl')
+    
+    www_dest = File.join(@www_dir, 'xsl', xsl_file)
+    r_dest = File.join(@www_dir, 'r', 'xsl', xsl_file)
+    index_dest = File.join(@www_dir, @public_type, 'index-template.html')
+
+    FileX.mkdir_p File.dirname(www_dest)
+    FileX.cp xsl_src, www_dest
+
+    FileX.mkdir_p File.dirname(r_dest)
+    FileX.cp xsl_src, r_dest
+
+    FileX.mkdir_p File.dirname(index_dest)
+    FileX.cp File.join(@cur_dir, 'index-template.html'), index_dest        
+
+    FileUtils.mkdir_p File.join(@media_dir, @dir)
+    
+  end
+
+  # create the input file
+  #  
+  def write(filename: '', content: '')
+
+    File.write File.join(@media_dir, @dir, filename), content
+    puts 'debug: filename: ' + filename.inspect
+
+  end
+
+end
+
+
+class PagesTester23 < MyMediaPages
+  
+  include PagesTestSetup
+  
+  # it is assumed this class will be executed from a test directory 
+  # containing the following auxillary files:
+  #  - pages.xsl
+  #  - index-template.html
+  
+  def initialize(config: '', cur_dir:  '', www_dir: '/tmp/www', 
+                 media_dir: '/tmp/media', debug: false)
+        
+    super(config: config, debug: debug)
+    set_paths(cur_dir, www_dir, media_dir)
+    
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia-pages
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 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-04-25 00:00:00.000000000 Z
+date: 2023-02-25 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.6
   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.6
 - !ruby/object:Gem::Dependency
   name: martile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.0
 - !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