citygate 0.0.4 → 0.0.5

data/app/controllers/citygate/application_controller.rb

@@ -21,4 +21,6 @@ class Citygate::ApplicationController < ::ApplicationController
   def stored_location_for(resource_or_scope)
     root_url
   end
+  
+  Devise.omniauth_path_prefix = "#{Citygate::Engine.mount_path}/users/auth".squeeze "/"
 end

data/app/controllers/citygate/users/omniauth_callbacks_controller.rb

@@ -1,13 +1,18 @@
+# @author Zamith
+# Encapsulates all the omniauth authorization logic
 class Citygate::Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
 
+  # Authorize user with his facebook account
   def facebook
     oauthorize "Facebook"
   end
   
+  # Authorize user with his google (openid) account
   def google
     oauthorize "Google"
   end
   
+  # In case of error renders 404
   def passthru
     render :file => "#{Rails.root}/public/404.html", :status => 404, :layout => false
   end
@@ -15,7 +20,8 @@ class Citygate::Users::OmniauthCallbacksController < Devise::OmniauthCallbacksCo
   private
 
   def oauthorize(kind)
-    @user = find_for_ouath(kind, request.env["omniauth.auth"], current_user)
+    current_user ||= (params[:user]) ? Citygate::User.find(params[:user]) : nil
+    @user = find_for_oauth(kind, request.env["omniauth.auth"], current_user)
     if @user.persisted?
       flash[:notice] = I18n.t "devise.omniauth_callbacks.success", :kind => kind
       session["devise.#{kind.downcase}_data"] = request.env["omniauth.auth"]
@@ -26,7 +32,7 @@ class Citygate::Users::OmniauthCallbacksController < Devise::OmniauthCallbacksCo
     end    
   end
 
-  def find_for_ouath(provider, access_token, resource=nil)
+  def find_for_oauth(provider, access_token, resource=nil)
     user, email, name, uid, auth_attr = nil, nil, nil, {}
     case provider
     when "Facebook"
@@ -50,7 +56,7 @@ class Citygate::Users::OmniauthCallbacksController < Devise::OmniauthCallbacksCo
         :name => access_token['info']['name'], 
       }
     else
-      raise 'Provider #{provider} not handled'
+      raise "Provider #{provider} not handled"
     end
     if resource.nil?
       if email
@@ -64,12 +70,8 @@ class Citygate::Users::OmniauthCallbacksController < Devise::OmniauthCallbacksCo
     else
       user = resource
     end
-    
     auth = user.authorizations.find_by_provider(provider)
-    if auth.nil?
-      auth = user.authorizations.build(:provider => provider)
-      user.authorizations << auth
-    end
+    auth ||= user.authorizations.build(:provider => provider)
     auth.update_attributes auth_attr
     
     return user

data/app/controllers/citygate/users_controller.rb

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

data/app/models/citygate/user.rb

@@ -20,7 +20,7 @@ module Citygate
     has_many :authorizations, :dependent => :destroy
     belongs_to :role
 
-    # Get the json object for an user
+    # Get the json object for an user. Used by to_json.
     # @example
     #   {
     #     "email": "user@example.com",
@@ -28,6 +28,7 @@ module Citygate
     #     "link": null,
     #     "image": "https://secure.gravatar.com/avatar/b58996c504c5638798eb6b511e6f49af.png/rating=g"
     #   }
+    # @return [Hash] the json object in the form of an hash
     def as_json(options = {})
       authorization = self.authorizations.first
       {
@@ -37,5 +38,11 @@ module Citygate
         image: (authorization.image_url if authorization) || self.gravatar_url
       }
     end
+    
+    # Get the name if it is present or else get the email
+    # @return [String] the name or email of the user
+    def name_or_email
+       self.name || self.email
+    end
   end
 end

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

@@ -1,3 +1,14 @@
 <div id="users">
-  <%= render "users" %>
+  <% @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 %>
 </div>

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

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

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

