citygate 0.0.3 → 0.0.4

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Miguel Regedor
+Copyright (c) 2012 GroupBuddies
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,3 +1,5 @@
-= Citygate
+= Citygate {<img src="https://secure.travis-ci.org/zamith/citygate.png" />}[http://travis-ci.org/zamith/citygate]
 
-This project rocks and uses MIT-LICENSE.
+Citygate is a rails engine that provides your application with user authentication (on the site or through facebook or google) using Devise and fully customizable authorization using CanCan.
+
+It also provides a customizable backend for administrating all your users, using pjax and pushState making your website as fast as responsive as you ever wanted it to be.

data/Rakefile

@@ -1,6 +1,7 @@
 #!/usr/bin/env rake
 begin
   require 'bundler/setup'
+  require 'bundler/gem_tasks'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
@@ -23,8 +24,6 @@ end
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'

data/app/assets/javascripts/citygate/admin_users.coffee

@@ -0,0 +1,14 @@
+$ ->
+  # Every link that is click in the users area must push the state for the previous location and update the URL, 
+  # since everything is AJAXified
+  $("#users a").live "click", ->
+    # Push the state before the click (when it's the first page load it starts the stack)
+    history.pushState buildState(), "", window.location.href
+
+    # Gets the content for the container through AJAX
+    $.getScript @href, =>
+      # If the last url to be pushed to the history is different the one we're at, then push the new state
+      history.replaceState buildState(), "", @href if history.state.page isnt @href
+
+    # Prevent the page refresh
+    false

data/app/assets/javascripts/citygate/application.js

@@ -12,4 +12,5 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require citygate/global
 //= require_tree .

data/app/assets/javascripts/citygate/global.coffee

@@ -0,0 +1,14 @@
+$ ->
+  # Is triggered every time the user clicks the browser's back button or at page load (except for firefox)
+  window.onpopstate = (event) ->
+    # If there is a state on the stack use to populate the container
+    $(event.state.holder).html(event.state.html) if event.state?
+
+  # Helper to build the state JSON object
+  buildState = ->
+    { 
+      html: $("#container").html(), 
+      holder: "#container", 
+      page: window.location.href
+    }
+

data/app/controllers/citygate/admin/application_controller.rb

@@ -0,0 +1,5 @@
+class Citygate::Admin::ApplicationController < Citygate::ApplicationController
+  protect_from_forgery
+  layout 'admin/application'
+
+end

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

@@ -0,0 +1,17 @@
+class Citygate::Admin::UsersController < Citygate::Admin::ApplicationController
+  load_and_authorize_resource :class => "Citygate::User"
+  respond_to :html, :json, :js
+
+  def index
+    @users = Citygate::User.paginate(per_page: 1, page: params[:page])
+    
+    respond_with @users
+  end
+  
+  def show
+    @user = Citygate::User.find(params[:id])
+    
+    respond_with @user
+  end
+  
+end

data/app/controllers/citygate/application_controller.rb

@@ -0,0 +1,24 @@
+# You can change the way CanCan handles an access denied to the user
+# by writing a rescue_from method in your application_controller.rb
+# @example CanCan::AccessDenied handling
+#   rescue_from CanCan::AccessDenied do |exception|
+#     redirect_to my_custom_path, :alert => exception.message
+#   end
+class Citygate::ApplicationController < ::ApplicationController
+  protect_from_forgery
+  
+  rescue_from CanCan::AccessDenied do |exception|
+    redirect_to root_url, :alert => exception.message
+  end unless ::ApplicationController.rescue_handlers.assoc "CanCan::AccessDenied"
+  
+  # Gets or creates an Ability instance for usage with CanCan
+  def current_ability
+    @current_ability ||= Citygate::Ability.new(current_user)
+  end
+  
+  # Change Devise's redirect after sign in url
+  # @param [Object] resource_or_scope Not used here
+  def stored_location_for(resource_or_scope)
+    root_url
+  end
+end

data/app/controllers/citygate/home_controller.rb

@@ -0,0 +1,7 @@
+class Citygate::HomeController < Citygate::ApplicationController
+  authorize_resource :class => false
+  
+  def index
+    @users = Citygate::User.all
+  end
+end

data/app/controllers/{users → citygate/users}/omniauth_callbacks_controller.rb

@@ -1,4 +1,4 @@
-class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
+class Citygate::Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
 
   def facebook
     oauthorize "Facebook"
@@ -77,27 +77,27 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
 
   def find_for_oauth_by_uid(uid, resource=nil)
     user = nil
-    if auth = Authorization.find_by_uid(uid.to_s)
+    if auth = Citygate::Authorization.find_by_uid(uid.to_s)
       user = auth.user
     end
     return user
   end
 
   def find_for_oauth_by_email(email, resource=nil)
-    if user = User.find_by_email(email)
+    if user = Citygate::User.find_by_email(email)
       user
     else
-      user = User.new(:email => email, :password => Devise.friendly_token[0,20]) 
+      user = Citygate::User.new(:email => email, :password => Devise.friendly_token[0,20]) 
       user.save
     end
     return user
   end
   
   def find_for_oauth_by_name(name, resource=nil)
-    if user = User.find_by_name(name)
+    if user = Citygate::User.find_by_name(name)
       user
     else
-      user = User.new(:name => name, :password => Devise.friendly_token[0,20], :email => "#{UUIDTools::UUID.random_create}@host")
+      user = Citygate::User.new(:name => name, :password => Devise.friendly_token[0,20], :email => "#{UUIDTools::UUID.random_create}@host")
       user.save false
     end
     return user

data/app/controllers/citygate/users_controller.rb

@@ -0,0 +1,7 @@
+class Citygate::UsersController < ApplicationController
+  load_and_authorize_resource :class => "Citygate::User"
+
+  def show
+    @user = User.find(params[:id])
+  end
+end

data/app/models/citygate/ability.rb

@@ -0,0 +1,31 @@
+module Citygate
+  # @author Zamith
+  class Ability
+    include CanCan::Ability
+  
+    # Defines the permissions for a user wich is not logged in or if it is, 
+    # calls the corresponding method to its role
+    # @param [Citygate::User] user the current user
+    def initialize(user)
+      @user = user || User.new # guest user (not logged in)
+      
+      can :index, :home
+      
+      if @user.role
+        send(@user.role.name.downcase)
+      end
+    end
+    
+    # Defines the permissions on a user with the role of member
+    def member
+      can :read, Citygate::User
+    end
+    
+    # Defines the permissions on a user with the role of admin, which inherits from member
+    def admin
+      member
+      can :manage, :all
+    end
+    
+  end
+end

data/app/models/citygate/authorization.rb

@@ -0,0 +1,12 @@
+module Citygate
+  # @author Zamith
+  # Holds the authorizations given by the users to get information 
+  # from their facebook and/or google accounts
+  class Authorization < ActiveRecord::Base
+    
+    belongs_to :user
+    
+    # @!visibility public
+    attr_accessible :provider, :uid, :user_id, :token, :secret, :name, :link, :image_url
+  end
+end

data/app/models/citygate/role.rb

@@ -0,0 +1,6 @@
+module Citygate
+  # @author Zamith
+  class Role < ActiveRecord::Base
+    
+  end
+end

data/app/models/citygate/user.rb

@@ -0,0 +1,41 @@
+module Citygate
+  
+  # @author Zamith
+  # @!attribute name
+  #   @return [String] the name of the user
+  # @!attribute email
+  #   @return [String] the email of the user
+  class User < ActiveRecord::Base
+    include Gravatar
+
+    # @!group Devise configurations
+    devise :database_authenticatable, :registerable, :encryptable,
+      :recoverable, :rememberable, :trackable, :validatable, :confirmable, :omniauthable
+
+    devise  :encryptor => :sha1
+    # @!endgroup
+
+    attr_accessible :name, :email, :password, :password_confirmation, :remember_me, :confirmed_at
+
+    has_many :authorizations, :dependent => :destroy
+    belongs_to :role
+
+    # Get the json object for an user
+    # @example
+    #   {
+    #     "email": "user@example.com",
+    #     "name": "First User",
+    #     "link": null,
+    #     "image": "https://secure.gravatar.com/avatar/b58996c504c5638798eb6b511e6f49af.png/rating=g"
+    #   }
+    def as_json(options = {})
+      authorization = self.authorizations.first
+      {
+        email: email,
+        name: name || (authorization.name if authorization),
+        link: (authorization.link if authorization),
+        image: (authorization.image_url if authorization) || self.gravatar_url
+      }
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+<% @users.each do |user| %>
+  <div class="user">
+    <span class="email"><%= user.email %></span>
+    <%= content_tag(:span, user.name) if user.name %>
+    <div class="user-links">
+      <%= link_to "Show", admin_user_path(user), :class => "show-link" %>
+      <%= link_to "Edit", edit_admin_user_path(user), :class => "edit-link" if can? :update, user %>
+    </div>
+  </div>
+<% end %>
+
+<%= will_paginate @users %>

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

@@ -0,0 +1,3 @@
+<div id="users">
+  <%= render "users" %>
+</div>

data/app/views/citygate/admin/users/index.js.erb

@@ -0,0 +1 @@
+$("#users").html("<%= escape_javascript(render("users")) %>");

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

@@ -0,0 +1,2 @@
+<p>User: <%= @user.name %></p>
+<p>Email: <%= @user.email if @user.email %></p>

data/app/views/citygate/admin/users/show.js.erb

@@ -0,0 +1 @@
+$("#container").html("<%= escape_javascript(render("user_show")) %>");

data/app/views/citygate/home/index.html.erb

@@ -0,0 +1,6 @@
+<header>
+  <h1>NORMAL PANEL</h1>
+  <nav>
+    <%= render 'citygate/shared/navigation' %>
+  </nav>
+</header>

data/app/views/{shared → citygate/shared}/_navigation.html.erb

@@ -8,8 +8,12 @@
 
     <li><%= link_to('Sign up', new_user_registration_path) %></li>
 
-    <% User.omniauth_providers.each do |provider| %>
-      <li><%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(User.new, provider) %></li>
+    <% Citygate::User.omniauth_providers.each do |provider| %>
+      <li><%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(Citygate::User.new, provider) %></li>
     <% end -%>
   <% end %>
+
+  <% if can?(:read, Citygate::User) && !params[:controller]["admin"]  %>
+    <li><%= link_to("Admin", admin_users_path) %></li>
+  <% end %>
 </ul>

data/app/views/layouts/admin/application.html.erb

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <%= stylesheet_link_tag    "citygate/application", :media => "all" %>
+  <%= javascript_include_tag "citygate/application" %>
+  <%= csrf_meta_tags %>
+  <%= yield :head %>
+</head>
+<body>
+  <%= render 'citygate/shared/navigation' %>
+
+  <% flash.each do |name, msg| %>
+    <%= content_tag :div, msg, :id => "flash_#{name}" if msg.is_a?(String) %>
+  <% end %>
+  <div id="container" class="container">
+    <%= yield %>
+  </div>
+</body>
+</html>

data/app/views/layouts/{citygate_layout.html.erb → application.html.erb}

@@ -2,7 +2,7 @@
   <%= stylesheet_link_tag 'citygate/application' %>
 <% end %>
 
-<%= render 'shared/navigation' %>
+<%= render 'citygate/shared/navigation' %>
 
 <% flash.each do |name, msg| %>
   <%= content_tag :div, msg, :id => "flash_#{name}" if msg.is_a?(String) %>

data/config/initializers/devise.rb

@@ -224,4 +224,8 @@ Devise.setup do |config|
   #   manager.intercept_401 = false
   #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
   # end
+  
+  Devise.setup do |config|
+    config.router_name = :citygate
+  end
 end

data/config/routes.rb

@@ -1,11 +1,13 @@
-Rails.application.routes.draw do
+Citygate::Engine.routes.draw do
   root :to => "home#index"
-  match 'user_root' => 'home#index'
-
-  devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
+  
+  devise_for :users, 
+             :controllers => { :omniauth_callbacks => "citygate/users/omniauth_callbacks" }, 
+             :class_name => "Citygate::User",
+             :module => :devise
   resources :users, :only => [:show]
     
-  namespace "admin" do
+  namespace "admin", constraints: { format: /(json|html|js| )/ } do
     resources :users
   end
   

data/db/migrate/20120303195052_devise_create_users.rb

@@ -1,6 +1,6 @@
 class DeviseCreateUsers < ActiveRecord::Migration
   def change
-    create_table(:users) do |t|
+    create_table(:citygate_users) do |t|
       ## Database authenticatable
       t.string :email,              :null => false, :default => ""
       t.string :encrypted_password, :null => false, :default => ""
@@ -40,8 +40,8 @@ class DeviseCreateUsers < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index :users, :email,                :unique => true
-    add_index :users, :reset_password_token, :unique => true
+    add_index :citygate_users, :email,                :unique => true
+    add_index :citygate_users, :reset_password_token, :unique => true
     # add_index :users, :confirmation_token,   :unique => true
     # add_index :users, :unlock_token,         :unique => true
     # add_index :users, :authentication_token, :unique => true

data/db/migrate/20120303195103_add_name_to_users.rb

@@ -1,6 +1,5 @@
 class AddNameToUsers < ActiveRecord::Migration
   def change
-    add_column :users, :name, :string
-
+    add_column :citygate_users, :name, :string
   end
 end

data/db/migrate/20120303195111_add_confirmable_to_users.rb

@@ -1,12 +1,11 @@
 class AddConfirmableToUsers < ActiveRecord::Migration
   def change
-    add_column :users, :confirmation_token, :string
+    add_column :citygate_users, :confirmation_token, :string
 
-    add_column :users, :confirmed_at, :datetime
+    add_column :citygate_users, :confirmed_at, :datetime
 
-    add_column :users, :confirmation_sent_at, :datetime
-
-    add_column :users, :unconfirmed_email, :string
+    add_column :citygate_users, :confirmation_sent_at, :datetime
 
+    add_column :citygate_users, :unconfirmed_email, :string
   end
 end

data/db/migrate/20120303195145_devise_invitable_add_to_users.rb

@@ -1,6 +1,6 @@
 class DeviseInvitableAddToUsers < ActiveRecord::Migration
   def up
-    change_table :users do |t|
+    change_table :citygate_users do |t|
       t.string     :invitation_token, :limit => 60
       t.datetime   :invitation_sent_at
       t.datetime   :invitation_accepted_at
@@ -11,11 +11,11 @@ class DeviseInvitableAddToUsers < ActiveRecord::Migration
     end
 
     # And allow null encrypted_password and password_salt:
-    change_column_null :users, :encrypted_password, true
+    change_column_null :citygate_users, :encrypted_password, true
   end
 
   def down
-    change_table :users do |t|
+    change_table :citygate_users do |t|
       t.remove_references :invited_by, :polymorphic => true
       t.remove :invitation_limit, :invitation_sent_at, :invitation_accepted_at, :invitation_token
     end

data/db/migrate/20120507112430_add_omniauth_to_devise.rb

@@ -1,9 +1,9 @@
 class AddOmniauthToDevise < ActiveRecord::Migration
   def change
-    add_index :users, :confirmation_token,   :unique => true
-    add_column :users , :password_salt, :string
+    add_index :citygate_users, :confirmation_token,   :unique => true
+    add_column :citygate_users , :password_salt, :string
     
-    create_table :authorizations do |t|
+    create_table :citygate_authorizations do |t|
       t.string :provider
       t.string :uid
       t.integer :user_id

data/db/migrate/20120523163700_create_roles.rb

@@ -0,0 +1,10 @@
+class CreateRoles < ActiveRecord::Migration
+  def change
+    create_table :citygate_roles do |t|
+      t.string :name
+      t.timestamps
+    end
+    
+    add_column :citygate_users, :role_id, :integer
+  end
+end

data/db/seeds.rb

@@ -5,6 +5,13 @@
 #
 #   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
 #   Mayor.create(name: 'Emanuel', city: cities.first)
-puts 'SETTING UP DEFAULT USER LOGIN'
-user = User.create! :name => 'First User', :email => 'user@example.com', :password => 'please', :password_confirmation => 'please', :confirmed_at => DateTime.now
-puts 'New user created: ' << user.name
+
+puts 'SETTING UP ROLES...'
+roles = [ 
+  {:name => "Member"},
+  {:name => "Admin"}
+]
+
+roles.each do |attributes| 
+  Citygate::Role.find_or_initialize_by_name(attributes[:name]).save!
+end

data/lib/app_controller_helpers.rb

@@ -4,17 +4,6 @@ module AppControllerHelpers
   end
   
   module InstanceMethods
-    # Devise hack
-    def stored_location_for(resource_or_scope)
-      root_url
-    end
-
-    def after_sign_in_path_for(resource)
-      # This should work, but session is lost. See https://github.com/plataformatec/devise/issues/1357
-      # return_to = session[:return_to]
-      # session[:return_to] = nil
-      return_to = request.env['omniauth.origin']
-      stored_location_for(resource) || return_to || root_path
-    end 
+    
   end
 end

data/lib/citygate/engine.rb

@@ -10,8 +10,7 @@ require 'omniauth-facebook'
 require 'omniauth-openid'
 require 'uuidtools'
 require 'will_paginate'
-
-require "citygate"
+require 'cancan'
 
 module Citygate
   def self.root
@@ -19,5 +18,6 @@ module Citygate
   end
 
   class Engine < ::Rails::Engine
+    isolate_namespace Citygate
   end
 end

data/lib/citygate/version.rb

@@ -1,3 +1,3 @@
 module Citygate
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/citygate.rb

@@ -1,8 +1,8 @@
 require "citygate/engine"
 
 module Citygate
-  require "#{File.join(Citygate.root,'lib/app_controller_helpers')}"
-    
+  Dir["#{Citygate.root}/lib/*.rb"].each {|file| require file}
+
   ActiveSupport.on_load(:action_controller) do
     extend AppControllerHelpers::ClassMethods
     include AppControllerHelpers::InstanceMethods

data/lib/gravatar.rb

@@ -0,0 +1,13 @@
+require 'digest/md5'
+
+module Gravatar
+
+  def gravatar_id
+    Digest::MD5.hexdigest(self.email.to_s.downcase)
+  end
+  
+  def gravatar_url(options = { rating: 'g'})
+    "https://secure.gravatar.com/avatar/#{self.gravatar_id}.png/rating=#{options[:rating]}"
+  end
+
+end

metadata

@@ -2,7 +2,7 @@
 name: citygate
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Group Buddies
@@ -10,12 +10,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-18 00:00:00 +01:00
-default_executable: 
+date: 2012-05-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -23,10 +21,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 3.2.2
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: haml
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,10 +32,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 3.1.4
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: devise
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,10 +43,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.4
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: devise-encryptable
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -56,10 +54,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.1.1
   type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: devise_invitable
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -67,10 +65,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :runtime
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: omniauth
-  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,10 +76,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.2
   type: :runtime
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: omniauth-facebook
-  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -89,10 +87,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.0
   type: :runtime
+  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: omniauth-openid
-  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -100,10 +98,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.1
   type: :runtime
+  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: uuidtools
-  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -111,10 +109,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.1.2
   type: :runtime
+  prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: will_paginate
-  prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -122,194 +120,140 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 3.0.3
   type: :runtime
+  prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: thin
-  prerelease: false
+  name: cancan
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.1
-  type: :development
+        version: 1.6.7
+  type: :runtime
+  prerelease: false
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: haml-rails
-  prerelease: false
+  name: thin
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.4
+        version: 1.3.1
   type: :development
+  prerelease: false
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: guard
-  prerelease: false
+  name: haml-rails
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.2
+        version: 0.3.4
   type: :development
+  prerelease: false
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: rb-fsevent
-  prerelease: false
+  name: rspec-rails
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.8.1
   type: :development
+  prerelease: false
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: growl
-  prerelease: false
+  name: email_spec
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.2.1
   type: :development
+  prerelease: false
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: guard-bundler
-  prerelease: false
+  name: factory_girl
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.1.3
+        version: 2.6.4
   type: :development
+  prerelease: false
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: guard-rails
-  prerelease: false
+  name: cucumber-rails
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.3
+        version: 1.3.0
   type: :development
+  prerelease: false
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  name: guard-livereload
-  prerelease: false
+  name: capybara
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 1.1.2
   type: :development
+  prerelease: false
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: guard-rspec
-  prerelease: false
+  name: database_cleaner
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.3
+        version: 0.7.1
   type: :development
+  prerelease: false
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
-  name: guard-cucumber
-  prerelease: false
+  name: launchy
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.1
+        version: 2.0.5
   type: :development
+  prerelease: false
   version_requirements: *id020
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
-  prerelease: false
+  name: jasmine-rails
   requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.8.1
+        version: 0.0.3
   type: :development
+  prerelease: false
   version_requirements: *id021
 - !ruby/object:Gem::Dependency 
-  name: email_spec
-  prerelease: false
+  name: jasmine-jquery-rails
   requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.1
-  type: :development
-  version_requirements: *id022
-- !ruby/object:Gem::Dependency 
-  name: factory_girl
-  prerelease: false
-  requirement: &id023 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.6.4
-  type: :development
-  version_requirements: *id023
-- !ruby/object:Gem::Dependency 
-  name: cucumber-rails
-  prerelease: false
-  requirement: &id024 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.3.0
-  type: :development
-  version_requirements: *id024
-- !ruby/object:Gem::Dependency 
-  name: capybara
-  prerelease: false
-  requirement: &id025 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.2
-  type: :development
-  version_requirements: *id025
-- !ruby/object:Gem::Dependency 
-  name: database_cleaner
-  prerelease: false
-  requirement: &id026 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.7.1
+        version: "0"
   type: :development
-  version_requirements: *id026
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id027 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.5
-  type: :development
-  version_requirements: *id027
+  version_requirements: *id022
 description: Citygate is an Engine that provides user model with sign up and log in, admin backend for managing users.
 email: 
 - zamith@groupbuddies.com
@@ -320,31 +264,36 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- app/assets/javascripts/citygate/admin_users.coffee
 - app/assets/javascripts/citygate/application.js
+- app/assets/javascripts/citygate/global.coffee
 - app/assets/stylesheets/citygate/application.css.scss
 - app/assets/stylesheets/citygate/main.sass
-- app/controllers/admin/application_controller.rb
-- app/controllers/admin/users_controller.rb
-- app/controllers/application_controller.rb
-- app/controllers/home_controller.rb
-- app/controllers/users/omniauth_callbacks_controller.rb
-- app/controllers/users_controller.rb
+- app/controllers/citygate/admin/application_controller.rb
+- app/controllers/citygate/admin/users_controller.rb
+- app/controllers/citygate/application_controller.rb
+- app/controllers/citygate/home_controller.rb
+- app/controllers/citygate/users/omniauth_callbacks_controller.rb
+- app/controllers/citygate/users_controller.rb
 - app/helpers/citygate/application_helper.rb
-- app/models/authorization.rb
-- app/models/user.rb
-- app/views/admin/users/index.html.erb
-- app/views/admin/users/show.html.erb
-- app/views/devise/_links.erb
-- app/views/devise/registrations/edit.html.haml
-- app/views/home/index.html.erb
-- app/views/layouts/admin/application.html.haml
-- app/views/layouts/admin/citygate_admin_layout.html.erb
-- app/views/layouts/citygate.html.erb
-- app/views/layouts/citygate_layout.html.erb
-- app/views/shared/_navigation.html.erb
-- app/views/users/show.html.erb
+- app/models/citygate/ability.rb
+- app/models/citygate/authorization.rb
+- app/models/citygate/role.rb
+- app/models/citygate/user.rb
+- app/views/citygate/admin/users/_user_show.html.erb
+- app/views/citygate/admin/users/_users.html.erb
+- app/views/citygate/admin/users/index.html.erb
+- app/views/citygate/admin/users/index.js.erb
+- app/views/citygate/admin/users/show.html.erb
+- app/views/citygate/admin/users/show.js.erb
+- app/views/citygate/devise/_links.erb
+- app/views/citygate/devise/registrations/edit.html.haml
+- app/views/citygate/home/index.html.erb
+- app/views/citygate/shared/_navigation.html.erb
+- app/views/citygate/users/show.html.erb
+- app/views/layouts/admin/application.html.erb
+- app/views/layouts/application.html.erb
 - config/cucumber.yml
-- config/initializers/devise-lol.rb
 - config/initializers/devise.rb
 - config/locales/devise.en.yml
 - config/locales/devise_invitable.en.yml
@@ -355,16 +304,17 @@ files:
 - db/migrate/20120303195111_add_confirmable_to_users.rb
 - db/migrate/20120303195145_devise_invitable_add_to_users.rb
 - db/migrate/20120507112430_add_omniauth_to_devise.rb
+- db/migrate/20120523163700_create_roles.rb
 - db/seeds.rb
 - lib/app_controller_helpers.rb
 - lib/citygate/engine.rb
 - lib/citygate/version.rb
 - lib/citygate.rb
+- lib/gravatar.rb
 - lib/tasks/citygate_tasks.rake
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
-has_rdoc: true
 homepage: 
 licenses: []
 
@@ -378,19 +328,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 1496931421819216404
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 1496931421819216404
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple authentication and user management Engine.
 test_files: []
 
+has_rdoc: 

data/app/controllers/admin/application_controller.rb

@@ -1,3 +0,0 @@
-class Admin::ApplicationController < ActionController::Base
-  protect_from_forgery
-end

data/app/controllers/admin/users_controller.rb

@@ -1,11 +0,0 @@
-class Admin::UsersController < Admin::ApplicationController
-  before_filter :authenticate_user!
-  
-  def index
-    @users = User.paginate(per_page: 15, page: params[:page])
-  end
-  
-  def show
-    @user = User.find(params[:id])
-  end
-end

data/app/controllers/application_controller.rb

@@ -1,4 +0,0 @@
-class ApplicationController < ActionController::Base
-  protect_from_forgery
-  
-end

data/app/controllers/home_controller.rb

@@ -1,5 +0,0 @@
-class HomeController < ApplicationController
-  def index
-    @users = User.all
-  end
-end

data/app/controllers/users_controller.rb

@@ -1,7 +0,0 @@
-class UsersController < ApplicationController
-  before_filter :authenticate_user!
-
-  def show
-    @user = User.find(params[:id])
-  end
-end

data/app/models/authorization.rb

@@ -1,6 +0,0 @@
-class Authorization < ActiveRecord::Base
-  
-  belongs_to :user
-  
-  attr_accessible :provider, :uid, :user_id, :token, :secret, :name, :link, :image_url
-end

data/app/models/user.rb

@@ -1,12 +0,0 @@
-class User < ActiveRecord::Base
-  devise :database_authenticatable, :registerable, :encryptable,
-         :recoverable, :rememberable, :trackable, :validatable, :confirmable, :omniauthable
-         
-  devise  :encryptor => :sha1
-
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :name, :email, :password, :password_confirmation, :remember_me, :confirmed_at
-  
-  
-  has_many :authorizations, :dependent => :destroy
-end

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

@@ -1,10 +0,0 @@
-<div id="users">
-  <% @users.each do |user| %>
-    <div class="user">
-      <span class="email"><%= user.email %></span>
-      <%= content_tag(:span, user.name) if user.name %>
-    </div>
-  <% end %>
-
-  <%= will_paginate @users %>
-</div>

data/app/views/home/index.html.erb

@@ -1,8 +0,0 @@
-<header>
-  <h1>NORMAL PANEL</h1>
-  <nav>
-    <ul class="hmenu">
-      <%= render 'shared/navigation' %>
-    </ul>
-  </nav>
-</header>

data/app/views/layouts/admin/citygate_admin_layout.html.erb

@@ -1,32 +0,0 @@
-!!!
-%html
-  %head
-    %title Citygate
-    %meta{:charset => "utf-8"}
-    %meta{"http-equiv" => "X-UA-Compatible", :content => "IE=edge,chrome=1"}
-    %meta{:name => "viewport", :content => "width=device-width, initial-scale=1, maximum-scale=1"}
-    = stylesheet_link_tag    "citygate/application", :media => "all"
-    = javascript_include_tag "citygate/application"
-    = csrf_meta_tags
-  %body{:class => params[:controller]}
-    #container.container
-      %header
-        .navbar.navbar-fixed-top
-          .navbar-inner
-            .container
-              %ul.nav
-                %li.active
-                  <a href="/">Home</a>
-                %li
-                  <a href="#">Link</a>
-                %li
-                  <a href="#">Link</a>
-        %h1 Admin PANEL
-        %nav
-          %ul.hmenu
-            = render 'shared/navigation'
-        - flash.each do |name, msg|
-          = content_tag :div, msg, :id => "flash_#{name}" if msg.is_a?(String)
-      #main{:role => "main"}
-        = yield
-      %footer

data/app/views/layouts/citygate.html.erb

@@ -1 +0,0 @@
-<%= render :file => "layouts/citygate_layout", :layout => "layouts/application" %>

data/config/initializers/devise-lol.rb

@@ -1,4 +0,0 @@
-#Devise.setup do |config|
-#  #config.router_name = :citygate
-#  config.parent_controller = 'ActionController::Base'
-#end