mymedia-pages 0.3.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e6a1f51dc5bd140b99776a51e52b6101dba849ab202faa898f4978fd9697a78
-  data.tar.gz: f226e165c7437ef3b0e1e33421f1529b1b2e2eb1cf032d3526ec6a762586a67a
+  metadata.gz: 0eea23c92c39a299c87722eb15a8718d64d16ff45a499b54668c1a9d0c4a3da6
+  data.tar.gz: 3b41298e25a327ca15924d186f21e81436f1a50147f5035bf7a060d5aa36c885
 SHA512:
-  metadata.gz: fc47aa4e734b8b9b1d1bcc28acb3d00644b1188f8956fd1c622d69ed5fb363261a351e736122873ca4caf7420ea4d45d16e6e5ca648ffd3ee919c5032d0c84e0
-  data.tar.gz: f54b7929e3213f8a21fbf01bf95226e106b9d5416076fefda578b4032cce785c18ec76f8137900bd64b47d196764824f0f70450c506de9e3f1d413668e7155db
+  metadata.gz: 5bdc93280a0eb6f2a81efe740f80facc0d0834302c13b1539d42b680b6065368fa27c387a4d47afc2924848f6097e0ce230ec45f5b465e82b6aecd1783dc6ee4
+  data.tar.gz: 67c5499fc6648907ff873ed42662c3b4625694390e7dec85a6bceb5a9b7e9fa4788b402ff49a7d937dcb0743156ae56b527238d95be87ba764cf122ae52930cd

data/lib/mymedia-pages.rb

@@ -5,55 +5,75 @@
 
 require 'mymedia'
 require 'martile'
+require 'kramdown'
 
 
+module PageReader
+  include RXFHelperModule
+
+  # read the source file
+  #
+  def read(filename)
+    FileX.read File.join(@media_src, escape(filename))
+  end
+
+  # view the published file
+  #
+  def view(filename)
+    FileX.read File.join(@home, @public_type, filename)
+  end
+
+end
+
 class MyMediaPagesError < Exception
 end
 
 class MyMediaPages < MyMedia::Base
+  include RXFHelperModule
+  include MyMedia::IndexReader
+  include PageReader
 
   def initialize(media_type: media_type='pages',
        public_type: @public_type=media_type, ext: '.(html|md|txt)',
-                 config: nil, log: log, debug: false)
-    
+                 config: nil, log: nil, debug: false)
+
     super(media_type: media_type, public_type: @public_type=media_type,
                             ext: '.(html|md|txt)', config: config, log: log)
 
-    @media_src = "%s/media/%s" % [@home, media_type]
     @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(@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')
         x_destination = raw_destination.sub(/\.html$/,ext)
 
 
-        FileUtils.cp src_path, x_destination
-        
+        FileX.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
+        src_content = FileX.read src_path
         doc = xml(src_content, relative_path, filename)
 
         return unless doc
@@ -63,82 +83,90 @@ class MyMediaPages < MyMedia::Base
 
         @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)
+        FileX.write raw_destination,
+            xsltproc("#{@home}/r/xsl/#{@public_type}.xsl", raw_dest_xml)
+
+        FileX.write destination,
+            xsltproc("#{@home}/#{@www}/xsl/#{@public_type}.xsl", dest_xml)
+
+        html_filename = basename(@media_src, src_path)\
+            .sub(/(?:md|txt)$/,'html')
 
-        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))
-        FileUtils.cp destination, File.join(File.dirname(destination), html_filename)
+        FileX.mkdir_p File.dirname(File.join(File.dirname(destination),
+                                             html_filename))
+        FileX.cp destination, File.join(File.dirname(destination),
+                                        html_filename)
 
-        FileUtils.mkdir_p File.dirname( File.join(File.dirname(dest_xml), xml_filename))
-        FileUtils.cp dest_xml, File.join(File.dirname(dest_xml), xml_filename)
+        FileX.mkdir_p File.dirname( File.join(File.dirname(dest_xml),
+                                              xml_filename))
+        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
+
+
+        @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        
-        
-        FileUtils.cp src_path, destination
-        FileUtils.cp src_path, raw_destination   
-        
-        raw_msg = File.read(destination)[/<title>([^<]+)<\/title>/,1]
+          FileX.mkdir_p File.dirname(html_filename)
+        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
-        FileUtils.mkdir_p File.dirname(@home + "/#{@public_type}/" + html_filename)
-        FileUtils.cp destination, @home + "/#{@public_type}/" + html_filename
+        FileX.mkdir_p File.dirname(@home + "/#{@public_type}/" + html_filename)
+        FileX.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('/')
-        
+
         if @log then
           @log.info 'MyMediaPages::copy_publish ->file_publish ' +
               'before publish_dynarex'
         end
