refinerycms-authentication 2.0.0 → 2.0.1

data/app/controllers/refinery/admin/users_controller.rb

@@ -37,8 +37,6 @@ module Refinery
       end
 
       def edit
-        @user = Refinery::User.find(params[:id])
-
         redirect_unless_user_editable!
 
         @selected_plugin_names = @user.plugins.collect(&:name)
@@ -81,20 +79,28 @@ module Refinery
 
     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] }
+      def find_user_with_slug
+        begin
+          find_user_without_slug
+        rescue ActiveRecord::RecordNotFound
+          @user = Refinery::User.all.detect{|u| u.to_param == params[:id]}
+        end
+      end
+      alias_method_chain :find_user, :slug
 
-      @available_roles = Refinery::Role.all
-    end
+      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 = Refinery::Role.all
+      end
 
       def redirect_unless_user_editable!
         unless current_refinery_user.can_edit?(@user)
           redirect_to(main_app.refinery_admin_users_path) and return
         end
       end
-
     end
   end
 end

data/app/controllers/refinery/passwords_controller.rb

@@ -42,7 +42,7 @@ module Refinery
         flash.now[:error] = if @refinery_user.email.blank?
           t('blank_email', :scope => 'refinery.users.forgot')
         else
-          t('email_not_associated_with_account_html', :email => @refinery_user.email, :scope => 'refinery.users.forgot').html_safe
+          t('email_not_associated_with_account_html', :email => @refinery_user.email, :scope => 'refinery.users.forgot')
         end
         render :new
       end

data/app/models/refinery/user.rb

@@ -87,7 +87,11 @@ module Refinery
     end
 
     def to_s
-      username
+      username.to_s
+    end
+
+    def to_param
+      to_s.parameterize
     end
 
   end

data/config/routes.rb

@@ -28,7 +28,9 @@ Refinery::Core::Engine.routes.draw do
       raise exc
     end
   end
+end
 
+Refinery::Core::Engine.routes.append do
   namespace :admin, :path => 'refinery' do
     resources :users, :except => :show
   end

data/lib/refinery/authentication/engine.rb

@@ -18,7 +18,7 @@ module Refinery
             :class_name => :'refinery/user',
             :title => 'username'
           }
-          plugin.url = { :controller => '/refinery/admin/users' }
+          plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.admin_users_path }
         end
       end
 

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
  
-Copyright (c) 2005-2011 [Resolve Digital](http://www.resolvedigital.com)
+Copyright (c) 2005-2012 [Resolve Digital](http://www.resolvedigital.com)
  
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/spec/controllers/refinery/admin/users_controller_spec.rb

@@ -4,12 +4,12 @@ describe Refinery::Admin::UsersController do
   login_refinery_superuser
 
   shared_examples_for "new, create, update, edit and update actions" do
-    it "should load roles" do
+    it "loads roles" do
       Refinery::Role.should_receive(:all).once{ [] }
       get :new
     end
 
-    it "should load plugins" do
+    it "loads plugins" do
       plugins = Refinery::Plugins.new
       plugins.should_receive(:in_menu).once{ [] }
 
@@ -19,7 +19,7 @@ describe Refinery::Admin::UsersController do
   end
 
   describe "#new" do
-    it "should render the new template" do
+    it "renders the new template" do
       get :new
       response.should be_success
       response.should render_template("refinery/admin/users/new")
@@ -29,7 +29,7 @@ describe Refinery::Admin::UsersController do
   end
 
   describe "#create" do
-    it "should create a new user with valid params" do
+    it "creates a new user with valid params" do
       user = Refinery::User.new :username => "bob"
       user.should_receive(:save).once{ true }
       Refinery::User.should_receive(:new).once.with(instance_of(HashWithIndifferentAccess)){ user }
@@ -39,7 +39,7 @@ describe Refinery::Admin::UsersController do
 
     it_should_behave_like "new, create, update, edit and update actions"
 
-    it "should re-render #new if there are errors" do
+    it "re-renders #new if there are errors" do
       user = Refinery::User.new :username => "bob"
       user.should_receive(:save).once{ false }
       Refinery::User.should_receive(:new).once.with(instance_of(HashWithIndifferentAccess)){ user }
@@ -50,8 +50,7 @@ describe Refinery::Admin::UsersController do
   end
 
   describe "#edit" do
-    it "should render the edit template" do
-      Refinery::User.should_receive(:find).at_least(1).times{ @refinery_superuser }
+    it "renders the edit template" do
       get :edit, :id => "1"
       response.should be_success
       response.should render_template("refinery/admin/users/edit")
@@ -61,7 +60,7 @@ describe Refinery::Admin::UsersController do
   end
 
   describe "#update" do
-    it "should update a user" do
+    it "updates a user" do
       user = FactoryGirl.create(:refinery_user)
       Refinery::User.should_receive(:find).at_least(1).times{ user }
       put "update", :id => user.id.to_s, :user => {}

data/spec/requests/refinery/admin/users_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe "manage users" do
-  login_refinery_user
+  login_refinery_superuser
 
   describe "new/create" do
     it "allows to create user" do
@@ -31,6 +31,20 @@ describe "manage users" do
       page.should have_content("cmsrefinery was successfully updated.")
       page.should have_content("cmsrefinery (cms@refinerycms.com)")
     end
+
+    let(:dotty_user) { FactoryGirl.create(:refinery_user, :username => 'user.name.with.lots.of.dots') }
+    it "accepts a username with a '.' in it" do
+      dotty_user # create the user
+      visit refinery.admin_users_path
+
+      page.should have_css("#sortable_#{dotty_user.id}")
+
+      within "#sortable_#{dotty_user.id}" do
+        click_link "Edit this user"
+      end
+
+      page.should have_css("form#edit_user_#{dotty_user.id}")
+    end
   end
 
   describe "destroy" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-authentication
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Philip Arndt
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-01 00:00:00 Z
+date: 2012-03-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -43,12 +43,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 2
         - 0
-        - 0
-        version: 2.0.0
+        - 1
+        version: 2.0.1
   version_requirements: *id002
   name: refinerycms-core
   type: :runtime