qa_server 7.1.3 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46a262b09fc1821b179ab2e770eac2b66d35309a
-  data.tar.gz: 63bbcbad456433456ac629314a26a7256d6e6f8f
+  metadata.gz: 6126532673f0c180df4ffdad52f48e676a86f123
+  data.tar.gz: 41ffe57ca6dcae519aaba5860378ea018dd5f988
 SHA512:
-  metadata.gz: ec68c4fc0737e5be3518d84cfb486e1083e727c7caa4954a4dd54499dbdd11bfb1273e125425bf1b234f39256e5db5e0c6ac81c7d55feb8c4838e3814f5cea1e
-  data.tar.gz: 7d065c38a41dc6e54d9f116328e76c62a18d918429fb13442f80e932eb3804ad3af5e7868dfbddab40f85e8ffef159ee7a5a7d53b5c8fb964e8f54a89f8cc52e
+  metadata.gz: 300bc7ce6d46fdd89c69a496753470c4de90687a272ad649a86559dd55f26af7a134e6cf9a8502eb4e210aa8268f6c27cc031d3d25a1e7227b1f559afbd4a8fe
+  data.tar.gz: a3110736087b71f9efa473ad65eb644b3e9cc6b4c305c091e74ed278447f9ab8aca12a7c0e7247b1f2213792fc922ddb9fceb2ad2d948fa86673525188ccc404

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 7.2.0 (2020-02-22)
+
+* move graphs from assets to public directory
+
 ### 7.1.3 (2020-02-22)
 
 * fix performance datatable never displays

data/app/cache_processors/qa_server/scenario_history_graph_cache.rb

@@ -7,7 +7,6 @@ module QaServer
 
     class << self
       include QaServer::CacheKeys
-      include QaServer::MonitorStatus::GruffGraph
 
       HISTORICAL_GRAPH_FILENAME = 'historical_side_stacked_bar.png'
 

data/app/presenters/concerns/qa_server/monitor_status/performance_graph_behavior.rb

@@ -3,7 +3,6 @@
 module QaServer::MonitorStatus
   module PerformanceGraphBehavior # rubocop:disable Metrics/ModuleLength
     include QaServer::PerformanceHistoryDataKeys
-    include QaServer::MonitorStatus::GruffGraph
 
     def performance_graphs
       auth_list = QaServer::AuthorityListerService.authorities_list

data/app/presenters/qa_server/monitor_status/history_presenter.rb

@@ -2,8 +2,6 @@
 # This presenter class provides historical testing data needed by the view that monitors status of authorities.
 module QaServer::MonitorStatus
   class HistoryPresenter
-    include QaServer::MonitorStatus::GruffGraph
-
     # @param parent [QaServer::MonitorStatusPresenter] parent presenter
     # @param historical_summary_data [Array<Hash>] summary of past failuring runs per authority to drive chart
     def initialize(parent:, historical_summary_data:)

data/app/presenters/qa_server/monitor_status/performance_presenter.rb

@@ -2,7 +2,6 @@
 # This presenter class provides performance data needed by the view that monitors status of authorities.
 module QaServer::MonitorStatus
   class PerformancePresenter
-    include QaServer::MonitorStatus::GruffGraph
     include QaServer::MonitorStatus::PerformanceDatatableBehavior
     include QaServer::MonitorStatus::PerformanceGraphBehavior
     include QaServer::PerformanceHistoryDataKeys

data/app/services/concerns/qa_server/gruff_graph.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+require 'fileutils'
+require 'gruff'
+
+# This module include provides graph methods for generating graphs with Gruff
+module QaServer
+  module GruffGraph
+    private
+
+      # common path for displaying and writing
+      def graph_relative_path
+        File.join('qa_server', 'charts')
+      end
+
+      # used for displaying in a view with <image> tag
+      def graph_image_path
+        File.join('/', graph_relative_path)
+      end
+
+      # used for writing out the file
+      def graph_full_path(graph_filename)
+        path = Rails.root.join('public', graph_relative_path)
+        # path = Rails.root.join('app', 'assets', 'images', graph_relative_path)
+        FileUtils.mkdir_p path
+        File.join(path, graph_filename)
+      end
+  end
+end