-        
-        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
-  
-  
+
+
   private
-  
+
   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
@@ -146,7 +174,7 @@ class MyMediaPages < MyMedia::Base
     html = Kramdown::Document.new(s).to_html
     [raw_title, raw_tags, html]
 
-  end  
+  end
 
   def microblog_title(doc)
 
@@ -154,7 +182,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)
 
@@ -165,17 +193,17 @@ 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
@@ -186,40 +214,42 @@ class MyMediaPages < MyMedia::Base
                           + ["href='#{@website}/#{xslpath}xsl/#{@public_type}.xsl'"]
 
     yield(doc) if block_given?
-    File.write filepath, doc.xml(declaration: true, pretty: false)
+    FileX.write filepath, doc.xml(declaration: true, pretty: false)
   end
-  
+
   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[: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 }}
@@ -230,21 +260,21 @@ 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)    
-    
-    Nokogiri::XSLT(File.open(xslpath))\
-              .transform(Nokogiri::XML(File.open(xmlpath))).to_xhtml(indent: 0)
+  end
+
+  def xsltproc(xslpath, xmlpath)
+
+    Nokogiri::XSLT(FileX.read(xslpath))\
+            .transform(Nokogiri::XML(FileX.read(xmlpath))).to_xhtml(indent: 0)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia-pages
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.1
 platform: ruby
 authors:
 - James Robertson
@@ -11,74 +11,94 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgxMjIzMjIwODMxWhcN
-  MTkxMjIzMjIwODMxWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCfQSh0
-  54uRwCwRP2UZxTYFukb9hOW+bkk2oxIKCtF8PqswL3GvT8cklOrX5Di3k62XZVo9
-  beR7L4Wg9XMrF5M8L/BaV9bQGuUdAX511KCvICWMdshkwb4YgXu67zCyNWYFI5OP
-  014NIzwRCfa0MwumixtzLGCwlzuyRY1sOt9vmrBiDfJuTaoM4fvNkeAUTcasnzc3
-  sXYAJYpAwqZyIgCLRGZneE2X0PniFN1GugLqDVnIyEYTT881mB7uZT+iossWgoPx
-  AR38kIFvIropiFN12LHCqYaHrZs4sOt+qWAVB+nD3FvNdInS5/LRR3vYCIzDrZNA
-  2zSqcaAlqDrGHd2ihbyOHOXo5+KTwI/PejnyjJ45NWTNCfHWzTV39JcoG2lQ3BhW
-  m8XymSUz8Kw21rweuM35dVwbTT9JJ6EGLA1b4Cn/Y5Y0xZTxIOxWL/pN8mlPE1RR
-  W8+RpbMTd7wDQvmV5ZKhoLKlmwx7x2bhdQsPSVKT8gVHGc3avwmNOBVOiP0CAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUnc0QUhFf
-  5ZzlxVZ49oWnaIY/67owJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  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
-  BgkqhkiG9w0BAQsFAAOCAYEAEOyi4k4QdyOta49jNF/ItwjvgzpyH5lSgrljgVIW
-  +EhQ2J4M4oZt3WCW2uz1ymBDhqaVhlivl1/2Pdfi+q1k99z9CYclxXQuc9BCE1Fv
-  U3PNcKt2eWUBDl38GiFS97i2e4hnP5aEcNKccp9qtBWgb7vb7qNfA2Hl/nj/pjfS
-  wUv/JGx+sRKvoEp7ZiArNv5zKF57CQcwXXdgl4EpQ8cDd0OvWkUnSwn8/Db2hVYh
-  Nof01v/DuLb7HRa3/jWXq5/sXdnkRGyvYcGVKIDUZXjCSkGmWe2KliWkRjTB69TN
-  2sB+X+/T/RYv/fZd1cQ2lqUvR87OtrSsihETlSZW3HMcDXuHhTQDNIMTfp/sCOxm
-  MYWc9C1P6edGrzbEs65/Ncf6+JvQi5y1gJm08/jFQZfgZ5C6EeqG88e5nz11D3PP
-  Zjzgguta+drnuIJnc+QwM1iiRbCxGnBHakqqO7LHJ9ZfNQUakUmPlDsmZhw8y/jo
-  jUJbajlf284t/3akvWUQ+1KB
+  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: 2018-12-23 00:00:00.000000000 Z
+date: 2022-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mymedia
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.14
+        version: 0.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
   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.2'
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: martile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.14
+        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: 1.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: martile
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.3.1
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -104,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: A MyMedia gem to publish a basic web page