lobby 0.0.4 → 0.0.5

data/app/models/lobby/auth_user.rb

@@ -47,11 +47,6 @@ module Lobby
       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
@@ -102,11 +97,6 @@ module Lobby
       tokenmail(:resend_signup_token)
     end
 
-    def send_new_email_request
-      return unless (confirmed? && generate_token(:new_email_token))
-      tokenmail(:new_email_request)
-    end
-
 
     private
 

data/app/models/lobby/auth_user.rb~

@@ -6,7 +6,7 @@ module Lobby
 
       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 :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
@@ -32,12 +32,11 @@ module Lobby
     end
 
 
-    def confirmed_duplicate(test_mail = self.email)
+    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
-        #self.id = self.class.name.constantize.confirmed.with_email(test_mail).first.id
         false
       end
     end
@@ -103,11 +102,6 @@ module Lobby
       tokenmail(:resend_signup_token)
     end
 
-    def send_new_email_request
-      return unless (confirmed? && generate_token(:new_email_token))
-      tokenmail(:new_email_request)
-    end
-
 
     private
 

data/config/locales/de.yml

@@ -80,6 +80,9 @@ de:
           link2: "Anmelden?"
 
     confirmation:
+      new_email:
+        flash:
+          success: "Deine E-Mail-Adresse wurde geändert."
       registration:
         title: "Token"
         resend_signup_token_link: "oder den Token nochmal senden."
@@ -107,15 +110,6 @@ de:
 
     confirmation_mailer:
 
-      new_email_request:
-        subject: 'Neue E-Mail bestätigen'
-        body: "Hallo,
-  um die Änderung Deiner E-Mail-Adress bei XYZ abzuschließen klicke bitte auf folgenden Link:
-
-  %{url}
-
-  Vielen Dank"
-
       registration:
         subject: 'Bitte Anmeldung bestätigen'
         body: "Hallo,

data/config/locales/de.yml~

@@ -80,6 +80,9 @@ de:
           link2: "Anmelden?"
 
     confirmation:
+      new_email:
+        flash:
+          success: "Deine E-Mail-Adresse wurde geändert."
       registration:
         title: "Token"
         resend_signup_token_link: "oder den Token nochmal senden."
@@ -107,6 +110,15 @@ de:
 
     confirmation_mailer:
 
+      new_email_request:
+        subject: 'Neue E-Mail bestätigen'
+        body: "Hallo,
+  um die Änderung Deiner E-Mail-Adress bei XYZ abzuschließen klicke bitte auf folgenden Link:
+
+  %{url}
+
+  Vielen Dank"
+
       registration:
         subject: 'Bitte Anmeldung bestätigen'
         body: "Hallo,

data/config/locales/en.yml

@@ -80,6 +80,9 @@ en:
           link2: "Log in?"
 
     confirmation:
+      new_email:
+        flash:
+          success: "Your e-mail was updated."
       registration:
         title: "Token"
         resend_signup_token_link: "or send token again."
@@ -107,15 +110,6 @@ en:
 
     confirmation_mailer:
 
-      new_email_request:
-        subject: 'Confirm new email'
-        body: "Hallo,
-  to complete the change of your e-mail address at XYZ please click on the following link:
-
-  %{url}
-
-  Thank you very much"
-
       registration:
         subject: 'Please confirm registration'
         body: "Hello,

data/config/locales/en.yml~

@@ -8,73 +8,144 @@ en:
     form:
       error: "error"
 
+  activerecord:
+    errors:
+      full_messages:
+        format: "{{message}}"
+      messages:
+        confirmation: "Repeat Password is incorrect."
+      models:
+        user:
+          attributes:
+            password:
+              blank: "Please enter a password."
+              too_short: "Password is too short."
+            password_confirmation:
+              blank: "Please verify the password."
+            email:
+              taken: 'This e-mail is already in the system.'
+              blank: "Please enter an e-mail."
+              invalid: "The e-mail has an incorrect format."
+            password_digest:
+              blank: "Please enter a password"
+            username:
+              blank: "Please enter a user name."
+              taken: 'This username is already in the system.'
   activemodel:
     errors:
       models:
-        accountly:
-          change_email_form:
-            attributes:
-              new_email:
-                blank: 'Bitte eine neue E-Mail angeben'
-                invalid: "Die E-Mail hat ein falsches Format."
-                duplicate: 'Diese E-Mail kann nicht gewählt werden.'
-              new_email_confirmation:
-                confirmation: 'Die E-Mail-Bestätigung war falsch'
-                blank: 'Bitte die E-Mail bestätigen'
-        accountly:
-          username_form:
-            attributes:
-              new_username:
-                blank: 'Bitte einen Username angeben'
-                duplicate: 'Dieser Username kann nicht gewählt werden.'
-              new_username_confirmation:
-                confirmation: 'Die Bestätigung war falsch'
-                blank: 'Bitte den Username bestätigen'
-              original_password:
-                blank: 'Bitte auch das alte Passwort angeben.'
-                invalid: 'Das aktuelle Passwort war nicht korrekt'
         password_forgotten_form:
           attributes:
             new_password:
-              too_short: 'Das neue Passwort ist zu kurz (mind. 5 Zeichen)'
+              too_short: 'The new password is too short (minimum 5 characters)'
             new_password_confirmation:
-              confirmation: 'Die Passwortbestätigung war falsch.'
-        accountly:
-          password_form:
-            attributes:
-              original_password:
-                blank: 'Bitte auch das alte Passwort angeben.'
-                invalid: 'Das aktuelle Passwort war nicht korrekt'
-              new_password:
-                too_short: 'Das neue Passwort ist zu kurz (mind. 5 Zeichen)'
-              new_password_confirmation:
-                confirmation: 'Die Passwortbestätigung war falsch.'
-
-  accountly:
-    passwords:
-      new:
-        title: 'Passwort ändern'
-        label_original_password: 'aktuelles Passwort'
-        label_new_password: 'neues Passwort'
-        label_new_password_confirmation: 'neues Passwort wiederholen'
-      create:
-        notice:
-          success: "Dein Passwort wurde geändert."
-    usernames:
+              confirmation: 'Incorrect password confirmation.'
+
+  lobby:
+
+    users:
       new:
-        title: 'Username ändern'
-        label_original_password: 'aktuelles Passwort'
-        label_new_username: 'neuer Username'
-        label_new_username_confirmation: 'neuen Username wiederholen'
+        title: 'Register'
+        label_email: 'e-mail'
+        label_username: 'Username'
+        label_password: 'Password'
+        label_password_confirmation: 'Password confirmation'
       create:
-        notice:
-          success: "Dein Username wurde geändert."
-    emails:
+        success: "To complete the registration please click on the link we've just sent you."
+
+    sessions:
+      destroy:
+        success: "You logged out. Bye."
       new:
-        title: "E-Mail ändern"
-        label_new_email: "Neue E-Mail"
-        label_new_email_confirmation: "E-Mail bestätigen"
-        label_password: "Passwort"
+        title: 'Login'
+        label_email: 'e-mail or username'
+        label_password: 'password'
+        link_password_forgotten: 'Forgot Password?'
       create:
         flash:
