dradis-html_export 3.19.0 → 3.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fcb7bc8d38264378015cd4c8e1685e44a7cd09e1253a01ef073fe9c27069cb7
-  data.tar.gz: 1dd26e8483b3613c68148c0b0ad0707dafa925219ee4e32192096860a11fa42a
+  metadata.gz: 5f6ac583114b620b0f712eec9d0d4635012a0566e1b6b5bf6e331b708991c223
+  data.tar.gz: 571a3c231cddac14d08577f6811dd8beab715a0387fc763a99ce57b8340e9110
 SHA512:
-  metadata.gz: 98d58bc1d770bf388e73946bbd76cda56ca9fec22f5f1505ff24c9ac8dd71005462ca7bc75fc5b0146402258f683680d32790b2e7f6524d5176bd1b9a81bb7e5
-  data.tar.gz: a387b6edd7adab12deba1868970b03f9c7a02e2fa5f75cff7add7ad37c9bdf2b19f0a1e7cccd2560c3bb1feae1c02db20415b045b476efcab37d076db0ab3dc7
+  metadata.gz: 6700179c827068d2810787d028bdc0621f918e86588d7c666547e7ea00be5425e141b15740cab0b0afe359021f13e28e1300c4a03edd87e7e2b86cd0b6adb1b8
+  data.tar.gz: 36b73d54c2167cf49063882d9521e6954562331a3edc4464ec77b3f951302ad8ebc20ded1b9a7d996acc369e2000364ee916b0d2e6a5b1a2038d43ae6a7b1800

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Dradis Framework 3.20 (December, 2020) ##
+
+*   Add an option in the exporter to pass a controller for rendering.
+*   Use NamingService to build export filename.
+
 ## Dradis Framework 3.19 (September, 2020) ##
 
 *   No changes.

data/lib/dradis/plugins/html_export/exporter.rb

@@ -7,8 +7,10 @@ module Dradis
         def export(args = {})
           log_report
 
+          controller = args[:controller] || ApplicationController
+
           # Render template
-          ApplicationController.render(
+          controller.render(
             file: options.fetch(:template),
             layout: false,
             locals: {

data/lib/dradis/plugins/html_export/gem_version.rb

@@ -8,7 +8,7 @@ module Dradis
 
       module VERSION
         MAJOR = 3
-        MINOR = 19
+        MINOR = 20
         TINY  = 0
         PRE   = nil
 

data/lib/tasks/thorfile.rb

@@ -15,9 +15,15 @@ class HtmlExportTasks < Thor
 
     report_path = options.output || Rails.root
     unless report_path.to_s =~ /\.html\z/
-      date      = DateTime.now.strftime("%Y-%m-%d")
-      sequence  = Dir.glob(File.join(report_path, "dradis-report_#{date}_*.html")).collect { |a| a.match(/_([0-9]+)\.html\z/)[1].to_i }.max || 0
-      report_path = File.join(report_path, "dradis-report_#{date}_#{sequence + 1}.html")
+      date = DateTime.now.strftime("%Y-%m-%d")
+      base_filename = "dradis-report_#{date}.html"
+
+      report_filename = NamingService.name_file(
+        original_filename: base_filename,
+        pathname: Pathname.new(report_path)
+      )
+
+      report_path = File.join(report_path, report_filename)
     end
 
     if template = options.template

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-html_export
 version: !ruby/object:Gem::Version
-  version: 3.19.0
+  version: 3.20.0
 platform: ruby
 authors:
 - Daniel Martin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dradis-plugins
@@ -87,7 +87,7 @@ homepage: http://dradisframework.org
 licenses:
 - GPL-2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,8 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.2.4
+signing_key:
 specification_version: 4
 summary: Dradis HTML export plugin
 test_files: