noodall-devise 0.0.1 → 0.1.0

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    noodall-devise (0.0.1)
+    noodall-devise (0.1.0)
       devise (~> 1.1.3)
       mm-devise (~> 1.1.6)
 
 PATH
   remote: /Users/steve/Gems/noodall-ui
   specs:
-    noodall-ui (0.0.2)
+    noodall-ui (0.0.5)
       dynamic_form
       noodall-core
       thoughtbot-sortable_table (= 0.0.6)
@@ -124,7 +124,7 @@ GEM
       jnunemaker-validatable (~> 1.8.4)
       plucky (~> 0.3.5)
     nokogiri (1.4.3.1)
-    noodall-core (0.1.0)
+    noodall-core (0.1.1)
       canable (= 0.1.1)
       mongo_mapper (= 0.8.4)
       ramdiv-mongo_mapper_acts_as_tree (= 0.1.1)

data/app/controllers/admin/users_controller.rb

@@ -1,6 +1,8 @@
 class Admin::UsersController < Noodall::Admin::BaseController
   include SortableTable::App::Controllers::ApplicationController
+  include Canable::Enforcers
   sortable_attributes :name, :email, :role
+  before_filter :enforce_admin_permission, :except => :index
 
   # GET /users
   # GET /users.xml
@@ -28,12 +30,7 @@ class Admin::UsersController < Noodall::Admin::BaseController
   # POST /users
   # POST /users.xml
   def create
-    @user = User.new(params[:user]) do |user|
-      # No need for email confirmation
-      user.email_confirmed = true
-      # Because mass assignment is protected
-      user.role = params[:user][:role]
-    end
+    @user = User.new(params[:user])
     respond_to do |format|
       if @user.save
         flash[:notice] = 'User was successfully created.'
@@ -73,6 +70,7 @@ class Admin::UsersController < Noodall::Admin::BaseController
   # DELETE /users/1.xml
   def destroy
     @user = User.find(params[:id])
+
     @user.destroy
     flash[:notice] = 'User was successfully deleted.'
 
@@ -82,4 +80,15 @@ class Admin::UsersController < Noodall::Admin::BaseController
     end
   end
 
+  # Uses tag cloud to render all groups
+  def groups
+    render :json => User.tag_cloud
+  end
+
+  private
+
+  def enforce_admin_permission
+    raise Canable::Transgression unless current_user.admin?
+  end
+
 end

data/app/models/user.rb

@@ -2,20 +2,24 @@ class User
   include MongoMapper::Document
   # Include default devise modules. Others available are:
   # :token_authenticatable, :confirmable, :lockable and :timeoutable
-  devise :database_authenticatable, 
+  devise :database_authenticatable,
          :recoverable, :rememberable, :trackable, :validatable
 
   include Canable::Cans
-  key :name, String
-  key :groups, Array
+  plugin Noodall::Tagging
 
+  key :name, String
   timestamps!
 
+  alias_attribute :groups, :tags
+  alias_attribute :group_list, :tag_list
+
   def full_name
     name || email
   end
 
   def admin?
-    groups.include?('admin')
+    tags.include?('admin')
   end
+
 end

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

@@ -1,7 +1,7 @@
 <h1>Listing Users</h1>
 
 <ul class="choices">
-<li><%= link_to 'Create New User', new_admin_user_path %></li>
+<li><%= link_to 'Create New User', new_admin_user_path, :class => 'button' %></li>
 </ul>
 
 <a class="tooltip" href="/cms_help.pdf">&nbsp;</a>
@@ -20,8 +20,8 @@
 <% for user in @users -%>
     <tr>
       <td><%= link_to user.name, [:admin, user], :class => 'edit', :title => 'Edit this user' %></td>
-      <td><%= user.email %></td>
-      <td><%= user.groups %></td>
+      <td><%= mail_to user.email %></td>
+      <td><%= user.group_list %></td>
       <td><%= link_to 'Delete', [:admin, user], :confirm => 'Are you sure?', :method => :delete, :class => 'delete', :title => 'Delete this user' %></td>
     </tr>
 <% end %>

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

