apit 0.0.35 → 0.0.36

data/lib/apit/version.rb

@@ -1,3 +1,3 @@
 module Apit
-  VERSION = "0.0.35"
+  VERSION = "0.0.36"
 end

data/lib/generators/apit/setup_generator.rb

@@ -12,18 +12,14 @@ module Apit
 					gem("simple_form")
 				end				
 				#Devise
-				if yes?("Would you like to use Devise for authentication?")
-				  gem("devise", :git => 'git://github.com/plataformatec/devise', :branch => 'master')
+				if yes?("Would you like to use OmniAuth authentication?")
 					gem("omniauth")
-					run('bundle install')					
-				  generate("devise:install")
-					template "user_token.rb", "app/models/user_token.rb"
+					generate("model", "provider:string uid:string name:string")
+					template "sessions_controller.rb", "app/controllers/sessions_controller.rb"
 					template "user.rb", "app/models/user.rb"
-				
-				  model_name = "user" if model_name.blank?
-				  generate("devise", model_name)
-				  generate("devise:views")
-				
+					route("match \"/auth/:provider/callback\" => \"sessions#create\"")
+					route("match \"/signout\" => \"sessions#destroy\", :as => :signout\"")
+					template "omniauth_initalizer.rb", "config/initializers/omniauth.rb"
 				
 					#CanCan
 					if yes?("Would you like to use CanCan for authorization?")
@@ -32,10 +28,8 @@ module Apit
 						@single=model_name
 						#insert_into_file "config/environment.rb", "config.gem :thor", :after => "Rails::Initializer.run do |config|\n"
 						inject_into_class "app/models/user.rb", model_name.camelcase, "has_and_belongs_to_many :roles\n"
-
 											
 						template "role.rb", "app/models/role.rb"
-						
 
 						migration_template 'create_roles_migration.rb', "db/migrate/create_roles_migration.rb"
 					end

data/lib/generators/apit/templates/omniauth_initializer.rb

@@ -0,0 +1,3 @@
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :twitter, 'CONSUMER_KEY', 'CONSUMER_SECRET'
+end

data/lib/generators/apit/templates/sessions_controller.rb

@@ -0,0 +1,13 @@
+class SessionsController < ApplicationController
+	def create
+	  auth = request.env["omniauth.auth"]
+	  user = User.find_by_provider_and_uid(auth["provider"], auth["uid"]) || User.create_with_omniauth(auth)
+	  session[:user_id] = user.id
+	  redirect_to root_url, :notice => "Signed in!"
+	end
+
+	def destroy
+	  session[:user_id] = nil
+	  redirect_to root_url, :notice => "Signed out!"
+	end
+end

data/lib/generators/apit/templates/user.rb

@@ -1,39 +1,9 @@
 class User < ActiveRecord::Base
-  has_many :user_tokens
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :confirmable, :lockable and :timeoutable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable, :omniauthable
-
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me
-  
-  def self.new_with_session(params, session)
-    super.tap do |user|
-      if data = session[:omniauth]
-        user.user_tokens.build(:provider => data['provider'], :uid => data['uid'])
-      end
-    end
-  end
-  
-  def apply_omniauth(omniauth)
-    #add some info about the user
-    #self.name = omniauth['user_info']['name'] if name.blank?
-    #self.nickname = omniauth['user_info']['nickname'] if nickname.blank?
-    
-    unless omniauth['credentials'].blank?
-      user_tokens.build(:provider => omniauth['provider'], :uid => omniauth['uid'])
-      #user_tokens.build(:provider => omniauth['provider'], 
-      #                  :uid => omniauth['uid'],
-      #                  :token => omniauth['credentials']['token'], 
-      #                  :secret => omniauth['credentials']['secret'])
-    else
-      user_tokens.build(:provider => omniauth['provider'], :uid => omniauth['uid'])
-    end
-    #self.confirm!# unless user.email.blank?
-  end
-  
-  def password_required?
-    (user_tokens.empty? || !password.blank?) && super  
-  end
+	def self.create_with_omniauth(auth)
+	  create! do |user|
+	    user.provider = auth["provider"]
+	    user.uid = auth["uid"]
+	    user.name = auth["user_info"]["name"]
+	  end
+	end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 35
-  version: 0.0.35
+  - 36
+  version: 0.0.36
 platform: ruby
 authors: 
 - Avocado
@@ -43,10 +43,11 @@ files:
 - lib/generators/apit/templates/ability.rb
 - lib/generators/apit/templates/create_roles_migration.rb
 - lib/generators/apit/templates/layout.html.erb
+- lib/generators/apit/templates/omniauth_initializer.rb
 - lib/generators/apit/templates/role.rb
+- lib/generators/apit/templates/sessions_controller.rb
 - lib/generators/apit/templates/stylesheet.css
 - lib/generators/apit/templates/user.rb
-- lib/generators/apit/templates/user_token.rb
 has_rdoc: true
 homepage: http://www.avocado.nl
 licenses: []

data/lib/generators/apit/templates/user_token.rb

@@ -1,3 +0,0 @@
-class UserToken < ActiveRecord::Base
-  belongs_to :user
-end