omniauth-scaffold 0.1.14 → 0.1.15

data/README.md

@@ -15,8 +15,8 @@ vi Gemfile
 gem 'rails_config'
 gem 'omniauth-scaffold', :group => :development
 gem 'omniauth-twitter'
-#gem 'omniauth-github'
-#gem 'omniauth-facebook'
+gem 'omniauth-facebook'
+gem 'omniauth-github'
 ```
 
 And then execute:
@@ -31,6 +31,8 @@ Or install it yourself as:
 gem install rails_config
 gem install omniauth-scaffold
 gem install omniauth-twitter
+gem install omniauth-facebook
+gem install omniauth-github
 ```
 
 ## Usage
@@ -83,8 +85,8 @@ app_name: "YOUR_APP_NAME"
 ### Keys
 
 <a href="https://dev.twitter.com/apps" target="_blank">Twitter</a><br />
-<a href="https://github.com/settings/applications" target="_blank">GitHub</a><br />
 <a href="https://developers.facebook.com/apps" target="_blank">Facebook</a><br />
+<a href="https://github.com/settings/applications" target="_blank">GitHub</a><br />
 
 ### Development Setting
 
@@ -94,6 +96,14 @@ Edit: config/settings.local.yml
 # Twitter OAuth Local Setting
 twitter_key:    "TWITTER_KEY"
 twitter_secret: "TWITTER_SECRET"