@@ -1,5 +1,6 @@
 <ul id="citygate-navigation">
   <% if user_signed_in? %>
+    <li><%= link_to('Profile', profile_path) %></li>
     <li><%= link_to('Edit account', edit_user_registration_path) %></li>
 
     <li><%= link_to('Log out', destroy_user_session_path, :method=>'delete') %></li>
@@ -9,7 +10,7 @@
     <li><%= link_to('Sign up', new_user_registration_path) %></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>
+      <li><%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(Citygate::User.new, provider), :id => "#{provider.to_s}" %></li>
     <% end -%>
   <% end %>
 

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

@@ -1,3 +1,14 @@
-<p>User: <%= @user.name %></p>
+<h2 class="name"><%= current_user.name_or_email %></h2>
 
-<p>Email: <%= @user.email if @user.email %></p>
+<div id="social-accounts">
+  <% connected_providers = current_user.authorizations.map(&:provider) %>
+
+  <%= connected_providers %>
+  <% @providers.each do |provider| %>
+    <% class_str = "#{provider}-connect " %>
+    <% class_str += (connected_providers.include? provider.to_s.capitalize) ? "connected" : "can-connect" %>
+    <div class="<%= class_str %>" >
+      <%= link_to "#{provider.to_s.capitalize}", user_omniauth_authorize_path(provider,{user: current_user}) %>
+    </div>
+  <% end %>
+</div>

data/app/views/devise/registrations/edit.html.erb

