🚚 Move Signup factory to Masq lib

Author: pboling

app/models/masq/account.rb

@@ -61,7 +61,7 @@ def authenticate(login, password, basic_auth_used = false)
           else
             password
           end
-          signup = Signup.create_account!(
+          signup = Masq::Signup.create_account!(
             login: login,
             password: pw,
             password_confirmation: pw,

lib/masq.rb

@@ -18,6 +18,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"
     rescue StandardError, LoadError => e
       if !defined?(::Rails::Engine)
         warn("masq2 is a Rails engine, but Rails::Engine isn't defined.")
@@ -37,13 +38,6 @@ module Masq
   end
 end
 
-require_relative "masq/engine"
-require_relative "masq/authenticated_system"
-require_relative "masq/openid_server_system"
-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"
-
 # Ensure version is configured before loading the rest of the library
 Masq::Version.class_eval do
   extend VersionGem::Basic

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