peak_flow_utils 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e3d80778a6e2f090ed1247e8afd8b0cf95c1c57d96a01315534f32aa0a56d00
-  data.tar.gz: b4ab6fd0ba591e3f750dca4d1fea08de84d2d04a150b0bf6a8a90c15928b4157
+  metadata.gz: b4fb7a276f751a58ba19b74e73955323e0f1b89215312b50ee3e3b9cf89a85f4
+  data.tar.gz: 29edd9b2f4225cf2ea74c67d4fccd1b21a0149781f2cacc168309ef8dd3082c6
 SHA512:
-  metadata.gz: 9dc474ec28b8221fb5730bad562121ef0925e6bb2cd0f554e759d51a5daba2169bb0290253b10dfda1a140a616c21751f228c2994bcddf468c6a5bae3b7d741a
-  data.tar.gz: 57b9245ce4892aa877dd01b7947f9db2a19a80cb1355a2a6ab57350779cd3c9090567417bd369399d8a4daba65c00d867c76fdb506b85e5342a330c3e79414bd
+  metadata.gz: 18328934879ae9fbb148e812926d68b5dca82837f929e5c3f3228bc4bc34bb140e8d42013333ef68976931819960d45110b26a8bf8bb2b37e363b8a519bf0ee9
+  data.tar.gz: 4251f1f1213fc0e9dfa426c7c4a1e75c53dbd23dff37ce09213f857ff7b7fba56251875d17a7baed74273d744f29b03bd9fa3e41f7a877319ada3cf9760bf9b4

data/app/services/peak_flow_utils/deep_merger.rb

@@ -0,0 +1,45 @@
+class PeakFlowUtils::DeepMerger < PeakFlowUtils::ApplicationService
+  def initialize(hashes:)
+    @hashes = hashes
+  end
+
+  def perform
+    merged = {}
+
+    @hashes.each do |hash|
+      merge_hash(hash, merged)
+    end
+
+    succeed! merged
+  end
+
+  def merge_something(object, merged)
+    if object.is_a?(Array)
+      merge_array(object, merged)
+    elsif object.is_a?(Hash)
+      merge_hash(object, merged)
+    else
+      raise "Unknown object: #{object.class.name}"
+    end
+  end
+
+  def merge_array(array, merged)
+    array.each do |value|
+      merged << value
+    end
+  end
+
+  def merge_hash(hash, merged)
+    hash.each do |key, value|
+      if !merged.key?(key)
+        merged[key] = value
+      elsif value.is_a?(Array)
+        merge_array(value, merged[key])
+      elsif value.is_a?(Hash)
+        merge_hash(value, merged[key])
+      else
+        raise "Unknown object: #{object.class.name}"
+      end
+    end
+  end
+end

data/lib/peak_flow_utils/notifier.rb

@@ -14,8 +14,41 @@ class PeakFlowUtils::Notifier
     @current
   end
 
-  def self.notify(*args)
-    PeakFlowUtils::Notifier.current.notify(*args)
+  def self.current_parameters(parameters: nil)
+    hashes = PeakFlowUtils::Notifier.current_parameters_hashes
+    hashes << parameters if parameters
+
+    PeakFlowUtils::DeepMerger.execute!(hashes: hashes)
+  end
+
+  def self.current_parameters_hashes
+    hashes = []
+
+    Thread.current[:peakflow_utils] ||= {}
+    Thread.current[:peakflow_utils].dig(:notifier, :with_parameters)&.each_value do |more_parameters|
+      hashes << more_parameters
+    end
+
+    hashes
+  end
+
+  def self.notify(*args, **opts, &blk)
+    PeakFlowUtils::Notifier.current.notify(*args, **opts, &blk)
+  end
+
+  def self.with_parameters(parameters)
+    random_id = SecureRandom.hex(16)
+
+    Thread.current[:peakflow_utils] ||= {}
+    Thread.current[:peakflow_utils][:notifier] ||= {}
+    Thread.current[:peakflow_utils][:notifier][:with_parameters] ||= {}
+    Thread.current[:peakflow_utils][:notifier][:with_parameters][random_id] = parameters
+
+    begin
+      yield
+    ensure
+      Thread.current[:peakflow_utils][:notifier][:with_parameters].delete(random_id)
+    end
   end
 
   def initialize(auth_token:)
@@ -29,6 +62,8 @@ class PeakFlowUtils::Notifier
       error: error
     )
 
+    merged_parameters = PeakFlowUtils::Notifier.current_parameters(parameters: parameters)
+
     uri = URI("https://www.peakflow.io/errors/reports")
 
     https = Net::HTTP.new(uri.host, uri.port)
@@ -43,7 +78,7 @@ class PeakFlowUtils::Notifier
         file_path: error_parser.file_path,
         line_number: error_parser.line_number,
         message: error.message,
