Fix more Style offenses

  - Use string interpolation instead of concatenation (Style/StringConcatenation)
  - Use symbol proc shorthand where applicable (Style/SymbolProc)
  - Use unpack1 instead of unpack.first (Style/UnpackFirst)

Author: beengine

.rubocop_todo.yml

@@ -471,27 +471,3 @@ Style/SoleNestedConditional:
     - 'lib/sorcery/model/submodules/brute_force_protection.rb'
     - 'lib/sorcery/model/submodules/external.rb'
     - 'lib/sorcery/model/submodules/user_activation.rb'
-
-# Offense count: 3
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Mode.
-Style/StringConcatenation:
-  Exclude:
-    - 'lib/generators/sorcery/install_generator.rb'
-    - 'lib/sorcery/providers/github.rb'
-    - 'spec/controllers/controller_oauth2_spec.rb'
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments.
-# AllowedMethods: define_method
-Style/SymbolProc:
-  Exclude:
-    - 'spec/shared_examples/user_shared_examples.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Style/UnpackFirst:
-  Exclude:
-    - 'lib/sorcery/crypto_providers/aes256.rb'
-    - 'spec/sorcery_crypto_providers_spec.rb'

lib/generators/sorcery/install_generator.rb

@@ -35,7 +35,7 @@ def configure_initializer_file
         # Add submodules to the initializer file.
         return unless submodules
 
-        submodule_names = submodules.collect { |submodule| ':' + submodule }
+        submodule_names = submodules.collect { |submodule| ":#{submodule}" }
 
         gsub_file sorcery_config_path, /submodules = \[.*\]/ do |str|
           current_submodule_names = (str =~ /\[(.*)\]/ ? Regexp.last_match(1) : '').delete(' ').split(',')

lib/sorcery/crypto_providers/aes256.rb

@@ -36,7 +36,7 @@ def matches?(crypted, *tokens)
         def decrypt(crypted)
           aes.decrypt
           aes.key = @key
-          (aes.update(crypted.unpack('m').first) + aes.final)
+          (aes.update(crypted.unpack1('m')) + aes.final)
         end
 
         private

lib/sorcery/providers/github.rb

@@ -48,7 +48,7 @@ def process_callback(params, _session)
       end
 
       def primary_email(access_token)
-        response = access_token.get(user_info_path + '/emails')
+        response = access_token.get("#{user_info_path}/emails")
         emails = JSON.parse(response.body)
         primary = emails.find { |i| i['primary'] }
         (primary && primary['email']) || (emails.first && emails.first['email'])

spec/controllers/controller_oauth2_spec.rb

@@ -549,7 +549,7 @@ def provider_url(provider)
           "&response_type=code&scope=#{config.vk.scope}&state",
       salesforce: 'https://login.salesforce.com/services/oauth2/authorize?' \
                   "client_id=#{config.salesforce.key}&display&redirect_uri=#{redirect_uri}" \
-                  "&response_type=code&scope#{'=' + config.salesforce.scope unless config.salesforce.scope.nil?}&state",
+                  "&response_type=code&scope#{"=#{config.salesforce.scope}" unless config.salesforce.scope.nil?}&state",
       slack: 'https://slack.com/oauth/authorize?' \
              "client_id=#{config.slack.key}&display&redirect_uri=#{redirect_uri}" \
              '&response_type=code&scope=identity.basic%2C%20identity.email&state',

spec/shared_examples/user_shared_examples.rb

@@ -219,7 +219,7 @@ class Admin2 < User; end
     it 'does not clear the virtual password field if save failed due to validity' do
       User.class_eval do
         validates_format_of :email, with: /\A(.)+@(.)+\Z/,
-                                    if: proc { |r| r.email }, message: 'is invalid'
+                                    if: :email, message: 'is invalid'
       end
 
       user.password = 'blupush'

spec/sorcery_crypto_providers_spec.rb

@@ -140,7 +140,7 @@
       aes = OpenSSL::Cipher.new('AES-256-ECB')
       aes.decrypt
       aes.key = @key
-      expect(aes.update(@digest.unpack('m').first) + aes.final).to eq 'Noam Ben-Ari'
+      expect(aes.update(@digest.unpack1('m')) + aes.final).to eq 'Noam Ben-Ari'
     end
   end