hero_generator 0.0.1.beta6 → 0.0.1.beta8

data/lib/generators/hero/authentication/authentication_generator.rb

@@ -54,7 +54,7 @@ module Hero
         template "config/initializers/action_mailer.rb", "config/initializers/action_mailer.rb"
         template "config/initializers/constants.rb", "config/initializers/constants.rb"
         template "config/initializers/fix_active_record_validations_full_messages.rb", "config/initializers/fix_active_record_validations_full_messages.rb"
-        template "config/locales/en.yml", "config/locales/en.yml"
+        template "config/locales/de.yml", "config/locales/de.yml"
       end
       
       def create_migration
@@ -81,14 +81,15 @@ module Hero
         route "default_url_options :host => 'localhost:3000'"
         route "resources #{user_plural_name.to_sym.inspect}"
         route "resources #{session_plural_name.to_sym.inspect}"
-        route "get 'log_out' => '#{session_plural_name.to_sym.inspect}#destroy', :as => 'log_out'"
+        route "get 'settings' => 'settings#index'"
+        route "match 'settings/change_email' => 'settings#change_user_email', :as => 'change_email'"
+        route "get 'log_out' => '#{session_plural_name}#destroy', :as => 'log_out'"
         route "get 'registrieren' => '#{user_plural_name}#new', :as => 'sign_up_form'"
         route "post 'registrieren' => '#{user_plural_name}#create', :as => 'sign_up'"
         route "match 'confirm/resend_confirmation' => 'confirmation#resend_signup_token', :as => 'resend_signup_token'"
         route "match 'confirm/:action(/:token)', :controller => :confirmation, :as => 'confirm'"
-        route "get 'log_in' => '#{session_plural_name.to_sym.inspect}#new', :as => 'log_in'"
-        route "post 'log_in' => '#{session_plural_name.to_sym.inspect}#create', :as => 'log_in'"
-        route "get 'recover_password_auth(/:token)' => 'confirmation#recover_password_auth', :as => 'recover_password_auth'"
+        route "get 'log_in' => '#{session_plural_name}#new', :as => 'log_in_link'"
+        route "post 'log_in' => '#{session_plural_name}#create', :as => 'log_in'"
         route "match 'recover_password(/:token)' => 'confirmation#recover_password', :as => 'recover_password'"
         route "match 'new_email(/:token)' => 'confirmation#new_email', :as => 'new_email'"
         route "match 'request_password' => 'confirmation#order_new_password', :as => 'order_new_password'"

data/lib/generators/hero/authentication/templates/config/locales/{en.yml → de.yml}

@@ -1,16 +1,13 @@
 # Sample localization file for English. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
-en:
-
+de:
   activerecord:
-    errors:
-    
+    errors:    
       full_messages:
         format: "{{message}}"    
       messages:
         confirmation: "Passwortwiederholung ist falsch."
-
       models:
         user:
           attributes:
@@ -22,9 +19,7 @@ en:
               invalid: "Die E-Mail hat ein falsches Format."
             password_digest:
               blank: "Bitte geben Sie ein Passwort an."
-              
-            
-                            
+                                                     
   common:
     button:
       send: 'Senden'
@@ -44,8 +39,8 @@ en:
   sessions:
     new:
       title: 'Login'
-      label_email: 'Email'
-      label_password: 'Password'
+      label_email: 'E-Mail'
+      label_password: 'Passwort'
     create:
       flash:
         success: "Eingeloggt, hurra!"
@@ -59,7 +54,13 @@ en:
       title: "Neue E-Mail bestätigen"
     order_new_password:
       flash:
-        success: 'Es wurde eine Email mit Passwort versendet'
+        success: 'Bitte prüfen Sie Ihre E-Mails. Dort finden Sie einen Link zum Setzen Ihres Passwortes.'
+    recover_password:
+      title: "Neues Passwort erstellen"
+      label_recover_password: "Neues Passwort"
+      label_recover_password_confirmation: "Neues Passwort wiederholen"
+      flash:
+        success: "Ihr Passwor wurde geändert"
     registration:
       flash:
         success: 'Endlich richtig dabei.'
