Merge branch 'main' into Update-rubocop-config

rubyforgood · Dec 21, 2024 · 13e19e8 · 13e19e8
2 parents 1ff33fe + 1f1f7ec
commit 13e19e8
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 13 deletions.
diff --git a/Gemfile b/Gemfile
@@ -157,7 +157,7 @@ group :development, :test do
   gem "rubocop"
   # Rails add-on for static analysis.
   gem 'rubocop-performance'
-  gem "rubocop-rails", "~> 2.25.1"
+  gem "rubocop-rails", "~> 2.27.0"
   # Default rules for Rubocop.
   gem "standard", "~> 1.40"
   gem "standard-rails"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -445,7 +445,7 @@ GEM
     parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
-    pdf-core (0.9.0)
+    pdf-core (0.10.0)
     pdf-reader (2.12.0)
       Ascii85 (~> 1.0)
       afm (~> 0.2.1)
@@ -454,11 +454,13 @@ GEM
       ttfunk
     pg (1.5.7)
     popper_js (2.11.8)
-    prawn (2.4.0)
-      pdf-core (~> 0.9.0)
-      ttfunk (~> 1.7)
-    prawn-rails (1.4.2)
+    prawn (2.5.0)
+      matrix (~> 0.4)
+      pdf-core (~> 0.10.0)
+      ttfunk (~> 1.8)
+    prawn-rails (1.5.0)
       actionview (>= 3.1.0)
+      activesupport (>= 3.1.0)
       prawn
       prawn-table
     prawn-table (0.2.2)
@@ -593,10 +595,10 @@ GEM
     rubocop-performance (1.23.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.25.1)
+    rubocop-rails (2.27.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
+      rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     ruby-graphviz (1.2.5)
       rexml
@@ -674,9 +676,10 @@ GEM
       execjs (>= 0.3.0, < 3)
     thor (1.3.2)
     tilt (2.2.0)
-    timeout (0.4.1)
-    ttfunk (1.7.0)
-    turbo-rails (2.0.10)
+    timeout (0.4.2)
+    ttfunk (1.8.0)
+      bigdecimal (~> 3.1)
+    turbo-rails (2.0.11)
       actionpack (>= 6.0.0)
       railties (>= 6.0.0)
     tzinfo (2.0.6)
@@ -792,7 +795,7 @@ DEPENDENCIES
   rspec-rails (~> 7.0.1)
   rubocop
   rubocop-performance
-  rubocop-rails (~> 2.25.1)
+  rubocop-rails (~> 2.27.0)
   sass-rails
   shoulda-matchers (~> 6.2)
   simple_form

diff --git a/app/models/organization.rb b/app/models/organization.rb
@@ -293,6 +293,6 @@ def get_admin_email
   end
 
   def logo_size_check
-    errors.add(:logo, 'File size is greater than 1 MB') if logo.byte_size > 1.megabytes
+    errors.add(:logo, 'File size is greater than 1 MB') if logo.byte_size > 1.megabyte
   end
 end
diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb
@@ -0,0 +1,2 @@
+# this is to enable the MoneyRails::ActionViewExtension in the helper files as they load
+require "action_view/base"
diff --git a/spec/fixtures/files/partners_with_bom_encoding.csv b/spec/fixtures/files/partners_with_bom_encoding.csv
@@ -0,0 +1,21 @@
+name,email
+Beaverton Police Department,[email protected]
+Catholic Charities,[email protected]
+Clackamas Service Center,[email protected]
+Healthy Familes of Clackamas County,[email protected]
+Dollar for Portland,[email protected]
+Emmanuel Housing Center,[email protected]
+Helensview School,[email protected]
+JOIN,[email protected]
+Job Corps (PIVOT),[email protected]
+NARA,[email protected]
+NW Housing Alternatives,[email protected]
+Pregnancy Resource Center,[email protected]
+Portland Homeless Family Solutions,[email protected]
+Raphael House,[email protected]
+The Rebecca Foundation's Cloth Diaper Closet,[email protected]
+Rose Haven,[email protected]
+Self Enhancement Inc.,[email protected]
+Teen Parent Services (PPS),[email protected]
+Volunteers of America,[email protected]
+Central City Concern,[email protected]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# this is to enable the MoneyRails::ActionViewExtension in the helper files as they load
		require "action_view/base"