hero_generator 0.0.1.beta8 → 0.0.1.beta9

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

@@ -13,6 +13,7 @@ module Hero
       
       
       def create_model_files
+        template "models/auth_user.rb", "app/models/auth_user.rb"
         template "models/user.rb", "app/models/#{user_singular_name}.rb"
         template "models/authentication.rb", "app/models/authentication.rb"
       end
@@ -85,9 +86,9 @@ module Hero
         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 "post 'registrieren' => '#{user_plural_name}#create', :as => 'sign_up'"        
         route "match 'confirm/:action(/:token)', :controller => :confirmation, :as => 'confirm'"
+        route "match 'confirm/resend_confirmation' => 'confirmation#resend_signup_token', :as => 'resend_signup_token'"        
         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'"

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

@@ -15,7 +15,7 @@ class UsersController < ApplicationController
       redirect_to root_url, :notice => t( '.users.create.flash.success' )      
       @user.send_registration
     else
-      #flash.now[:error] = t( '.users.create.flash.error' )      
+      flash.now[:error] = t( '.users.create.flash.error' )      
       render :new
     end
   end

data/lib/generators/hero/authentication/templates/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

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

@@ -0,0 +1,149 @@
+module AuthUser
+
+  def self.included(base)
+    base.has_secure_password
+    base.attr_accessible :email, :password, :password_confirmation, :new_email_confirmation, :set_new_email, :recover_password
+    attr_accessor :update_password, :new_email_confirmation, :set_new_email, :recover_password
+       
+    base.validates_presence_of :email
+    base.validates_format_of :email, :with => EMAIL_REGEX,
+                                :if => :should_validate_email_format?
+    base.validates_uniqueness_of :email, :unless => :confirmed_duplicate
+    
+    base.validates_presence_of     :password, :if => :should_validate_password?
+    base.validates_length_of       :password, :if => :should_validate_password_length?,
+                                         :within => 3..30,
+                                         :too_short => 'too short message',
+                                         :too_long => 'too long message'
+
+    #set new email
+    base.validates_presence_of     :new_email, :if => :should_validate_new_email?
+    base.validates_format_of :new_email, :with => EMAIL_REGEX, 
+                                    :if => :should_validate_new_email_format?
+                                    
+    base.validates_presence_of     :new_email_confirmation, :if => :should_validate_new_email?                       
+    base.validates_confirmation_of :new_email, :if => :should_validate_new_email? 
+    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
+
+    if ((self.class.name.constantize.confirmed.with_email(self.email).count == 0) || (self.class.name.constantize.with_email(self.email).count == 0))
+      true
+    else
+      self.id = self.class.name.constantize.confirmed.with_email(self.email).first.id    
+      false
+    end
+  end
+      
+  def new_email=(new_email)
+    self[:new_email] = new_email if self.set_new_email.present?
+  end
+
+  
+  def confirm_signup!
+    update_attribute(:confirmed, Time.now)
+    update_attribute(:signup_token, nil)
+  end
+
+  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!
+    update_attribute(:email, new_email)
+    update_attribute(:new_email_token, nil)
+  end
+  
+  def confirmed?
+    !self.confirmed.nil?
+  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 should_validate_email_format?
+    email.present?
+  end
+        
+  def should_validate_new_email?
+    set_new_email.present?
+  end  
+        
+  def should_validate_new_email_format?
+    set_new_email.present? && new_email.present?
+  end
+          
+  def should_validate_password?
+    update_password
+  end    
+  
+  def should_validate_password_length?
+    (new_record? || update_password) && password.present?
+  end   
+  
+  
+  def send_password_reset  
+    return unless generate_token(:password_token)
+    tokenmail(:send_password_reset)   
+  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
+    
+  def send_new_email( new_email )
+    if self.set_new_email.present?
+      if self.save
+        send_new_email_request
+        self.set_new_email = false
+      end
+    end
+  end
+  
+  private
+  
+  def generate_token( token )
+    (defined?( token ) && update_attribute( token, SecureRandom.hex(13) ))? true : false
+  end  
+end
+
+

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

@@ -1,147 +1,8 @@
 class User < ActiveRecord::Base
-  has_secure_password
-  
-  attr_accessible :email, :password, :password_confirmation, :new_email_confirmation, :set_new_email, :recover_password
-  
-  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_length_of       :password, :if => :should_validate_password_length?,
-                                       :within => 3..30,
-                                       :too_short => 'too short message',
-                                       :too_long => 'too long message'
+  include AuthUser
 