@@ -67,7 +68,7 @@ en:
     resend_signup_token:
       title: "Token nochmal zusenden"          
       flash:
-        success: "Token wurde nochmal gesendet"
+        success: "Der Token wurde nochmal gesendet"
         error: "Sie sind schon freigeschaltet. Was soll das?"
                 
   confirmation_mailer:

data/lib/generators/hero/authentication/templates/controllers/confirmation_controller.rb

@@ -38,26 +38,18 @@ class ConfirmationController < ApplicationController
   # Aufruf des Links, der in der E-Mail steht, wenn man ein neues Passwort anfordert
   #
   
-  def recover_password_auth
-    @user = User.find_by_password_token( params[:token] ) unless params[:token].nil? 
-    render @user ? :recover_password : :password_token
-  end
-   
-   
   def recover_password
     @token = params[:token]
     @user = User.find_by_password_token( params[:token] ) unless params[:token].nil?
    
     if @user
-      if !params[:recover_password].nil? && params[:recover_password_confirmation] == params[:recover_password]
-        if @user.confirm_password!(params[:recover_password])
-          redirect_to( log_in_path, :notice => t( 'confirmation.recover_password.flash_success' ))
-        else
-          flash.now[:notice] = t( 'confirmation.recover_password.flash_error' )
+      if params[:recover_password]
+        if @user.confirm_password!(params[:recover_password], params[:recover_password_confirmation])
+          redirect_to( log_in_path, :notice => t( 'confirmation.recover_password.flash.success' ))
         end
       end
     else
-      redirect_to recover_password_auth_url
+      render :password_token
     end
   end 
    

data/lib/generators/hero/authentication/templates/models/user.rb

@@ -1,23 +1,21 @@
 class User < ActiveRecord::Base
   has_secure_password
   
-  attr_accessible :email, :password, :password_confirmation, :new_email_confirmation, :set_new_email
+  attr_accessible :email, :password, :password_confirmation, :new_email_confirmation, :set_new_email, :recover_password
   
-  attr_accessor :update_password, :new_email_confirmation, :set_new_email
+  attr_accessor :update_password, :new_email_confirmation, :set_new_email, :recover_password
        
   validates_presence_of :email
   validates_format_of :email, :with => EMAIL_REGEX,
                               :if => :should_validate_email_format?
   validates_uniqueness_of :email, :unless => :confirmed_duplicate
   
-  #validates_presence_of     :password, :if => :should_validate_password?
+  validates_presence_of     :password, :if => :should_validate_password?
   validates_length_of       :password, :if => :should_validate_password_length?,
                                        :within => 3..30,
                                        :too_short => 'too short message',
                                        :too_long => 'too long message'
 
-  #validates_confirmation_of :password, :if => :should_validate_password?
-  
   #set new email
   validates_presence_of     :new_email, :if => :should_validate_new_email?
   validates_format_of :new_email, :with => EMAIL_REGEX, 
@@ -37,9 +35,16 @@ class User < ActiveRecord::Base
     update_attribute(:signup_token, nil)
   end
 
-  def confirm_password!(password)
-    update_attribute(:password, password)
-    update_attribute(:password_token, nil)
+  def confirm_password!(password="", password_confirmation="")
+    self.update_password = true
+    self.password = password
+    self.password_confirmation = password_confirmation
+    if self.save
+      update_attribute(:password, password)
+      update_attribute(:password_token, nil)
+    else
+      false
+    end
   end
 
   def confirm_new_email!
@@ -91,11 +96,11 @@ class User < ActiveRecord::Base
   end
           
   def should_validate_password?
-    update_password || new_record?
+    update_password
   end    
   
   def should_validate_password_length?
-    should_validate_password? && password.present?
+    (new_record? || update_password) && password.present?
   end   
   
   

data/lib/generators/hero/authentication/templates/views/confirmation/recover_password.html.haml

@@ -1,12 +1,23 @@
-%h1 Recover Password
+%h1
+  = t '.title'
+  
 
