citygate 0.0.1 → 0.0.2

data/app/controllers/citygate/citygate_controller.rb

@@ -0,0 +1,10 @@
+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/controllers/home_controller.rb

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

data/app/controllers/users/omniauth_callbacks_controller.rb

@@ -1,4 +1,4 @@
-class Users::OmniauthCallbacksController < Users::OmniauthInterface
+class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
 
   def facebook
     oauthorize "Facebook"
@@ -15,11 +15,11 @@ class Users::OmniauthCallbacksController < Users::OmniauthInterface
   private
 
   def oauthorize(kind)
-    @user = find_for_ouath(kind, env["omniauth.auth"], current_user)
+    @user = find_for_ouath(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"] = env["omniauth.auth"]
-      sign_in_and_redirect @user, :event => :authentication
+      session["devise.#{kind.downcase}_data"] = request.env["omniauth.auth"]
+      sign_in_and_redirect @user, :event => :authentication      
     end    
   end
 
@@ -99,5 +99,4 @@ class Users::OmniauthCallbacksController < Users::OmniauthInterface
     end
     return user
   end
-
 end

data/app/controllers/users_controller.rb

@@ -1,4 +1,4 @@
-class UsersController < ApplicationController
+class UsersController < Citygate::CitygateController
   before_filter :authenticate_user!
 
   def show

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

@@ -0,0 +1,5 @@
+<h3>Home</h3>
+<% @users.each do |user| %>
+  <p>User: <%= link_to user.name, admin_user_path(user) %></p>
+<% end %>
+<p>fim.</p>

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

@@ -0,0 +1,27 @@
+
+<% 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' %>
+
+    

data/lib/app_controller_helpers.rb

@@ -0,0 +1,12 @@
+module AppControllerHelpers
+  module ClassMethods
+    
+  end
+  
+  module InstanceMethods
+    # Devise hack
+    def stored_location_for(resource_or_scope)
+      root_url
+    end
+  end
+end

data/lib/citygate/engine.rb

@@ -1,6 +1,21 @@
+require "citygate"
+require "rails"
+
+
 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
-    config.autoload_paths << File.expand_path("../lib/*", __FILE__)
+    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.1"
+  VERSION = "0.0.2"
 end

data/lib/citygate.rb

@@ -1,4 +1,5 @@
 require "citygate/engine"
 
 module Citygate
+  
 end

metadata

@@ -2,7 +2,7 @@
 name: citygate
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Group Buddies
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-07 00:00:00 +01:00
+date: 2012-05-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,116 +80,160 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: haml-rails
+  name: omniauth
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.0.2
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: omniauth-facebook
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.2.0
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: omniauth-openid
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.0.1
+  type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: thin
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.1
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: haml-rails
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.3.4
   type: :development
-  version_requirements: *id007
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 2.8.1
   type: :development
-  version_requirements: *id008
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: guard
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.6.2
   type: :development
-  version_requirements: *id009
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: rb-fsevent
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: growl
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: guard-bundler
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.1.3
   type: :development
-  version_requirements: *id012
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: guard-rails
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.0.3
   type: :development
-  version_requirements: *id013
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: guard-livereload
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.3.0
   type: :development
-  version_requirements: *id014
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: guard-rspec
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.4.3
   type: :development
-  version_requirements: *id015
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: guard-cucumber
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.6.1
   type: :development
-  version_requirements: *id016
-description: Citygate is an Engine that provides user model with sign up and log in, admin backend for managing users and a simple comunication system.
+  version_requirements: *id020
+description: Citygate is an Engine that provides user model with sign up and log in, admin backend for managing users.
 email: 
 - zamith@groupbuddies.com
 executables: []
@@ -203,11 +247,9 @@ files:
 - app/assets/stylesheets/citygate/application.css.scss
 - app/controllers/admin/application_controller.rb
 - app/controllers/admin/users_controller.rb
-- app/controllers/application_controller.rb
+- app/controllers/citygate/citygate_controller.rb
 - app/controllers/home_controller.rb
 - app/controllers/users/omniauth_callbacks_controller.rb
-- app/controllers/users/omniauth_dummy.rb
-- app/controllers/users/omniauth_interface.rb
 - app/controllers/users_controller.rb
 - app/helpers/citygate/application_helper.rb
 - app/models/authorization.rb
@@ -216,9 +258,9 @@ files:
 - app/views/devise/_links.erb
 - app/views/devise/registrations/edit.html.haml
 - app/views/devise/registrations/new.html.haml
-- app/views/home/index.html.haml
+- app/views/home/index.html.erb
 - app/views/layouts/admin/application.html.haml
-- app/views/layouts/application.html.haml
+- app/views/layouts/citygate.html.erb
 - app/views/shared/_navigation.html.erb
 - app/views/users/show.html.haml
 - config/cucumber.yml
@@ -234,7 +276,7 @@ files:
 - db/migrate/20120303195145_devise_invitable_add_to_users.rb
 - db/migrate/20120507112430_add_omniauth_to_devise.rb
 - db/seeds.rb
-- lib/abstract_interface.rb
+- lib/app_controller_helpers.rb
 - lib/citygate/engine.rb
 - lib/citygate/version.rb
 - lib/citygate.rb
@@ -242,8 +284,6 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
-- test/citygate_test.rb
-- test/test_helper.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -272,6 +312,5 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simple authentication and user management Engine.
-test_files: 
-- test/citygate_test.rb
-- test/test_helper.rb
+test_files: []
+

data/app/controllers/application_controller.rb

@@ -1,8 +0,0 @@
-class ApplicationController < ActionController::Base
-  protect_from_forgery
-  
-  # Devise hack
-  def stored_location_for(resource_or_scope)
-    root_url
-  end
-end

data/app/controllers/users/omniauth_dummy.rb

@@ -1,6 +0,0 @@
-class Users::OmniauthDummy < Users::OmniauthInterface
-  def facebook
-    true
-  end
-  
-end

data/app/controllers/users/omniauth_interface.rb

@@ -1,6 +0,0 @@
-class Users::OmniauthInterface < Devise::OmniauthCallbacksController
-  include ::AbstractInterface
-  
-  needs_implementation :facebook
-  needs_implementation :google
-end

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

@@ -1,4 +0,0 @@
-%h3 Home
-- @users.each do |user|
-  %p User: #{link_to user.name, admin_user_path(user)}
-%p fim.

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

@@ -1,22 +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
-        %h1 NORMAL 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/lib/abstract_interface.rb

@@ -1,36 +0,0 @@
-module AbstractInterface
-  
-  class InterfaceNotImplementedError < NoMethodError
-  end
-  
-  def self.included(klass)
-    klass.send(:include, AbstractInterface::Methods)
-    klass.send(:extend, AbstractInterface::Methods)
-    klass.send(:extend, AbstractInterface::ClassMethods)
-  end
-  
-  module Methods
-    
-    def api_not_implemented(klass, method_name = nil)
-      if method_name.nil?
-        caller.first.match(/in \`(.+)\'/)
-        method_name = $1
-      end
-      raise AbstractInterface::InterfaceNotImplementedError.new("#{klass.class.name} needs to implement '#{method_name}' for interface #{self.name}!")
-    end
-    
-  end
-  
-  module ClassMethods
-    
-    def needs_implementation(name, *args)
-      self.class_eval do
-        define_method(name) do |*args|
-          Bicycle.api_not_implemented(self, name)
-        end
-      end
-    end
-    
-  end
-  
-end

data/test/citygate_test.rb

@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class CitygateTest < ActiveSupport::TestCase
-  test "truth" do
-    assert_kind_of Module, Citygate
-  end
-end

data/test/test_helper.rb

@@ -1,10 +0,0 @@
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
-
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-require "rails/test_help"
-
-Rails.backtrace_cleaner.remove_silencers!
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }