citygate 0.0.2 → 0.0.3

data/app/assets/stylesheets/citygate/application.css.scss

@@ -11,31 +11,3 @@
  *= require_self
  *= require_tree .
 */
-
-@import 'bootstrap';
-
-body {
-  background-color: #cccccc;
-}
-
-header nav ul {
-  list-style: none;
-  margin: 0 0 2em;
-  padding: 0;
-}
-header nav ul li {
-  display: inline;
-}
-#flash_notice, #flash_alert {
-  padding: 5px 8px;
-  margin: 10px 0;
-}
-#flash_notice {
-  background-color: #CFC;
-  border: solid 1px #6C6;
-}
-#flash_alert {
-  background-color: #FCC;
-  border: solid 1px #C66;
-}
-

data/app/assets/stylesheets/citygate/main.sass

@@ -0,0 +1,22 @@
+body
+  background-color: #FFF
+
+
+h1
+  color: #000
+  font-size: 15em
+
+
+#flash_notice, #flash_alert
+  padding: 5px 8px
+  margin: 10px 0
+
+
+#flash_notice
+  background-color: #CFC
+  border: solid 1px #6C6
+
+
+#flash_alert
+  background-color: #FCC
+  border: solid 1px #C66

data/app/controllers/admin/application_controller.rb

@@ -1,4 +1,3 @@
 class Admin::ApplicationController < ActionController::Base
   protect_from_forgery
-  before_filter :authenticate_user!
 end

data/app/controllers/admin/users_controller.rb

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

data/app/controllers/application_controller.rb

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

data/app/controllers/home_controller.rb

@@ -1,4 +1,4 @@
-class HomeController < Citygate::CitygateController
+class HomeController < ApplicationController
   def index
     @users = User.all
   end

data/app/controllers/users/omniauth_callbacks_controller.rb

@@ -19,7 +19,10 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
     if @user.persisted?
       flash[:notice] = I18n.t "devise.omniauth_callbacks.success", :kind => kind
       session["devise.#{kind.downcase}_data"] = request.env["omniauth.auth"]
-      sign_in_and_redirect @user, :event => :authentication      
+      sign_in_and_redirect @user, :event => :authentication
+    else
+      session["devise.#{kind.downcase}_data"] = request.env["omniauth.auth"]
+      redirect_to new_user_registration_url
     end    
   end
 

data/app/controllers/users_controller.rb

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

data/app/models/authorization.rb

@@ -2,4 +2,5 @@ class Authorization < ActiveRecord::Base
   
   belongs_to :user
   
+  attr_accessible :provider, :uid, :user_id, :token, :secret, :name, :link, :image_url
 end

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

@@ -0,0 +1,10 @@
+<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/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/home/index.html.erb

@@ -1,5 +1,8 @@
-<h3>Home</h3>
-<% @users.each do |user| %>
-  <p>User: <%= link_to user.name, admin_user_path(user) %></p>
-<% end %>
-<p>fim.</p>
+<header>
+  <h1>NORMAL PANEL</h1>
+  <nav>
+    <ul class="hmenu">
+      <%= render 'shared/navigation' %>
+    </ul>
+  </nav>
+</header>

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

@@ -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/admin/citygate_admin_layout.html.erb

@@ -0,0 +1,32 @@
+!!!
+%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,27 +1 @@
-
-<% content_for :content do %>
-
-  
-  <div id="container" class="container">
-      <header>
-        <h1>NORMAL PANEL</h1>
-        <nav>
-          <ul class="hmenu">
-            <%= render 'shared/navigation' %>
-          </ul>
-        </nav>
-        <% flash.each do |name, msg| %>
-          <%= content_tag :div, msg, :id => "flash_#{name}" if msg.is_a?(String) %>
-        <% end %>
-      </header>
-      <div id="main" role="main">
-        <%= yield %>
-      </div>
-      <footer></footer>
-    </div>
-
-<% end -%>
-
-<%= render :file => 'layouts/application' %>
-
-    
+<%= render :file => "layouts/citygate_layout", :layout => "layouts/application" %>

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

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

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

@@ -1,13 +1,15 @@
-<% if user_signed_in? %>
-  <li><%= link_to('Logout', destroy_user_session_path, :method=>'delete') %></li>
-  <li><%= link_to('Edit account', edit_user_registration_path) %></li>
-<% else %>
-  <li><%= link_to('Login', new_user_session_path) %></li>
-  <li><%= link_to('Sign up', new_user_registration_path) %></li>
-   <% User.omniauth_providers.each do |provider| %>
-      <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(User.new,provider) %>
-    <% end -%>
-<% end %>
+<ul id="citygate-navigation">
+  <% if user_signed_in? %>
+    <li><%= link_to('Edit account', edit_user_registration_path) %></li>
 
+    <li><%= link_to('Log out', destroy_user_session_path, :method=>'delete') %></li>
+  <% else %>
+    <li><%= link_to('Log in', new_user_session_path) %></li>
 
+    <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>
+    <% end -%>
+  <% end %>
+</ul>

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

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

data/config/initializers/devise.rb

@@ -9,8 +9,6 @@ Devise.setup do |config|
   # Configure the class responsible to send e-mails.
   # config.mailer = "Devise::Mailer"
 
