sra2019 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c218936c612857dcb565b574d4f1389b13a8c4ac38a53a37d85f0142b29db28
-  data.tar.gz: b0b015c92aa5edaac4b6e192280f19fb79a19bb664be5931e60d8b0b071b2631
+  metadata.gz: f6d80258051ebf745f12d63277fa418945b747e4143cddfdb9ae14fd59d8a7cf
+  data.tar.gz: 62d9f9565ac94cff85a4c4177c3ffac2e166c7c945754aa1570382a45f221002
 SHA512:
-  metadata.gz: '09f230999dd5325b870cc3d79176dc8bb021494d56772c0418fbfb22383ed3896ed615326b5499118227bca771c3d3d954a08760da5759729b785fc31ffdc321'
-  data.tar.gz: 375ba62df0f925740216880a929518bcf7d3346b0789fcf3e3d58d09e9c38efb16865b82b2e85100f43f03c44ccb2bc23d69b947f38fc509d2b761d78de9e3e7
+  metadata.gz: 8da13a1cf115f3c94899df1372100300f17434997abeaeeecf59abda9775b96a2bb06f065c73789f4d1998dfaa143ee29a53ae3abd67853600713ab713f05a93
+  data.tar.gz: 568778997ef54ccbb817f56700c388d8ab491cadf6d34c88aaef017d4c0624feb166a141a87cc2a7e77ffb56687ca71447e2a532c529c50bc7b96941abec2d78

data.tar.gz.sig

@@ -1,3 +1 @@
-�+�ha�4ߧ)t*��G���<d�~�V�bx��_�ڵ�9��~����͠�=�<��FMZ�1��)u=�fVV�<��h�8i<��
-R��S��5���Q,
-*_��VHn�g�hם2��H�g3I��&\�*����K։�H��5`�C}�t��+(5:��9F�@�M4y�	*��3��ޅA�i����/x!v$B�i�`s�M�V�ǯN�^�6��7����[�ь��b:OO�+��F�d��'֥@Nk�S�/r�i�?��vU�i�*�D�K�?cA�7|c�'��^���k�
+o��Q~��Qy�&��n����pH.�X�!�%d�6��>�pP&#���8��OJc���(��۾ȉ��{��,1�
1�7�Y��v�ߡW�����vo�}9:L���:�	��'Bܤ���W�WE�KXQ��C����^񆧑AJ'�2MQ�r\�*���D�C�|�ƈ������3��#��|��o73�l0w��~�re�^�q��"\���#x���H>��*/Yw��.$x<��u��l.qE��6,f�4

data/lib/sra2019.rb

@@ -8,6 +8,7 @@
 require 'hlt'
 require 'rexle'
 require 'base64'
+require 'zip/zip'
 require 'rxfhelper'
 require 'wicked_pdf'
 require 'mini_magick'
@@ -16,7 +17,6 @@ require 'rexle-builder'
 
 
 
-
 class StepsRecorderAnalyser
   using ColouredText
 
@@ -26,7 +26,15 @@ class StepsRecorderAnalyser
   def initialize(s, debug: false, savepath: '/tmp', title: 'Untitled')
 
     @savepath, @title, @debug = savepath, title, debug
-    content = RXFHelper.read(s).first
+    
+    raw_content, type = RXFHelper.read(s)
+    
+    content = if type == :file and File.extname(s) == '.zip' then
+      Zip::ZipFile.new(s).instance_eval {read(to_a[0].name)}
+    else
+      raw_content
+    end
+
     puts ('content: ' + content.inspect).debug if @debug
     
     all_steps = parse_steps  content  
@@ -101,30 +109,28 @@ EOF
     @sliml
   end
   
-  def to_pdf()
+  def to_pdf(pdf_file=File.join(@savepath, 'sra' + Time.now.to_i.to_s, 
+                              @title.gsub(/ /,'-') + '.pdf'))
     
-    project = 'sra' + Time.now.to_i.to_s
-    newdir = project
-    pdf_file = File.join(@savepath, project, @title.gsub(/ /,'-') + '.pdf')
-    html_file = File.join(@savepath, project, 'index.html')
+    dir = File.dirname(pdf_file)
+    html_file = File.join(dir, 'index.html')
     
-    to_html(newdir)    
+    to_html(dir)
     pdf = WickedPdf.new.pdf_from_html_file(html_file)
     File.write pdf_file, pdf
     
   end
   
-  # not yet working properly
-  #
+
   def to_zip()
     
     project = 'sra' + Time.now.to_i.to_s
     newdir = File.join(@savepath, project)
-    zipfile = File.join(@savepath, project + '.zip')
+    zipfile = newdir + '.zip'
     
-    to_html(newdir)    
+    to_pdf(File.join(newdir, @title.gsub(/ /,'-') + '.pdf'))    
 
-    Archive::Zip.archive(zipfile, File.join(@savepath, project))
+    Archive::Zip.archive(zipfile, newdir)
     
     'saved to ' +  zipfile
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sra2019
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - James Robertson