-  #set new email
-  validates_presence_of     :new_email, :if => :should_validate_new_email?
-  validates_format_of :new_email, :with => EMAIL_REGEX, 
-                                  :if => :should_validate_new_email_format?
-                                  
-  validates_presence_of     :new_email_confirmation, :if => :should_validate_new_email?                       
-  validates_confirmation_of :new_email, :if => :should_validate_new_email?  
-  
-      
-  def new_email=(new_email)
-    self[:new_email] = new_email if self.set_new_email.present?
-  end
-
-  
-  def confirm_signup!
-    update_attribute(:confirmed, Time.now)
-    update_attribute(:signup_token, nil)
-  end
-
-  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!
-    update_attribute(:email, new_email)
-    update_attribute(:new_email_token, nil)
-  end
-  
-  def confirmed?
-    !self.confirmed.nil?
-  end
-  
-  def self.confirmed
-    where("confirmed IS NOT NULL")
-  end
-  
-  def self.with_email(email)
-    where(:email => email)
-  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 confirmed_duplicate
-    if ((User.confirmed.with_email(self.email).count == 0) || (User.with_email(self.email).count == 0))
-      true
-    else
-      self.id = User.confirmed.with_email(self.email).first.id    
-      false
-    end
-  end
-      
-  def should_validate_email_format?
-    email.present?
-  end
-        
-  def should_validate_new_email?
-    set_new_email.present?
-  end  
-        
-  def should_validate_new_email_format?
-    set_new_email.present? && new_email.present?
-  end
-          
-  def should_validate_password?
-    update_password
-  end    
-  
-  def should_validate_password_length?
-    (new_record? || update_password) && password.present?
-  end   
-  
-  
-  def send_password_reset  
-    if generate_token(:password_token)
-      ConfirmationMailer.send_password_reset( self ).deliver
-    end
-  end
-  
-  def send_registration
-    if generate_token(:signup_token)
-      ConfirmationMailer.registration( self ).deliver
-    end
-  end
-  
-  def resend_signup_token
-    if !confirmed? && generate_token(:signup_token)
-      ConfirmationMailer.resend_signup_token( self ).deliver
-    end
-  end
-  
-  def send_new_email_request
-    if generate_token(:new_email_token)
-      ConfirmationMailer.new_email_request( self ).deliver
-    end
-  end
+  def tokenmail(request)
+    ConfirmationMailer.send(request, self).deliver
+  end 
     
-  def send_new_email( new_email )
-    if self.set_new_email.present?
-      if self.save
-        send_new_email_request
-        self.set_new_email = false
-      end
-    end
-  end
-  
-  private
-  
-  def generate_token( token )
-    (defined?( token ) && update_attribute( token, SecureRandom.hex(13) ))? true : false
-  end  
 end
-
-

data/lib/generators/hero/authentication/templates/tests/spec/factories.rb

@@ -1,11 +1,3 @@
-#Factory.define :propertyname do |f|  
-#  f.p0 "eins"
-#  f.p1 ""  
-#  f.p2 ""  
-#  f.p3 ""  
-#end  
-
-
 Factory.define :user do |u|
   
   u.email { Factory.next(:email) }
@@ -13,7 +5,6 @@ Factory.define :user do |u|
   u.password_confirmation 'secret'
 end
 
-
 Factory.sequence :email do |n|
    names = %w[ joe bob sue ]
    "#{names[rand names.count]}#{n}@somewhere.com"

data/lib/generators/hero/authentication/templates/tests/spec/requests/new_email_request_spec.rb

@@ -1,9 +1,10 @@
 require 'spec_helper'
 
+
 describe "send new email" do
 
   before(:each) do
-    @user = Factory(:user, :confirmed => Time.now)   
+    @user = Factory(:user, :confirmed => Time.now)  
     visit log_in_path
     fill_in "email", :with => @user.email
     fill_in "password", :with => @user.password
@@ -12,7 +13,7 @@ describe "send new email" do
   
   describe "GET index" do
     it "send new email request" do
-      visit "/settings/index"
+      visit "/settings"
       new_email = "neue@example.com"
       fill_in "user_new_email", :with => new_email
       fill_in "user_new_email_confirmation", :with => new_email
@@ -55,6 +56,7 @@ describe "send new email" do
     @user.new_email_confirmation = "new@email.de"
     @user.send_new_email_request
     @user.save
+    @user.email.should_not eq nil
 
     visit new_email_path    
     fill_in "token", :with => @user.new_email_token

data/lib/generators/hero/authentication/templates/tests/spec/requests/password_resets_spec.rb

@@ -8,7 +8,7 @@ describe "PasswordResets" do
     fill_in "email", :with => user.email
     click_button "send_new_password_button"
     current_path.should eq root_path
-    page.should have_content( I18n.t( "fe.confirmation.order_new_password.flash.success" ))
+    page.should have_content( I18n.t( "confirmation.order_new_password.flash.success" ))
     last_email.to.should include(user.email)
   end
   
