refinerycms-authentication 1.0.11 → 2.0.0

metadata

@@ -1,116 +1,92 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: refinerycms-authentication
-version: !ruby/object:Gem::Version
-  version: 1.0.11
+version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
+  segments: 
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
-authors:
-- Resolve Digital
+authors: 
 - Philip Arndt
+- "U\xC4\xA3is Ozols"
 - David Jones
 - Steven Heidel
-- Uģis Ozols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: refinerycms-core
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.11
-  type: :runtime
+
+date: 2012-03-01 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.11
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.10
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  version_requirements: *id001
   name: devise
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.3
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.3
-- !ruby/object:Gem::Dependency
-  name: friendly_id_globalize3
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.1
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  version_requirements: *id002
+  name: refinerycms-core
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.1
-description: The default authentication engine for Refinery CMS
+description: The default authentication extension for Refinery CMS
 email: info@refinerycms.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- app/controllers/admin/users_controller.rb
-- app/controllers/passwords_controller.rb
-- app/controllers/sessions_controller.rb
-- app/controllers/users_controller.rb
-- app/helpers/sessions_helper.rb
-- app/helpers/users_helper.rb
-- app/mailers/user_mailer.rb
-- app/models/role.rb
-- app/models/roles_users.rb
-- app/models/user.rb
-- app/models/user_plugin.rb
-- app/views/admin/users/_actions.html.erb
-- app/views/admin/users/_form.html.erb
-- app/views/admin/users/_records.html.erb
-- app/views/admin/users/_user.html.erb
-- app/views/admin/users/_users.html.erb
-- app/views/admin/users/edit.html.erb
-- app/views/admin/users/index.html.erb
-- app/views/admin/users/new.html.erb
-- app/views/layouts/login.html.erb
-- app/views/passwords/edit.html.erb
-- app/views/passwords/new.html.erb
-- app/views/sessions/new.html.erb
-- app/views/user_mailer/reset_notification.html.erb
-- app/views/user_mailer/reset_notification.text.plain.erb
-- app/views/users/new.html.erb
+
+files: 
+- app/controllers/refinery/admin/users_controller.rb
+- app/controllers/refinery/passwords_controller.rb
+- app/controllers/refinery/sessions_controller.rb
+- app/controllers/refinery/users_controller.rb
+- app/helpers/refinery/sessions_helper.rb
+- app/helpers/refinery/users_helper.rb
+- app/mailers/refinery/user_mailer.rb
+- app/models/refinery/role.rb
+- app/models/refinery/roles_users.rb
+- app/models/refinery/user.rb
+- app/models/refinery/user_plugin.rb
+- app/views/refinery/admin/users/_actions.html.erb
+- app/views/refinery/admin/users/_form.html.erb
+- app/views/refinery/admin/users/_records.html.erb
+- app/views/refinery/admin/users/_user.html.erb
+- app/views/refinery/admin/users/_users.html.erb
+- app/views/refinery/admin/users/edit.html.erb
+- app/views/refinery/admin/users/index.html.erb
+- app/views/refinery/admin/users/new.html.erb
+- app/views/refinery/layouts/login.html.erb
+- app/views/refinery/passwords/edit.html.erb
+- app/views/refinery/passwords/new.html.erb
+- app/views/refinery/sessions/new.html.erb
+- app/views/refinery/user_mailer/reset_notification.html.erb
+- app/views/refinery/user_mailer/reset_notification.text.plain.erb
+- app/views/refinery/users/new.html.erb
 - config/locales/bg.yml
 - config/locales/cs.yml
 - config/locales/da.yml
@@ -121,8 +97,8 @@ files:
 - config/locales/fi.yml
 - config/locales/fr.yml
 - config/locales/it.yml
-- config/locales/jp.yml
-- config/locales/lolcat.yml
+- config/locales/ja.yml
+- config/locales/ko.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
 - config/locales/nb.yml
@@ -139,47 +115,56 @@ files:
 - config/locales/zh-TW.yml
 - config/routes.rb
 - db/migrate/20100913234705_create_refinerycms_authentication_schema.rb
