authentifyd 0.2.0 → 0.3.0

data/app/controllers/authentifyd/registrations_controller.rb

@@ -4,7 +4,7 @@ class Authentifyd::RegistrationsController < Devise::RegistrationsController
 
   layout Authentifyd.custom_layout || 'authentifyd/application'
   before_filter :define_body_class
-  
+
   def new
     # Building the resource with information that MAY BE available from omniauth!
     build_resource(:email => session[:omniauth_email])
@@ -28,22 +28,24 @@ class Authentifyd::RegistrationsController < Devise::RegistrationsController
   def build_resource(*args)
     super
 
+    @user.language = I18n.locale
+
     if session[:omniauth]
       @user.apply_omniauth(session[:omniauth])
       @user.valid?
     end
   end
-  
+
   private
-  
+
   def define_body_class
     @body_class = "authentifyd_registrations_#{action_name}"
   end
-  
+
   alias_method :orig_after_inactive_sign_up_path_for, :after_inactive_sign_up_path_for
   def after_inactive_sign_up_path_for resource_or_scope
     new_user_session_url || orig_after_sign_up_path_for
   end
-  
-  
-end
+
+
+end

data/app/mailers/authentifyd/devise_mailer.rb

@@ -0,0 +1,6 @@
+module Authentifyd
+  class DeviseMailer < ::Devise::Mailer
+    helper :application # gives access to all helpers defined within `application_helper`.
+    include ::Devise::Controllers::UrlHelpers # Optional. eg. `confirmation_url`
+  end
+end

data/app/views/authentifyd/devise_mailer/confirmation_instructions.html.erb

@@ -0,0 +1,5 @@
+<p><%= t('Welcome') %> <%= @resource.email %>!</p>
+
+<p><%= t('You_can_confirm_your_account_email_through_the_link_below') %></p>
+
+<p><%= link_to t('Confirm_my_account'), confirmation_url(@resource, :confirmation_token => @resource.confirmation_token, :locale => @resource.language || I18n.locale) %></p>

data/app/views/authentifyd/{devise/mailer → devise_mailer}/reset_password_instructions.html.erb

@@ -2,7 +2,7 @@
 
 <p><%= t("Someone_has_requested_a_link_to_change_your_password_and_you_can_do_this_through_the_link_below") %></p>
 
-<p><%= link_to t('Change_my_password'), edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %></p>
+<p><%= link_to t('Change_my_password'), edit_password_url(@resource, :reset_password_token => @resource.reset_password_token, :locale => @resource.language || I18n.locale) %></p>
 
 <p><%= t('If_you_didnt_request_this_please_ignore_this_email') %> </p>
 <p><%= t('Your_password_wont_change_until_you_access_the_link_above_and_create_a_new_one') %></p>

data/app/views/authentifyd/{devise/mailer → devise_mailer}/unlock_instructions.html.erb

@@ -4,4 +4,4 @@
 
 <p><%= t('Click_the_link_below_to_unlock_your_account') %></p>
 
-<p><%= link_to t('Unlock_my_account'), unlock_url(@resource, :unlock_token => @resource.unlock_token) %></p>
+<p><%= link_to t('Unlock_my_account'), unlock_url(@resource, :unlock_token => @resource.unlock_token, :locale => @resource.language || I18n.locale) %></p>

data/lib/authentifyd/engine.rb

@@ -7,9 +7,9 @@ require_relative './action_controller/base'
 module Authentifyd
   class Engine < ::Rails::Engine
     isolate_namespace Authentifyd
-    
+
     config.authentifyd = ActiveSupport::OrderedOptions.new
-    
+
     initializer "authentifyd.configure_omniauth_services" do |app|
       require_relative "./configuration/omniauth"
     end

data/lib/authentifyd/version.rb

@@ -1,3 +1,3 @@
 module Authentifyd
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authentifyd
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70226993881400 !ruby/object:Gem::Requirement
+  requirement: &70270396753260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70226993881400
+  version_requirements: *70270396753260
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70226993879260 !ruby/object:Gem::Requirement
+  requirement: &70270396752680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 2.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70226993879260
+  version_requirements: *70270396752680
 - !ruby/object:Gem::Dependency
   name: devise-encryptable
