Skip to content

Commit e623c52

Browse files
committed
Rubocop fixes
1 parent 6bdb807 commit e623c52

File tree

22 files changed

+1559
-1434
lines changed

22 files changed

+1559
-1434
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,9 +474,9 @@ GEM
474474
actiontext (>= 6.0)
475475
mobility (~> 1.2)
476476
msgpack (1.8.0)
477+
multi_json (1.17.0)
477478
multi_xml (0.7.1)
478479
bigdecimal (~> 3.1)
479-
multi_json (1.17.0)
480480
multipart-post (2.4.1)
481481
mutex_m (0.3.0)
482482
net-http (0.6.0)

app/controllers/better_together/person_platform_integrations_controller.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ def edit; end
2323

2424
# POST /better_together/person_platform_integrations
2525
def create
26-
# rubocop:todo Layout/LineLength
2726
@better_together_person_platform_integration = BetterTogether::PersonPlatformIntegration.new(person_platform_integration_params)
28-
# rubocop:enable Layout/LineLength
29-
3027
if @person_platform_integration.save
3128
redirect_to @person_platform_integration, notice: 'PersonPlatformIntegration was successfully created.'
3229
else

app/models/concerns/better_together/devise_user.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ def send_confirmation_instructions(opts = {})
7373
send_devise_notification(:confirmation_instructions, @raw_confirmation_token, opts)
7474
end
7575

76-
def send_devise_notification(notification, *args)
77-
devise_mailer.send(notification, self, *args).deliver_later
76+
def send_devise_notification(notification, *)
77+
devise_mailer.send(notification, self, *).deliver_later
7878
end
7979

8080
# # override devise method to include additional info as opts hash

app/models/concerns/better_together/seedable.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ def export_collection_as_seed( # rubocop:todo Metrics/MethodLength
141141
seed_hash
142142
end
143143

144-
def export_collection_as_seed_yaml(records, **opts)
145-
export_collection_as_seed(records, **opts).deep_stringify_keys.to_yaml
144+
def export_collection_as_seed_yaml(records, **)
145+
export_collection_as_seed(records, **).deep_stringify_keys.to_yaml
146146
end
147147
end
148148
end

app/policies/better_together/person_block_policy.rb

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,28 @@ def index?
66
user.present?
77
end
88

9+
def new?
10+
user.present?
11+
end
12+
913
def create?
10-
user.present? && record.blocker == agent && !record.blocked.permitted_to?('manage_platform')
14+
# Must be logged in and be the blocker
15+
return false unless user.present? && record.blocker == agent
16+
17+
# Must have a valid blocked person
18+
return false unless record.blocked.present?
19+
20+
# Cannot block platform managers
21+
!blocked_user_is_platform_manager?
22+
end
23+
24+
private
25+
26+
def blocked_user_is_platform_manager?
27+
return false unless record.blocked&.user
28+
29+
# Check if the blocked person's user has platform management permissions
30+
record.blocked.user.permitted_to?('manage_platform')
1131
end
1232

1333
def destroy?

spec/dummy/db/schema.rb

Lines changed: 1499 additions & 1391 deletions
Large diffs are not rendered by default.

spec/factories/better_together/seeds.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22

3-
FactoryBot.define do # rubocop:todo Metrics/BlockLength
4-
factory :better_together_seed, class: 'BetterTogether::Seed' do # rubocop:todo Metrics/BlockLength
3+
FactoryBot.define do
4+
factory :better_together_seed, class: 'BetterTogether::Seed' do
55
id { SecureRandom.uuid }
66
version { '1.0' }
77
created_by { 'Better Together Solutions' }

spec/helpers/better_together/person_platform_integrations_helper_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
# end
1313
# end
1414
# end
15-
RSpec.describe BetterTogether::PersonPlatformIntegrationsHelper, type: :helper do
15+
RSpec.describe BetterTogether::PersonPlatformIntegrationsHelper do
1616
pending "add some examples to (or delete) #{__FILE__}"
1717
end

spec/helpers/better_together/seeds_helper_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# end
1414
# end
1515
module BetterTogether
16-
RSpec.describe SeedsHelper, type: :helper do
16+
RSpec.describe SeedsHelper do
1717
pending "add some examples to (or delete) #{__FILE__}"
1818
end
1919
end

spec/models/better_together/person_platform_integration_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
require 'rails_helper'
44

5-
RSpec.describe BetterTogether::PersonPlatformIntegration, type: :model do
5+
RSpec.describe BetterTogether::PersonPlatformIntegration do
66
pending "add some examples to (or delete) #{__FILE__}"
77
end

0 commit comments

Comments
 (0)