citygate 0.0.6 → 0.0.7

data/README.rdoc

@@ -46,6 +46,19 @@ In case of development add this to +config/environments/development.rb+
 
   config.action_mailer.default_url_options = { :host => 'localhost:3000' }
 
+== Helper Configuration
+
+In order to get the helper methods citygate exposes you'll have to include them in your +app/controllers/application_controller.rb+ like so:
+
+  class ApplicationController < ActionController::Base
+    helper Citygate::Engine.helpers
+  end
+
+The exposed methods are:
+
+role_changer:: a select for changing roles (only available when logged in and in development)
+citygate_nav_links:: the default +nav+ for citygate with sign in, log out and admin links
+
 == OmniAuth Configuration
 
 Citygate needs your facebook apps identifiers which are loaded from a file you must create called +config/accounts.yml+ and has the following format:
@@ -54,8 +67,16 @@ Citygate needs your facebook apps identifiers which are loaded from a file you m
     app_id: "your app id from https://developers.facebook.com/apps"
     app_secret: "your app secret from https://developers.facebook.com/apps"
 
+This file is not required for the application to run, but without it the facebook login will not work.
+
 In case you are wondering, the reason it is not required for you to add your google OAuth identifier is because it is the same for everyone. It then redirects you to a authentication service within google servers.
 
+== Loading Assets
+
+In order to have the javascript added by Citygate you need to include it in your manifest file, like so:
+
+  //= require citygate
+
 == Citygate Options
 
 You can change citygate's defaults by editing your +config/application.rb+ file like so

data/app/assets/javascripts/citygate.js

@@ -12,5 +12,4 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require ./citygate/jquery.pjax
-//= require ./citygate/admin_users
+//= require citygate/home

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

@@ -1,2 +1,2 @@
 $ ->
-  $("a").pjax("#container").on 'click'
+  $("a").pjax("#pjax-container").on 'click'

data/app/assets/javascripts/citygate/home.js.coffee.erb

@@ -0,0 +1,13 @@
+$ ->
+  role_selector =
+    $el: $("#role_id")
+
+    select_new_role: ->
+      role_selector.$el.on "change", (event) ->
+        $.post "home/role_change", { data: role_selector.$el.val() }, (data) ->
+          window.location.href = data.redirect
+
+    init: ->
+      role_selector.select_new_role()
+
+  role_selector.init()

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

@@ -4,12 +4,10 @@ class Citygate::Admin::ApplicationController < Citygate::ApplicationController
 
   private
   def set_layout
-    if request.headers['X-PJAX-layout']
-      "admin/application"
-    elsif request.headers['X-PJAX']
+    if request.headers['X-NO-LAYOUT']
       false
     else
-      "admin/application"
+      "admin"
     end
   end
 end

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

@@ -14,4 +14,21 @@ class Citygate::Admin::UsersController < Citygate::Admin::ApplicationController
     respond_with @user
   end
 
+  def edit
+    @user = Citygate::User.find(params[:id])
+
+    respond_with @user
+  end
+
+  def update
+    @user = Citygate::User.find(params[:id])
+
+    if @user.update_without_password(params[:user])
+      flash[:notice] = t('admin.users.update.success')
+      redirect_to :action => 'show'
+    else
+      flash[:error] = t('admin.users.update.error')
+      redirect_to :action => 'edit'
+    end
+  end
 end

data/app/controllers/citygate/application_controller.rb

@@ -6,23 +6,30 @@
 #   end
 class Citygate::ApplicationController < ::ApplicationController
   protect_from_forgery
-  
+
+  before_filter :set_locale
+
   rescue_from CanCan::AccessDenied do |exception|
     redirect_to root_url, :alert => t('cancan.access_denied')
   end unless ::ApplicationController.rescue_handlers.assoc "CanCan::AccessDenied"
-  
+
   # Gets or creates an Ability instance for usage with CanCan
   def current_ability
     @current_ability ||= 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
-  
+
   # Defines the omniauth prefix so that citygate can be
   # mounted in anywhere
   Devise.omniauth_path_prefix = "#{Citygate::Engine.mount_path}/users/auth".squeeze "/"
+
+  # Sets the language for the current page
+  def set_locale
+    I18n.locale = params[:locale] || I18n.default_locale
+  end
 end

data/app/controllers/citygate/home_controller.rb

@@ -1,7 +1,16 @@
 class Citygate::HomeController < Citygate::ApplicationController
   authorize_resource :class => false
+  skip_authorize_resource :only => :role_change
   
   def index
     @users = Citygate::User.all
   end
+  
+  def role_change
+    saved = current_user.update_attribute :role_id, params[:data]
+    
+    respond_to do |format|
+      format.json { render json: { text: (saved) ? "OK" : "Arrebentou", redirect: root_path } }
+    end
+  end
 end

data/app/helpers/citygate/application_helper.rb

@@ -1,4 +1,16 @@
 module Citygate
   module ApplicationHelper
