mymedia-pages 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89f8c997b5dd0bde2f3a98b90f40329891888113
-  data.tar.gz: 6a8956160a8416c3781873e02f747b3a686c9b5c
+  metadata.gz: b15f19822509733aa65c31a7fea3a55c1c6983b2
+  data.tar.gz: 0fe7c67942ed134abf13e991257aec981d8d7969
 SHA512:
-  metadata.gz: 14cd28b7ef656821c45d27e7a01079250a6a1490b8e1d2aff3f8e8b4b36c0df9ceaac3cd37d3c410bf807b72c04eeccb265628b7fbc990fa360111ccafbb2d37
-  data.tar.gz: 6fa0988c11cc2e2547ae0b4a137e674a56b0fb1a67067f3d3921af997cc39f2d9cd6374d171a52d37f0f18136630cb8bcb2b6f7a3196c159892db2354d3af9a6
+  metadata.gz: e8bbacbba3be319ae6c0a6440ba4fc551017a82fe8fab1851c71b4327216cab819ad46db5b9fac2a4cb5c3e0669a6b9f5c6eea94c76df36f7aaee1b912792fb3
+  data.tar.gz: 5c7edaf55572f4dc2e6e6174a98c00562ef1c9aac7d744dd41fe4ee0daf69f10652cd919d3e5452eabe252a07c90f719dc6f8af3a4dbde25e005e5f5c76afcda

data/lib/mymedia-pages.rb

@@ -3,15 +3,17 @@
 # file: mymedia-pages.rb
 
 
-require 'mymedia-blogbase'
+require 'mymedia'
 
 
 class MyMediaPages < MyMedia::Base
 
-  def initialize(config: nil)
+  def initialize(media_type: media_type='pages',
+       public_type: @public_type=media_type, ext: '.(html|md|txt)',config: nil)
     
-    super(media_type: 'pages', public_type: @public_type='pages', ext: '.(html|md|txt)', config: config)
-    @media_src = "%s/media/pages" % @home
+    super(media_type: media_type, public_type: @public_type=media_type,
+                                        ext: '.(html|md|txt)', config: config)
+    @media_src = "%s/media/%s" % [@home, media_type]
     @target_ext = '.html'
     @static_html = true
     
@@ -22,7 +24,7 @@ class MyMediaPages < MyMedia::Base
     @filename = filename
     src_path = File.join(@media_src, filename)
 
-    if File.basename(src_path)[/[pw]\d{6}T\d{4}\.(?:html)/] then      
+    if File.basename(src_path)[/[pwn]\d{6}T\d{4}\.(?:html)/] then      
       return file_publish(src_path, raw_msg)
     end
     
@@ -62,15 +64,22 @@ class MyMediaPages < MyMedia::Base
         File.write destination, 
            Nokogiri::XSLT(xsl).transform(Nokogiri::XML(File.read dest_xml))
 
+        html_filename = File.basename(src_path).sub(/(?:md|txt)$/,'html')
+        xml_filename = html_filename.sub(/html$/,'xml')
+        FileUtils.cp destination, File.dirname(destination) + html_filename
+        FileUtils.cp dest_xml, File.dirname(dest_xml) + xml_filename
+
+
+        #target_url = [@website, @public_type, html_filename].join('/')
+
       else
         FileUtils.cp src_path, destination
         FileUtils.cp src_path, raw_destination   
       end
 
-      if not File.basename(src_path)[/[pw]\d{6}T\d{4}\.(?:html|md|txt)/] then
+      if not File.basename(src_path)[/[pwn]\d{6}T\d{4}\.(?:html|md|txt)/] then
         
-        html_filename = File.basename(src_path).sub(/(?:md|txt)$/,'html')
-        xml_filename = html_filename.sub(/html$/,'xml')
+
 
         FileUtils.cp destination, @home + "/#{@public_type}/" + html_filename
         FileUtils.cp dest_xml, @home + "/#{@public_type}/" + xml_filename
@@ -83,13 +92,14 @@ class MyMediaPages < MyMedia::Base
         target_url = [@website, @public_type, x_filename].join('/')
 
         publish_dynarex(static_filepath, {title: x_filename, url: target_url })          
-
-        tags = doc.root.xpath('summary/tags/tag/text()')
-
-        raw_msg = "%s %s" % [doc.root.text('summary/title'), 
-               tags.map {|x| "#%s" % x }.join]
+        
 
       end
+      
+      tags = doc.root.xpath('summary/tags/tag/text()')
+
+      raw_msg = "%s %s" % [doc.root.text('summary/title'), 
+              tags.map {|x| "#%s" % x }.join]      
 
       [raw_msg, target_url]
     end    
@@ -143,7 +153,8 @@ class MyMediaPages < MyMedia::Base
     
     doc = docx.clone
     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.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)    
   end
@@ -180,13 +191,14 @@ class MyMediaPages < MyMedia::Base
           xml.source_file File.basename(filename)
           xml.original_file original_file
           xml.published Time.now.strftime("%d-%m-%Y %H:%M")
+          xml.filetitle original_file[/.*(?=\.\w+$)/]
         end
         
         xml.body body
       end
     
     rescue
-      @logger.debug "mymedia-blogbase.rb: html: " + ($!).to_s
+      @logger.debug "mymedia-pages.rb: html: " + ($!).to_s
     end
     
     return Rexle.new(a)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia-pages
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - James Robertson
@@ -31,10 +31,10 @@ cert_chain:
   R8qQYTqUH5uyN1gXTamDXNnXrSWNIRgATqBFU0Rk4ia1O2X6/oMnJctbKR+A3n78
   zZLvJwXE0u524g==
   -----END CERTIFICATE-----
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mymedia-blogbase
+  name: mymedia
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -42,7 +42,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 description: 
 email: james@r0bertson.co.uk
 executables: []