tbone-devise 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/app/assets/javascripts/routers/sessions_router.js.coffee

@@ -26,6 +26,7 @@ define [
       @user  = options.user
       @guest = options.guest
       @token = options.token
+      @modules = options.modules
       @session = new Session(@user)
       @user.on('change', =>
         @session = new Session(@user)
@@ -85,7 +86,7 @@ define [
 
     newSession: ->
       View = require 'views/sessions/new_view'
-      @view = new View(model: @session, user: @user, token: @token)
+      @view = new View(model: @session, user: @user, token: @token, modules: @modules)
       Layout.setContent(@view)
 
     destroy: ->

data/app/assets/javascripts/tbone-devise.js.coffee

@@ -14,11 +14,11 @@ define [
   App.Views.Confirmations = {}
 
   class TboneDevise
-    constructor: (vars = {}) ->
-      @currentUser = new User(vars.currentUser)
-      guest = new User(vars.guestUser)
+    constructor: ->
+      @currentUser = new User(App.Params.currentUser)
+      guest = new User(App.Params.guestUser)
       view = new LoginBar(model: @currentUser)
       $("#add-bar").html(view.render().el)
-      new SessionsRouter(user: @currentUser, guest: guest, token: Tbone.token)
+      new SessionsRouter(user: @currentUser, guest: guest, token: Tbone.token, modules: App.Params.devise_modules)
 
-  new TboneDevise(vars)
+  new TboneDevise()

data/app/assets/javascripts/templates/sessions/new.jst.hamljs

@@ -11,19 +11,23 @@
       .controls
         %input#password{name: "password", type: "password"}
 
-    .control-group
-      %label.control-label{for: "remember_me"}= I18n.t('remember_me')
-      .controls
-        %input#remember_me{name: "remember_me", type: "checkbox"}
+    :if $.inArray('rememberable', this.options.modules) != -1
+      .control-group
+        %label.control-label{for: "remember_me"}= I18n.t('remember_me')
+        .controls
+          %input#remember_me{name: "remember_me", type: "checkbox"}
 
     .form-actions
       %input#new-post.btn.btn-primary{type: "submit"}
 
-    %p
-      %a{href: '#/signup'}= I18n.t('sign_up')
+    :if $.inArray('registerable', this.options.modules) != -1
+      %p
+        %a{href: '#/signup'}= I18n.t('sign_up')
 
-    %p
-      %a{href: '#/forgot'}= I18n.t('forgot_password') 
+    :if $.inArray('recoverable', this.options.modules) != -1
+      %p
+        %a{href: '#/forgot'}= I18n.t('forgot_password') 
 
-    %p
-      %a{href: '#/confirm'}= I18n.t('confirm')
+    :if $.inArray('confirmable', this.options.modules) != -1
+      %p
+        %a{href: '#/confirm'}= I18n.t('confirm')

data/app/assets/javascripts/views/sessions/new_view.js.coffee

@@ -13,6 +13,8 @@ define [
 
     success: (session) ->
       @options.user.id = session.id
-      @options.user.fetch()
+      @options.user.fetch(
+        success: ->
+          window.location.hash = "/"
+      )
       @addSuccessAlert(I18n.t('devise.sessions.signed_in'))
-      window.location.hash = "/"

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

@@ -0,0 +1,5 @@
+<p>Welcome <%= @resource.email %>!</p>
+
+<p>You can confirm your account email through the link below:</p>
+
+<p><%= link_to 'Confirm my account', "http://" + Rails.configuration.action_mailer.default_url_options[:host] + "/#/confirm?token=" + @resource.confirmation_token %></p>

data/app/views/devise/mailer/reset_password_instructions.html.erb

@@ -0,0 +1,8 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Someone has requested a link to change your password, and you can do this through the link below.</p>
+
+<p><%= link_to 'Change my password', "http://" + Rails.configuration.action_mailer.default_url_options[:host] + "/#/forgot?token=" + @resource.reset_password_token %></p>
+
+<p>If you didn't request this, please ignore this email.</p>
+<p>Your password won't change until you access the link above and create a new one.</p>

data/app/views/devise/mailer/unlock_instructions.html.erb

@@ -0,0 +1,7 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Your account has been locked due to an excessive amount of unsuccessful sign in attempts.</p>
+
+<p>Click the link below to unlock your account:</p>
+
+<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %></p>

data/config/routes.rb

@@ -0,0 +1,6 @@
+Tbone::Engine.routes.draw do
+  resources :tokens
+  root :to => 'home#index'
+  devise_for :users
+  resources :users
+end

data/lib/tbone/devise/engine.rb

@@ -2,7 +2,11 @@ require 'rails'
 module Tbone
   module Devise
     class Engine < Rails::Engine
-
+      initializer "tbone-devise" do |app|
+        Tbone.configure do |c|
+          c.add_params devise_modules: User.devise_modules
+        end
+      end
     end
   end
 end

data/tbone-devise.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tbone-devise}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Pavel Tatarsky}]
-  s.date = %q{2012-06-27}
+  s.date = %q{2012-07-08}
   s.description = %q{Devise views for Tbone}
   s.email = %q{fazzzenda@mail.ru}
   s.extra_rdoc_files = [
@@ -50,7 +50,11 @@ Gem::Specification.new do |s|
     "app/assets/javascripts/views/sessions/login_bar_view.js.coffee",
     "app/assets/javascripts/views/sessions/new_view.js.coffee",
     "app/controllers/users_controller.rb",
+    "app/views/devise/mailer/confirmation_instructions.html.erb",
+    "app/views/devise/mailer/reset_password_instructions.html.erb",
+    "app/views/devise/mailer/unlock_instructions.html.erb",
     "config/locales/tbone-devise.en.yml",
+    "config/routes.rb",
     "lib/tbone-devise.rb",
     "lib/tbone/devise/engine.rb",
     "tbone-devise.gemspec",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tbone-devise
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70229449392260 !ruby/object:Gem::Requirement
+  requirement: &70361528330060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70229449392260
+  version_requirements: *70361528330060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70229449434940 !ruby/object:Gem::Requirement
+  requirement: &70361528329220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70229449434940
+  version_requirements: *70361528329220
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70229449431300 !ruby/object:Gem::Requirement
+  requirement: &70361528327780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70229449431300
+  version_requirements: *70361528327780
 description: Devise views for Tbone
 email: fazzzenda@mail.ru
 executables: []
@@ -85,7 +85,11 @@ files:
 - app/assets/javascripts/views/sessions/login_bar_view.js.coffee
 - app/assets/javascripts/views/sessions/new_view.js.coffee
 - app/controllers/users_controller.rb
+- app/views/devise/mailer/confirmation_instructions.html.erb
+- app/views/devise/mailer/reset_password_instructions.html.erb
+- app/views/devise/mailer/unlock_instructions.html.erb
 - config/locales/tbone-devise.en.yml
+- config/routes.rb
 - lib/tbone-devise.rb
 - lib/tbone/devise/engine.rb
 - tbone-devise.gemspec
@@ -106,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2900774237236071146
+      hash: 2102245750480204451
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: