adva-user 0.0.3 → 0.0.4

data/app/controllers/admin/base_controller_slice.rb

@@ -0,0 +1,5 @@
+require 'admin/base_controller'
+
+Admin::BaseController.class_eval do
+  before_filter :authenticate_user!
+end

data/app/controllers/installations_controller_slice.rb

@@ -0,0 +1,9 @@
+require 'installations_controller'
+
+InstallationsController.class_eval do
+  before_filter :set_admin_params, :only => :create
+
+  def set_admin_params
+    params[:site][:account_attributes][:users_attributes] ||= [{ :email => 'admin@admin.org', :password => 'admin!' }]
+  end
+end

data/app/controllers/user/confirmations_controller.rb

@@ -0,0 +1,3 @@
+class User::ConfirmationsController < Devise::ConfirmationsController
+  layout 'user'
+end

data/app/controllers/user/passwords_controller.rb

@@ -0,0 +1,3 @@
+class User::PasswordsController < Devise::PasswordsController
+  layout 'user'
+end

data/app/controllers/user/registrations_controller.rb

@@ -0,0 +1,3 @@
+class User::RegistrationsController < Devise::RegistrationsController
+  layout 'user'
+end

data/app/controllers/user/sessions_controller.rb

@@ -0,0 +1,7 @@
+class User::SessionsController < Devise::SessionsController
+  layout 'user'
+
+  def after_sign_in_path_for(resource)
+    params[:return_to] || '/'
+  end
+end

data/app/controllers/user/unlocks_controller.rb

@@ -0,0 +1,3 @@
+class User::UnlocksController < Devise::UnlocksController
+  layout 'user'
+end

data/app/models/account_slice.rb

@@ -0,0 +1,4 @@
+Account.class_eval do
+  has_many :users, :dependent => :destroy
+  accepts_nested_attributes_for :users
+end

data/app/models/user.rb

@@ -0,0 +1,12 @@
+require 'devise'
+
+class User < ActiveRecord::Base
+  devise :database_authenticatable, :registerable, :rememberable, :confirmable,
+    :recoverable, :validatable, :trackable
+
+  serialize :roles, Array
+
+  def roles
+    read_attribute(:roles) || []
+  end
+end

data/app/views/layouts/admin/_header_slice.rb

@@ -0,0 +1,16 @@
+require_dependency 'layouts/admin'
+require_dependency 'layouts/admin/_header'
+
+module Layouts::Admin::Header::User
+  def right
+    login_status
+    super
+  end
+
+  def login_status
+    link_to t('.sign_out', :user => current_user.email), destroy_user_session_path
+    self << '&middot;'.html_safe
+  end
+
+  Layouts::Admin::Header.send(:include, self)
+end

data/app/views/layouts/user.rb

@@ -0,0 +1,2 @@
+class Layouts::User < Layouts::Simple
+end

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

@@ -0,0 +1,5 @@
+<p>Welcome <%= @resource.email %>!</p>
+
+<p>You can confirm your account through the link below:</p>
+
+<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %></p>

data/app/views/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', edit_password_url(@resource, :reset_password_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/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/app/views/user/confirmations/new.html.rb

@@ -0,0 +1,16 @@
+class User::Confirmations::New < User::Form
+  include do
+    def to_html
+      h2 :'.title'
+      super
+    end
+
+    def fields
+      form.input :email
+    end
+
+    def form_arguments
+      [resource, { :as => resource_name, :url => confirmation_path(resource_name) }]
+    end
+  end
+end

data/app/views/user/form.rb