@@ -23,7 +23,7 @@ describe "PasswordResets" do
     
   it "password recovery with password token form" do
     user = Factory(:user, :password_token => "ein_kleiner_token")
-    visit recover_password_auth_path
+    visit recover_password_path
     fill_in "token", :with => user.password_token
     click_button "password_token_button"
     current_path.should eq recover_password_path
@@ -32,7 +32,7 @@ describe "PasswordResets" do
   it "password recovery without valid token leads to token_form" do
     params = { :token => 'den_token_gibt_es_nicht' }
     visit recover_password_path
-    current_path.should eq recover_password_auth_path
+    current_path.should eq recover_password_path
   end
       
   it "password recovery with valid token leads password recover form and user sets new pw" do
@@ -49,7 +49,7 @@ describe "PasswordResets" do
     fill_in "password", :with => "geheim"
     click_button "log_in_button"
     current_path.should eq root_path
-    page.should have_content( I18n.t( "fe.session.create.flash.success" )) 
+    page.should have_content( I18n.t( "sessions.create.flash.success" )) 
   end
        
         

data/lib/generators/hero/authentication/templates/tests/spec/requests/user_confirmation_spec.rb

@@ -8,7 +8,7 @@ describe "UserConfirmation" do
     fill_in "user_password_confirmation", :with => "geheim"
     click_button "sign_up_button"
     current_path.should eq root_path
-    page.should have_content( I18n.t( "fe.user.create.flash.success" ))
+    page.should have_content( I18n.t( "users.create.flash.success" ))
     last_email.to.should include("test@test.de")
   end
 
@@ -18,7 +18,7 @@ describe "UserConfirmation" do
     fill_in "token", :with => user.signup_token
     click_button "token_button"
     current_path.should eq log_in_path
-    page.should have_content( I18n.t( "fe.confirmation.registration.flash.success" ))
+    page.should have_content( I18n.t( "confirmation.registration.flash.success" ))
   end
     
   it "user not confirmed with false confirmation token" do
@@ -27,7 +27,7 @@ describe "UserConfirmation" do
     fill_in "token", :with => "ein_anderer_token"
     click_button "token_button"
     current_path.should eq confirm_path(:action => :registration)
-    page.should have_content( I18n.t( "fe.confirmation.registration.flash.error" ))
+    page.should have_content( I18n.t( "confirmation.registration.flash.error" ))
   end
     
   it "user asks for new confirmation token" do
@@ -40,7 +40,7 @@ describe "UserConfirmation" do
     click_button "resend_signup_token_button"
     user = User.find(user.id)
     last_email.to.should include(user.email)
-    page.should have_content( I18n.t( "fe.confirmation.resend_signup_token.flash.success" ))
+    page.should have_content( I18n.t( "confirmation.resend_signup_token.flash.success" ))
     user.signup_token.should_not eq "halloklaus2"    
   end
       
@@ -54,7 +54,7 @@ describe "UserConfirmation" do
     click_button "resend_signup_token_button"
     last_email.should eq nil
     current_path.should eq log_in_path
-    page.should have_content( I18n.t( "fe.confirmation.resend_signup_token.flash.error" ))
+    page.should have_content( I18n.t( "confirmation.resend_signup_token.flash.error" ))
   end
   
       

data/lib/generators/hero/authentication/templates/tests/spec/requests/user_sign_in_spec.rb

@@ -7,7 +7,7 @@ describe "UserSignIn" do
     fill_in "email", :with => user.email
     fill_in "password", :with => user.password
     click_button "log_in_button"
-    page.should have_content( I18n.t( "fe.session.create.flash.error.not_confirmed" ))
+    page.should have_content( I18n.t( "sessions.create.flash.error.not_confirmed" ))
     current_path.should eq confirm_path(:action => :registration)
   end
 end

data/lib/generators/hero/authentication/templates/tests/spec/requests/user_sign_up_spec.rb

@@ -8,17 +8,17 @@ describe "UserSignUp" do
     fill_in "user_password", :with => "geheim"
     fill_in "user_password_confirmation", :with => "geheim"    
     click_button "sign_up_button"