+    
+    def role_changer
+      if Rails.env == "development" && current_user
+        @role = current_user.role || Citygate::Role.new
+        render :partial => "citygate/home/role_changer"
+      end
+    end
+
+    def citygate_nav_links
+      render 'citygate/shared/navigation'
+    end
+
   end
 end

data/app/models/citygate/permission.rb

@@ -1,7 +1,24 @@
 module Citygate
   # @author Zamith
   class Permission < ActiveRecord::Base
-    attr_accessible :action, :subject_class, :subject_id, :role_id
+    attr_accessible :action, :subject_class, :subject_id, :role_id, :conditions
     belongs_to :role
+
+    # Load all the permissions for all the roles
+    # DB intensive, should run only once!
+    def self.load_all
+      permissions = {}
+
+      # Get guest permissions
+      permissions[:guest] = Citygate::Permission.find_all_by_role_id(nil)
+
+      # Get everyother role permissions
+      roles = Citygate::Role.select [:id, :name]
+      roles.each do |role|
+        permissions[role.name.underscore.to_sym] = Citygate::Permission.find_all_by_role_id(role.id)
+      end
+
+      return permissions
+    end
   end
 end

data/app/models/citygate/user.rb

@@ -50,9 +50,14 @@ module Citygate
     # Get the user's full name (the concatenation of his first and last names)
     # @return [String] the user's full name
     def full_name
-      "#{self.first_name} #{self.last_name}".strip
+      name = "#{self.first_name} #{self.last_name}".strip
+      (name.blank?) ? nil : name
     end
 
+    # Alias for name_or_email
+    def to_s
+      self.name_or_email
+    end
 
     protected
 

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

@@ -0,0 +1,22 @@
+<%= form_for @user, :url => admin_user_path(@user), :method => :put, :html => { :id => dom_id(@user, :edit) } do |f| %>
+  <%#= devise_error_messages! %>
+
+  <div class="field">
+    <%= f.label :first_name %>
+    <%= f.text_field :first_name %>
+  </div>
+
+  <div class="field">
+    <%= f.label :last_name %>
+    <%= f.text_field :last_name %>
+  </div>
+
+  <div class="field">
+    <%= f.label :email %>
+    <%= f.email_field :email %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit t('admin.users.edit.update_link') %>
+  </div>
+<% end %>

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

@@ -0,0 +1,3 @@
+<%= form_for @role, url: citygate.home_role_change_path do |f| %>
+  <%= select "role", "id", Citygate::Role.all.collect {|r| [r.name, r.id]} %>
+<% end %>

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

@@ -1,5 +1,3 @@
-<header>
-  <h1>Welcome to CityGate!</h1>
+<%= role_changer %>
 
-  <%= render 'citygate/shared/navigation' %>
-</header>
+<%= citygate_nav_links %>

data/app/views/citygate/shared/_navigation.html.erb

@@ -1,20 +1,19 @@
 <nav>
   <ul>
     <% if user_signed_in? %>
-      <li><%= link_to t('navigation.links.profile'), profile_path %></li>
-      <li><%= link_to t('navigation.links.edit'), edit_user_registration_path %></li>
-      <li><%= link_to t('navigation.links.log_out'), destroy_user_session_path, :method => 'delete' %></li>
+      <% if can?(:manage, Citygate::User) and !params[:controller]["admin"]  %>
+        <li><i class='icon-cog'></i><%= link_to t('navigation.links.admin'), citygate.admin_users_path %></li>
+      <% end %>
+
+      <li><i class='icon-user'></i><%= link_to t('navigation.links.profile'), citygate.profile_path %></li>
+      <li><i class='icon-unlock'></i><%= link_to t('navigation.links.log_out'), citygate.destroy_user_session_path, method: 'delete' %></li>
     <% else %>
-      <li><%= link_to t('navigation.links.log_in'), new_user_session_path %></li>
-      <li><%= link_to t('navigation.links.sign_up'), new_user_registration_path %></li>
+      <li><%= link_to t('navigation.links.log_in'), citygate.new_user_session_path %></li>
+      <li><%= link_to t('navigation.links.sign_up'), citygate.new_user_registration_path %></li>
 
       <% Citygate::User.omniauth_providers.each do |provider| %>
-        <li><%= link_to t('navigation.links.omniauth', provider: provider.to_s.titleize), omniauth_authorize_path(Citygate::User.new, provider), :id => "#{provider.to_s}" %></li>
+        <li><%= link_to t('navigation.links.omniauth', provider: provider.to_s.titleize), "/users/auth/#{provider.to_s}", :id => "#{provider.to_s}" %></li>
       <% end -%>
     <% end %>
-
-    <% if can?(:manage, Citygate::User) and !params[:controller]["admin"]  %>
-      <li><%= link_to t('navigation.links.admin'), admin_users_path %></li>
-    <% end %>
   </ul>
 </nav>

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

@@ -14,3 +14,5 @@
     </div>
   <% end %>
 </div>
+
+<%= link_to t('navigation.links.edit'), citygate.edit_user_registration_path %>

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

@@ -6,15 +6,15 @@
   <%= csrf_meta_tags %>
   <%= yield :head %>
 </head>