@@ -0,0 +1,67 @@
+class User::Form < Adva::View::Form
+  include do
+    def fields
+      devise_error_messages!
+      super
+    end
+  
+    def button_group
+      super
+      links
+    end
+  
+    def buttons
+      form.submit t(:'.submit')
+    end
+  
+    def links
+      ul :class => 'links user' do
+        li { sign_in_link }             if sign_in?
+        li { sign_up_link }             if sign_up?
+        li { forgot_password_link }     if forgot_password?
+        li { resend_confirmation_link } if resend_confirmation?
+        li { resend_unlock_link }       if resend_unlock?
+      end
+    end
+
+    def sign_in?
+      controller_name != 'sessions'
+    end
+
+    def sign_up?
+      devise_mapping.registerable? && controller_name != 'registrations'
+    end
+
+    def forgot_password?
+      devise_mapping.recoverable? && controller_name != 'passwords'
+    end
+
+    def resend_confirmation?
+      devise_mapping.confirmable? && controller_name != 'confirmations'
+    end
+
+    def resend_unlock?
+      devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
+    end
+
+    def sign_in_link
+      capture { link_to(:'user.links.sign_in', new_session_path(resource_name), :class => :sign_in) }
+    end
+
+    def sign_up_link
+      capture { link_to(:'user.links.sign_up', new_registration_path(resource_name), :class => :sign_up) }
+    end
+
+    def forgot_password_link
+      capture { link_to(:'user.links.forgot_password', new_password_path(resource_name), :class => :forgot_password) }
+    end
+
+    def resend_confirmation_link
+      capture { link_to(:'user.links.resend_confirmation', new_confirmation_path(resource_name), :class => :resend_confirmation) }
+    end
+
+    def resend_unlock_link
+      capture { link_to(:'user.links.resend_unlock', new_unlock_path(resource_name), :class => :resend_unlock) }
+    end
+  end
+end

data/app/views/user/passwords/edit.html.rb

@@ -0,0 +1,18 @@
+class User::Passwords::Edit < User::Form
+  include do
+    def to_html
+      h2 :'.title'
+      super
+    end
+
+    def fields
+      form.hidden_field :reset_password_token
+      form.input :password
+      form.input :password_confirmation
+    end
+
+    def form_arguments
+      [resource, { :as => resource_name, :url => password_path(resource_name), :html => { :method => :put } }]
+    end
+  end
+end

data/app/views/user/passwords/new.html.rb

@@ -0,0 +1,16 @@
+class User::Passwords::New < User::Form
+  include do
+    def to_html
+      h2 :'.title'
+      super
+    end
+
+    def fields
+      form.input :email
+    end
+
+    def form_arguments
+      [resource, { :as => resource_name, :url => password_path(resource_name) }]
+    end
+  end
+end

data/app/views/user/registrations/edit.html.rb

@@ -0,0 +1,18 @@
+class User::Registrations::Edit < User::Form
+  include do
+    def to_html
+      h2 :'.title'
+      super
+    end
+
+    def fields
+      form.input :email
+      form.input :password
+      form.input :password_confirmation
+    end
+
+    def form_arguments
+      [resource, { :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put } }]
+    end
+  end
+end

data/app/views/user/registrations/new.html.rb

@@ -0,0 +1,18 @@
+class User::Registrations::New < User::Form
+  include do
+    def to_html
+      h2 :'.title'
+      super
+    end
+
+    def fields
+      form.input :email
+      form.input :password
+      form.input :password_confirmation
+    end
+
+    def form_arguments
+      [resource, { :as => resource_name, :url => registration_path(resource_name) }]
+    end
+  end
+end

data/app/views/user/sessions/new.html.rb

@@ -0,0 +1,26 @@
+class User::Sessions::New < User::Form
+  include do
+    def to_html
+      h2 :'.title'
+      super
+    end
+
+    def fields
+      pass_return_to
+      form.input :email
+      form.input :password
+      remember_me if devise_mapping.rememberable?
+    end
+
+    def form_arguments
+      [resource, { :as => resource_name, :url => session_path(resource_name) }]
+    end
+
+    def remember_me
+      div :class => :checkbox_group do
+        form.check_box :remember_me
+        form.label :remember_me, :class => :inline
+      end
+    end
+  end
+end

data/app/views/user/unlocks/new.html.rb

@@ -0,0 +1,16 @@
+class User::Unlocks::New < User::Form
+  include do
+    def to_html
+      h2 :'.title'
+      super
+    end
+
+    def fields
+      form.input :email
+    end
+
+    def form_arguments
+      [resource, { :as => resource_name, :url => unlock_path(resource_name) }]
+    end
+  end
+end

