mymedia-pages 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5327c3e0dfbcf0f8817098bed4b1d6a1c5ca8ca
-  data.tar.gz: 1a8a70f162f9fe2a3a4d22dc546943ab9cf74cc8
+  metadata.gz: f1e3a784fcd53878b091d5997175e46b4ddd2ca9
+  data.tar.gz: beab5cf0dd0b0c13de30c2c523b066c88dae324b
 SHA512:
-  metadata.gz: 6b88b26d981ecf5dbc88eb5bb517384a8a1e20d92b37386d67f49e62f30175d5a4ff0b6c4695b797423fcbf5541031e7b992b2a33d7b5f29131636384b9c529e
-  data.tar.gz: 1747d60cfbe92e6d46fbcc78465ea786fa029b6d0176852ab8ba3e89e533c7c7a736240b04830b3a6a32cabaab0cfde7be1dd3fccc8766cb8ee2dd42e4af8e32
+  metadata.gz: 932e20f4695523a45bab0aef9f3101818013f6c3eaecd519e189694206a9ef768b3657e11130952326c1359bf6c7028a8e38347d21cdf1140a18502f3d65b238
+  data.tar.gz: b475be7bbd8068c4adbe802a037103aeeff87ab7a9f30b71da5fe24368505940513a979260d0a7798989a48951e84b2fbe18a9e376354fa25ffdf0f82791f5f7

data/lib/mymedia-pages.rb

@@ -7,13 +7,17 @@ require 'mymedia'
 require 'martile'
 
 
+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)
     
     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'
@@ -47,13 +51,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)
@@ -151,18 +158,27 @@ 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
   
   def xml(raw_buffer, filename, original_file)
 
-
     begin
 
 
@@ -208,9 +224,9 @@ class MyMediaPages < MyMedia::Base
             
     
     rescue
-
+      raise MyMediaPagesError, 'xml(): ' + ($!).inspect
     end
-    
+
     return Rexle.new(a)
   end  
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia-pages
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   f5cM/DycnWUbyyxUfvCHRvwNubEB3M+NDfHtIlbbeK82WC+HbtOYLXWQsy7266iP
   Nz7iR/JcIY24rA==
   -----END CERTIFICATE-----
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2018-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mymedia
@@ -39,60 +39,60 @@ 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: '0.4'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.2
+        version: 1.16.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.2
+        version: 1.16.2
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A MyMedia gem to publish a basic web page