data/app/services/qa_server/history_graphing_service.rb

@@ -3,7 +3,7 @@
 module QaServer
   class HistoryGraphingService
     class << self
-      include QaServer::MonitorStatus::GruffGraph
+      include QaServer::GruffGraph
 
       HISTORICAL_GRAPH_FILENAME = 'historical_side_stacked_bar.png'
 
@@ -12,7 +12,7 @@ module QaServer
 
       # Path to use with <image> tags
       def history_graph_image_path
-        historical_graph_relative_path
+        File.join(graph_image_path, HISTORICAL_GRAPH_FILENAME)
       end
 
       # @return [Boolean] true if image for graph exists; otherwise, false
@@ -51,10 +51,6 @@ module QaServer
           graph_full_path(HISTORICAL_GRAPH_FILENAME)
         end
 
-        def historical_graph_relative_path
-          File.join(graph_relative_path, HISTORICAL_GRAPH_FILENAME)
-        end
-
         def rework_historical_data_for_gruff(data)
           labels = {}
           pass_data = []

data/app/services/qa_server/performance_graphing_service.rb

@@ -4,7 +4,7 @@ module QaServer
   class PerformanceGraphingService
     class << self
       include QaServer::PerformanceHistoryDataKeys
-      include QaServer::MonitorStatus::GruffGraph
+      include QaServer::GruffGraph
 
       class_attribute :authority_list_class
       self.authority_list_class = QaServer::AuthorityListerService
@@ -14,7 +14,7 @@ module QaServer
       # @param time_period [Symbol] time period for the graph (i.e. :day, :month, :year)
       # @return [String] Path to use with <image> tags
       def performance_graph_image_path(authority_name: ALL_AUTH, action:, time_period:)
-        File.join(graph_relative_path, graph_filename(authority_name, action, time_period))
+        File.join(graph_image_path, graph_filename(authority_name, action, time_period))
       end
       alias performance_graph_file performance_graph_image_path
 

data/lib/qa_server/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module QaServer
-  VERSION = '7.1.3'
+  VERSION = '7.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qa_server
 version: !ruby/object:Gem::Version
-  version: 7.1.3
+  version: 7.2.0
 platform: ruby
 authors:
 - E. Lynette Rayle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-22 00:00:00.000000000 Z
+date: 2020-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -373,7 +373,6 @@ files:
 - app/prepends/prepended_linked_data/find_term.rb
 - app/prepends/prepended_linked_data/search_query.rb
 - app/prepends/prepended_rdf/rdf_graph.rb
-- app/presenters/concerns/qa_server/monitor_status/gruff_graph.rb
 - app/presenters/concerns/qa_server/monitor_status/performance_datatable_behavior.rb
 - app/presenters/concerns/qa_server/monitor_status/performance_graph_behavior.rb
 - app/presenters/qa_server/authority_list_presenter.rb
@@ -384,6 +383,7 @@ files:
 - app/presenters/qa_server/monitor_status/performance_presenter.rb
 - app/presenters/qa_server/monitor_status_presenter.rb
 - app/presenters/qa_server/navmenu_presenter.rb
+- app/services/concerns/qa_server/gruff_graph.rb
 - app/services/qa_server/authority_lister_service.rb
 - app/services/qa_server/authority_loader_service.rb
 - app/services/qa_server/authority_validator_service.rb

data/app/presenters/concerns/qa_server/monitor_status/gruff_graph.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-require 'fileutils'
-require 'gruff'
-
-# This module include provides graph methods used by all monitor status presenters working with graphs
-module QaServer::MonitorStatus
-  module GruffGraph
-    private
-
-      def graph_relative_path
-        File.join('qa_server', 'charts')
-      end
-
-      def graph_full_path(graph_filename)
-        path = Rails.root.join('app', 'assets', 'images', graph_relative_path)
-        FileUtils.mkdir_p path
-        File.join(path, graph_filename)
-      end
-  end
-end