data/config/locales/en.yml

@@ -0,0 +1,87 @@
+en:
+  errors:
+    messages:
+      not_found: "not found"
+      already_confirmed: "was already confirmed"
+      not_locked: "was not locked"
+
+  user:
+    links:
+      sign_in: Sign in
+      sign_up: Sign up
+      forgot_password: Forgot password?
+      resend_confirmation: Resend confirmation
+      resend_unlock: Resend unlock
+    sessions:
+      new:
+        title: Sign in
+        submit: Sign in
+    registrations:
+      new:
+        title: Sign up
+        submit: Sign up
+      edit:
+        title: Edit account
+        submit: Update account
+        current_password_required: "We need your current password to confirm your changes."
+    confirmations:
+      new:
+        title: Resend confirmation instructions
+        submit: Resend instructions
+    passwords:
+      new:
+        title: Forgot your password?
+        submit: Send instructions
+      edit:
+        title: Change your password
+        submit: Change password
+    unlocks:
+      new:
+        title: Resend unlock instructions
+        submit: Send instructions
+
+  devise:
+    failure:
+      unauthenticated: 'You need to sign in or sign up before continuing.'
+      unconfirmed: 'You have to confirm your account before continuing.'
+      locked: 'Your account is locked.'
+      invalid: 'Invalid email or password.'
+      invalid_token: 'Invalid authentication token.'
+      timeout: 'Your session expired, please sign in again to continue.'
+      inactive: 'Your account was not activated yet.'
+    sessions:
+      signed_in: 'Signed in successfully.'
+      signed_out: 'Signed out successfully.'
+    passwords:
+      send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
+      updated: 'Your password was changed successfully. You are now signed in.'
+    confirmations:
+      send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
+      confirmed: 'Your account was successfully confirmed. You are now signed in.'
+    registrations:
+      signed_up: 'You have signed up successfully. A confirmation was sent to your e-mail.'
+      updated: 'You updated your account successfully.'
+      destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
+    unlocks:
+      send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
+      unlocked: 'Your account was successfully unlocked. You are now signed in.'
+    mailer:
+      confirmation_instructions:
+        subject: 'Confirmation instructions'
+      reset_password_instructions:
+        subject: 'Reset password instructions'
+      unlock_instructions:
+        subject: 'Unlock Instructions'
+
+  layouts:
+    default:
+      signed_in_as: "Signed in as %{user}"
+      sign_in: Sign in
+      sign_up: Sign up
+      sign_out: Sign out
+
+    admin:
+      header:
+        sign_in: Sign in
+        sign_up: Sign up
+        sign_out: Sign out %{user}

data/config/routes.rb

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  devise_for :user, :module => 'user'
+end

data/lib/adva-user.rb

@@ -0,0 +1 @@
+require 'adva/user'

data/lib/adva/user.rb

@@ -0,0 +1,42 @@
+require 'adva/core'
+require 'devise'
+
+module Adva
+  class User < ::Rails::Engine
+    include Adva::Engine
+
+    # TODO [config] should probably happen in the client app
+    # for more devise options see http://bit.ly/bwxrGg
+    initializer 'adva-user.devise_setup' do |app|
+
+      # FIXME [config]
+      app.config.action_mailer.default_url_options = { :host => 'www.example.com' }
+
+      Devise.setup do |config|
+        require 'devise/orm/active_record'
+        config.mailer_sender   = 'please-change-me@config-initializers-devise.com'
+        config.encryptor       = :bcrypt
+        config.password_length = 5..20
+      end
+
+      Devise::FailureApp.class_eval do
+        def redirect
+          flash[:alert] = i18n_message unless flash[:notice]
+          redirect_to send(:"new_#{scope}_session_path", :return_to => attempted_path)
+        end
+      end
+    end
+
+    initializer 'adva-user.register_asset_expansions' do
+      ActionView::Helpers::AssetTagHelper.register_javascript_expansion(
+        :user => %w()
+      )
+
+      ActionView::Helpers::AssetTagHelper.register_stylesheet_expansion(
+        :user => %w( adva-core/default/forms
+                     adva-core/admin/common
+                     adva-user/user )
+      )
+    end
+  end
+end