-- db/migrate/20100929035252_add_missing_indexes_to_roles_users.rb
-- db/migrate/20101206013505_change_to_devise_users_table.rb
-- db/migrate/20110106184757_add_remember_created_at_to_users.rb
-- db/migrate/20110325213325_remove_password_salt_from_users.rb
-- features/lost_password.feature
-- features/manage_users.feature
-- features/step_definitions/lost_password.rb
-- features/step_definitions/user_steps.rb
-- features/support/factories.rb
-- features/support/paths.rb
-- lib/authenticated_system.rb
-- lib/gemspec.rb
-- lib/generators/refinerycms_authentication_generator.rb
+- lib/refinery/authenticated_system.rb
+- lib/refinery/authentication.rb
+- lib/refinery/authentication/configuration.rb
+- lib/refinery/authentication/engine.rb
 - lib/refinerycms-authentication.rb
 - license.md
 - refinerycms-authentication.gemspec
-- spec/models/user_spec.rb
+- spec/controllers/refinery/admin/users_controller_spec.rb
+- spec/factories/user.rb
+- spec/models/refinery/user_spec.rb
+- spec/requests/refinery/admin/users_spec.rb
+- spec/requests/refinery/passwords_spec.rb
+- spec/requests/refinery/sessions_spec.rb
 homepage: http://refinerycms.com
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: refinerycms
-rubygems_version: 1.8.22
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: Authentication engine for Refinery CMS
-test_files: []
-has_rdoc: 
+summary: Authentication extension for Refinery CMS
+test_files: 
+- spec/controllers/refinery/admin/users_controller_spec.rb
+- spec/factories/user.rb
+- spec/models/refinery/user_spec.rb
+- spec/requests/refinery/admin/users_spec.rb
+- spec/requests/refinery/passwords_spec.rb
+- spec/requests/refinery/sessions_spec.rb

data/app/controllers/admin/users_controller.rb

@@ -1,86 +0,0 @@
-module Admin
-  class UsersController < Admin::BaseController
-
-    crudify :user,
-            :order => 'username ASC',
-            :title_attribute => 'username',
-            :xhr_paging => true
-
-    before_filter :load_available_plugins_and_roles, :only => [:new, :create, :edit, :update]
-
-    def new
-      @user = User.new
-      @selected_plugin_names = []
-    end
-
-    def create
-      @user = User.new(params[:user])
-      @selected_plugin_names = params[:user][:plugins] || []
-      @selected_role_names = params[:user][:roles] || []
-
-      if @user.save
-        @user.plugins = @selected_plugin_names
-        # if the user is a superuser and can assign roles according to this site's
-        # settings then the roles are set with the POST data.
-        unless current_user.has_role?(:superuser) and RefinerySetting.find_or_set(:superuser_can_assign_roles, false)
-          @user.add_role(:refinery)
-        else
-          @user.roles = @selected_role_names.collect{|r| Role[r.downcase.to_sym]}
-        end
-
-        redirect_to(admin_users_url, :notice => t('created', :what => @user.username, :scope => 'refinery.crudify'))
-      else
-        render :action => 'new'
-      end
-    end
-
-    def edit
-      @user = User.find params[:id]
-      @selected_plugin_names = @user.plugins.collect{|p| p.name}
-    end
-
-    def update
-      # Store what the user selected.
-      @selected_role_names = params[:user].delete(:roles) || []
-      unless current_user.has_role?(:superuser) and RefinerySetting.find_or_set(:superuser_can_assign_roles, false)
-        @selected_role_names = @user.roles.collect{|r| r.title}
-      end
-      @selected_plugin_names = params[:user][:plugins]
-
-      # Prevent the current user from locking themselves out of the User manager
-      if current_user.id == @user.id and (params[:user][:plugins].exclude?("refinery_users") || @selected_role_names.map(&:downcase).exclude?("refinery"))
-        flash.now[:error] = t('cannot_remove_user_plugin_from_current_user', :scope => 'admin.users.update')
-        render :action => "edit"
-      else
-        # Store the current plugins and roles for this user.
-        @previously_selected_plugin_names = @user.plugins.collect{|p| p.name}
-        @previously_selected_roles = @user.roles
-        @user.roles = @selected_role_names.collect{|r| Role[r.downcase.to_sym]}
-        if params[:user][:password].blank? and params[:user][:password_confirmation].blank?
-          params[:user].delete(:password)
-          params[:user].delete(:password_confirmation)
-        end
-
-        if @user.update_attributes(params[:user])
-          redirect_to admin_users_url, :notice => t('updated', :what => @user.username, :scope => 'refinery.crudify')
-        else
-          @user.plugins = @previously_selected_plugin_names
-          @user.roles = @previously_selected_roles
-          @user.save
-          render :action => 'edit'
-        end
-      end
-    end
-
-  protected
-
-    def load_available_plugins_and_roles
-      @available_plugins = ::Refinery::Plugins.registered.in_menu.collect{|a|
-        {:name => a.name, :title => a.title}
-      }.sort_by {|a| a[:title]}
-
-      @available_roles = Role.all
-    end
-
-  end
-end

data/app/controllers/passwords_controller.rb

@@ -1,42 +0,0 @@
-class PasswordsController < ::Devise::PasswordsController
-  layout 'login'
-
-  # Rather than overriding devise, it seems better to just apply the notice here.
-  after_filter :give_notice, :only => [:update]
-  def give_notice
-    unless %w(notice error alert).include?(flash.keys.map(&:to_s)) or @user.errors.any?
-      flash[:notice] = t('successful', :scope => 'users.reset', :email => @user.email)
-    end
-  end
-  protected :give_notice
-
-  # GET /registrations/password/edit?reset_password_token=abcdef
-  def edit
-    if params[:reset_password_token] and (@user = User.where(:reset_password_token => params[:reset_password_token]).first).present?
-      render_with_scope :edit
-    else
-      redirect_to(new_user_password_url, :flash => ({
-        :error => t('code_invalid', :scope => 'users.reset')
-      }))
-    end
-  end
-
-  # POST /registrations/password
-  def create
-    if params[:user].present? and (email = params[:user][:email]).present? and
-       (user = User.where(:email => email).first).present?
-
-      # Call devise reset function.
-      user.send(:generate_reset_password_token!)
-      UserMailer.reset_notification(user, request).deliver
-      redirect_to new_user_session_path, :notice => t('email_reset_sent', :scope => 'users.forgot') and return
-    else
-      flash.now[:error] = if (email = params[:user][:email]).blank?
-        t('blank_email', :scope => 'users.forgot')
-      else
-        t('email_not_associated_with_account_html', :email => ERB::Util.html_escape(email), :scope => 'users.forgot').html_safe
-      end
-      render_with_scope :new
-    end
-  end
-end

data/app/controllers/sessions_controller.rb

@@ -1,23 +0,0 @@
-class SessionsController < ::Devise::SessionsController
-  layout 'login'
-
-  before_filter :clear_unauthenticated_flash, :only => [:new]
-
-  def create
-    super
-  rescue ::BCrypt::Errors::InvalidSalt, ::BCrypt::Errors::InvalidHash
-    flash[:error] = t('password_encryption', :scope => 'users.forgot')
-    redirect_to new_user_password_path
-  end
-
-protected
-  # We don't like this alert.
-  def clear_unauthenticated_flash
-    if flash.keys.include?(:alert) and flash.values.any?{|v|
-      ['unauthenticated', t('unauthenticated', :scope => 'devise.failure')].include?(v)
-    }
-      flash.delete(:alert)
-    end
-  end
-
-end

data/app/controllers/users_controller.rb

@@ -1,67 +0,0 @@
-class UsersController < ::Devise::RegistrationsController
-
-  # Protect these actions behind an admin login
-  before_filter :redirect?, :only => [:new, :create]
-
-  layout 'login'
-
-  def new
-    @user = User.new
-  end
-
-  # This method should only be used to create the first Refinery user.
-  def create
-    @user = User.new(params[:user])
-    @selected_plugin_titles = params[:user][:plugins] || []
-
-    @user.save if @user.valid?
-
-    if @user.errors.empty?
-      @user.add_role(:refinery)
-      @user.plugins = @selected_plugin_titles
-      @user.save
-      if Role[:refinery].users.count == 1
-        # this is the superuser if this user is the only user.
-        @user.add_role(:superuser)
-        @user.save
-
-        # set this user as the recipient of inquiry notifications, if we're using that engine.
-        if defined?(InquirySetting) and
-          (notification_recipients = InquirySetting.find_or_create_by_name("Notification Recipients")).present?
-          notification_recipients.update_attributes({
-            :value => @user.email,
-            :destroyable => false
-          })
-        end
-      end
-
-      flash[:message] = "<h2>#{t('welcome', :scope => 'users.create', :who => @user.username).gsub(/\.$/, '')}.</h2>".html_safe
-
-      site_name_setting = RefinerySetting.find_or_create_by_name('site_name', :value => "Company Name")
-      if site_name_setting.value.to_s =~ /^(|Company\ Name)$/ or Role[:refinery].users.count == 1
-        flash[:message] << "<p>#{t('setup_website_name_html', :scope => 'users',
-                                   :link => edit_admin_refinery_setting_path(site_name_setting, :dialog => true),
-                                   :title => t('edit', :scope => 'admin.refinery_settings'))}</p>".html_safe
-      end
-      sign_in(@user)
-      redirect_back_or_default(admin_root_url)
-    else
-      render :action => 'new'
-    end
-  end
-
-protected
-
-  def redirect?
-    if refinery_user?
-      redirect_to admin_users_url
-    elsif refinery_users_exist?
-      redirect_to new_user_session_path
-    end
-  end
-
-  def refinery_users_exist?
-    Role[:refinery].users.any?
-  end
-
-end

data/app/helpers/sessions_helper.rb

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

data/app/helpers/users_helper.rb

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

data/app/mailers/user_mailer.rb

@@ -1,20 +0,0 @@
-class UserMailer < ActionMailer::Base
-
-  def reset_notification(user, request)
-    @user = user
-    @url = edit_user_password_url(:host => request.host_with_port,
-                                  :reset_password_token => @user.reset_password_token)
-
-    domain = request.domain(RefinerySetting.find_or_set(:tld_length, 1))
-
-    mail(:to => user.email,
-         :subject => t('subject', :scope => 'user_mailer.reset_notification'),
-         :from => "\"#{RefinerySetting[:site_name]}\" <no-reply@#{domain}>")
-  end
-
-protected
-
-  def url_prefix(request)
-    "#{request.protocol}#{request.host_with_port}"
-  end
-end

data/app/models/role.rb

@@ -1,16 +0,0 @@
-class Role < ActiveRecord::Base
-
-  has_and_belongs_to_many :users
-
-  before_validation :camelize_title
-  validates :title, :uniqueness => true
-
-  def camelize_title(role_title = self.title)
-    self.title = role_title.to_s.camelize
-  end
-
-  def self.[](title)
-    find_or_create_by_title(title.to_s.camelize)
-  end
-
-end

data/app/models/roles_users.rb

@@ -1,6 +0,0 @@
-class RolesUsers < ActiveRecord::Base
-
-  belongs_to :role
-  belongs_to :user
-
-end

data/app/models/user.rb

