minimum-omniauth-scaffold 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b58db84863bddeda53dfe1deb1be497cf6f7e5c6
-  data.tar.gz: f4cc21e109fa18c68b743c351bc01ef07991a133
+  metadata.gz: 52af5b7d1ddd1b11159df09bc27d7aa664383ec9
+  data.tar.gz: ab7c2a8fce67e6533b77ddb21ed0db7fa3c4aa6d
 SHA512:
-  metadata.gz: a461ee413262ac5570b5aba564e000de4be6a54fd7e035cd39139c6dfb7ef4740730ba62832007d5e75fbea23d00961cdda2c513c6d0e3ea4c83a4451e6626b9
-  data.tar.gz: 65fdc8f07dac7d6c9c704cb7fc5a5786ac53f91b44a3812e902d56d39a5496fdf49568032d89d8cfe03da08a170d071a710cae4de6bdabc6c2c0bd2550bdf741
+  metadata.gz: 67cea8ccb5f7a2d7715eea2b21fa3bd91c62da2f1d57fd3d0f7c3a6b9d9e4a3df54bb34b063b29817674511315af0ce8fec3bff90ea6bfb3b9a38689256ec0bc
+  data.tar.gz: ad76623071e21473e9ee084b0edc0acc7d126967402e6c4fc601dc94269edf6b8ae24a33c29c5a2f4d6c3649d48f62e1251a7d13b6848beb7324e7b98b32df7b

data/README.md

