dradis-calculator_dread 4.12.0 → 4.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce9322fae5ea0cffd3de7e4053d12b92c37dc7e34ca36daf252b100e8d43713f
-  data.tar.gz: 4e291c5dd54c22ec0b2bb58857c514361ea7c6c71d4313d2d6cb80b8df6cfc81
+  metadata.gz: 56c87df30f8c0186ffa3a9d34e66c479c4a76c0655f632ebc258cbb718fe4e34
+  data.tar.gz: 0272411af65a9418dd2abcb42b5a04e53d23f4034d962911631bdeaa49520911
 SHA512:
-  metadata.gz: cc0df3c98d9b953ada49e24fd51d86b7f9f1dc2e4b7e73fdb012d8e5502abc86dfcb9b95258f8ab7e1c25b8b478158af4f756fe9361cbc1c4b94778d87f9aa84
-  data.tar.gz: 9600ebeac7798baf8407a7ccc163ddba025e6f913ad2f49f09b0ffbdb916c5acf72ce303d048652220e3566db7ea2f0c9ded30d949a57f5608fe54e05bd032bd
+  metadata.gz: 781ba1cfbba9179f3e2f51fe45a9a7dc23e516e108b7e042cee0fb8304b22f6ec53bdc442364edc83e56090c17d95b47f3b850382895649c860ff6f532685324
+  data.tar.gz: f449d0c7a74e2b7cf11fe9db555628f66e82daa8348408ae20244742fda594463f530effddd0af6ae5bcecbcdb9f55315e5dba842a4c61f901688703576737e9

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+v4.13.0 (July 2024)
+  - Add ability to enable/disable calculator in the Tools Manager
+
 v4.12.0 (May 2024)
   - Update Dradis links in README
 

data/app/views/dradis/plugins/calculators/dread/issues/_show-content.html.erb

@@ -1,4 +1,3 @@
-<% if Dradis::Plugins::Calculators::DREAD::Engine.settings.show.to_i == 1 %>
 <div class="tab-pane" id="dread-tab">
   <div class="inner">
     <h4 class="header-underline">DREAD Risk Scoring -
@@ -19,4 +18,3 @@
     </div>
   </div>
 </div>
-<% end %>

data/app/views/dradis/plugins/calculators/dread/issues/_show-tabs.html.erb

@@ -1,5 +1,3 @@
-<% if Dradis::Plugins::Calculators::DREAD::Engine.settings.show.to_i == 1 %>
 <li class="nav-item">
   <a href="#dread-tab" data-bs-toggle="tab" class="nav-link"><i class="fa-solid fa-calculator"></i> DREAD</a>
 </li>
-<% end %>

data/dradis-calculator_dread.gemspec

@@ -25,6 +25,6 @@ Gem::Specification.new do |spec|
   # s.add_dependency 'rails', '~> 4.1.1'
   spec.add_dependency 'dradis-plugins', '~> 4.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 10.0'
 end

data/lib/dradis/plugins/calculators/dread/engine.rb

@@ -6,10 +6,6 @@ module Dradis::Plugins::Calculators::DREAD
     provides :addon
     description 'Risk Calculators: DREAD'
 
-    addon_settings :calculator_dread do
-      settings.default_show = 1
-    end
-
     initializer 'calculator_dread.asset_precompile_paths' do |app|
       app.config.assets.precompile += [
         'dradis/plugins/calculators/dread/manifests/application.css',
@@ -25,10 +21,20 @@ module Dradis::Plugins::Calculators::DREAD
     end
 
     initializer 'calculator_dread.mount_engine' do
-      Rails.application.routes.append do
-        mount Dradis::Plugins::Calculators::DREAD::Engine => '/', as: :dread_calculator
+      # By default, this engine is loaded into the main app. So, upon app
+      # initialization, we first check if the DB is loaded and the Configuration
+      # table has been created, before checking if the engine is enabled
+      Rails.application.reloader.to_prepare do
+        if (ActiveRecord::Base.connection rescue false) && ::Configuration.table_exists?
+          Rails.application.routes.append do
+            # Enabling/disabling integrations calls Rails.application.reload_routes! we need the enable
+            # check inside the block to ensure the routes can be re-enabled without a server restart
+            if Engine.enabled?
+              mount Engine => '/', as: :dread_calculator
+            end
+          end
+        end
       end
     end
-
   end
 end

data/lib/dradis/plugins/calculators/dread/gem_version.rb

@@ -9,7 +9,7 @@ module Dradis
 
         module VERSION
           MAJOR = 4
-          MINOR = 12
+          MINOR = 13
           TINY = 0
           PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-calculator_dread
 version: !ruby/object:Gem::Version
-  version: 4.12.0
+  version: 4.13.0
 platform: ruby
 authors:
 - Daniel Martin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-07 00:00:00.000000000 Z
+date: 2024-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dradis-plugins
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Display a DREAD score calculator in Dradis Framework.
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -93,7 +93,7 @@ homepage: https://dradis.com/support/guides/projects/calculators.html
 licenses:
 - GPL-2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,8 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.5.6
+signing_key:
 specification_version: 4
 summary: This plugin adds a DREAD score calculator to Dradis.
 test_files: []