lobby 0.0.1a → 0.0.1h

data/app/models/{lobby/authentication.rb → authentication.rb}

@@ -2,7 +2,7 @@ module Lobby
   module Authentication
 
     def self.included(controller)
-      controller.send :helper_method, :current_user
+      controller.send :helper_method, :current_user, :auth_with_username?
     end
 
     def current_user

data/lib/lobby/version.rb

@@ -1,3 +1,3 @@
 module Lobby
-  VERSION = "0.0.1a"
+  VERSION = "0.0.1h"
 end

data/lib/lobby/version.rb~

@@ -1,3 +1,3 @@
 module Lobby
-  VERSION = "0.0.1i"
+  VERSION = "0.0.1g"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lobby
 version: !ruby/object:Gem::Version
-  version: 0.0.1a
+  version: 0.0.1h
   prerelease: 5
 platform: ruby
 authors:
@@ -103,12 +103,11 @@ files:
 - app/controllers/lobby/password_forgotten_controller.rb
 - app/helpers/lobby/application_helper.rb
 - app/models/authentication.rb~
-- app/models/lobby/auth_user.rb
-- app/models/lobby/auth_user.rb~
-- app/models/lobby/authentication.rb
-- app/models/lobby/password_forgotten_form_abstract.rb
+- app/models/auth_user.rb
 - app/models/auth_user.rb~
+- app/models/authentication.rb
 - app/models/password_forgotten_form_abstract.rb~
+- app/models/password_forgotten_form_abstract.rb
 - config/locales/de.yml
 - config/locales/en.yml~
 - config/locales/en.yml

data/app/models/lobby/auth_user.rb

@@ -1,100 +0,0 @@
-module Lobby
-  module AuthUser
-
-    def self.included(base)
-      base.has_secure_password
-
-      base.validates :email, presence: true
-      base.validates :email, format: {with: EMAIL_REGEX, multiline: true}, if: Proc.new { |u| u.email.present? }
-      base.validates :email, uniqueness: true, :unless => :confirmed_duplicate, :on => :create, if: Proc.new { |u| u.email.present? }
-      base.validates :password, length: { minimum: 5 }, :on => :create, if: Proc.new { |u| u.password.present? }
-
-      base.extend ClassMethods
-    end
-
-
-    module ClassMethods
-      def confirmed
-        where("confirmed IS NOT NULL")
-      end
-
-      def with_email(email)
-        where(:email => email)
-      end
-
-    end
-
-
-    def confirmed_duplicate(test_mail = self.email)
-      if ((self.class.name.constantize.confirmed.with_email(test_mail).count == 0) ||
-          (self.class.name.constantize.with_email(test_mail).count == 0))
-        true
-      else
-        #self.id = self.class.name.constantize.confirmed.with_email(test_mail).first.id
-        false
-      end
-    end
-
-    def confirm_signup!
-      update_attribute(:confirmed, Time.now)
-      update_attribute(:signup_token, nil)
-      update_attribute(:active, true)
-    end
-
-    def confirm_new_email!
-      update_attribute(:email, new_email)
-      update_attribute(:new_email_token, nil)
-    end
-
-    def confirmed?
-      !self.confirmed.nil?
-    end
-
-    def active?
-      self.active == true
-    end
-
-    # Wenn der User sich registriert, dann wird ein signup_token für ihn hinterlegt.
-    # Dieser Token wird per Mail verschickt. Der User kann sich nun per Klick auf den
-    # Tokenlink verifizieren. Sollte die Mail nicht mehr erreichbar sein, so kann der User
-    # unter Angabe seiner Email einen neuen signup_Token anfordern. Der alte Token ist
-    # ab diesem Zeitpunkt ungültig.
-
-    # Nach erfolgreicher Verifizierung der Email-Adresse) wird das
-    # Feld confirmed mit einem Datum gefüllt. Ab diesem Zeitpunkt kann keine neuer
-    # Confirmation-Token generiert und verschickt werden.
-
-    def tokenmail(request)
-      ConfirmationMailer.send(request, self).deliver
-    end
-
-    def send_password_reset(with_mail = true)
-      return unless generate_token(:password_token)
-      if with_mail
-        tokenmail(:send_password_reset)
-      end
-    end
-
-    def send_registration
-      return unless generate_token(:signup_token)
-      tokenmail(:registration)
-    end
-
-    def resend_signup_token
-      return unless (!confirmed? && generate_token(:signup_token))
-      tokenmail(:resend_signup_token)
-    end
-
-    def send_new_email_request
-      return unless (confirmed? && generate_token(:new_email_token))
-      tokenmail(:new_email_request)
-    end
-
-
-    private
-
-    def generate_token( token )
-      (defined?( token ) && update_attribute( token, SecureRandom.hex(13) ))? true : false
-    end
-  end
-end