mymedia-pages 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 809f1a3cee00322cfa48782c228d1f3895f92766
-  data.tar.gz: 906b99837af46ad7fe2829c022b5e919add14d40
+  metadata.gz: f834ec33b619e8053d6eeb55162ef595fac462be
+  data.tar.gz: 6c6106a093a5de4ba9b95c39567ea2f121c0b5ee
 SHA512:
-  metadata.gz: cca88abbee502b5460e4a736763a8c3ec7d06d0df84459ced5e70ec406883e4db621ccb92faddae2cc55f0222640bb4ab1b75a3424c380de61b5077436c626cf
-  data.tar.gz: afa63e8b610334c49c16ec4e7c323f3d4074b6c5fe62f4bc0f0f6bbef922073558d6728e0c6b4dcefbda87ab08e8576ce34d27e40254109c17efb54cfdca738a
+  metadata.gz: 01584f4e2e53d549b070db08041501f7ec140f33c23d871fedfbd08de1353bd17ea56a885c83dc13a596e3d1cc59b26cf5835dc8a63d4a8eefb42816b69b4a2c
+  data.tar.gz: 2c942b296afa097b80018ba10e37a9ff273ddbb4e1539c3fd2fbbcb0edb5c386dcdf7ab6b588667d6f3dda47b314f7769922be0efbaa697d6a9aad7f7795ceae

data/lib/mymedia-pages.rb

@@ -21,16 +21,16 @@ class MyMediaPages < MyMedia::Base
   end  
   
   def copy_publish(filename, raw_msg='')
-    
+
     @filename = filename
     src_path = File.join(@media_src, filename)
 
-    if File.basename(src_path)[/[pwn]\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      
@@ -48,20 +48,12 @@ class MyMediaPages < MyMedia::Base
 
         doc = xml(File.open(src_path, 'r').read, relative_path, filename)
 
-        
         modify_xml(doc, raw_dest_xml)
         modify_xml(doc, dest_xml)
 
-        basic_xsl = File.read "#{@home}/r/xsl/#{@public_type}.xsl"
+        File.write raw_destination, xsltproc("#{@home}/r/xsl/#{@public_type}.xsl", raw_dest_xml)
 
-        File.write raw_destination, 
-          Nokogiri::XSLT(basic_xsl)\
-            .transform(Nokogiri::XML(File.read raw_dest_xml))
-
-        xsl = File.read "#{@home}/#{@www}/xsl/#{@public_type}.xsl"
-
-        File.write destination, 
-           Nokogiri::XSLT(xsl).transform(Nokogiri::XML(File.read dest_xml))
+        File.write destination, xsltproc("#{@home}/#{@www}/xsl/#{@public_type}.xsl", dest_xml)
 
         html_filename = File.basename(src_path).sub(/(?:md|txt)$/,'html')
         xml_filename = html_filename.sub(/html$/,'xml')
@@ -82,7 +74,7 @@ class MyMediaPages < MyMedia::Base
         raw_msg = File.read(destination)[/<title>([^<]+)<\/title>/,1]
       end
             
-      if not File.basename(src_path)[/[pwn]\d{6}T\d{4}\.(?:html|md|txt)/] then
+      if not File.basename(src_path)[/[a-z]\d{6}T\d{4}\.(?:html|md|txt)/] then
         
         FileUtils.cp destination, @home + "/#{@public_type}/" + html_filename
 
@@ -94,9 +86,7 @@ class MyMediaPages < MyMedia::Base
         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 })          
-
-        
+        publish_dynarex(static_filepath, {title: raw_msg, url: target_url })                  
 
       end
 
@@ -150,16 +140,14 @@ class MyMediaPages < MyMedia::Base
   
   
   def modify_xml(docx, filepath, xslpath='r/')
-    
-    doc = docx.clone
-    
+
+    doc = Rexle.new docx.xml pretty: false
     raw_msg = microblog_title(doc)
-    
+
     doc.instructions.push %w(xml-stylesheet title='XSL_formatting' type='text/xsl') \
                                       + ["href='#{@website}/#{xslpath}xsl/#{@public_type}.xsl'"]
-    
-    doc = yield(doc) if block_given?
-    File.write filepath, doc.xml(pretty: true)    
+    yield(doc) if block_given?
+    File.write filepath, doc.xml(declaration: true, pretty: false)
   end
   
   def xml(raw_buffer, filename, original_file)
@@ -208,5 +196,9 @@ class MyMediaPages < MyMedia::Base
     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
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia-pages
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   R8qQYTqUH5uyN1gXTamDXNnXrSWNIRgATqBFU0Rk4ia1O2X6/oMnJctbKR+A3n78
   zZLvJwXE0u524g==
   -----END CERTIFICATE-----
-date: 2015-02-21 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mymedia