Skip to content

Commit

Permalink
cleanup rubocop offenses, update gems
Browse files Browse the repository at this point in the history
  • Loading branch information
@scambra
scambra committed Oct 18, 2024
1 parent 8a738a8 commit 45872ab
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 66 deletions.
128 changes: 64 additions & 64 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,65 +16,65 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actioncable (6.1.7.8)
actionpack (= 6.1.7.8)
activesupport (= 6.1.7.8)
actioncable (6.1.7.9)
actionpack (= 6.1.7.9)
activesupport (= 6.1.7.9)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.7.8)
actionpack (= 6.1.7.8)
activejob (= 6.1.7.8)
activerecord (= 6.1.7.8)
activestorage (= 6.1.7.8)
activesupport (= 6.1.7.8)
actionmailbox (6.1.7.9)
actionpack (= 6.1.7.9)
activejob (= 6.1.7.9)
activerecord (= 6.1.7.9)
activestorage (= 6.1.7.9)
activesupport (= 6.1.7.9)
mail (>= 2.7.1)
actionmailer (6.1.7.8)
actionpack (= 6.1.7.8)
actionview (= 6.1.7.8)
activejob (= 6.1.7.8)
activesupport (= 6.1.7.8)
actionmailer (6.1.7.9)
actionpack (= 6.1.7.9)
actionview (= 6.1.7.9)
activejob (= 6.1.7.9)
activesupport (= 6.1.7.9)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.7.8)
actionview (= 6.1.7.8)
activesupport (= 6.1.7.8)
actionpack (6.1.7.9)
actionview (= 6.1.7.9)
activesupport (= 6.1.7.9)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.7.8)
actionpack (= 6.1.7.8)
activerecord (= 6.1.7.8)
activestorage (= 6.1.7.8)
activesupport (= 6.1.7.8)
actiontext (6.1.7.9)
actionpack (= 6.1.7.9)
activerecord (= 6.1.7.9)
activestorage (= 6.1.7.9)
activesupport (= 6.1.7.9)
nokogiri (>= 1.8.5)
actionview (6.1.7.8)
activesupport (= 6.1.7.8)
actionview (6.1.7.9)
activesupport (= 6.1.7.9)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.7.8)
activesupport (= 6.1.7.8)
activejob (6.1.7.9)
activesupport (= 6.1.7.9)
globalid (>= 0.3.6)
activemodel (6.1.7.8)
activesupport (= 6.1.7.8)
activerecord (6.1.7.8)
activemodel (= 6.1.7.8)
activesupport (= 6.1.7.8)
activemodel (6.1.7.9)
activesupport (= 6.1.7.9)
activerecord (6.1.7.9)
activemodel (= 6.1.7.9)
activesupport (= 6.1.7.9)
activerecord-jdbc-adapter (61.2-java)
activerecord (~> 6.1.0)
activerecord-jdbcsqlite3-adapter (61.2-java)
activerecord-jdbc-adapter (= 61.2)
jdbc-sqlite3 (~> 3.8, < 3.30)
activestorage (6.1.7.8)
actionpack (= 6.1.7.8)
activejob (= 6.1.7.8)
activerecord (= 6.1.7.8)
activesupport (= 6.1.7.8)
activestorage (6.1.7.9)
actionpack (= 6.1.7.9)
activejob (= 6.1.7.9)
activerecord (= 6.1.7.9)
activesupport (= 6.1.7.9)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.7.8)
activesupport (6.1.7.9)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand All @@ -83,27 +83,27 @@ GEM
ansi (1.5.0)
ast (2.4.2)
brakeman (5.4.1)
builder (3.2.4)
builder (3.3.0)
bundler-audit (0.9.1)
bundler (>= 1.2.0, < 3)
thor (~> 1.0)
concurrent-ruby (1.3.1)
concurrent-ruby (1.3.4)
cow_proxy (0.3.3)
crass (1.0.6)
date (3.3.4)
date (3.3.4-java)
docile (1.4.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
erubi (1.12.0)
erubi (1.13.0)
gli (2.21.0)
globalid (1.2.1)
activesupport (>= 6.1)
highline (2.0.3)
http-accept (1.7.0)
http-cookie (1.0.5)
domain_name (~> 0.5)
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
i18n-tasks (0.9.36)
activesupport (>= 4.0.2)
Expand Down Expand Up @@ -140,7 +140,7 @@ GEM
mime-types-data (3.2022.0105)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
minitest (5.23.1)
minitest (5.25.1)
minitest-reporters (1.6.0)
ansi
builder
Expand Down Expand Up @@ -173,25 +173,25 @@ GEM
stringio
psych (5.1.2-java)
jar-dependencies (>= 0.1.7)
racc (1.8.0)
racc (1.8.0-java)
rack (2.2.9)
racc (1.8.1)
racc (1.8.1-java)
rack (2.2.10)
rack-test (2.1.0)
rack (>= 1.3)
rails (6.1.7.8)
actioncable (= 6.1.7.8)
actionmailbox (= 6.1.7.8)
actionmailer (= 6.1.7.8)
actionpack (= 6.1.7.8)
actiontext (= 6.1.7.8)
actionview (= 6.1.7.8)
activejob (= 6.1.7.8)
activemodel (= 6.1.7.8)
activerecord (= 6.1.7.8)
activestorage (= 6.1.7.8)
activesupport (= 6.1.7.8)
rails (6.1.7.9)
actioncable (= 6.1.7.9)
actionmailbox (= 6.1.7.9)
actionmailer (= 6.1.7.9)
actionpack (= 6.1.7.9)
actiontext (= 6.1.7.9)
actionview (= 6.1.7.9)
activejob (= 6.1.7.9)
activemodel (= 6.1.7.9)
activerecord (= 6.1.7.9)
activestorage (= 6.1.7.9)
activesupport (= 6.1.7.9)
bundler (>= 1.15.0)
railties (= 6.1.7.8)
railties (= 6.1.7.9)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
Expand All @@ -202,9 +202,9 @@ GEM
rails-i18n (6.0.0)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 7)
railties (6.1.7.8)
actionpack (= 6.1.7.8)
activesupport (= 6.1.7.8)
railties (6.1.7.9)
actionpack (= 6.1.7.9)
activesupport (= 6.1.7.9)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand Down Expand Up @@ -244,15 +244,15 @@ GEM
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
sprockets-rails (3.5.0)
sprockets-rails (3.5.2)
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
sqlite3 (1.4.4)
stringio (3.0.6)
terminal-table (3.0.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thor (1.3.1)
thor (1.3.2)
timeout (0.4.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
Expand All @@ -266,7 +266,7 @@ GEM
websocket-driver (0.7.6-java)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.6.15)
zeitwerk (2.6.18)

PLATFORMS
java
Expand Down
4 changes: 2 additions & 2 deletions lib/active_scaffold/helpers/form_column_helpers.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def active_scaffold_input_for_tabbed(column, record, subsection_id, tab_options,
hidden_style = 'display: none;'
blank_choice = content_tag(:option, as_(:_select_), value: '')
option_tags = tab_options.inject(blank_choice) do |html, (label, value, tab_record)|
used = used_tabs.include? tab_record || value
used = used_tabs.include?(tab_record || value)
html << content_tag(:option, label, value: value, style: (hidden_style if used))
end
select_tag(nil, option_tags, class: "#{column.tabbed_by}-input", id: "#{subsection_id}_input")
Expand Down Expand Up @@ -260,7 +260,7 @@ def active_scaffold_tab_content(tab_id, active, content)
end

def active_scaffold_tabs_for(column, record, subsection_id, tab_options, used_tabs)
used_tabs = used_tabs.map { |value, value_id| [value, "#{clean_id(value_id || value.to_s)}"] }
used_tabs = used_tabs.map { |value, value_id| [value, clean_id(value_id || value.to_s)] }
content_tag(:div, id: subsection_id, class: 'tabbed') do
content_tag(:ul, class: 'nav nav-tabs') do
tabs = used_tabs.map.with_index do |(tab_value, id), i|
Expand Down

0 comments on commit 45872ab

Please sign in to comment.