mymedia-pages 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e5327c3e0dfbcf0f8817098bed4b1d6a1c5ca8ca
-  data.tar.gz: 1a8a70f162f9fe2a3a4d22dc546943ab9cf74cc8
+SHA256:
+  metadata.gz: b0c08643b6ed8f8d1d995683aaa991064cd2257a3f1dec07025f26d0536e281d
+  data.tar.gz: 1e75399e2f80fef5212540d456e7ac905cd91a14de65ed77d6d401d0bc83db2c
 SHA512:
-  metadata.gz: 6b88b26d981ecf5dbc88eb5bb517384a8a1e20d92b37386d67f49e62f30175d5a4ff0b6c4695b797423fcbf5541031e7b992b2a33d7b5f29131636384b9c529e
-  data.tar.gz: 1747d60cfbe92e6d46fbcc78465ea786fa029b6d0176852ab8ba3e89e533c7c7a736240b04830b3a6a32cabaab0cfde7be1dd3fccc8766cb8ee2dd42e4af8e32
+  metadata.gz: 23195bd7994a9f2cdb40c2eab3373c89e8e20708e4f5ff055fa0def6ff7c93f178ba426aa1374a07cc5ca217e04d0905e9416d0e523611fae2c87ee989a9045a
+  data.tar.gz: 5acb6b674ce42dd2857d4316918c979ab5fab6ce419aee51b0ce15b321cd0c8a9320cb8719104577a4a1f072d5cfb9c9c8cc238e5da8ff068c0adcd2feb1eb5e

data/lib/mymedia-pages.rb

@@ -5,36 +5,60 @@
 
 require 'mymedia'
 require 'martile'
+require 'kramdown'
 
 
+module PageReader
+
+  # read the source file
+  #
+  def read(filename)
+    File.read File.join(@media_src, escape(filename))
+  end
+
+  # view the published file
+  #
+  def view(filename)
+    File.read File.join(@home, @public_type, filename)
+  end
+
+end
+
+class MyMediaPagesError < Exception
+end
+
 class MyMediaPages < MyMedia::Base
+  include MyMedia::IndexReader
+  include PageReader
 
   def initialize(media_type: media_type='pages',
-       public_type: @public_type=media_type, ext: '.(html|md|txt)',config: nil)
-    
+       public_type: @public_type=media_type, ext: '.(html|md|txt)',
+                 config: nil, log: nil, debug: false)
+
     super(media_type: media_type, public_type: @public_type=media_type,
-                                        ext: '.(html|md|txt)', config: config)
+                            ext: '.(html|md|txt)', config: config, log: log)
 
-    @media_src = "%s/media/%s" % [@home, media_type]
     @target_ext = '.html'
     @static_html = true
-    
-  end  
-  
+    @debug = debug
+
+  end
+
   def copy_publish(filename, raw_msg='')
 