-        parameters: parameters,
+        parameters: merged_parameters,
         remote_ip: error_parser.remote_ip,
         url: error_parser.url,
         user_agent: error_parser.user_agent

data/lib/peak_flow_utils/notifier_rack.rb

@@ -9,13 +9,13 @@ class PeakFlowUtils::NotifierRack
   rescue Exception => e # rubocop:disable Lint/RescueException
     controller = env["action_controller.instance"]
     request = controller&.request
-    parameters = {}.merge(request.GET).merge(request.POST)
 
-    PeakFlowUtils::Notifier.notify(
-      environment: env,
-      error: e,
-      parameters: parameters
-    )
+    PeakFlowUtils::Notifier.with_parameters(rack: {get: request.GET, post: request.POST}) do
+      PeakFlowUtils::Notifier.notify(
+        environment: env,
+        error: e
+      )
+    end
 
     raise e
   end

data/lib/peak_flow_utils/version.rb

@@ -1,3 +1,3 @@
 module PeakFlowUtils
-  VERSION = "0.1.14".freeze
+  VERSION = "0.1.15".freeze
 end

data/lib/peak_flow_utils.rb

@@ -13,7 +13,6 @@ module PeakFlowUtils
   autoload :NotifierRails, "#{path}/notifier_rails"
   autoload :NotifierResponse, "#{path}/notifier_response"
   autoload :NotifierSidekiq, "#{path}/notifier_sidekiq"
-  autoload :RspecHelper, "#{path}/rspec_helper"
   autoload :HandlerHelper, "#{path}/handler_helper"
 
   autoload :ApplicationRecord, "#{models_path}/application_record"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peak_flow_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-04 00:00:00.000000000 Z
+date: 2022-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -111,8 +111,7 @@ dependencies:
 description: Utilities to be used with PeakFlow.
 email:
 - kaspernj@gmail.com
-executables:
-- peak_flow_rspec_files
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -135,6 +134,7 @@ files:
 - app/services/peak_flow_utils/attribute_service.rb
 - app/services/peak_flow_utils/configuration_service.rb
 - app/services/peak_flow_utils/database_initializer_service.rb
+- app/services/peak_flow_utils/deep_merger.rb
 - app/services/peak_flow_utils/erb_inspector.rb
 - app/services/peak_flow_utils/erb_inspector/file_inspector.rb
 - app/services/peak_flow_utils/erb_inspector/translation_inspector.rb
@@ -143,7 +143,6 @@ files:
 - app/services/peak_flow_utils/model_inspector.rb
 - app/services/peak_flow_utils/translation_service.rb
 - app/services/peak_flow_utils/translations_parser_service.rb
-- bin/peak_flow_rspec_files
 - config/routes.rb
 - lib/peak_flow_utils.rb
 - lib/peak_flow_utils/engine.rb
@@ -167,7 +166,6 @@ files:
 - lib/peak_flow_utils/notifier_rails.rb
 - lib/peak_flow_utils/notifier_response.rb
 - lib/peak_flow_utils/notifier_sidekiq.rb
-- lib/peak_flow_utils/rspec_helper.rb
 - lib/peak_flow_utils/version.rb
 - lib/tasks/peak_flow_utils_tasks.rake
 homepage: https://github.com/kaspernj/peak_flow_utils
@@ -189,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Utilities to be used with PeakFlow.

data/bin/peak_flow_rspec_files

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-
-# This task detects and prints out the RSpec files for the current build group
-
-require "#{__dir__}/../lib/peak_flow_utils"
-
-args = {}
-ARGV.each do |arg|
-  if (match = arg.match(/\A--(.+?)=(.+)\Z/))
-    args[match[1]] = match[2]
-  end
-end
-
-rspec_helper = PeakFlowUtils::RspecHelper.new(
-  groups: args.fetch("groups").to_i,
-  group_number: args.fetch("group-number").to_i,
-  only_types: args["only-types"]&.split(","),
-  tags: args["tags"]&.split(",")
-)
-
-print rspec_helper.group_files.map { |group_file| group_file.fetch(:path) }.join(" ")

data/lib/peak_flow_utils/rspec_helper.rb

@@ -1,209 +0,0 @@
-class PeakFlowUtils::RspecHelper
-  attr_reader :only_types, :tags
-
-  def initialize(groups:, group_number:, only_types: nil, tags: nil)
-    @groups = groups
-    @group_number = group_number
-    @example_data_exists = File.exist?("spec/examples.txt")
-    @only_types = only_types
-    @tags = tags
-  end
-
-  def example_data_exists?
-    @example_data_exists
-  end
-
-  def example_data
-    @example_data ||= begin
-      raw_data = File.read("spec/examples.txt")
-
-      result = []
-      raw_data.scan(/^\.\/(.+)\[(.+?)\]\s+\|\s+(.+?)\s+\|\s+((.+?) seconds|)\s+\|$/) do |match|
-        file_path = match[0]
-        spec_result = match[1]
-        seconds = match[4]&.to_f
-
-        spec_data = {
-          file_path: file_path,
-          spec_result: spec_result,
-          seconds: seconds
-        }
-
-        result << spec_data
-      end
-
-      result
-    end
-  end
-
-  def example_files
-    @example_files ||= begin
-      files = {}
-      example_data.each do |spec_data|
-        file_path = spec_data.fetch(:file_path)
-        seconds = spec_data.fetch(:seconds)
-
-        files[file_path] ||= {examples: 0, seconds: 0.0}
-        files[file_path][:examples] += 1
-        files[file_path][:seconds] += seconds if seconds
-      end
-
-      files
-    end
-  end
-
-  def example_file(path)
-    example_files[path]
-  end
-
-  def group_files
-    return @group_files if @group_files
-
-    sorted_files.each do |file|
-      file_path = file.fetch(:path)
-      file_data = example_file(file_path) if example_data_exists?
-
-      if file_data
-        examples = file_data.fetch(:examples)
-        seconds = file_data.fetch(:seconds)
-      else
-        examples = file.fetch(:examples)
-      end
-
-      group = group_with_least
-      group[:examples] += examples
-      group[:files] << file
-      group[:seconds] += seconds if seconds
-    end
-
-    @group_files = group_orders[@group_number - 1].fetch(:files)
-  end
-
-  def group_orders
-    @group_orders ||= begin
-      group_orders = []
-      @groups.times do
-        group_orders << {
-          examples: 0,
-          files: [],
-          seconds: 0.0
-        }
-      end
-      group_orders
-    end
-  end
-
-  def group_with_least
-    group_orders.min do |group1, group2|
-      if example_data_exists? && group1.fetch(:seconds) != 0.0 && group2.fetch(:seconds) != 0.0
-        group1.fetch(:seconds) <=> group2.fetch(:seconds)
-      else
-        group1.fetch(:examples) <=> group2.fetch(:examples)
-      end
-    end
-  end
-
-  # Sort them so that they are sorted by file path in three groups so each group have an equal amount of controller specs, features specs and so on
-  def sorted_files
-    files.values.sort do |file1, file2|
-      file1_path = file1.fetch(:path)
-      file2_path = file2.fetch(:path)
-
-      file1_data = example_file(file1_path) if example_data_exists?
-      file2_data = example_file(file2_path) if example_data_exists?
-
-      if file1_data && file2_data && file1_data.fetch(:seconds) != 0.0 && file2_data.fetch(:seconds) != 0.0
-        value1 = file1_data[:seconds]
-      else
-        value1 = file1.fetch(:points)
-      end
-
-      if file2_data && file1_data && file2_data.fetch(:seconds) != 0.0 && file2_data.fetch(:seconds) != 0.0
-        value2 = file2_data[:seconds]
-      else
-        value2 = file2.fetch(:points)
-      end
-
-      if value1 == value2
-        value2 = file1_path
-        value1 = file2_path
-      end
-
-      value2 <=> value1
-    end
-  end
-
-private
-
-  def dry_result
-    @dry_result ||= begin
-      require "json"
-      require "rspec/core"
-
-      output_capture = StringIO.new
-      RSpec::Core::Runner.run(rspec_options, $stderr, output_capture)
-
-      result = ::JSON.parse(output_capture.string)
-
-      raise "No examples were found" if result.fetch("examples").empty?
-
-      result
-    end
-  end
-
-  def dry_file(path)
-    files.fetch(path)
-  end
-
-  def files
-    @files ||= begin
-      result = {}
-      dry_result.fetch("examples").each do |example|
-        file_path = example.fetch("file_path")
-        file_path = file_path[2, file_path.length]
-        type = type_from_path(file_path)
-        points = points_from_type(type)
-
-        next if ignore_type?(type)
-
-        result[file_path] = {examples: 0, path: file_path, points: 0, type: type} unless result.key?(file_path)
-        result[file_path][:examples] += 1
-        result[file_path][:points] += points
-      end
-
-      result
-    end
-  end
-
-  def ignore_type?(type)
-    only_types && !only_types.include?(type) # rubocop:disable Rails/NegateInclude:, Style/SafeNavigation
-  end
-
-  def points_from_type(type)
-    if type == "feature" || type == "system"
-      10
-    elsif type == "controllers"
-      3
-    else
-      1
-    end
-  end
-
-  def rspec_options
-    rspec_options = ["--dry-run", "--format", "json"]
-
-    tags&.each do |tag|
-      rspec_options += ["--tag", tag]
-    end
-
-    # Add the folder with all the specs, which is required when running programmatically
-    rspec_options << "spec"
-
-    rspec_options
-  end
-
-  def type_from_path(file_path)
-    match = file_path.match(/^spec\/(.+?)\//)
-    match[1] if match
-  end
-end