-  # Automatically apply schema changes in tableless databases
-  config.apply_schema = false
 
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default) and
@@ -111,10 +109,6 @@ Devise.setup do |config|
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
 
-  # If true, uses the password salt as remember token. This should be turned
-  # to false if you are not using database authenticatable.
-  config.use_salt_as_remember_token = true
-
   # Options to be passed to the created cookie. For instance, you can set
   # :secure => true in order to force SSL only cookies.
   # config.rememberable_options = {}

data/config/routes.rb

@@ -1,8 +1,10 @@
 Rails.application.routes.draw do
   root :to => "home#index"
+  match 'user_root' => 'home#index'
 
   devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
-  
+  resources :users, :only => [:show]
+    
   namespace "admin" do
     resources :users
   end

data/lib/app_controller_helpers.rb

@@ -8,5 +8,13 @@ module AppControllerHelpers
     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

@@ -1,21 +1,23 @@
-require "citygate"
 require "rails"
 
+require "rubygems"
+require "devise"
+require "devise"
+require "devise_invitable"
+require "devise-encryptable"
+require 'omniauth'
+require 'omniauth-facebook'
+require 'omniauth-openid'
+require 'uuidtools'
+require 'will_paginate'
+
+require "citygate"
 
 module Citygate
   def self.root
     File.expand_path '../../..', __FILE__
   end
-  
+
   class Engine < ::Rails::Engine
-    require "#{File.join(Citygate.root,'lib/app_controller_helpers')}"
-    
-    #isolate_namespace Citygate
-    initializer 'myengine.app_controller' do |app|
-      ActiveSupport.on_load(:action_controller) do
-        extend AppControllerHelpers::ClassMethods
-        include AppControllerHelpers::InstanceMethods
-      end
-    end
   end
 end

data/lib/citygate/version.rb

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

data/lib/citygate.rb

@@ -1,5 +1,10 @@
 require "citygate/engine"
 
 module Citygate
-  
+  require "#{File.join(Citygate.root,'lib/app_controller_helpers')}"
+    
+  ActiveSupport.on_load(:action_controller) do
+    extend AppControllerHelpers::ClassMethods
+    include AppControllerHelpers::InstanceMethods
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: citygate
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Group Buddies
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-11 00:00:00 +01:00
+date: 2012-05-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,36 +25,36 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: jquery-rails
+  name: haml
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 3.1.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: devise
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.1.4
+        version: 2.0.4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: devise
+  name: devise-encryptable
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.4
+        version: 0.1.1
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -69,80 +69,80 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: bootstrap-sass
+  name: omniauth
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.0.1
+        version: 1.0.2
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: omniauth
+  name: omniauth-facebook
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.2
+        version: 1.2.0
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: omniauth-facebook
+  name: omniauth-openid
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.0.1
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: omniauth-openid
+  name: uuidtools
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.1
+        version: 2.1.2
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: thin
+  name: will_paginate
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.1
-  type: :development
+        version: 3.0.3
+  type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: haml-rails
+  name: thin
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.4
+        version: 1.3.1
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  name: haml-rails
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.8.1
+        version: 0.3.4
   type: :development
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
@@ -233,6 +233,83 @@ dependencies:
         version: 0.6.1
   type: :development
   version_requirements: *id020
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id021 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.8.1
+  type: :development
+  version_requirements: *id021
+- !ruby/object:Gem::Dependency 
+  name: email_spec
+  prerelease: false
+  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
+  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
 description: Citygate is an Engine that provides user model with sign up and log in, admin backend for managing users.
 email: 
 - zamith@groupbuddies.com
@@ -245,24 +322,27 @@ extra_rdoc_files: []
 files: 
 - app/assets/javascripts/citygate/application.js
 - 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/citygate/citygate_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/helpers/citygate/application_helper.rb
 - app/models/authorization.rb
 - app/models/user.rb
-- app/views/admin/users/index.html.haml
+- 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/devise/registrations/new.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.haml
+- app/views/users/show.html.erb
 - config/cucumber.yml
 - config/initializers/devise-lol.rb
 - config/initializers/devise.rb

data/app/controllers/citygate/citygate_controller.rb

@@ -1,10 +0,0 @@
-module Citygate
-  class CitygateController < ApplicationController
-    
-    unloadable
-    
-    layout 'citygate'
-    
-    # Any methods to be inserted in the app's Application controller should be inserted into lib/app_controller_helpers.rb
-  end
-end

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

@@ -1,4 +0,0 @@
-%p
-  User: #{@user.name}
-%p
-  Email: #{@user.email if @user.email}

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

@@ -1,21 +0,0 @@
-%h2 Sign up
-= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
-  = devise_error_messages!
-  %p
-    = f.label :name
-    %br/
-    = f.text_field :name
-  %p
-    = f.label :email
-    %br/
-    = f.email_field :email
-  %p
-    = f.label :password
-    %br/
-    = f.password_field :password
-  %p
-    = f.label :password_confirmation
-    %br/
-    = f.password_field :password_confirmation
-  %p= f.submit "Sign up"
-= render "links"

data/app/views/users/show.html.haml

@@ -1,4 +0,0 @@
-%p
-  User: #{@user.name}
-%p
-  Email: #{@user.email if @user.email}