-          success: 'Ein Bestätigungslink wurde an die neue E-Mail-Adresse versendet.'
+          success: "You're in."
+          error:
+            not_active: "Your account has been disabled."
+            not_confirmed: "Please confirm the registration first."
+            wrong_password_or_email: "Incorrect email and / or password"
+
+    info:
+      login_status:
+        logged_in:
+          message_html: "You are logged in as: %{email}. %{logout_link}"
+          link1: "log off?"
+        logged_out:
+          message_html: "You are not logged in. %{signin_link} or %{signup_link}"
+          link1: "Sign up?"
+          link2: "Log in?"
+
+    confirmation:
+      new_email:
+        flash:
+          success: "Your e-mail was updated."
+      registration:
+        title: "Token"
+        resend_signup_token_link: "or send token again."
+        flash:
+          success: 'Your registration was successful. Now you can login'
+          error: 'Your registration could not be confirmed. Was the link incorrect? If your email program does not properly represent the confirmation link, so you can copy it to the field activation token below.'
+      resend_signup_token:
+        label_email: "E-mail"
+        label_password: "Password"
+        title: "Send activation token again"
+        flash:
+          success: "The activation token was again sent"
+          error: "You are already confirmed. This link is no longer valid."
+
+
+    password_forgotten:
+      recover_password_auth:
+        title: 'Create new password'
+        label_token: 'Token'
+      order_new_password:
+        title: "Generate new password"
+        label_email: "Your registered e-mail"
+        flash:
+          success: 'Please check your e-mails. There you will find a link to set your password.'
+
+    confirmation_mailer:
+
+      new_email_request:
+        subject: 'Confirm new email'
+        body: "Hello,
+  to complete the change of your e-mail address at XYZ please click on the following link:
+
+  %{url}
+
+  Thank you very much"
+
+      registration:
+        subject: 'Please confirm registration'
+        body: "Hello,
+  many Thanks for registering with XYZ. To complete your registration please click on the following link:
+
+  %{url}
+
+  Thank you very much"
+
+
+      send_password_reset:
+        subject: 'Requested new password'
+        body: "Hello.
+  This is an automatically generated message from XYZ for users who have forgotten their login details. Enclosed you will receive,
+   as requested, a link with which you can generate your new password:
+
+  %{url}
+
+  Thank you very much"
+
+
+      resend_signup_token:
+        subject: 'New registration token'
+        body: "Hello.
+  This is an automatically generated message from XYZ for users who have lost their registration email. Enclosed you will receive,
+   as requested, a link with which you can confirm your registration:
+
+  %{url}
+
+  VThank you very much"

data/config/routes.rb

@@ -15,8 +15,6 @@ Lobby::Engine.routes.draw do
   post 'recover_password' => 'password_forgotten#create', as: 'recover_password'
   match 'request_password' => 'password_forgotten#order_new_password', as: 'order_new_password', via: [:get, :post]
 
-  match 'new_email(/:token)' => 'confirmation#new_email', as: 'new_email', via: [:get, :post]
-
   resources :sessions
 
   default_url_options  :host => 'localhost:3000'

data/lib/generators/templates/db/migrate/create_users.rb

@@ -5,8 +5,6 @@ class CreateUsers < ActiveRecord::Migration
       t.string :password_digest
       t.string :signup_token
       t.string :password_token
-#      t.string :new_email
-#      t.string :new_email_token
       t.boolean :active
       t.string  :username
       t.datetime :confirmed, :null => true

data/lib/generators/templates/db/migrate/create_users.rb~

@@ -0,0 +1,16 @@
+class CreateUsers < ActiveRecord::Migration
+  def change
+    create_table :users do |t|
+      t.string :email
+      t.string :password_digest
+      t.string :signup_token
+      t.string :password_token
+#      t.string :new_email
+#      t.string :new_email_token
+      t.boolean :active
+      t.string  :username
+      t.datetime :confirmed, :null => true
+      t.timestamps
+    end
+  end
+end

data/lib/lobby/version.rb

@@ -1,3 +1,3 @@
 module Lobby
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/lobby/version.rb~

@@ -1,3 +1,3 @@
 module Lobby
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lobby
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -266,6 +266,7 @@ files:
 - lib/generators/lobby/lobby_generator.rb~
 - lib/generators/lobby/install_generator.rb~
 - lib/generators/templates/db/migrate/create_users.rb
+- lib/generators/templates/db/migrate/create_users.rb~
 - lib/generators/templates/config/initializers/constants.rb
 - lib/generators/templates/config/initializers/action_mailer.rb
 - lib/generators/templates/config/locales/de.yml