lobby 0.0.23 → 0.0.24

data/lib/lobby/auth_user.rb

@@ -2,14 +2,14 @@ module Lobby
   module AuthUser
 
     def self.included(base)
-      base.has_secure_password
+      base.has_secure_password(validations: validate_password?)
 
-      base.validates :email, presence: true
+      base.validates :email, presence: true, if: :email_required?
       base.validates :email, format: {with: EMAIL_REGEX, multiline: true}, if: Proc.new { |u| u.email.present? }
       base.validates :email, uniqueness: true, :unless => :confirmed_duplicate_email, :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.validates :username, presence: true
+      base.validates :username, presence: true, if: :username_required?
       base.validates :username, uniqueness: true, :unless => :confirmed_duplicate_username, :on => :create
 
       base.extend ClassMethods
@@ -97,6 +97,17 @@ module Lobby
       tokenmail(:resend_signup_token)
     end
 
+    def validate_password?
+      true
+    end
+
+    def email_required?
+      true
+    end
+
+    def username_required?
+      true
+    end
 
     private
 

data/lib/lobby/auth_user.rb~

@@ -0,0 +1,118 @@
+module Lobby
+  module AuthUser
+
+    def self.included(base)
+      base.has_secure_password(validations: validate_password?)
+
+      base.validates :email, presence: true, if: :email_required?
+      base.validates :email, format: {with: EMAIL_REGEX, multiline: true}, if: Proc.new { |u| u.email.present? }
+      base.validates :email, uniqueness: true, :unless => :confirmed_duplicate_email, :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.validates :username, presence: true, if: :username_required?
+      base.validates :username, uniqueness: true, :unless => :confirmed_duplicate_username, :on => :create
+
+      base.extend ClassMethods
+    end
+
+
+    module ClassMethods
+      def confirmed
+        where("confirmed IS NOT NULL")
+      end
+
+      def with_email(email)
+        where(:email => email)
+      end
+
+      def with_username(username)
+        where(:username => username)
+      end
+
+    end
+
+
+    def confirmed_duplicate_email(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
+        false
+      end
+    end
+
+    def confirm_signup!
+      update_attribute(:confirmed, Time.now)
+      update_attribute(:signup_token, nil)
+      update_attribute(:active, true)
+    end
+
+    def confirmed?
+      !self.confirmed.nil?
+    end
+
+    def active?
+      self.active == true
+    end
+
+ # attr_accessible :username
+
+    def confirmed_duplicate_username(test_username = self.username)
+      if ((User.confirmed.with_username(test_username).count == 0) ||
+          (User.with_username(test_username).count == 0))
+        true
+      else
+        false
+      end
+    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 validate_password?
+      true
+    end
+
+    def email_required?
+      true
+    end
+
+    def username_required?
+      true
+    end
+
+    private
+
+    def generate_token( token )
+      (defined?( token ) && update_attribute( token, SecureRandom.hex(13) ))? true : false
+    end
+  end
+end

data/lib/lobby/version.rb

@@ -1,3 +1,3 @@
 module Lobby
-  VERSION = "0.0.23"
+  VERSION = "0.0.24"
 end

data/lib/lobby/version.rb~

@@ -1,3 +1,3 @@
 module Lobby
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lobby
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
   prerelease: 
 platform: ruby
 authors:
@@ -245,6 +245,7 @@ files:
 - config/routes.rb
 - lib/lobby/engine.rb~
 - lib/lobby/auth_user.rb
+- lib/lobby/auth_user.rb~
 - lib/lobby/engine.rb
 - lib/lobby/version.rb
 - lib/lobby/version.rb~