-<body data-pjax-container>
+<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">
+  <div id="main">
     <%= yield %>
-  </div>
+  </div> <!-- /main -->
 </body>
 </html>

data/config/initializers/01_load_config.rb

@@ -1 +1,2 @@
-ACCOUNTS = YAML.load_file("#{Citygate.root}/config/accounts.yml") unless Rails.env.test?
+file_name = "#{Rails.root}/config/accounts.yml"
+ACCOUNTS = YAML.load_file(file_name) unless Rails.env.test? or not File.exist?(file_name)

data/config/initializers/devise.rb

@@ -205,7 +205,7 @@ Devise.setup do |config|
   # Add a new OmniAuth provider. Check the wiki for more information on setting
   # up on your models and hooks.
   # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
-  unless Rails.env.test?
+  if not Rails.env.test? and (defined? ACCOUNTS and ACCOUNTS['facebook'])
     config.omniauth :facebook, ACCOUNTS['facebook']['app_id'], ACCOUNTS['facebook']['app_secret'],
       { :scope => 'email, offline_access' }
       

data/config/locales/controllers/admin/users/en.yml

@@ -0,0 +1,6 @@
+en:
+  admin:
+    users:
+      update:
+        success: "User updated successfully"
+        error: "Error updating user"

data/config/routes.rb

@@ -5,6 +5,8 @@ Citygate::Engine.routes.draw do
   
   match '/confirm/:confirmation_token', :to => "devise/confirmations#show", :as => "user_confirm", :only_path => false
   
+  match "/home/role_change", :to => "home#role_change", :via => :post
+  
   devise_for :users, 
              :controllers => { 
                :omniauth_callbacks => "citygate/users/omniauth_callbacks"

data/db/migrate/20120916221334_add_conditions_to_permissions.rb

@@ -0,0 +1,5 @@
+class AddConditionsToPermissions < ActiveRecord::Migration
+  def change
+    add_column :citygate_permissions, :conditions, :string
+  end
+end

data/db/seeds.rb

@@ -16,7 +16,7 @@ roles.each do |attributes|
   Citygate::Role.find_or_initialize_by_name(attributes[:name]).save!
 end
 
-puts 'Creating permission for citygate...'
+puts 'Creating permissions for citygate...'
 permissions = [
   # Guest
   {:action => "index", :subject_class => "home", :role_id => nil },

data/lib/ability.rb

@@ -2,16 +2,19 @@
 class Ability
   include CanCan::Ability
 
-  # Defines the permissions for a user wich is not logged in or if it is, 
+  # 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)
+    # This runs only once
+    @@permissions ||= Citygate::Permission.load_all
+
     @user = user || Citygate::User.new # guest user (not logged in)
-    
-    Citygate::Permission.find_all_by_role_id(nil).each do |permission|
+
+    @@permissions[:guest].each do |permission|
       handle_permission permission
     end
-    
+
     if @user.role
       send(@user.role.name.downcase)
     end
@@ -19,35 +22,52 @@ class Ability
 
   # Defines the permissions on a user with the role of member
   def member
-    Citygate::Permission.find_all_by_role_id(1).each do |permission|
+    @@permissions[:member].each do |permission|
       handle_permission permission
     end
   end
 
-  # Defines the permissions on a user with the role of admin, which inherits from member
+  # Defines the permissions on a user with the role of admin
+  # As this is a super admin that can do anything, it does not need
+  # to inherit from member
   def admin
-    member
-    Citygate::Permission.find_all_by_role_id(2).each do |permission|
+    #member
+    @@permissions[:admin].each do |permission|
       handle_permission permission
     end
   end
-  
+
   protected
-  
-  def handle_permission(permission)
-    if permission.subject_id.nil?
-      begin
-        can permission.action.to_sym, permission.subject_class.constantize
-      rescue
-        can permission.action.to_sym, permission.subject_class.to_sym
+
+    def handle_permission(permission)
+      if permission.subject_id.nil?
+        begin
+          can permission.action.to_sym, permission.subject_class.constantize, generate_conditions_hash(permission)
+        rescue
+          can permission.action.to_sym, permission.subject_class.to_sym, generate_conditions_hash(permission)
+        end
+      else
+        begin
+          can permission.action.to_sym, permission.subject_class.constantize, generate_conditions_hash(permission)
+        rescue
+          can permission.action.to_sym, permission.subject_class.to_sym, generate_conditions_hash(permission)
+        end
       end
-    else
-      begin
-        can permission.action.to_sym, permission.subject_class.constantize, :id => permission.subject_id
-      rescue
-        can permission.action.to_sym, permission.subject_class.to_sym, :id => permission.subject_id
+    end
+
+    def generate_conditions_hash(permission)
+      user = @user
+      conditions_hash = {}
+      if permission.conditions
+        permission.conditions.split(",").each do |condition|
+          key,value = condition.split("#")
+          conditions_hash[key.to_sym] = instance_eval value
+        end
+        
+        conditions_hash.merge({id: permission.subject_id}) if permission.subject_id
       end
+      
+      return conditions_hash
     end
-  end
 
 end