@@ -1,65 +0,0 @@
-require 'devise'
-
-class User < ActiveRecord::Base
-  has_and_belongs_to_many :roles
-  has_many :plugins, :class_name => "UserPlugin", :order => "position ASC", :dependent => :destroy
-  has_friendly_id :username, :use_slug => true
-
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :confirmable, :lockable and :timeoutable
-  devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable
-
-  # Setup accessible (or protected) attributes for your model
-  # :login is a virtual attribute for authenticating by either username or email
-  # This is in addition to a real persisted field like 'username'
-  attr_accessor :login
-  attr_accessible :email, :password, :password_confirmation, :remember_me, :username, :plugins, :login
-
-  validates :username, :presence => true, :uniqueness => true
-
-  class << self
-    # Configure authentication_keys here instead of devise.rb initialzer so we don't overwrite standard devise models
-    def authentication_keys
-      [:login]
-    end
-
-    # Find user by email or username.
-    # https://github.com/plataformatec/devise/wiki/How-To:-Allow-users-to-sign_in-using-their-username-or-email-address
-    def find_for_database_authentication(conditions)
-      value = conditions[authentication_keys.first]
-      where(["username = :value OR email = :value", { :value => value }]).first
-    end
-  end
-
-  def plugins=(plugin_names)
-    if persisted? # don't add plugins when the user_id is nil.
-      UserPlugin.delete_all(:user_id => id)
-
-      plugin_names.each_with_index do |plugin_name, index|
-        plugins.create(:name => plugin_name, :position => index) if plugin_name.is_a?(String)
-      end
-    end
-  end
-
-  def authorized_plugins
-    plugins.collect { |p| p.name } | Refinery::Plugins.always_allowed.names
-  end
-
-  def can_delete?(user_to_delete = self)
-    user_to_delete.persisted? and
-    id != user_to_delete.id and
-    !user_to_delete.has_role?(:superuser) and
-    Role[:refinery].users.count > 1
-  end
-
-  def add_role(title)
-    raise ArgumentException, "Role should be the title of the role not a role object." if title.is_a?(Role)
-    roles << Role[title] unless has_role?(title)
-  end
-
-  def has_role?(title)
-    raise ArgumentException, "Role should be the title of the role not a role object." if title.is_a?(Role)
-    roles.any?{|r| r.title == title.to_s.camelize}
-  end
-
-end

data/app/models/user_plugin.rb

@@ -1,6 +0,0 @@
-class UserPlugin < ActiveRecord::Base
-
-  belongs_to :user
-  attr_accessible :user_id, :name, :position
-
-end

data/app/views/admin/users/_actions.html.erb

@@ -1,5 +0,0 @@
-<ul>
-  <li>
-    <%= link_to t('.create_new_user'), new_admin_user_url, :class => "add_icon" %>
-  </li>
-</ul>

data/app/views/admin/users/_user.html.erb

@@ -1,19 +0,0 @@
-<li id="sortable_<%= user.id %>" class='clearfix record <%= cycle("on", "on-hover") %>'>
-  <span class='title'>
-    <strong><%= user.username %></strong>
-    <span class="preview">
-      <%= t('.preview', :who => user.email, :created_at => l(user.created_at, :format => :short)) %>
-    </span>
-  </span>
-  <span class='actions'>
-    <%= mail_to user.email, refinery_icon_tag('email_go.png'),
-                :title => t('.email_user') %>
-    <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_user_path(user),
-                :title => t('edit', :scope => 'admin.users')%>
-    <%= link_to refinery_icon_tag('delete.png'), admin_user_path(user),
-                :class => "cancel confirm-delete",
-                :title => t('delete', :scope => 'admin.users'),
-                :method => :delete,
-                :confirm => t('message', :scope => 'shared.admin.delete', :title => user.username) if current_user.can_delete?(user) %>
-  </span>
-</li>

data/app/views/admin/users/_users.html.erb

@@ -1,4 +0,0 @@
-<%= will_paginate @users %>
-<ul>
-  <%= render :partial => "user", :collection => @users %>
-</ul>

data/app/views/admin/users/edit.html.erb

@@ -1 +0,0 @@
-<%= render :partial => 'form' %>

data/app/views/admin/users/index.html.erb

@@ -1,6 +0,0 @@
-<section id='records'>
-  <%= render :partial => 'records' %>
-</section>
-<aside id='actions'>
-  <%= render :partial => 'actions' %>
-</aside>