💚 More fixes

Author: pboling

.rubocop_gradual.lock

@@ -8,15 +8,6 @@
   "app/controllers/masq/sessions_controller.rb:3600302919": [
     [39, 21, 3, "Style/AndOr: Use `&&` instead of `and`.", 193409806]
   ],
-  "app/models/masq/persona.rb:3585878101": [
-    [14, 5, 55, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 1041090622],
-    [18, 5, 142, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 3038409932],
-    [55, 5, 3, "Lint/IneffectiveAccessModifier: `private` (on line 52) does not make singleton methods private. Use `private_class_method` or `private` inside a `class << self` block instead.", 193404514],
-    [55, 5, 78, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 2563415249]
-  ],
-  "app/models/masq/signup.rb:1186383472": [
-    [7, 5, 126, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 1071524745]
-  ],
   "lib/masq/authenticated_system.rb:2956957840": [
     [95, 5, 3, "Lint/IneffectiveAccessModifier: `protected` (on line 3) does not make singleton methods protected. Use `protected` inside a `class << self` block instead.", 193404514],
     [95, 5, 111, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 4258707989],

app/models/masq/account.rb

@@ -53,15 +53,15 @@ def find_and_activate!(activation_code)
       # Authenticates a user by their login name and password.
       # Returns the user or nil.
       def authenticate(login, password, basic_auth_used = false)
-        a = Account.find_by(login: login)
+        a = find_by(login: login)
         if a.nil? && Masq::Engine.config.masq["create_auth_ondemand"]["enabled"]
           # Need to set some password - but is never used
           pw = if Masq::Engine.config.masq["create_auth_ondemand"]["random_password"]
             SecureRandom.hex(13)
           else
             password
           end
-          signup = Signup.create_account!(
+          signup = Masq::Signup.create_account!(
             login: login,
             password: pw,
             password_confirmation: pw,
@@ -144,15 +144,15 @@ def authenticated?(password)
       elsif password.length < 50 && !(yubico_identity? && yubikey_mandatory?)
         encrypt(password) == crypted_password
       elsif Masq::Engine.config.masq["can_use_yubikey"]
-        password, yubico_otp = Account.split_password_and_yubico_otp(password)
+        password, yubico_otp = self.class.split_password_and_yubico_otp(password)
         @authenticated_with_yubikey = yubikey_authenticated?(yubico_otp) if encrypt(password) == crypted_password
       end
     end
 
     # Is the Yubico OTP valid and belongs to this account?
     def yubikey_authenticated?(otp)
-      if yubico_identity? && Account.verify_yubico_otp(otp)
-        (Account.extract_yubico_identity_from_otp(otp) == yubico_identity)
+      if yubico_identity? && self.class.verify_yubico_otp(otp)
+        (self.class.extract_yubico_identity_from_otp(otp) == yubico_identity)
       else
         false
       end
@@ -163,8 +163,8 @@ def authenticated_with_yubikey?
     end
 
     def associate_with_yubikey(otp)
-      if Account.verify_yubico_otp(otp)
-        self.yubico_identity = Account.extract_yubico_identity_from_otp(otp)
+      if self.class.verify_yubico_otp(otp)
+        self.yubico_identity = self.class.extract_yubico_identity_from_otp(otp)
         save(validate: false)
       else
         false
@@ -238,7 +238,7 @@ def make_password_reset_code
     end
 
     def deliver_forgot_password
-      AccountMailer.forgot_password(self).deliver_now if recently_forgot_password?
+      Masq::AccountMailer.forgot_password(self).deliver_now if recently_forgot_password?
     end
   end
 end

app/models/masq/persona.rb

@@ -11,15 +11,24 @@ class Persona < ActiveRecord::Base
 
     # attr_protected :account_id, :deletable
 
-    def self.properties
-      Persona.mappings.keys
-    end
+    class << self
+      def properties
+        mappings.keys
+      end
+
+      def attribute_name_for_type_uri(type_uri)
+        prop = mappings.detect { |i| i[1].include?(type_uri) }
+        prop ? prop[0] : nil
+      end
 
-    def self.attribute_name_for_type_uri(type_uri)
-      prop = mappings.detect { |i| i[1].include?(type_uri) }
-      prop ? prop[0] : nil
+      # Mappings for SReg names and AX Type URIs to attributes
+      def mappings
+        Masq::Engine.config.masq["attribute_mappings"]
+      end
     end
 
+    public
+
     # Returns the personas attribute for the given SReg name or AX Type URI
     def property(type)
       prop = Persona.mappings.detect { |i| i[1].include?(type) }
@@ -48,12 +57,5 @@ def date_of_birth=(dob)
     def check_deletable!
       raise ActiveRecord::RecordNotDestroyed unless deletable
     end
-
-    private
-
-    # Mappings for SReg names and AX Type URIs to attributes
-    def self.mappings
-      Masq::Engine.config.masq["attribute_mappings"]
-    end
   end
 end

app/models/masq/site.rb

@@ -10,7 +10,7 @@ class Site < ActiveRecord::Base
 
     # Sets the release policies by first deleting the old ones and
     # then appending a new one for every given sreg and ax property.
-    # This setter is used to set the attributes recieved from the
+    # This setter is used to set the attributes received from the
     # update site form, so it gets passed AX and SReg properties.
     # To be backwards compatible (SReg seems to be obsolete now that
     # there is AX), SReg properties get a type_identifier matching
@@ -53,7 +53,7 @@ def sreg_properties
     end
 
     # Returns a hash with all released AX properties.
-    # AX properties have an URL as type_identifier.
+    # AX properties have a URL as type_identifier.
     def ax_properties
       props = {}
       release_policies.each do |rp|

lib/masq.rb

@@ -34,6 +34,7 @@ module Masq
 require_relative "masq/active_record_openid_store/association"
 require_relative "masq/active_record_openid_store/nonce"
 require_relative "masq/active_record_openid_store/openid_ar_store"
+require_relative "masq/signup"
 
 # Ensure version is configured before loading the rest of the library
 Masq::Version.class_eval do

app/models/masq/signup.rb renamed to lib/masq/signup.rb

@@ -4,10 +4,12 @@ module Masq
   class Signup
     attr_accessor :account
 
-    def self.create_account!(attrs = {})
-      signup = Signup.new(attrs)
-      signup.send(:create_account!)
-      signup
+    class << self
+      def create_account!(attrs = {})
+        factory = new(attrs)
+        factory.send(:create_account!)
+        factory
+      end
     end
 
     def succeeded?
@@ -21,16 +23,17 @@ def send_activation_email?
     protected
 
     def initialize(attrs = {})
-      self.account = Account.new(attrs)
+      self.account = Masq::Account.new(attrs)
     end
 
     def create_account!
       return false unless account.valid?
+
       make_activation_code if send_activation_email?
       account.save!
       make_default_persona
       if send_activation_email?
-        AccountMailer.signup_notification(account).deliver_now
+        Masq::AccountMailer.signup_notification(account).deliver_now
       else
         account.activate!
       end