venus 0.3.3 → 0.4.1

data/README.md

@@ -18,6 +18,12 @@ end
 Usage
 =====
 
+* Setup Omniauth for multiple omniauth (Facebook, Twitter, Github) in model `User`.
+
+  ```
+  rails generate venus:omniauth
+  ```
+
 * Setup gem 'capistrano' for deloyment.
 
   ```
@@ -55,12 +61,6 @@ Usage
   rails generate venus:devise
   ```
 
-* Setup Omniauth for Facebook login (model `User`).
-
-  ```
-  rails generate venus:fbauth
-  ```
-
 * Setup Rspec testing framework
 
   ```

data/lib/generators/venus/init/init_generator.rb

@@ -53,6 +53,10 @@ module Venus
         bundle_install
       end
 
+      def run_magic_encoding
+        run 'magic_encoding'
+      end
+
     end
   end
-end
+end

data/lib/generators/venus/omniauth/omniauth_generator.rb

@@ -0,0 +1,63 @@
+module Venus
+  module Generators
+    class OmniauthGenerator < Base
+      desc "Setup gem 'omniauth' with multi providers"
+
+      def name
+        "Omniauth"
+      end
+
+      def asks
+        say 'checking dependent gems "settinglogic"...'
+        generate 'venus:settingslogic' unless has_gem?('settingslogic')
+        say 'checking dependent gems "devise"...'
+        generate 'venus:devise' unless has_gem?('devise')
+
+        @settinglogic_class = ask?("Your settinglogic class name?", 'Setting')
+        @settinglogic_yml = ask?("Your settinglogic yaml file in config/ ?", 'setting.yml')
+
+        @providers = {}
+        [:facebook, :github, :twitter].each do |provider|
+          if ask?("Use '#{provider}'?", true)
+            token = ask?("#{provider.capitalize} App ID?", '267188576687915')
+            secret = ask?("#{provider.capitalize} App Secret?", '84f72292e1f6b299f4a668f12ed1a7f2')
+            @providers[provider] = {:token => token, :secret => secret}
+          end
+        end
+      end
+
+      def gemfile
+        add_gem('omniauth')
+        @providers.each do |provider, |
+          add_gem("omniauth-#{provider}")
+        end
+        bundle_install
+      end
+
+      def controller
+        template 'omniauth_callbacks_controller.rb', 'app/controllers/users/omniauth_callbacks_controller.rb', :force => true
+      end
+
+      def configs
+        insert_template('config/routes.rb', 'routes.erb', :after => "routes.draw do\n")
+        template 'omniauth.rb', 'config/initializers/omniauth.rb'
+        ["config/#{@settinglogic_yml}", "config/#{@settinglogic_yml}.example"].each do |to_file|
+          insert_template(to_file, "setting.yml.erb", :after => "&defaults\n")
+        end
+      end
+
+      def model
+        generate "model authorization provider:string uid:string auth_type:string auth_id:integer auth_data:text"
+        insert_template 'app/models/authorization.rb', 'authorization.rb', :after => "ActiveRecord::Base\n"
+        template 'omniauthable.rb', 'app/lib/omniauthable.rb'
+        insert_template("app/models/user.rb", "user.erb", :before => "\nend\n")
+        sleep(1)
+        migration_template "migrations.rb", "db/migrate/add_index_for_authorizations_and_add_column_for_users"
+      end
+
+      def msg
+        bundle_exec('rake db:migrate') if ask?("Run 'bundle exec rake db:migrate'?", true)
+      end
+    end
+  end
+end

data/lib/generators/venus/omniauth/templates/authorization.rb

@@ -0,0 +1,5 @@
+
+  belongs_to :auth, :polymorphic => true
+  validates_presence_of :provider, :uid, :auth_type, :auth_id
+  attr_accessible :provider, :uid, :auth_type, :auth_id, :auth_data
+  serialize :auth_data, Hash

data/lib/generators/venus/omniauth/templates/migrations.rb

@@ -0,0 +1,7 @@
+class AddIndexForAuthorizationsAndAddColumnForUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :name, :string, :after => :email
+    add_index :authorizations, [:provider, :uid]
+    add_index :authorizations, [:auth_type, :auth_id]
+  end
+end

data/lib/generators/venus/omniauth/templates/omniauth.rb

@@ -0,0 +1,7 @@
+Rails.application.config.middleware.use OmniAuth::Builder do
+  Setting.providers.each do |provider_name|
+    provider provider_name, Setting.send("#{provider_name}_token"), Setting.send("#{provider_name}_secret")
+  end
+end
+
+OmniAuth.config.path_prefix = '/users/auth'

data/lib/generators/venus/omniauth/templates/omniauth_callbacks_controller.rb

@@ -0,0 +1,15 @@
+class Users::OmniauthCallbacksController < ApplicationController
+
+  def callback
+    provider = params[:provider]
+    if not current_user.blank?
+      current_user.bind_service(env["omniauth.auth"])
+      sign_in_and_redirect(current_user, :notice => "Successfully binded to #{provider}.")
+    else
+      @user = User.find_or_create_by_omniauth(env["omniauth.auth"])
+      flash[:notice] = "Sign in with #{provider.to_s.titleize} successfully."
+      sign_in_and_redirect @user, :event => :authentication, :notice => "Login successfully."
+    end
+  end
+
+end

data/lib/generators/venus/omniauth/templates/omniauthable.rb

@@ -0,0 +1,59 @@
+module Omniauthable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :authorizations, :dependent => :destroy, :as => :auth
+  end
+
+  module ClassMethods
+
+    def find_or_create_by_omniauth(authhash)
+      authorization = Authorization.find_by_provider_and_uid(authhash['provider'], authhash['uid'])
+      return authorization.auth if authorization
+      user = send "initialize_from_omniauth_#{authhash['provider']}", authhash
+      if User.find_by_email(user.email)
+        user = _
+      else
+        user.save
+        user.bind_service(authhash)
+      end
+      user
+    end
+
+    private
+
+    def initialize_from_omniauth_facebook(authhash)
+      User.new(:email => authhash['info']['email'], :name => authhash['info']['name'])
+    end
+
+    def initialize_from_omniauth_twitter(authhash)
+      User.new(:email => authhash['info']['email'], :name => authhash['info']['name'])
+    end
+
+    def initialize_from_omniauth_github(authhash)
+      User.new(:email => authhash['info']['email'], :name => authhash['info']['name'])
+    end
+
+  end
+
+  module InstanceMethods
+
+    def bind_service(authhash)
+      authorization = Authorization.find_by_provider_and_uid(authhash['provider'], authhash['uid'])
+      unless authorization
+        authorization = authorizations.create! :uid => authhash['uid'], :provider => authhash['provider'], :auth_data => authhash
+      end
+      authorization
+    end
+
+    def can_bind_to
+      Setting.providers - (authorizations.map {|auth| auth.provider})
+    end
+
+    def password_required?
+      false
+    end
+
+  end
+
+end

data/lib/generators/venus/omniauth/templates/routes.erb

@@ -0,0 +1,7 @@
+
+  match '/users/auth/:provider/callback', :to => "users/omniauth_callbacks#callback"
+  match '/users/auth/failure' => 'sessions#failure', :as => :auth_failure
+
+  Setting.providers.each do |provider|
+    match "/users/auth/#{provider}", :as => "user_auth_#{provider}"
+  end

data/lib/generators/venus/omniauth/templates/setting.yml.erb

@@ -0,0 +1,5 @@
+  providers: <%= (@providers.map {|p| p[0].to_s}).to_s %>
+<%- @providers.each do |name, info| -%>
+  <%=name%>_token: "<%=info[:token] %>"
+  <%=name%>_secret: "<%=info[:secret] %>"
+<%- end -%>

data/lib/generators/venus/omniauth/templates/user.erb

@@ -0,0 +1,3 @@
+
+  attr_accessible :name
+  include Omniauthable

data/lib/generators/venus/paginate/paginate_generator.rb

@@ -21,11 +21,11 @@ module Venus
 
       def kaminari_views
         if @kaminari_views
-          haml = @kaminari_haml != 'n' ? ' -e haml' : ''
+          haml = @kaminari_haml ? ' -e haml' : ''
           generate 'kaminari:views default' + haml
         end
       end
 
     end
   end
-end
+end

data/lib/venus/version.rb

@@ -1,3 +1,3 @@
 module Venus
-  VERSION = "0.3.3"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: venus
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -80,17 +80,20 @@ files:
 - lib/generators/venus/deploy/templates/gemfile.erb
 - lib/generators/venus/deploy/templates/stage.erb
 - lib/generators/venus/devise/devise_generator.rb
-- lib/generators/venus/fbauth/fbauth_generator.rb
-- lib/generators/venus/fbauth/templates/migration.rb
-- lib/generators/venus/fbauth/templates/omniauth.erb
-- lib/generators/venus/fbauth/templates/routes.rb
-- lib/generators/venus/fbauth/templates/sessions_controller.rb
-- lib/generators/venus/fbauth/templates/user.rb
 - lib/generators/venus/helpers.rb
 - lib/generators/venus/init/init_generator.rb
 - lib/generators/venus/init/templates/gem_developments.erb
 - lib/generators/venus/mysql/mysql_generator.rb
 - lib/generators/venus/mysql/templates/database.yml.erb
+- lib/generators/venus/omniauth/omniauth_generator.rb
+- lib/generators/venus/omniauth/templates/authorization.rb
+- lib/generators/venus/omniauth/templates/migrations.rb
+- lib/generators/venus/omniauth/templates/omniauth.rb
+- lib/generators/venus/omniauth/templates/omniauth_callbacks_controller.rb
+- lib/generators/venus/omniauth/templates/omniauthable.rb
+- lib/generators/venus/omniauth/templates/routes.erb
+- lib/generators/venus/omniauth/templates/setting.yml.erb
+- lib/generators/venus/omniauth/templates/user.erb
 - lib/generators/venus/paginate/paginate_generator.rb
 - lib/generators/venus/rspec/rspec_generator.rb
 - lib/generators/venus/rspec/templates/config_application.rb

data/lib/generators/venus/fbauth/fbauth_generator.rb

@@ -1,56 +0,0 @@
-module Venus
-  module Generators
-    class FbauthGenerator < Base
-      desc "Setup gem 'omniauth-fb'"
-
-      def asks
-        say 'checking dependent gems "settinglogic"...'
-        generate 'venus:settingslogic' unless has_gem?('settingslogic')
-        say 'checking dependent gems "devise"...'
-        generate 'venus:devise' unless has_gem?('devise')
-        @fb_app_id = ask?("Facebook App ID?", '267188576687915')
-        @fb_secret = ask?("Facebook App Secret?", '84f72292e1f6b299f4a668f12ed1a7f2')
-        @settinglogic_class = ask?("Your settinglogic class name?", 'Setting')
-        @settinglogic_yml = ask?("Your settinglogic yaml file in config/ ?", 'setting.yml')
-      end
-
-      def name
-        "Omniauth FB"
-      end
-
-      def gemfile
-        add_gem('omniauth')
-        add_gem('omniauth-facebook')
-        bundle_install
-      end
-
-      def controller
-        generate "controller sessions"
-        template 'sessions_controller.rb', 'app/controllers/sessions_controller.rb', :force => true
-      end
-
-      def routes
-        insert_template("config/routes.rb", "routes.rb", :after => "routes.draw do\n")
-      end
-
-      def model
-        migration_template "migration.rb", "db/migrate/add_columns_for_fblogin_to_users"
-        insert_template("app/models/user.rb", "user.rb", :before => "\nend\n")
-        replace_in_file("app/models/user.rb", "  attr_accessible ", "  attr_accessible :name, :facebook_id, ")
-      end
-
-      def config
-        template 'omniauth.erb', 'config/initializers/omniauth.rb'
-        ["config/#{@settinglogic_yml}", "config/#{@settinglogic_yml}.example"].each do |to_file|
-          replace_in_file(to_file, "facebook_app_id: ", "facebook_app_id: '#{@fb_app_id}'")
-          replace_in_file(to_file, "facebook_secret: ", "facebook_secret: '#{@fb_secret}'")
-        end
-      end
-
-      def msg
-        bundle_exec('rake db:migrate') if ask?("Run 'bundle exec rake db:migrate'?", true)
-      end
-
-    end
-  end
-end

data/lib/generators/venus/fbauth/templates/migration.rb

@@ -1,7 +0,0 @@
-class AddColumnsForFbloginToUsers < ActiveRecord::Migration
-  def change
-    add_column :users, :name, :string, :after => :email
-    add_column :users, :facebook_id, :string, :after => :email
-    add_index :users, [:facebook_id]
-  end
-end

data/lib/generators/venus/fbauth/templates/omniauth.erb

@@ -1,3 +0,0 @@
-Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :facebook, <%= @settinglogic_class %>.facebook_app_id, <%= @settinglogic_class %>.facebook_secret, :scope => <%= @settinglogic_class %>.facebook_perms
-end

data/lib/generators/venus/fbauth/templates/routes.rb

@@ -1,4 +0,0 @@
-
-  match '/auth/:provider/callback', :to => 'sessions#create'
-  match '/auth/failure' => 'sessions#failure', :as => :auth_failure
-  match '/auth/facebook', :as => :facebook_login

data/lib/generators/venus/fbauth/templates/sessions_controller.rb

@@ -1,16 +0,0 @@
-class SessionsController < ApplicationController
-
-  def create
-    if current_user = User.create_by_omniauth(request.env['omniauth.auth'], current_user)
-      flash[:notice] = "Login success"
-      sign_in_and_redirect :user, current_user
-    else
-      redirect_to new_user_session_path, :alert => "Login fail"
-    end  
-  end
-
-  def failure
-    redirect_to new_user_session_path, :alert => params[:message]
-  end
-
-end

data/lib/generators/venus/fbauth/templates/user.rb

@@ -1,15 +0,0 @@
-
-  def self.create_by_omniauth(hash, current_user)
-    hash = ActiveSupport::HashWithIndifferentAccess.new hash
-    user = User.send("find_by_#{hash[:provider]}_id", hash[:uid])
-    unless user
-      user = current_user || User.find_by_email(hash[:info][:email]) || User.new( :email => hash[:info][:email], :name => hash[:info][:name] )
-      user.send("#{hash[:provider]}_id=", hash[:uid])
-      user.save!
-    end
-    user
-  end
-
-  def password_required?
-    facebook_id.present? ? false : true
-  end