@@ -0,0 +1,32 @@
+<h2>Edit Profile</h2>
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
+  <%= devise_error_messages! %>
+  <p>
+    <%= f.label :name %>
+    <%= f.text_field :name %>
+  </p>
+  <p>
+    <%= f.label :email %>
+    <%= f.email_field :email %>
+  </p>
+  <p>
+    <%= f.label :password %>
+    <%= f.password_field :password %>
+    <p class="hint">(leave blank if you don't want to change it)</p>
+  </p>
+  <p>
+    <%= f.label :password_confirmation %>
+    <%= f.password_field :password_confirmation %>
+  </p>
+  <p>
+    <%= f.label :current_password %>
+    <%= f.password_field :current_password %>
+    <p class="hint">(we need your current password to confirm your changes)</p>
+  </p>
+  <p><%= f.submit "Update" %></p>
+<% end %>
+<h3>Cancel my account</h3>
+<p>
+  Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %>.
+</p>
+<%= link_to "Back", :back %>

data/app/views/devise/registrations/new.html.erb

@@ -0,0 +1,18 @@
+<h2>Sign up</h2>
+
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email %></div>
+
+  <div><%= f.label :password %><br />
+  <%= f.password_field :password %></div>
+
+  <div><%= f.label :password_confirmation %><br />
+  <%= f.password_field :password_confirmation %></div>
+
+  <div><%= f.submit "Sign up" %></div>
+<% end %>
+
+<%= render :partial => "devise/shared/links" %>

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

@@ -12,6 +12,7 @@
   <% 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>

data/config/accounts.yml

@@ -0,0 +1,5 @@
+facebook:
+  app_id: "387891007905465"
+  app_secret: "0cb143f301a74968289daf606b29dbec"
+google:
+  identifier: "https://www.google.com/accounts/o8/id"

data/config/initializers/01_load_config.rb

@@ -0,0 +1 @@
+ACCOUNTS = YAML.load_file("#{Citygate.root}/config/accounts.yml") unless Rails.env.test?

data/config/initializers/devise.rb

@@ -205,15 +205,27 @@ 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'
-  config.omniauth :facebook, "387891007905465", "0cb143f301a74968289daf606b29dbec",
-    { :scope => 'email, offline_access' }
-    
-  require 'openid/store/filesystem'
-  config.omniauth :open_id, 
-                  :store => OpenID::Store::Filesystem.new('/tmp'), 
-                  :name => 'google', 
-                  :identifier => 'https://www.google.com/accounts/o8/id', 
-                  :require => 'omniauth-openid'
+  unless Rails.env.test?
+    config.omniauth :facebook, ACCOUNTS['facebook']['app_id'], ACCOUNTS['facebook']['app_secret'],
+      { :scope => 'email, offline_access' }
+      
+    require 'openid/store/filesystem'
+    config.omniauth :open_id, 
+                    :store => OpenID::Store::Filesystem.new('/tmp'), 
+                    :name => 'google', 
+                    :identifier => ACCOUNTS['google']['identifier'], 
+                    :require => 'omniauth-openid'             
+  else
+    config.omniauth :facebook, "foo", "bar",
+      { :scope => 'email, offline_access' }
+      
+    require 'openid/store/filesystem'
+    config.omniauth :open_id, 
+                    :store => OpenID::Store::Filesystem.new('/tmp'), 
+                    :name => 'google', 
+                    :identifier => "foobar", 
+                    :require => 'omniauth-openid'
+  end
 
 
   # ==> Warden configuration
@@ -225,7 +237,5 @@ Devise.setup do |config|
   #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
   # end
   
-  Devise.setup do |config|
-    config.router_name = :citygate
-  end
+  config.router_name = :citygate
 end

data/config/routes.rb

@@ -1,13 +1,18 @@
 Citygate::Engine.routes.draw do
   root :to => "home#index"
   
+  match "/user/profile" => "users#show", :as => "profile"
+  
+  match '/confirm/:confirmation_token', :to => "devise/confirmations#show", :as => "user_confirm", :only_path => false
+  
   devise_for :users, 
-             :controllers => { :omniauth_callbacks => "citygate/users/omniauth_callbacks" }, 
+             :controllers => { 
+               :omniauth_callbacks => "citygate/users/omniauth_callbacks"
+             }, 
              :class_name => "Citygate::User",
              :module => :devise
-  resources :users, :only => [:show]
-    
-  namespace "admin", constraints: { format: /(json|html|js| )/ } do
+
+  namespace "admin", constraints: { format: /(json|html| )/ } do
     resources :users
   end
   

data/lib/citygate/engine.rb

@@ -2,7 +2,6 @@ require "rails"
 
 require "rubygems"
 require "devise"
-require "devise"
 require "devise_invitable"
 require "devise-encryptable"
 require 'omniauth'
@@ -12,6 +11,9 @@ require 'uuidtools'
 require 'will_paginate'
 require 'cancan'
 
+# Make Devise "see" the changes made in the citygate appilication controller
+Devise.parent_controller = "Citygate::ApplicationController"
+
 module Citygate
   def self.root
     File.expand_path '../../..', __FILE__
@@ -19,5 +21,17 @@ module Citygate
 
   class Engine < ::Rails::Engine
     isolate_namespace Citygate
+    
+    mattr_accessor :will_paginate_options
+    @@will_paginate_options = {per_page: 1}
+    
+    mattr_accessor :mount_path
+    @@mount_path = ""
+    
+    def configure
+      yield self
+    end
   end
 end
+
+

data/lib/citygate/version.rb

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

data/lib/gravatar.rb

@@ -1,11 +1,19 @@
 require 'digest/md5'
 
+# @author Zamith
+# This module provides helper methods to be include in a class which has an email
+# such as User
 module Gravatar
 
+  # Generates the gravatar id from the object's email
+  # @return [String] gravatar id
   def gravatar_id
     Digest::MD5.hexdigest(self.email.to_s.downcase)
   end
   
+  # Generates the full gravatar url for the user (always uses https)
+  # @param [Hash] options The only available option is the avatar rating you which to fetch
+  # @return [String] gravatar url
   def gravatar_url(options = { rating: 'g'})
     "https://secure.gravatar.com/avatar/#{self.gravatar_id}.png/rating=#{options[:rating]}"
   end