mymedia-pages 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd50fb53aa3bec5bb8317c7f85d1e30f1aa9063f
-  data.tar.gz: c191cdd51acfb0553b0278ed8deb4b80ac15d4e8
+  metadata.gz: 809f1a3cee00322cfa48782c228d1f3895f92766
+  data.tar.gz: 906b99837af46ad7fe2829c022b5e919add14d40
 SHA512:
-  metadata.gz: b4f31a2b4ee1cb76dbe5f46d16b21de1f73c7e903ab96aeca4552618becce19dba142fc0acafc697faf1b701a1a7772238feeac273fa2441581570fa1fdd9843
-  data.tar.gz: 3059c74c10c8879ffa68a5b9eb139ab972c171e98257a34e187eb6df41bec9200aab935d00236f3fbdb76e5e95c24390a0c618597940b8f1e5253437faf189f7
+  metadata.gz: cca88abbee502b5460e4a736763a8c3ec7d06d0df84459ced5e70ec406883e4db621ccb92faddae2cc55f0222640bb4ab1b75a3424c380de61b5077436c626cf
+  data.tar.gz: afa63e8b610334c49c16ec4e7c323f3d4074b6c5fe62f4bc0f0f6bbef922073558d6728e0c6b4dcefbda87ab08e8576ce34d27e40254109c17efb54cfdca738a

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-���I��6i�+��%��҃�"}ׂ\�硛�V�e��و��#4��@4�g�S?���(�K�{>��CW�_����s����~B}�F�;|Yl�)��󺕯n�ԊE�I���a픖�cg���I�/r<rͰ���=�܍=CS��K��w���B
��g���e��ϵ�G���w#����`G�[�U߃:��'������8��ޜ��d�3Z�����i"�uO?np涬�mb�G�#��Ee��YκR
+_�
+���.JכLy�ᕛ���Ul�
+��B�NM|Ó^�
	n}9S�v	�w�mB�K�������k�k���o���|-&���~vE�?�凑�;w���������y@�[��\�������!��F����v���*D�w8MD��4[��\�Y�]T`Ea5Z(_)c�W|П�}??�f��$#��<������G�/4���O�h��T9�9լ�VwI�r,l�Z?j�Q����i;f����'׮�@�#

data/lib/mymedia-pages.rb

@@ -31,8 +31,6 @@ class MyMediaPages < MyMedia::Base
     
     file_publish(src_path, raw_msg) do |destination, raw_destination|
       
-      #FileUtils.cp src_path, destination
-      #FileUtils.cp src_path, raw_destination   
       ext = File.extname(src_path)
       
       if ext[/\.(?:md|txt)/] then      
@@ -52,10 +50,10 @@ class MyMediaPages < MyMedia::Base
 
         
         modify_xml(doc, raw_dest_xml)
-        modify_xml(doc, dest_xml,'')
+        modify_xml(doc, dest_xml)
 
         basic_xsl = File.read "#{@home}/r/xsl/#{@public_type}.xsl"
-                
+
         File.write raw_destination, 
           Nokogiri::XSLT(basic_xsl)\
             .transform(Nokogiri::XML(File.read raw_dest_xml))
@@ -70,20 +68,22 @@ class MyMediaPages < MyMedia::Base
         FileUtils.cp destination, File.dirname(destination) + html_filename
         FileUtils.cp dest_xml, 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(' ')] 
 
-        #target_url = [@website, @public_type, html_filename].join('/')
 
       else
         
         html_filename = File.basename(src_path)
         FileUtils.cp src_path, destination
         FileUtils.cp src_path, raw_destination   
+        
+        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
         
-
-
         FileUtils.cp destination, @home + "/#{@public_type}/" + html_filename
 
         if xml_filename then
@@ -91,27 +91,15 @@ class MyMediaPages < MyMedia::Base
         end
 
         static_filepath = @home + "/#{@public_type}/static.xml"          
-
-        x_filename = @static_html == true ? html_filename : xml_filename
-
-        
+        x_filename = @static_html == true ? html_filename : xml_filename        
         target_url = [@website, @public_type, x_filename].join('/')
 
-        publish_dynarex(static_filepath, {title: x_filename, url: target_url })          
+        publish_dynarex(static_filepath, {title: raw_msg, url: target_url })          
 
         
 
       end
 
-      if doc then
-        
-        tags = doc.root.xpath('summary/tags/tag/text()')
-        raw_msg = "%s %s" % [doc.root.text('summary/title'), 
-                tags.map {|x| "#%s" % x }.join]              
-      else
-        raw_msg = File.read(destination)[/<title>([^<]+)<\/title>/,1]
-      end
-
       [raw_msg, target_url]
     end    
 
@@ -146,8 +134,8 @@ class MyMediaPages < MyMedia::Base
     summary = doc.root.element('summary')
 
     title = summary.text('title')
-    tags = summary.xpath('tags/tag/text()').map{|x| '#' + x}.join ' '
-
+    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)
 
@@ -163,7 +151,8 @@ class MyMediaPages < MyMedia::Base
   
   def modify_xml(docx, filepath, xslpath='r/')
     
-    doc = docx.clone    
+    doc = docx.clone
+    
     raw_msg = microblog_title(doc)
     
     doc.instructions.push %w(xml-stylesheet title='XSL_formatting' type='text/xsl') \

metadata

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