dradis-html_export 3.3.4 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 999b958ac30198a59e0fc400882c69392ec36143
-  data.tar.gz: 1b318b737692ac8462e2ed3c330aae379ea7d2cd
+  metadata.gz: 3bd63e4e5e10a84f073e39bb6783ba0a74745a49
+  data.tar.gz: d6b8d955487b127c791cc1ffed1ea3a6067c59af
 SHA512:
-  metadata.gz: ca7c0c4fddf70e6310734ada7f6d2c7803f1f5c76ea7f5957ff3a333ff91e35e29175edae785ed804edb45e8d04c7ca20dfced98d60d323a01e05d63034c54e5
-  data.tar.gz: f4d5b842a2b58e936ac2d060d9979707386908d1e4a247d1856152fd41bf1f9a078540b2542c8166606d6d74983cd19b620f01e16e1040eb9adf0ecec83d2816
+  metadata.gz: c4fb479e4726cec3519e28043418347106ffe3fe95140719345321a33f20a9bda04cc47df4f859a303d11e35ab1a4ea0872eda40d8830ab6697c5bc0f82594b5
+  data.tar.gz: 10809d2374965d7927dd8c8bdf8c82819114a530a8a2b7f102cf0aa1573d4b489e795271d127a0c5953515e68722620c3f00b98bd66f7691339f53a7962f1e43

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## Dradis Framework 3.6 (March XX, 2017) ##
+
+*   No changes.

data/README.md

@@ -21,3 +21,8 @@ See the Dradis Framework's [CONTRIBUTING.md](https://github.com/dradis/dradisfra
 ## License
 
 Dradis Framework and all its components are released under [GNU General Public License version 2.0](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) as published by the Free Software Foundation and appearing in the file LICENSE included in the packaging of this file.
+
+
+## Feature requests and bugs
+
+Please use the [Dradis Framework issue tracker](https://github.com/dradis/dradis-ce/issues) for add-on improvements and bug reports.

data/app/controllers/dradis/plugins/html_export/base_controller.rb

@@ -7,18 +7,10 @@ module Dradis
         #
         # It uses the template at: ./vendor/plugins/html_export/template.html.erb
         def index
+          exporter = Dradis::Plugins::HtmlExport::Exporter.new(export_options)
+          html     = exporter.export
 
-          # these come from Export#create
-          export_manager_hash   = session[:export_manager].with_indifferent_access
-          content_service_class = export_manager_hash[:content_service].constantize
-
-          exporter = Dradis::Plugins::HtmlExport::Exporter.new(
-            content_service: content_service_class.new(plugin: Dradis::Plugins::HtmlExport)
-          )
-
-          doc = exporter.export(export_manager_hash)
-
-          render type: 'text/html', text: doc
+          render type: 'text/html', text: html
         end
       end
 

data/dradis-html_export.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # gem.add_dependency 'dradis_core', version
-  spec.add_dependency 'dradis-plugins', '~> 3.3'
+  spec.add_dependency 'dradis-plugins', '~> 3.6'
 
   # Note markup
   spec.add_dependency 'rails_autolink', '~> 1.1'

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

@@ -25,18 +25,6 @@ module Dradis
             mount Dradis::Plugins::HtmlExport::Engine => '/export/html'
           end
         end
-
-        # # TODO: could we use this instead?
-        # # https://github.com/spree/spree_analytics/blob/079949fd0e6d9ec87eefd8e3b9c70b5aa3bf25d3/lib/spree_analytics/engine.rb
-        # # Configuration
-        # # mattr_accessor :app_id, :site_id, :token, :api_url, :data_url
-        # # self.template = ''
-        # class Configuration < Dradis::Core::Configurator
-        #   configure :namespace => 'htmlexport'
-        #   setting :category, :default => 'HtmlExport ready'
-        #   # setting :template, :default => Rails.root.join( 'vendor', 'plugins', 'html_export', 'template.html.erb' )
-        #   setting :template, :default => '/Users/etd/dradis/git/dradis-html_export/template.html.erb'
-        # end
       end
     end
   end

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

@@ -9,9 +9,8 @@ module Dradis
         include ::ActionView::Helpers::UrlHelper
 
         def export(args = {})
-          template_path       = args.fetch(:template)
+          template_path       = options.fetch(:template)
           template_properties = ::ReportTemplateProperties.find_by_template_file(File.basename(template_path)) rescue nil
-          project             = args.key?(:project_id) ? Project.find_by_id(args[:project_id]) : nil
 
           # Build title
           title = if Dradis.constants.include?(:Pro)
@@ -22,6 +21,7 @@ module Dradis
           logger.debug{ "Report title: #{title}"}
 
           # Prepare notes
+          reporting_cat = content_service.report_category
           notes = content_service.all_notes
           logger.debug{ "Found #{notes.count} notes assigned to the reporting category."}
 

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

@@ -8,8 +8,8 @@ module Dradis
 
       module VERSION
         MAJOR = 3
-        MINOR = 3
-        TINY  = 4
+        MINOR = 6
+        TINY  = 0
         PRE   = nil
 
         STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

data/lib/tasks/thorfile.rb

@@ -1,5 +1,5 @@
 class HtmlExportTasks < Thor
-  include Dradis::Plugins::thor_helper_module.to_s.constantize
+  include Rails.application.config.dradis.thor_helper_module
 
   namespace     "dradis:plugins:html"
 
@@ -13,11 +13,10 @@ class HtmlExportTasks < Thor
     # The options we'll end up passing to the Processor class
     opts = {}
 
-    STDOUT.sync = true
-    logger = Logger.new(STDOUT)
-    logger.level = Logger::DEBUG
+    STDOUT.sync   = true
+    logger        = Logger.new(STDOUT)
+    logger.level  = Logger::DEBUG
     opts[:logger] = logger
-    content_service = nil
 
     report_path = options.output || Rails.root
     unless report_path.to_s =~ /\.html\z/
@@ -26,26 +25,22 @@ class HtmlExportTasks < Thor
       report_path = File.join(report_path, "dradis-report_#{date}_#{sequence + 1}.html")
     end
 
-
     if template = options.template
       shell.error("Template file doesn't exist") && exit(1) unless File.exists?(template)
       opts[:template] = template
     end
 
     detect_and_set_project_scope
-    exporter = Dradis::Plugins::HtmlExport::Exporter.new(
-      content_service: Dradis::Plugins::ContentService.new(plugin: Dradis::Plugins::HtmlExport)
-    )
 
-    doc = exporter.export(opts)
+    exporter = Dradis::Plugins::HtmlExport::Exporter.new(opts)
+    html = exporter.export
 
     File.open(report_path, 'w') do |f|
-      f << doc
+      f << html
     end
 
     logger.info{ "Report file created at:\n\t#{report_path}" }
     logger.close
   end
 
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-html_export
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.6.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-01 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dradis-plugins
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rails_autolink
   requirement: !ruby/object:Gem::Requirement
@@ -62,6 +62,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - README.md
@@ -100,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Dradis HTML export plugin