From a2e22c1bb151165338dde89d6f5791eab7d63d13 Mon Sep 17 00:00:00 2001 From: claytongentry Date: Sat, 19 Apr 2025 11:07:37 -0400 Subject: [PATCH 1/3] Upgrade dependencies April 2025 --- Gemfile.lock | 88 +++++++++++++++-------------- lib/manifold/cli.rb | 4 +- spec/manifold/api/workspace_spec.rb | 52 ++++++++--------- 3 files changed, 73 insertions(+), 71 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 65aa532..3e93bcd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,71 +1,71 @@ GEM remote: https://rubygems.org/ specs: - ast (2.4.2) - debug (1.9.2) + ast (2.4.3) + date (3.4.1) + debug (1.10.0) irb (~> 1.10) reline (>= 0.3.8) - diff-lcs (1.5.1) + diff-lcs (1.6.1) docile (1.4.1) - fakefs (2.5.0) - io-console (0.7.2) - irb (1.14.1) + fakefs (3.0.0) + io-console (0.8.0) + irb (1.15.2) + pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) - json (2.7.2) - language_server-protocol (3.17.0.3) - logger (1.6.1) - parallel (1.24.0) - parser (3.3.1.0) + json (2.10.2) + language_server-protocol (3.17.0.4) + lint_roller (1.1.0) + logger (1.7.0) + parallel (1.27.0) + parser (3.3.8.0) ast (~> 2.4.1) racc - psych (5.1.2) + pp (0.6.2) + prettyprint + prettyprint (0.2.0) + prism (1.4.0) + psych (5.2.3) + date stringio - racc (1.7.3) + racc (1.8.1) rainbow (3.1.1) - rdoc (6.7.0) + rdoc (6.13.1) psych (>= 4.0.0) - regexp_parser (2.9.0) - reline (0.5.10) + regexp_parser (2.10.0) + reline (0.6.1) io-console (~> 0.5) - rexml (3.2.6) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.0) + rspec-core (3.13.3) rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.0) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.1) - rubocop (1.63.4) + rspec-support (3.13.2) + rubocop (1.75.2) json (~> 2.3) - language_server-protocol (>= 3.17.0) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.1.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.31.1, < 2.0) + regexp_parser (>= 2.9.3, < 3.0) + rubocop-ast (>= 1.44.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.3) - parser (>= 3.3.1.0) - rubocop-capybara (2.20.0) - rubocop (~> 1.41) - rubocop-factory_bot (2.25.1) - rubocop (~> 1.41) - rubocop-rspec (2.29.1) - rubocop (~> 1.40) - rubocop-capybara (~> 2.17) - rubocop-factory_bot (~> 2.22) - rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.28.3) - rubocop (~> 1.40) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.44.1) + parser (>= 3.3.7.2) + prism (~> 1.4) + rubocop-rspec (3.6.0) + lint_roller (~> 1.1) + rubocop (~> 1.72, >= 1.72.1) ruby-progressbar (1.13.0) simplecov (0.22.0) docile (~> 1.1) @@ -77,9 +77,11 @@ GEM simplecov simplecov-lcov (0.8.0) simplecov_json_formatter (0.1.4) - stringio (3.1.1) - thor (1.3.1) - unicode-display_width (2.5.0) + stringio (3.1.6) + thor (1.3.2) + unicode-display_width (3.1.4) + unicode-emoji (~> 4.0, >= 4.0.4) + unicode-emoji (4.0.4) PLATFORMS arm64-darwin-22 diff --git a/lib/manifold/cli.rb b/lib/manifold/cli.rb index bc2f41b..d2a2227 100644 --- a/lib/manifold/cli.rb +++ b/lib/manifold/cli.rb @@ -6,8 +6,8 @@ module Manifold class CLI < Thor attr_accessor :logger - def initialize(*args, logger: Logger.new($stdout)) - super(*args) + def initialize(*, logger: Logger.new($stdout)) + super(*) self.logger = logger logger.level = Logger::INFO diff --git a/spec/manifold/api/workspace_spec.rb b/spec/manifold/api/workspace_spec.rb index 5425363..68919c8 100644 --- a/spec/manifold/api/workspace_spec.rb +++ b/spec/manifold/api/workspace_spec.rb @@ -257,36 +257,36 @@ def find_breakout(name) end end - include_examples "breakout metrics", "paid" - include_examples "breakout metrics", "organic" - include_examples "breakout metrics", "us" - include_examples "breakout metrics", "global" - include_examples "breakout metrics", "retargeting" - include_examples "breakout metrics", "prospecting" + it_behaves_like "breakout metrics", "paid" + it_behaves_like "breakout metrics", "organic" + it_behaves_like "breakout metrics", "us" + it_behaves_like "breakout metrics", "global" + it_behaves_like "breakout metrics", "retargeting" + it_behaves_like "breakout metrics", "prospecting" # Test two-way intersection fields - include_examples "breakout metrics", "paidUs" - include_examples "breakout metrics", "paidGlobal" - include_examples "breakout metrics", "organicUs" - include_examples "breakout metrics", "organicGlobal" - include_examples "breakout metrics", "paidRetargeting" - include_examples "breakout metrics", "paidProspecting" - include_examples "breakout metrics", "organicRetargeting" - include_examples "breakout metrics", "organicProspecting" - include_examples "breakout metrics", "usRetargeting" - include_examples "breakout metrics", "usProspecting" - include_examples "breakout metrics", "globalRetargeting" - include_examples "breakout metrics", "globalProspecting" + it_behaves_like "breakout metrics", "paidUs" + it_behaves_like "breakout metrics", "paidGlobal" + it_behaves_like "breakout metrics", "organicUs" + it_behaves_like "breakout metrics", "organicGlobal" + it_behaves_like "breakout metrics", "paidRetargeting" + it_behaves_like "breakout metrics", "paidProspecting" + it_behaves_like "breakout metrics", "organicRetargeting" + it_behaves_like "breakout metrics", "organicProspecting" + it_behaves_like "breakout metrics", "usRetargeting" + it_behaves_like "breakout metrics", "usProspecting" + it_behaves_like "breakout metrics", "globalRetargeting" + it_behaves_like "breakout metrics", "globalProspecting" # Test three-way intersection fields - include_examples "breakout metrics", "paidUsRetargeting" - include_examples "breakout metrics", "paidUsProspecting" - include_examples "breakout metrics", "paidGlobalRetargeting" - include_examples "breakout metrics", "paidGlobalProspecting" - include_examples "breakout metrics", "organicUsRetargeting" - include_examples "breakout metrics", "organicUsProspecting" - include_examples "breakout metrics", "organicGlobalRetargeting" - include_examples "breakout metrics", "organicGlobalProspecting" + it_behaves_like "breakout metrics", "paidUsRetargeting" + it_behaves_like "breakout metrics", "paidUsProspecting" + it_behaves_like "breakout metrics", "paidGlobalRetargeting" + it_behaves_like "breakout metrics", "paidGlobalProspecting" + it_behaves_like "breakout metrics", "organicUsRetargeting" + it_behaves_like "breakout metrics", "organicUsProspecting" + it_behaves_like "breakout metrics", "organicGlobalRetargeting" + it_behaves_like "breakout metrics", "organicGlobalProspecting" it "includes all condition fields and intersection fields in the metrics fields" do expect(schema_fields[:metrics]["fields"] From 275d143650c3b88755b62a670d7538da72bbe3eb Mon Sep 17 00:00:00 2001 From: claytongentry Date: Sat, 19 Apr 2025 11:10:47 -0400 Subject: [PATCH 2/3] CI against latest minors --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4db03b2..374548a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,9 +14,9 @@ jobs: strategy: matrix: ruby: - - '3.2.7' - - '3.3.7' - - '3.4.2' + - '3.2.8' + - '3.3.8' + - '3.4.3' steps: - uses: actions/checkout@v4 From 0f921a2294deeee35a4b8c7f2a36363087635108 Mon Sep 17 00:00:00 2001 From: claytongentry Date: Sat, 19 Apr 2025 11:15:18 -0400 Subject: [PATCH 3/3] debride and rebundle --- Gemfile.lock | 3 ++- lib/manifold/api/schema_manager.rb | 7 ------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3e93bcd..4acac25 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,6 +86,7 @@ GEM PLATFORMS arm64-darwin-22 ruby + x86_64-darwin-24 DEPENDENCIES debug @@ -100,4 +101,4 @@ DEPENDENCIES thor BUNDLED WITH - 2.5.9 + 2.6.7 diff --git a/lib/manifold/api/schema_manager.rb b/lib/manifold/api/schema_manager.rb index f926197..8260478 100644 --- a/lib/manifold/api/schema_manager.rb +++ b/lib/manifold/api/schema_manager.rb @@ -176,13 +176,6 @@ def generate_intersections(group_config) end end - def add_combinations_of_size(size, breakout_groups, group_config, all_fields) - breakout_groups.combination(size).each do |breakout_combination| - fields = generate_intersection_fields_for_combination(group_config, breakout_combination) - all_fields.concat(fields) - end - end - def generate_intersection_fields_for_combination(group_config, breakout_combination) # Get all conditions from the given breakout groups condition_sets = breakout_combination.map do |breakout_group|