-    page.should have_content( I18n.t( "fe.user.create.flash.success" ))
+    page.should have_content( I18n.t( "users.create.flash.success" ))
     current_path.should eq root_path
   end
   
   [
-   {:email => "test@test.de", :password => "",       :password_confirmation => ""},
-   {:email => "test@test.de", :password => "geheim", :password_confirmation => ""},
-   {:email => "test@test.de", :password => "geheim", :password_confirmation => "gehei_"},
-   {:email => "test@test.de", :password => "",       :password_confirmation => "geheim"},
-   {:email => "test@test",    :password => "geheim", :password_confirmation => "geheim"},
-   {:email => "testtest.de",  :password => "geheim", :password_confirmation => "geheim"}    
+   {:email => "test@test.de", :password => "",       :password_confirmation => "", :errortext => I18n.t( "activerecord.errors.models.user.attributes.password.blank" ) },
+   {:email => "test@test.de", :password => "geheim", :password_confirmation => "", :errortext => I18n.t( "activerecord.errors.messages.confirmation")},
+   {:email => "test@test.de", :password => "geheim", :password_confirmation => "gehei_", :errortext => I18n.t( "activerecord.errors.messages.confirmation")},
+   {:email => "test@test.de", :password => "",       :password_confirmation => "geheim", :errortext => I18n.t( "activerecord.errors.models.user.attributes.password.blank")},
+   {:email => "test@test",    :password => "geheim", :password_confirmation => "geheim", :errortext => I18n.t( "activerecord.errors.models.user.attributes.email.invalid")},
+   {:email => "testtest.de",  :password => "geheim", :password_confirmation => "geheim", :errortext => I18n.t( "activerecord.errors.models.user.attributes.email.invalid")}    
   ].each do |u|
     it "User cannot sign up with wrong parameters" do   
       visit sign_up_form_path
@@ -26,7 +26,7 @@ describe "UserSignUp" do
       fill_in "user_password", :with => u[:password]
       fill_in "user_password_confirmation", :with => u[:password_confirmation]
       click_button "sign_up_button"
-      page.should have_content( I18n.t( "fe.user.create.flash.error" ))
+      page.should have_content( u[:errortext])
     end
   end  
   
@@ -38,7 +38,7 @@ describe "UserSignUp" do
     fill_in "user_password", :with => "geheim"
     fill_in "user_password_confirmation", :with => "geheim"
     click_button "sign_up_button"
-    page.should have_content( I18n.t( "fe.user.create.flash.success" ))
+    page.should have_content( I18n.t( "users.create.flash.success" ))
   end
       
   it "User cannot sign up with used email-address if confirmed" do 
@@ -49,7 +49,7 @@ describe "UserSignUp" do
     fill_in "user_password", :with => "geheim"
     fill_in "user_password_confirmation", :with => "geheim"
     click_button "sign_up_button"
-    page.should have_content( I18n.t( "fe.user.create.flash.error" ))
+    page.should have_content( I18n.t( "users.create.flash.error" ))
   end
         
 end

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

@@ -6,5 +6,5 @@
   %p
     = submit_tag t( "common.button.send" ), :id => "token_button"
   %p
-    = link_to t('confirmation.registration.view.resend_signup_token_link'), resend_signup_token_path, :id => 'resend_signup_token'
+    = link_to t('confirmation.registration.resend_signup_token_link'), resend_signup_token_url, :id => 'resend_signup_token'
     

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hero_generator
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta8
+  version: 0.0.1.beta9
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000Z
+date: 2012-10-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &84196390 !ruby/object:Gem::Requirement
+  requirement: &88518190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *84196390
+  version_requirements: *88518190
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &84196140 !ruby/object:Gem::Requirement
+  requirement: &88517940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *84196140
+  version_requirements: *88517940
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &84195910 !ruby/object:Gem::Requirement
+  requirement: &88517710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *84195910
+  version_requirements: *88517710
 description: Write a gem description
 email:
 - guido@boyke.de
@@ -71,6 +71,7 @@ files:
 - lib/generators/hero/authentication/templates/views/confirmation/order_new_password.html.haml
 - lib/generators/hero/authentication/templates/views/confirmation/new_email_token.html.haml
 - lib/generators/hero/authentication/templates/views/confirmation/registration.html.haml
+- lib/generators/hero/authentication/templates/helpers/application_helper.rb
 - lib/generators/hero/authentication/templates/tests/spec/requests/user_sign_in_spec.rb
 - lib/generators/hero/authentication/templates/tests/spec/requests/user_confirmation_spec.rb
 - lib/generators/hero/authentication/templates/tests/spec/requests/password_resets_spec.rb
@@ -86,6 +87,7 @@ files:
 - lib/generators/hero/authentication/templates/mailers/confirmation_mailer.rb
 - lib/generators/hero/authentication/templates/models/user.rb
 - lib/generators/hero/authentication/templates/models/authentication.rb
+- lib/generators/hero/authentication/templates/models/auth_user.rb
 - lib/generators/hero/authentication/templates/config/initializers/action_mailer.rb
 - lib/generators/hero/authentication/templates/config/initializers/constants.rb
 - lib/generators/hero/authentication/templates/config/initializers/fix_active_record_validations_full_messages.rb