+    @log.info 'MyMediaPagesinside copy_publish' if @log
     @filename = filename
     src_path = File.join(@media_src, 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')
@@ -42,25 +66,28 @@ class MyMediaPages < MyMedia::Base
 
 
         FileUtils.cp src_path, x_destination
-        
+
         source = x_destination[/\/r\/#{@public_type}.*/]
         s = @website + source
 
         relative_path = s[/https?:\/\/[^\/]+([^$]+)/,1]
+        src_content = File.read src_path
+        doc = xml(src_content, relative_path, filename)
 
-        doc = xml(File.open(src_path, 'r').read, relative_path, filename)
         return unless doc
 
         modify_xml(doc, raw_dest_xml)
         modify_xml(doc, dest_xml)
 
+        @log.info 'mymedia_pages/copy_publish: after modify_xml' if @log
+
         File.write raw_destination, xsltproc("#{@home}/r/xsl/#{@public_type}.xsl", raw_dest_xml)
 
         File.write destination, xsltproc("#{@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')
 
         FileUtils.mkdir_p File.dirname(File.join(File.dirname(destination), html_filename))
@@ -70,56 +97,68 @@ class MyMediaPages < MyMedia::Base
         FileUtils.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'), 
-                tags.map {|x| "#%s" % x }.join(' ')] 
+        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(@media_src, src_path)
-        
+
         if html_filename =~ /\// then
           FileUtils.mkdir_p File.dirname(html_filename)
-        end        
-        
+        end
+
         FileUtils.cp src_path, destination
-        FileUtils.cp src_path, raw_destination   
-        
+        FileUtils.cp src_path, raw_destination
+
         raw_msg = File.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
         FileUtils.mkdir_p File.dirname(@home + "/#{@public_type}/" + html_filename)
         FileUtils.cp destination, @home + "/#{@public_type}/" + html_filename
 
         if xml_filename then
-          FileUtils.cp dest_xml, @home + "/#{@public_type}/" + xml_filename 
+          FileUtils.cp dest_xml, @home + "/#{@public_type}/" + xml_filename
         end
 
-        static_filepath = @home + "/#{@public_type}/static.xml"          
-        x_filename = @static_html == true ? html_filename : xml_filename        
+        static_filepath = @home + "/#{@public_type}/static.xml"
+        x_filename = @static_html == true ? html_filename : xml_filename
         target_url = [@website, @public_type, x_filename].join('/')
 
-        publish_dynarex(static_filepath, {title: raw_msg, url: target_url })                  
+        if @log then
+          @log.info 'MyMediaPages::copy_publish ->file_publish ' +
+              'before publish_dynarex'
+        end
+
+        publish_dynarex(static_filepath, {title: raw_msg, url: target_url })
 
       end
 
       [raw_msg, target_url]
-    end    
+    end
 
   end
-  
-  
+
+
   private
-  
-  def htmlize(raw_buffer)
 
-    buffer = Martile.new(raw_buffer, ignore_domainlabel: @domain).to_html
+  def htmlize(raw_buffer)
 
+    buffer = Martile.new(raw_buffer, ignore_domainlabel: @domain).to_s
     lines = buffer.strip.lines.to_a
+    puts 'lines: ' + lines.inspect if @debug
 
     raw_title = lines.shift.chomp
+    puts 'lines 2): ' + lines.inspect if @debug
+
+    raise MyMediaPagesError, 'invalid input file' if lines.empty?
     raw_tags = lines.pop[/[^>]+$/].split
 
     s = lines.join
@@ -127,7 +166,7 @@ class MyMediaPages < MyMedia::Base
     html = Kramdown::Document.new(s).to_html
     [raw_title, raw_tags, html]
 
-  end  
+  end
 
   def microblog_title(doc)
 
@@ -135,7 +174,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)
 
@@ -146,52 +185,62 @@ class MyMediaPages < MyMedia::Base
 
     title + ' ' + tags
 
-  end   
-  
-  
+  end
+
+
   def modify_xml(docx, filepath, xslpath='r/')
 
+    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
+
     raw_msg = microblog_title(doc)
 
     doc.instructions.push %w(xml-stylesheet title='XSL_formatting' type='text/xsl') \
-                                      + ["href='#{@website}/#{xslpath}xsl/#{@public_type}.xsl'"]
+                          + ["href='#{@website}/#{xslpath}xsl/#{@public_type}.xsl'"]
+
     yield(doc) if block_given?
     File.write filepath, doc.xml(declaration: true, pretty: false)
   end
-  
-  def xml(raw_buffer, filename, original_file)
 
+  def xml(raw_buffer, filename, original_file)
 
     begin
 
-
+      puts 'before htmlize'
       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/" + new_link
         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 }}
@@ -202,20 +251,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
 
+
+    rescue
+      raise MyMediaPagesError, 'xml(): ' + ($!).inspect
     end
-    
+
     return Rexle.new(a)
-  end  
-  
-  def xsltproc(xslpath, xmlpath)    
-    
+  end
+
+  def xsltproc(xslpath, xmlpath)
+
     Nokogiri::XSLT(File.open(xslpath))\
               .transform(Nokogiri::XML(File.open(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.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,91 +10,95 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE3MDMxMTIwNTIzNloXDTE4MDMxMTIwNTIzNlowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAL9Yny0RdospLkKN90owdm55hopv4IS7M44/DCkkMyh/ezjeIk30fHJn33l1
-  hDDoKaWiOWZ1HOvNEkOPGSX0bgi3yHu4XWoBgal5f+tmxLYhVY2hsidtUryiohu/
-  qKsyhOJwoWPvkSuGLrhdTENVcfFkVPhKfZy/nH2Fu6F4PHaLXY1qbcLDdL2Fg+v7
-  I+KAh5YIi78v2/mbbyhBbYCxC38fzH+O+NRcmWvWmX7htGqYtHTy/W7XvF0Gtdzg
-  oWlSuhM6uquWQIcdIiw+xPRHPSp+LLbL7dz2h+aBPDgXjgZWZj5eFVLCMffn/5gW
-  omObJXrV48bkjZRtBsGe2NOZcYUCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQU1xeiJOTJNXQ9Fk2bJEReYjcoj+QwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEALkl3UeCA
-  csxxol+6zjzluuVIEDztd9oN09ymiNVe4D2DhSxmZd+bPj08VCCwPiU3YxBQyWoz
-  r8Bh/b1MKSzx7t+hvZpxru4sgFbZF81IvHmkMae2qsDq85Qs5gU/sGYxgSFXQ/Ab
-  pLpY4UcMheGnBiAFztIsAI0X5I6xzIkFAEuXEv+ckjYaHYdQWng7KnpXatZih/id
-  5J2a8Ha54WMDm0wAJlhT700D4+nRjufaYiRWusYWwz71/YdJp5ZlWTHhisG0VdwN
-  f5cM/DycnWUbyyxUfvCHRvwNubEB3M+NDfHtIlbbeK82WC+HbtOYLXWQsy7266iP
-  Nz7iR/JcIY24rA==
+  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
   -----END CERTIFICATE-----
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mymedia
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: martile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 1.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 1.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.2
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.2
+        version: 2.3.1
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -120,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: A MyMedia gem to publish a basic web page