+
+# Facebook OAuth Setting
+facebook_app_id:     "FACEBOOK_APP_ID"
+facebook_app_secret: "FACEBOOK_APP_SECRET"
+
+# GitHub OAuth Setting
+github_client_id: "GITHUB_CLIENT_ID"
+github_secret:    "GITHUB_SECRET"
 ```
 
 ### Production Setting For Heroku

data/lib/omniauth-scaffold.rb

@@ -74,6 +74,7 @@ module Omniauth
         # ----- assets ----- #
         copy_file( "templates/base.css.scss", "app/assets/stylesheets/base.css.scss" )
         copy_file( "templates/scaffolds.css.scss", "app/assets/stylesheets/scaffolds.css.scss" )
+        copy_file( "templates/z_style.css.scss", "app/assets/stylesheets/z_style.css.scss" )
 
         # ----- public ----- #
         remove_file( 'public/index.html' )
@@ -86,6 +87,7 @@ module Omniauth
         content = "\n# Add\n"
         content += ".DS_Store\n"
         content += "vendor/bundle\n"
+        content += "/log/*.log.*\n"
         content += "\n# rails_config\n"
         content += "config/settings.local.yml\n"
         content += "config/settings/*.local.yml\n"

data/lib/omniauth-scaffold/templates/application.html.erb

@@ -1,26 +1,36 @@
-<% if current_user %>
-  <%# ログイン済み %>
-  <%= link_to_unless( current_user.screen_name.blank?, image_tag( current_user.image, size: "20x20" ), "https://twitter.com/#!/#{current_user.screen_name}", target: "_blank" ) %>
-  <%= current_user.screen_name %> :
-   || <%= link_to "Logout", logout_path %>
-<% else %>
-  <%# 未ログイン %>
-  <%= link_to "Login", "/auth/#{Settings.provider}" %>
-<% end %>
-
-<%# 通知／エラーメッセージ %>
-<%= simple_format( flash[:notice], style: "color: green;" ) unless flash[:notice].blank? %>
-<%= simple_format( flash[:alert], style: "color: red;" ) unless flash[:alert].blank? %>
-
-<%= yield %>
-
-<br />
-<br />
-
-<center>
-  Developed by <a href="https://twitter.com/#!/<%= Settings.programmer_twitter_id %>/" target="_blank">@<%= Settings.programmer_twitter_id %></a>,
-  Designed by <a href="https://twitter.com/#!/<%= Settings.designer_twitter_id %>/" target="_blank">@<%= Settings.designer_twitter_id %></a>,
-  Licence by <a href="https://creativecommons.org/licenses/by-nc-sa/2.1/jp/" target="_blank">CC BY-NC-SA 2.1</a>
-</center>
-
-<br />
+  <%# グローバルメニュー %>
+  <ul class="nav nav-tabs navbar-fixed-top backcolor_white padding_top10">
+    <li class="navbar offset2 <%= params[:controller] == 'top' ? 'active' : '' %>"><%= link_to Settings.app_name, :root, class: "brand" %></li>
+    <% unless session[:user_id].blank? %>
+      <%# ログイン済み %>
+      <li><%= link_to_unless( current_user.screen_name.blank?, image_tag( current_user.image, size: "18x18", class: "margin_minus2" ), "#{Settings.provider_page}#{current_user.screen_name}", target: "_blank" ) %></li>
+      <li class="<%= params[:controller] == 'controllers' ? 'active' : '' %>"><%= link_to( "controllers", { controller: "controllers" } ) %></li>
+      <li><%= link_to( "Logout", logout_path ) %></li>
+    <% else %>
+      <%# 未ログイン %>
+      <li><%= link_to "Login", "/auth/#{Settings.provider}" %></li>
+    <% end %>
+  </ul>
+
+  <div class="container">
+
+  <div class="margin_top50"><div>
+
+  <%# 通知／エラーメッセージ %>
+  <%= simple_format( flash[:notice], style: "color: green;" ) unless flash[:notice].blank? %>
+  <%= simple_format( flash[:alert], style: "color: red;" ) unless flash[:alert].blank? %>
+
+  <%= yield %>
+
+  <br />
+  <br />
+
+  <center>
+    Developed by <a href="https://twitter.com/#!/<%= Settings.programmer_twitter_id %>/" target="_blank">@<%= Settings.programmer_twitter_id %></a>,
+    Designed by <a href="https://twitter.com/#!/<%= Settings.designer_twitter_id %>/" target="_blank">@<%= Settings.designer_twitter_id %></a>,
+    Licence by <a href="https://creativecommons.org/licenses/by-nc-sa/2.1/jp/" target="_blank">CC BY-NC-SA 2.1</a>
+  </center>
+
+  <br />
+
+  </div>

data/lib/omniauth-scaffold/templates/application_controller.rb

@@ -6,7 +6,7 @@ class ApplicationController < ActionController::Base
   # httpsリダイレクト
   before_filter :ssl_redirect if Rails.env.production?
 
-  # 未ログインリダイレクト
+  # ログイン認証
   before_filter :authorize
 
   # セッション有効期限延長
@@ -35,6 +35,9 @@ class ApplicationController < ActionController::Base
     if params[:controller] != "sessions" and params[:controller] != "top"
       # 未ログインであればルートヘリダイレクト
       if session[:user_id].blank?
+        # リクエストURL保管
+        session[:request_url] = request.url
+
         redirect_to :root and return
       end
     end

data/lib/omniauth-scaffold/templates/ja.yml

@@ -2,13 +2,14 @@
 ja:
   # Add
   menu:
-    show: "Show"
-    edit: "Edit"
+    new:     "New"
+    show:    "Show"
+    edit:    "Edit"
     destroy: "Delete"
-    new: "New"
-    top: "Top"
-    list: "List"
-    create: "Create"
+    top:     "Top"
+    list:    "List"
+    create:  "Create"
+    update:  "Update"
 
   date:
     abbr_day_names:

data/lib/omniauth-scaffold/templates/omniauth.rb

@@ -1,10 +1,7 @@
 Rails.application.config.middleware.use OmniAuth::Builder do
-  # --- Twitter - Default --- #
-  provider :twitter, Settings.twitter_key, Settings.twitter_secret
-
-  # --- Others --- #
-  # provider :developer unless Rails.env.production?
-  # provider :twitter,  Settings.twitter_key,      Settings.twitter_secret
-  # provider :github,   Settings.github_client_id, Settings.github_secret
-  # provider :facebook, Settings.facebook_app_id,  Settings.facebook_app_secret
+  # --- Providers --- #
+  provider :developer unless Rails.env.production?
+  provider :twitter,  Settings.twitter_key,      Settings.twitter_secret
+  provider :facebook, Settings.facebook_app_id,  Settings.facebook_app_secret
+  provider :github,   Settings.github_client_id, Settings.github_secret
 end

data/lib/omniauth-scaffold/templates/rails_config/settings.local.yml

@@ -1,3 +1,11 @@
 # Twitter OAuth Local Setting
 twitter_key:    "TWITTER_KEY"
 twitter_secret: "TWITTER_SECRET"
+
+# Facebook OAuth Setting
+facebook_app_id:     "FACEBOOK_APP_ID"
+facebook_app_secret: "FACEBOOK_APP_SECRET"
+
+# GitHub OAuth Setting
+github_client_id: "GITHUB_CLIENT_ID"
+github_secret:    "GITHUB_SECRET"

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

@@ -1,5 +1,12 @@
 # OmniAuth Provider
 provider: "twitter"
+#provider: "facebook"
+#provider: "github"
+
+# Provider Page
+provider_page: "https://twitter.com/"
+#provider_page: "https://www.facebook.com/"
+#provider_page: "https://github.com/"
 
 # アプリケーション名
 app_name: "YOUR_APP_NAME"

data/lib/omniauth-scaffold/templates/sessions_controller.rb

@@ -9,6 +9,13 @@ class SessionsController < ApplicationController
     user = User.where( provider: auth["provider"], uid: auth["uid"] ).first || User.create_with_omniauth( auth )
     session[:user_id] = user.id
 
+    # 保管URLへリダイレクト
+    unless session[:request_url].blank?
+      redirect_to session[:request_url]
+      session[:request_url] = nil
+      return
+    end
+
     redirect_to :root, notice: "ログインしました。"
   end
 

data/lib/omniauth-scaffold/templates/z_style.css.scss

@@ -0,0 +1,26 @@
+.navbar .brand {
+  display: block;
+  float: left;
+  padding: 8px 20px 6px 20px;
+  margin-left: -20px;
+  font-size: 20px;
+  font-weight: 200;
+  line-height: 1;
+  color: #999;
+}
+
+.backcolor_white {
+  background-color: #fff;
+}
+
+.padding_top10 {
+  padding: 10px 0px 0px 0px;
+}
+
+.margin_minus2 {
+  margin: -2px 0px -2px 0px;
+}
+
+.margin_top50 {
+  margin: 50px 0px 0px 0px;
+}

data/lib/omniauth-scaffold/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Scaffold
-    VERSION = "0.1.14"
+    VERSION = "0.1.15"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-scaffold
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000 Z
+date: 2012-07-27 00:00:00.000000000 Z
 dependencies: []
 description: Scaffold for OmniAuth.
 email:
@@ -42,6 +42,7 @@ files:
 - lib/omniauth-scaffold/templates/sessions_controller.rb
 - lib/omniauth-scaffold/templates/top_controller.rb
 - lib/omniauth-scaffold/templates/user.rb
+- lib/omniauth-scaffold/templates/z_style.css.scss
 - lib/omniauth-scaffold/version.rb
 - omniauth-scaffold.gemspec
 homepage: https://github.com/shu0115/omniauth-scaffold