@@ -65,6 +65,56 @@ rails g minimum:omniauth:scaffold
 rake db:migrate
 ```
 
+### キー作成
+
+* Twitter
+  * [Create an application | Twitter Developers](https://dev.twitter.com/apps/new)
+  * ※必須マークが無いが 「Callback URL」も入力必要
+
+* Facebook
+  * [Facebook Developers](https://developers.facebook.com/apps)
+  * ※「新しいアプリを作成」作成後「Facebookでログインするウェブサイト」に「http://0.0.0.0:3000/」を入力
+
+* GitHub
+  * [New OAuth Application](https://github.com/settings/applications/new)
+  * ※Main URL／Callback URL：「http://0.0.0.0:3000/」
+
+config/settings.local.yml
+
+```yaml
+# Twitter OAuth Local Setting
+twitter_key:    "Consumer key"
+twitter_secret: "Consumer secret"
+
+# Facebook OAuth Setting
+facebook_app_id:     "アプリID / APIキー"
+facebook_app_secret: "アプリのシークレットキー"
+
+# GitHub OAuth Setting
+github_client_id: "Client ID"
+github_secret:    "Client Secret"
+```
+
+## Heroku環境変数設定
+
+* Twitter
+
+```
+heroku config:set TWITTER_KEY=xxxxxxxxxx TWITTER_SECRET=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+```
+
+* Facebook
+
+```
+heroku config:set FACEBOOK_APP_ID=xxxxxxxxxx FACEBOOK_APP_SECRET=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+```
+
+* GitHub
+
+```
+heroku config:set GITHUB_CLIENT_ID=xxxxxxxxxx GITHUB_SECRET=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+```
+
 ## Contributing
 
 1. Fork it

data/lib/minimum/omniauth/scaffold/templates/controllers/application_controller.rb

@@ -21,12 +21,12 @@
 
   # ログインユーザ
   def current_user
-    @current_user ||= User.where( id: session[:user_id] ).first
+    @current_user ||= User.find_by(id: session[:user_id])
   end
   helper_method :current_user
 
-  # ユーザ登録チェック
+  # ログイン／ユーザ登録済みチェック
   def signed_in?
-    User.where( id: session[:user_id] ).exists?
+    User.where(id: session[:user_id]).exists?
   end
   helper_method :signed_in?

data/lib/minimum/omniauth/scaffold/templates/controllers/sessions_controller.rb

@@ -4,11 +4,14 @@ class SessionsController < ApplicationController
   # ログイン
   def callback
     auth = request.env["omniauth.auth"]
+    authentication = Authentication.find_by(provider: auth["provider"], uid: auth["uid"]) || Authentication.create_with_omniauth(auth)
+    authentication.auth_update(auth)
 
-    user = User.where( provider: auth["provider"], uid: auth["uid"] ).first || User.create_with_omniauth( auth )
-    user.auth_update( auth )
+    # ユーザ作成
+    user = User.create_with_auth(authentication)
 
     session[:user_id] = user.id
+    flash[:notice]    = "ログインしました。"
 
     # 保管URLへリダイレクト
     unless session[:request_url].blank?
@@ -17,18 +20,19 @@ class SessionsController < ApplicationController
       return
     end
 
-    redirect_to :root, notice: "ログインしました。"
+    redirect_to :root and return
   end
 
   # ログアウト
   def destroy
     session[:user_id] = nil
 
-    redirect_to :root, notice: "ログアウトしました。"
+    redirect_to :root, notice: "ログアウトしました。" and return
   end
 
   # ログインエラー
   def failure
-    render text: "<span style='color: red;'>Auth Failure</span>"
+    flash[:alert] = 'Auth Failure'
+    redirect_to :root and return
   end
 end

data/lib/minimum/omniauth/scaffold/templates/migrate/create_authentications.rb

@@ -0,0 +1,19 @@
+class CreateAuthentications < ActiveRecord::Migration
+  def change
+    create_table :authentications do |t|
+      t.references :user, index: true
+      t.string :provider
+      t.string :uid
+      t.string :name
+      t.string :nickname
+      t.string :image
+      t.string :email
+      t.string :location
+      t.string :gender
+      t.string :token
+      t.string :secret
+
+      t.timestamps
+    end
+  end
+end

data/lib/minimum/omniauth/scaffold/templates/migrate/create_users.rb

@@ -1,16 +1,12 @@
 class CreateUsers < ActiveRecord::Migration
   def change
     create_table :users do |t|
-      t.string :provider
-      t.string :uid
-      t.string :name
-      t.string :nickname
-      t.string :image
-      t.string :email
-      t.string :location
-      t.string :gender
-      t.string :token
-      t.string :secret
+      t.string    :name
+      t.string    :image
+      t.string    :email
+      t.boolean   :admin_flag, default: false
+      t.string    :last_login_provider
+      t.timestamp :last_login_at
 
       t.timestamps
     end

data/lib/minimum/omniauth/scaffold/templates/models/authentication.rb

@@ -0,0 +1,65 @@
+class Authentication < ActiveRecord::Base
+  belongs_to :user
+
+  # バリデーション
+  validates :provider, presence: true
+  validates :uid, presence: true
+
+  # auth情報更新
+  def auth_update(auth)
+    case auth["provider"]
+    when "facebook"
+      image_path = "https://graph.facebook.com/#{auth['info']['nickname'].presence || auth["uid"]}/picture?width=200&height=200"
+    when "twitter"
+      image_path = auth["info"]["image"].to_s.gsub('_normal', '') rescue nil
+    when "github"
+      image_path = "#{auth['info']['image']}&size=200" rescue nil
+    end
+
+    gender   = auth["extra"]["raw_info"]["gender"] rescue nil
+    location = (auth["info"]["location"].presence || auth["extra"]["raw_info"]["location"]) rescue nil
+
+    self.name     = auth["info"]["name"]     if auth["info"]["name"].present?
+    self.nickname = auth["info"]["nickname"] if auth["info"]["nickname"].present?
+    self.image    = image_path               if image_path.present?
+    self.email    = auth["info"]["email"]    if auth["info"]["email"].present?
+    self.gender   = gender                   if gender.present?
+    self.location = location                 if location.present?
+    self.save!
+  rescue => e
+    puts "[ ---------- e ---------- ]" ; e.tapp ;
+    return nil
+  end
+
+  private
+
+  # auth情報登録／ユーザ作成
+  def self.create_with_omniauth(auth)
+    # auth情報登録
+    authentication = Authentication.new
+    authentication.provider = auth["provider"]
+    authentication.uid      = auth["uid"]
+
+    if auth["info"].present?
+      authentication.name     = auth["info"]["name"]
+      authentication.nickname = auth["info"]["nickname"]
+      authentication.image    = auth["info"]["image"]
+      authentication.email    = auth["info"]["email"]
+      authentication.location = auth["info"]["location"]
+    end
+
+    if auth["credentials"].present?
+      authentication.token  = auth['credentials']['token']
+      authentication.secret = auth['credentials']['secret']
+    end
+
+    if auth["extra"].present? and auth["extra"]["raw_info"].present?
+      authentication.gender   = auth["extra"]["raw_info"]["gender"]
+      authentication.location = auth["extra"]["raw_info"]["location"] if authentication.location.blank?
+    end
+
+    authentication.save!
+
+    return authentication
+  end
+end

data/lib/minimum/omniauth/scaffold/templates/models/user.rb

@@ -1,51 +1,25 @@
 class User < ActiveRecord::Base
-  # auth情報更新
-  def auth_update( auth )
-    if auth["provider"] == "facebook"
-      image_path = "https://graph.facebook.com/#{auth['info']['nickname'].presence || auth["uid"]}/picture?width=200&height=200"
-    else
-      image_path = auth["info"]["image"]
-    end
-
-    if self.name != auth["info"]["name"] or self.nickname != auth["info"]["nickname"] or self.image != image_path or self.email != auth["info"]["email"]
-      self.name     = auth["info"]["name"]
-      self.nickname = auth["info"]["nickname"]
-      self.image    = image_path
-      self.email    = auth["info"]["email"]
-      self.gender   = auth["extra"]["raw_info"]["gender"]
-      self.location = auth["info"]["location"] || auth["extra"]["raw_info"]["location"]
-      self.save!
-    end
-  end
+  has_many :authentications
 
   private
 
-  # auth情報登録
-  def self.create_with_omniauth( auth )
+  # ユーザ作成
+  def self.create_with_auth(authentication)
+    # ユーザ作成
     user = User.new
-    user.provider = auth["provider"]
-    user.uid      = auth["uid"]
-
-    if auth["info"].present?
-      user.name     = auth["info"]["name"]
-      user.nickname = auth["info"]["nickname"]
-      user.image    = auth["info"]["image"]
-      user.email    = auth["info"]["email"]
-      user.location = auth["info"]["location"]
-    end
-
-    if auth["credentials"].present?
-      user.token  = auth['credentials']['token']
-      user.secret = auth['credentials']['secret']
-    end
-
-    if auth["extra"].present? and auth["extra"]["raw_info"].present?
-      user.gender   = auth["extra"]["raw_info"]["gender"]
-      user.location = auth["extra"]["raw_info"]["location"] if user.location.blank?
-    end
+    user.name                = (authentication.nickname.presence || authentication.name)
+    user.image               = authentication.image    if authentication.image.present?
+    user.email               = authentication.email    if authentication.email.present?
+    user.last_login_provider = authentication.provider if authentication.provider.present?
+    user.last_login_at       = Time.now
 
+    # データ保存
     user.save!
 
+    # auth紐付け
+    authentication.user_id = user.id
+    authentication.save!
+
     return user
   end
 end

data/lib/minimum/omniauth/scaffold/templates/rails_config/settings.yml

@@ -1,7 +1,7 @@
 # Provider Page
-twitter_page: "https://twitter.com/"
+twitter_page:  "https://twitter.com/"
 facebook_page: "https://www.facebook.com/"
-github_page: "https://github.com/"
+github_page:   "https://github.com/"
 
 # アプリケーション名
 app_name: "YOUR_APP_NAME"

data/lib/minimum/omniauth/scaffold/templates/views/_user_icon.html.erb

@@ -1,3 +1,3 @@
 <% if user.present? %>
-  <%= link_to_unless( user.nickname.blank?, image_tag( user.image, size: size, class: klass ), "#{Settings[user.provider + '_page']}#{user.nickname}", target: "_blank", title: user.nickname, rel: "tooltip", "data-original-title" => user.nickname ) %>
+  <%= link_to_unless(user.name.blank?, image_tag( user.image, size: size, class: klass ), "#{Settings[user.last_login_provider + '_page']}#{user.name}", target: "_blank", title: user.name, rel: "tooltip", "data-original-title" => user.name) %>
 <% end %>

data/lib/minimum/omniauth/scaffold/templates/views/application.html.erb

@@ -3,8 +3,8 @@
 <% if signed_in? %>
   <%# ログイン済み %>
   <%= render partial: '/layouts/user_icon', locals: { user: current_user, size: "18x18", klass: "margin_minus2" } %>
-  <%= link_to( "Top", root_path ) %>
-  <%= link_to( "Logout", logout_path ) %>
+  <%= link_to "Top", root_path %>
+  <%= link_to "Logout", logout_path %>
 <% else %>
   <%# 未ログイン %>
   Login:
@@ -14,8 +14,8 @@
 <% end %>
 
 <%# 通知／エラーメッセージ %>
-<%= simple_format( flash[:notice], style: "color: green;" ) if flash[:notice].present? %>
-<%= simple_format( flash[:alert], style: "color: red;" ) if flash[:alert].present? %>
+<%= simple_format(flash[:notice], style: "color: green;") if flash[:notice].present? %>
+<%= simple_format(flash[:alert], style: "color: red;") if flash[:alert].present? %>
 
 <%= yield %>
 

data/lib/minimum/omniauth/scaffold/version.rb

@@ -1,7 +1,7 @@
 module Minimum
   module Omniauth
     module Scaffold
-      VERSION = "0.1.6"
+      VERSION = "0.1.7"
     end
   end
 end

data/lib/minimum/omniauth/scaffold.rb

@@ -1,7 +1,5 @@
 require "minimum/omniauth/scaffold/version"
-
 require 'rails/generators'
-
 require 'rails_config'
 require 'omniauth-twitter'
 require 'omniauth-facebook'
@@ -63,11 +61,13 @@ module Minimum
         copy_file( "#{@@template_path}/locales/ja.yml", "config/locales/ja.yml" )
         copy_file( "#{@@template_path}/locales/translation_ja.yml", "config/locales/translation_ja.yml" )
 
-        # ----- create_users.rb ----- #
+        # ----- migration ----- #
         copy_file( "#{@@template_path}/migrate/create_users.rb", "db/migrate/20000101000000_create_users.rb" )
+        copy_file( "#{@@template_path}/migrate/create_authentications.rb", "db/migrate/20000102000000_create_authentications.rb" )
 
         # ----- models ----- #
         copy_file( "#{@@template_path}/models/user.rb", "app/models/user.rb" )
+        copy_file( "#{@@template_path}/models/authentication.rb", "app/models/authentication.rb" )
 
         # ----- controllers ----- #
         content = File.read( "#{@@template_path}/controllers/application_controller.rb", encoding: Encoding::UTF_8 )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minimum-omniauth-scaffold
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - shu0115
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,7 +142,9 @@ files:
 - lib/minimum/omniauth/scaffold/templates/initializers/omniauth.rb
 - lib/minimum/omniauth/scaffold/templates/locales/ja.yml
 - lib/minimum/omniauth/scaffold/templates/locales/translation_ja.yml
+- lib/minimum/omniauth/scaffold/templates/migrate/create_authentications.rb
 - lib/minimum/omniauth/scaffold/templates/migrate/create_users.rb
+- lib/minimum/omniauth/scaffold/templates/models/authentication.rb
 - lib/minimum/omniauth/scaffold/templates/models/user.rb
 - lib/minimum/omniauth/scaffold/templates/rails_config/development.yml
 - lib/minimum/omniauth/scaffold/templates/rails_config/production.yml
@@ -176,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Minimum OmniAuth Scaffold