data/lib/adva_user/version.rb

@@ -0,0 +1,3 @@
+module AdvaUser
+  VERSION = "0.0.4"
+end

data/lib/testing/factories.rb

@@ -0,0 +1,11 @@
+Factory.define :user, :class => User do |f|
+  f.sequence(:email) { |n| "user-#{n}@example.com" }
+  f.password 'password'
+  f.after_build  { |user| User.deactivate_callbacks }
+  f.after_create { |user| user.confirm!; User.activate_callbacks }
+end
+
+Factory.define :admin, :parent => :user do |f|
+  f.email { User.find_by_email('admin@admin.org') ? 'admin-2@admin.org' : 'admin@admin.org' }
+  f.password 'admin!'
+end

data/lib/testing/paths.rb

@@ -0,0 +1,14 @@
+module Adva::User::Paths
+  def path_to(page)
+    case page
+    when /^the sign in page$/
+      new_user_session_path
+    when /^the new registration page$/
+      new_user_registration_path
+    else
+      super
+    end
+  end
+end
+
+World(Adva::User::Paths)

data/lib/testing/step_definitions.rb

@@ -0,0 +1,23 @@
+Given /^I am signed in with "([^"]*)" and "([^"]*)"$/ do |email, password|
+  post user_session_path, :user => { :email => email, :password => password }
+end
+
+# This step should only be used for testing the login itself (login.feature)
+# Please, use the step 'Given I am signed in with "admin@admin.org" and "admin!"' in all
+# other features for performance reasons.
+Given /^I sign in with "([^"]*)" and "([^"]*)"$/ do |email, password|
+  get new_user_session_path
+  fill_in 'Email', :with => email
+  fill_in 'Password', :with => password
+  click_button 'Sign in'
+end
+
+Given /a confirmed user with email "([^"]+)" and password "([^"]+)"/ do |email, password|
+  user = User.without_callbacks.create!(:email => email, :password => password)
+  user.confirm!
+end
+
+Then 'I should be signed in' do
+  When 'I go to the sign in page'
+  Then 'I should be on the homepage'
+end

data/public/stylesheets/adva-user/user.css

@@ -0,0 +1,30 @@
+body {
+  font-size: 11pt;
+}
+#page {
+  border-top: 5px solid #c22222;
+}
+.main {
+  width: 400px;
+	margin: 0 auto;
+	padding-top: 0px;
+}
+#content {
+	padding: 20px 30px 30px 30px;
+}
+
+.links {
+  display: block !important;
+  margin-top: 30px;
+}
+.links li:first-child:before {
+  content: '';
+}
+.links .sign_in,
+.links .sign_up,
+.links .forgot_password,
+.links .resend_confirmation,
+.links .resend_unlock {
+  font-size: 9pt;
+  color: #999;
+}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adva-user
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Ingo Weiss
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 +01:00
+date: 2010-12-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,7 +58,37 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/bundler/repository.rb
+- app/controllers/user/passwords_controller.rb
+- app/controllers/user/sessions_controller.rb
+- app/controllers/user/unlocks_controller.rb
+- app/controllers/user/confirmations_controller.rb
+- app/controllers/user/registrations_controller.rb
+- app/controllers/installations_controller_slice.rb
+- app/controllers/admin/base_controller_slice.rb
+- app/views/layouts/user.rb
+- app/views/layouts/admin/_header_slice.rb
+- app/views/user/unlocks/new.html.rb
+- app/views/user/sessions/new.html.rb
+- app/views/user/passwords/edit.html.rb
+- app/views/user/passwords/new.html.rb
+- app/views/user/form.rb
+- app/views/user/confirmations/new.html.rb
+- app/views/user/registrations/edit.html.rb
+- app/views/user/registrations/new.html.rb
+- app/views/mailer/confirmation_instructions.html.erb
+- app/views/mailer/unlock_instructions.html.erb
+- app/views/mailer/reset_password_instructions.html.erb
+- app/models/user.rb
+- app/models/account_slice.rb
+- config/routes.rb
+- config/locales/en.yml
+- lib/adva-user.rb
+- lib/adva_user/version.rb
+- lib/adva/user.rb
+- lib/testing/factories.rb
+- lib/testing/paths.rb
+- lib/testing/step_definitions.rb
+- public/stylesheets/adva-user/user.css
 has_rdoc: true
 homepage: http://github.com/svenfuchs/adva-cms2
 licenses: []

data/lib/bundler/repository.rb

@@ -1,118 +0,0 @@
-require 'pathname'
-
-# Bundler gemfile support for local/remote workspaces/repositories for work in
-# development teams.
-#
-# Usage:
-#
-#   # define paths to be searched for repositories:
-#   workspace '~/.projects ~/Development/{projects,work}'
-#
-#   # define developer preferences for using local or remote repositories (uses ENV['user']):
-#   developer :sven, :prefer => :local
-#
-#   # define repositories to be used for particular gems:
-#   adva_cms  = repository('adva-cms2', :git => 'git@github.com:svenfuchs/adva-cms2.git', :ref => 'c2af0de')
-#   adva_shop = repository('adva-shop', :source => :local)
-#
-#   # now use repositories to define gems:
-#   adva_cms.gem  'adva-core'
-#   adva_shop.gem 'adva-catalog'
-#
-#   # The gem definition will now be proxied to Bundler with arguments according
-#   # to the setup defined earlier. E.g. as:
-#
-#   gem 'adva-core', :path => 'Development/projects/adva-cms2/adva-core'                 # for developer 'sven'
-#   gem 'adva-core', :git => 'git@github.com:svenfuchs/adva-cms2.git', :ref => 'c2af0de' # for other developers
-#   gem 'adva-catalog', :path => 'Development/projects/adva-shop/adva-catalog'           # for all developers
-#
-#  One can also set an environment variable FORCE_REMOTE which will force remote
-#  repositories to be used *except* when a repository was defined with :source => :local
-#  which always forces the local repository to be used.
-#
-class Repository
-  class << self
-    def paths
-      @paths ||= []
-    end
-
-    def path(*paths)
-      paths.join(' ').split(' ').each do |path|
-        self.paths.concat(Pathname.glob(File.expand_path(path)))
-      end
-    end
-
-    def developer(name, preferences)
-      developers[name] = preferences
-      workspaces(preferences[:workspace])
-    end
-
-    def current_developer
-      developers[ENV['USER'].to_sym] || {}
-    end
-
-    def developers(developers = nil)
-      @developers ||= {}
-    end
-  end
-
-  class Gem < Array
-    def initialize(name, repository)
-      if repository.local?
-        sub_path = repository.path.join(name)
-        super([name, { :path => sub_path.exist? ? sub_path.to_s : repository.path.to_s }])
-      else
-        super([name, repository.options.dup])
-      end
-    end
-  end
-
-  attr_reader :bundler, :name, :options, :source
-
-  def initialize(bundler, name, options)
-    @bundler = bundler
-    @name    = name
-    @source  = options.delete(:source)
-    @options = options
-  end
-
-  def gem(name)
-    bundler.gem(*Gem.new(name, self))
-  end
-
-  def local?
-    source == :local # && path
-  end
-
-  def source
-    @source ||= forced_source || preferred_source || :remote
-  end
-
-  def forced_source
-    :remote if ENV['FORCE_REMOTE']
-  end
-
-  def preferred_source
-    self.class.current_developer[:prefer] || self.class.current_developer[name.to_sym]
-  end
-
-  def path
-    @path ||= begin
-      path = self.class.paths.detect { |path| path.join(name).exist? }
-      path ? path.join(name) : Pathname.new('.')
-    end
-  end
-end
-
-def workspace(*paths)
-  Repository.path(*paths)
-end
-alias :workspaces :workspace
-
-def developer(name, preferences)
-  Repository.developer(name, preferences)
-end
-
-def repository(*args)
-  Repository.new(self, *args)
-end