mymedia-pages 0.1.11 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2083d3ecbfabed426b2a51c6c14e6f316d58d764
-  data.tar.gz: 6ae058366224dc5ccd950b5815d5f5c9ea04ec22
+SHA256:
+  metadata.gz: b73bbe8ccbfca9c049ebafb8920245647980534923ae57c9da9985e38e1cfb42
+  data.tar.gz: 00f5c19e76daa03134c8bcd72c72e501638db8293f02d2f7e7ee85a4dc169ecc
 SHA512:
-  metadata.gz: ebf0ff08940ec12b24f9d3a6fadfbf92400e29d840b3759d37728d9383b31e4929a17c9b1863eb4701be7efbad5f9c8a45ad59fbb72fa2001d653938bb1efdba
-  data.tar.gz: 7f1d8692143bc2e4404899d152e2eb1025e629cec54cab8f5a54c50bbede523c70639520a8c10363848012ccbb332928afa37caf99cbf150d06aa84d233d6afb
+  metadata.gz: 30ea1ee77cc43b186c7b71e6318b62e5f2a09d7de8749f2078d39d0fe4cbc71c14640454a94c7939c960893c14e717ba7b59a7d00e0b97f9f19891e4f91c4870
+  data.tar.gz: 975df95d7e5725ef13da16ff2740307c4171b4754f3cc4f6e92a5e35ffdae2cee83c3dfddbc1eede264cf494297139da432a68ea108a69e1dbd5caec934016ce

data/lib/mymedia-pages.rb

@@ -5,30 +5,38 @@
 
 require 'mymedia'
 require 'martile'
+require 'kramdown'
 
 
+class MyMediaPagesError < Exception
+end
+
 class MyMediaPages < MyMedia::Base
 
   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: log, 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
+    @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      
       return file_publish(src_path, raw_msg)
     end
-    
+
     file_publish(src_path, raw_msg) do |destination, raw_destination|
 
       ext = File.extname(src_path)
@@ -46,12 +54,16 @@ class MyMediaPages < MyMedia::Base
         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)
@@ -69,7 +81,10 @@ class MyMediaPages < MyMedia::Base
 
         tags = doc.root.xpath('summary/tags/tag/text()')
         raw_msg = "%s %s" % [doc.root.text('summary/title'), 
-                tags.map {|x| "#%s" % x }.join(' ')] 
+                tags.map {|x| "#%s" % x }.join(' ')]
+        
+        
+        @log.info "msg: %s tags: %s" % [raw_msg, tags.inspect]if @log
 
 
       else
@@ -88,6 +103,7 @@ class MyMediaPages < MyMedia::Base
             
       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
 
@@ -98,7 +114,12 @@ class MyMediaPages < MyMedia::Base
         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 })                  
 
       end
@@ -113,14 +134,17 @@ class MyMediaPages < MyMedia::Base
   
   def htmlize(raw_buffer)
 
-    buffer = Martile.new(raw_buffer, ignore_domainlabel: @domain).to_html
+    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
     raw_tags = lines.pop[/[^>]+$/].split
 
     s = lines.join
-    html = RDiscount.new(s).to_html
+
+    html = Kramdown::Document.new(s).to_html
     [raw_title, raw_tags, html]
 
   end  
@@ -147,11 +171,21 @@ class MyMediaPages < MyMedia::Base
   
   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
@@ -160,8 +194,9 @@ class MyMediaPages < MyMedia::Base
 
     begin
 
+
       raw_title, raw_tags, html = htmlize(raw_buffer)
-      
+
       doc = Rexle.new("<body>%s</body>" % html)    
 
       doc.root.xpath('//a').each do |x|
@@ -202,15 +237,15 @@ class MyMediaPages < MyMedia::Base
             
     
     rescue
-      @logger.debug "mymedia-pages.rb: html: " + ($!).to_s
+      raise MyMediaPagesError, 'xml(): ' + ($!).inspect
     end
-    
+
     return Rexle.new(a)
   end  
   
-  def xsltproc(xslpath, xmlpath)
+  def xsltproc(xslpath, xmlpath)    
     
     Nokogiri::XSLT(File.open(xslpath))\
               .transform(Nokogiri::XML(File.open(xmlpath))).to_xhtml(indent: 0)
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia-pages
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.3.1
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE0MTAxMTA3MjEyNloXDTE1MTAxMTA3MjEyNlowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAO4uMlwDp8SzCTHHoNR5yg7iXw30qPSFTo/0o9mZUUgAL4FBVZ3cW0q+SKFb
-  AD6WxWLXMQMEwiWK2vjqatc3/OVKmXiTJwCnpv5c1Dhe3weKu+GQQjBy/d9WwwsB
-  qpcWvJVWfSB0juu0j71y3X2GyAkuas7jwarVIANiz/bw61IyPxWwB+Z/Fk3SHon3
-  7myi4HUyAyI3Hzh9LYv5x70hFaNv8iBz3jtAJoO5LdqfEBsJNcVNP5CTRqcdsMXy
-  ZV+lfBPWlTObaiWKjoTZzWqKSuqDKXvJeSy+NjJ2TUyD7AYBh0ZYEwgw76+ek4Cb
-  QJJu5cWB8ahHCNQMKhHCa6A/eLkCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQU9nDRpUKIQRdeqhpJ5U+IYU9IcUwwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAhd+6VtkW
-  zTWhEASEUzwwdljhmphQ9+LnB7kr4v48YdzWItKmxP7JB+G7NlUltNxQdKP8NaQp
-  0c5Sclk44z8+40sitYz4L+NN0XOnfPPKaEzNpKwD24PfKzpEfimgoWu7GYgBMqPv
-  iMlNwLMWUP/1odJBfaZA5SSlXzEI5BiFeOtxfTRpk0PZPB/mAPTGfJrfoAedfVrR
-  HYQ7SZQHsL53Qog6zW3FIF708tn1G20bkYqWnYKdzKBvpSxGk4BShAaKFZ7g0xJt
-  R8qQYTqUH5uyN1gXTamDXNnXrSWNIRgATqBFU0Rk4ia1O2X6/oMnJctbKR+A3n78
-  zZLvJwXE0u524g==
+  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: 2015-08-15 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mymedia
@@ -39,42 +43,62 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.14
 - !ruby/object:Gem::Dependency
   name: martile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 2.3.1
 description: 
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -100,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: A MyMedia gem to publish a basic web page