+- if @user.errors.any?
+  .error_messages
+    %h2
+      = t( 'common.form.error' )
+    %ul
+      - for message in @user.errors.full_messages
+        %li
+          = message
+              
 = form_tag recover_password_path(@token) do
   %p
-    = label_tag :recover_password
+    = label_tag :recover_password, t( ".label_recover_password" )
     %br
     = password_field_tag :recover_password
   %p
-    = label_tag :recover_password_confirmation
+    = label_tag :recover_password_confirmation, t( ".label_recover_password_confirmation" )
     %br
     = password_field_tag :recover_password_confirmation
                 

data/lib/generators/hero/authentication/templates/views/confirmation/resend_signup_token.html.haml

@@ -1,7 +1,7 @@
 %h1 
   = t( 'confirmation.resend_signup_token.title' )
 
-= form_tag resend_signup_token_path do
+= form_tag resend_signup_token_url do
   %p
     = label_tag :email
     %br

data/lib/generators/hero/authentication/templates/views/layouts/application.html.haml

@@ -18,8 +18,6 @@
       = " oder "
       = link_to "Registrieren?", sign_up_form_path
       
-      
-    
     - flash.each do |name, msg|
       %div{:class => "box box-#{name}", :id => "flash_#{name}"}
         = msg

data/lib/generators/hero/authentication/templates/views/sessions/new.html.haml

@@ -3,11 +3,11 @@
 
 = form_tag log_in_url do
   %p
-    = label_tag t( '.label_email' )
+    = label_tag :email, t( '.label_email' )
     %br
     = text_field_tag :email, params[:email]
   %p
-    = label_tag t( '.label_password' )
+    = label_tag :password, t( '.label_password' )
     %br
     = password_field_tag :password
     

data/lib/generators/hero/authentication/templates/views/settings/index.html.haml

@@ -1,6 +1,6 @@
 %h2 Email
 
-= form_tag(:controller => "settings", :action => "change_user_email") do
+= form_tag change_email_url do
 
   - if @user.errors.any?
     .error_messages

data/lib/generators/hero/authentication/templates/views/users/new.html.haml

@@ -1,7 +1,6 @@
 %h1 
   = t '.title'
 
-
 = form_for @user, :url => sign_up_url do |f|
   - if @user.errors.any?
     .error_messages
@@ -12,15 +11,15 @@
           %li
             = message
   %p
-    = f.label t( '.label_email')
+    = f.label :email, t( '.label_email')
     %br
     = f.text_field :email
   %p
-    = f.label t( '.label_password' )
+    = f.label :password, t( '.label_password' )
     %br
     = f.password_field :password
   %p
-    = f.label t( '.label_password_confirmation' )
+    = f.label :password_confirmation, t( '.label_password_confirmation' )
     %br
     = f.password_field :password_confirmation          
   %p.button

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hero_generator
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta6
+  version: 0.0.1.beta8
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000Z
+date: 2012-10-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &74047410 !ruby/object:Gem::Requirement
+  requirement: &84196390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *74047410
+  version_requirements: *84196390
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &74047160 !ruby/object:Gem::Requirement
+  requirement: &84196140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *74047160
+  version_requirements: *84196140
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &74046930 !ruby/object:Gem::Requirement
+  requirement: &84195910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *74046930
+  version_requirements: *84195910
 description: Write a gem description
 email:
 - guido@boyke.de
@@ -90,7 +90,7 @@ files:
 - lib/generators/hero/authentication/templates/config/initializers/constants.rb
 - lib/generators/hero/authentication/templates/config/initializers/fix_active_record_validations_full_messages.rb
 - lib/generators/hero/authentication/templates/config/config.yml
-- lib/generators/hero/authentication/templates/config/locales/en.yml
+- lib/generators/hero/authentication/templates/config/locales/de.yml
 - lib/generators/hero/authentication/templates/migrations/create_users.rb
 - lib/generators/hero/authentication/templates/controllers/confirmation_controller.rb
 - lib/generators/hero/authentication/templates/controllers/users_controller.rb