💚 More fixes

Author: pboling

Appraisals

@@ -48,7 +48,7 @@ end
 appraise "rails-7-0" do
   # Load order is very important with combustion!
   gem "combustion", "~> 1.5"
-  gem "sqlite3", "~> 2.0"
+  gem "sqlite3", "~> 1.4"
 
   gem "rails", "~> 7.0.8.7"
   eval_gemfile "modular/mini_testing.gemfile"

app/models/masq/open_id_request.rb

@@ -15,18 +15,18 @@ def parameters=(params)
         case params
           # arbitrary params passed as Hash
         when Hash
-          params.delete_if { |k, v| k.index("openid.") != 0 }
+          params.delete_if { |k, _v| k.index("openid.") != 0 }
           # params from ActionController (does not inherit directly from HashWithIndifferentAccess after Rails 4.2)
         when ActionController::Parameters
-          params.to_unsafe_h.delete_if { |k, v| k.index("openid.") != 0 }
+          params.to_unsafe_h.delete_if { |k, _v| k.index("openid.") != 0 }
         end
     end
 
     def from_trusted_domain?
       host = URI.parse(parameters["openid.realm"] || parameters["openid.trust_root"]).host
-      unless Masq::Engine.config.masq["trusted_domains"].nil?
-        Masq::Engine.config.masq["trusted_domains"].find { |domain| host.ends_with?(domain) }
-      end
+      return false if Masq::Engine.config.masq["trusted_domains"].nil?
+
+      Masq::Engine.config.masq["trusted_domains"].find { |domain| host.to_s.ends_with?(domain) }
     end
 
     protected

gemfiles/rails_7_0.gemfile

@@ -7,7 +7,7 @@ gem "rexml"
 gem "mutex_m", "~> 0.2"
 gem "stringio", "~> 3.0"
 gem "combustion", "~> 1.5"
-gem "sqlite3", "~> 2.0"
+gem "sqlite3", "~> 1.4"
 gem "rails", "~> 7.0.8.7"
 
 gemspec path: "../"

lib/masq/engine.rb

@@ -2,6 +2,11 @@
 
 module Masq
   class Engine < ::Rails::Engine
+    # An isolated engine will set its name according to namespace,
+    #   so Masq::Engine.engine_name will be “masq”.
+    # It will also set Masq.table_name_prefix to “masq_”,
+    #   changing the MyEngine::Persona model to use the masq_personas table
+    # See: http://edgeapi.rubyonrails.org/classes/Rails/Engine.html#label-Isolated+Engine
     isolate_namespace Masq
   end
 end