-  requirement: &70226993875960 !ruby/object:Gem::Requirement
+  requirement: &70270396752220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70226993875960
+  version_requirements: *70270396752220
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70226993875000 !ruby/object:Gem::Requirement
+  requirement: &70270396751760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70226993875000
+  version_requirements: *70270396751760
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &70226993890300 !ruby/object:Gem::Requirement
+  requirement: &70270396751300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70226993890300
+  version_requirements: *70270396751300
 - !ruby/object:Gem::Dependency
   name: omniauth-twitter
-  requirement: &70226993889380 !ruby/object:Gem::Requirement
+  requirement: &70270396750840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70226993889380
+  version_requirements: *70270396750840
 - !ruby/object:Gem::Dependency
   name: omniauth-google-oauth2
-  requirement: &70226993888320 !ruby/object:Gem::Requirement
+  requirement: &70270396750380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +87,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70226993888320
+  version_requirements: *70270396750380
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &70226993887560 !ruby/object:Gem::Requirement
+  requirement: &70270396749940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,21 +98,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70226993887560
+  version_requirements: *70270396749940
 - !ruby/object:Gem::Dependency
   name: localyzed
-  requirement: &70226993886320 !ruby/object:Gem::Requirement
+  requirement: &70270396749340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70226993886320
+  version_requirements: *70270396749340
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70226993885680 !ruby/object:Gem::Requirement
+  requirement: &70270396748900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226993885680
+  version_requirements: *70270396748900
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70226993884420 !ruby/object:Gem::Requirement
+  requirement: &70270396748420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226993884420
+  version_requirements: *70270396748420
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70226993897820 !ruby/object:Gem::Requirement
+  requirement: &70270396747960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226993897820
+  version_requirements: *70270396747960
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &70226993896360 !ruby/object:Gem::Requirement
+  requirement: &70270396747500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226993896360
+  version_requirements: *70270396747500
 description: Devise + Omniauth Authentication encapsulated in an Engine. Uses Devise.
   Parts taken from perens-instant-user and sso-devise-omniauth-provider
 email:
@@ -181,6 +181,7 @@ files:
 - app/controllers/authentifyd/sessions_controller.rb
 - app/controllers/authentifyd/unlocks_controller.rb
 - app/helpers/authentifyd/application_helper.rb
+- app/mailers/authentifyd/devise_mailer.rb
 - app/models/authentifyd/authentication.rb
 - app/models/authentifyd/user.rb
 - app/models/authentifyd.rb
@@ -188,10 +189,10 @@ files:
 - app/views/authentifyd/authentications/index.html.erb
 - app/views/authentifyd/authentications/link.html.erb
 - app/views/authentifyd/confirmations/new.html.erb
-- app/views/authentifyd/devise/mailer/confirmation_instructions.html.erb
-- app/views/authentifyd/devise/mailer/reset_password_instructions.html.erb
-- app/views/authentifyd/devise/mailer/unlock_instructions.html.erb
 - app/views/authentifyd/devise/shared/_links.erb
+- app/views/authentifyd/devise_mailer/confirmation_instructions.html.erb
+- app/views/authentifyd/devise_mailer/reset_password_instructions.html.erb
+- app/views/authentifyd/devise_mailer/unlock_instructions.html.erb
 - app/views/authentifyd/layouts/_account_menu.html.haml
 - app/views/authentifyd/passwords/edit.html.erb
 - app/views/authentifyd/passwords/new.html.erb

data/app/views/authentifyd/devise/mailer/confirmation_instructions.html.erb

@@ -1,5 +0,0 @@
-<p><%= t('Welcome') %><%= @resource.email %>!</p>
-
-<p><%= t('You_can_confirm_your_account_email_through_the_link_below')</p>
-
-<p><%= link_to t('Confirm_my_account'), confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %></p>