@@ -4,33 +4,38 @@
   <%= f.error_messages %>
 
   <p>
+    <span class="tooltip" title="Enter the name of this user">&nbsp;</span>
     <%= f.label :name %><br/>
-    <%= f.text_field :name  %>
+    <span class="input-wrap"><%= f.text_field :name  %></span>
   </p>
 
   <p>
+    <span class="tooltip" title="Enter the email address the user will use to login">&nbsp;</span>
     <%= f.label :email %><br/>
-    <%= f.text_field :email %>
+    <span class="input-wrap"><%= f.text_field :email %></span>
   </p>
 
   <p>
+    <span class="tooltip" title="Enter the a password for the user">&nbsp;</span>
     <%= f.label :password %><br/>
-    <%= f.password_field :password, :onKeyUp => "updateStrength(this.value)"  %>
-    <div id="password-meter"><strong>Strength</strong><div id = "psContainer"><div id = "psStrength"></div></div></div>
+    <span class="input-wrap"><%= f.password_field :password, :onKeyUp => "updateStrength(this.value)"  %></span>
   </p>
 
   <p>
+    <span class="tooltip" title="Enter the password again to confirm it is correct">&nbsp;</span>
     <%= f.label :password_confirmation %><br/>
-    <%= f.password_field :password_confirmation %>
+    <span class="input-wrap"><%= f.password_field :password_confirmation %></span>
   </p>
 
   <p>
-    <%= f.label :groups %><br/>
-    <%= f.text_field :groups %>
+    <span class="tooltip" title="Enter the groups this user belongs to (comma seperated)">&nbsp;</span>
+    <%= f.label :group_list, "Groups" %><br/>
+    <span class="input-wrap"><%= f.text_field :group_list %></span>
   </p>
 
-  <p>
-    <%= f.submit @user.new_record? ? 'Create' : 'Update', :disable_with => 'Submitting...' %> or <%= link_to 'Cancel', admin_users_path %>
+  <p class="fixed-form">
+    <%= f.submit @user.new_record? ? 'Create' : 'Update', :disable_with => 'Submitting...', :class => 'update' %>
+    <%= link_to 'Cancel', admin_users_path, :class => 'cancel' %>
   </p>
 <% end %>
 

data/features/manage_users.feature

@@ -6,7 +6,8 @@ Feature: Manage users
 
   Scenario: List Users
     Given 20 users exist
-    And I am on the users admin page
+    And I am in the cms
+    When I follow "Users" within "ul#topnav"
     Then I should see a list of users
 
   Scenario: Create a User

data/features/step_definitions/user_steps.rb

@@ -10,6 +10,10 @@ Then /^I should see a list of users$/ do
   page.should have_css('tbody tr', :count => 20)
 end
 
+Given /^I am in the cms$/ do
+  visit noodall_admin_nodes_path
+end
+
 # Database
 
 Given /^a user exists with the attrubutes:$/ do |fields|

data/lib/noodall/devise/engine.rb

@@ -1,9 +1,9 @@
 module Noodall
   module Devise
     class Engine < Rails::Engine
-#      initializer "static assets" do |app|
-#        app.middleware.use ::ActionDispatch::Static, "#{root}/public"
-#      end
+      initializer "static assets" do |app|
+        Noodall::UI.menu_items['Users'] = :admin_users_path
+      end
     end
   end
 end

data/lib/noodall/devise/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module Devise
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -2,8 +2,6 @@
 <html>
 <head>
   <title>Dummy</title>
-  <%= stylesheet_link_tag :all %>
-  <%= javascript_include_tag :defaults %>
   <%= csrf_meta_tag %>
 </head>
 <body>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-devise
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: []
 
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 +00:00
+date: 2010-11-05 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency