lobby 0.0.3 → 0.0.4

data/app/mailers/lobby/confirmation_mailer.rb~

@@ -21,10 +21,5 @@ module Lobby
       mail( :to => user.email, :subject => t( '.subject' ))
     end
 
-    def new_email_request( user )
-      @user = user
-      @confirmation_url = new_email_url( @user.new_email_token )
-      mail( :to => @user.new_email, :subject => t( '.subject' ))
-    end
   end
 end

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

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

@@ -25,6 +25,10 @@ module Lobby
         where(:email => email)
       end
 
+      def with_username(username)
+        where(:username => username)
+      end
+
     end
 
 
@@ -68,10 +72,6 @@ module Lobby
       end
     end
 
-    def self.with_username(username)
-      where(:username => username)
-    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

data/config/locales/en.yml~

@@ -8,141 +8,73 @@ 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: 'The new password is too short (minimum 5 characters)'
+              too_short: 'Das neue Passwort ist zu kurz (mind. 5 Zeichen)'
             new_password_confirmation:
-              confirmation: 'Incorrect password confirmation.'
-
-  lobby:
-
-    users:
+              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: 'Register'
-        label_email: 'e-mail'
-        label_username: 'Username'
-        label_password: 'Password'
-        label_password_confirmation: 'Password confirmation'
+        title: 'Passwort ändern'
+        label_original_password: 'aktuelles Passwort'
+        label_new_password: 'neues Passwort'
+        label_new_password_confirmation: 'neues Passwort wiederholen'
       create:
-        success: "To complete the registration please click on the link we've just sent you."
-
-    sessions:
-      destroy:
-        success: "You logged out. Bye."
+        notice:
+          success: "Dein Passwort wurde geändert."
+    usernames:
       new:
-        title: 'Login'
-        label_email: 'e-mail or username'
-        label_password: 'password'
-        link_password_forgotten: 'Forgot Password?'
+        title: 'Username ändern'
+        label_original_password: 'aktuelles Passwort'
+        label_new_username: 'neuer Username'
+        label_new_username_confirmation: 'neuen Username wiederholen'
+      create:
+        notice:
+          success: "Dein Username wurde geändert."
+    emails:
+      new:
+        title: "E-Mail ändern"
+        label_new_email: "Neue E-Mail"
+        label_new_email_confirmation: "E-Mail bestätigen"
+        label_password: "Passwort"
       create:
         flash:
-          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:
-      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: "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,
-  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"
+          success: 'Ein Bestätigungslink wurde an die neue E-Mail-Adresse versendet.'

data/config/routes.rb

@@ -15,5 +15,9 @@ 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'
 end

data/config/routes.rb~

@@ -15,7 +15,9 @@ 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]
 
-  # new email confirmation
   match 'new_email(/:token)' => 'confirmation#new_email', as: 'new_email', via: [:get, :post]
+
+  resources :sessions
+
   default_url_options  :host => 'localhost:3000'
 end

data/lib/lobby/engine.rb

@@ -2,14 +2,6 @@ module Lobby
   class Engine < ::Rails::Engine
     isolate_namespace Lobby
 
-#    initializer :append_migrations do |app|
-#      unless app.root.to_s.match root.to_s
-#        config.paths["db/migrate"].expanded.each do |expanded_path|
-#          app.config.paths["db/migrate"] << expanded_path
-#        end
-#      end
-#    end
-
      config.generators do |g|
        g.test_framework :rspec, :view_specs => false
        g.integration_tool :rspec

data/lib/lobby/engine.rb~

@@ -2,13 +2,13 @@ module Lobby
   class Engine < ::Rails::Engine
     isolate_namespace Lobby
 
-    initializer :append_migrations do |app|
-      unless app.root.to_s.match root.to_s
-        config.paths["db/migrate"].expanded.each do |expanded_path|
-          app.config.paths["db/migrate"] << expanded_path
-        end
-      end
-    end
+#    initializer :append_migrations do |app|
+#      unless app.root.to_s.match root.to_s
+#        config.paths["db/migrate"].expanded.each do |expanded_path|
+#          app.config.paths["db/migrate"] << expanded_path
+#        end
+#      end
+#    end
 
      config.generators do |g|
        g.test_framework :rspec, :view_specs => false

data/lib/lobby/version.rb

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

data/lib/lobby/version.rb~

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lobby
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement