minimum-omniauth-scaffold 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b054df83fe81b8289ee0c3b9d1faee5e142a49a
-  data.tar.gz: 9bffd5bfb02881c9ccfb23c29dd23d0d657b0f2a
+  metadata.gz: f48287bf1ddf9d429f7485eef3412005c4ca5354
+  data.tar.gz: cb12d076dc92f7d35b0d1259ea38927e7c4ed196
 SHA512:
-  metadata.gz: 99c4d5c07fab706d7ae7c1d1be7bb7a0af22986548b7ebcd716f4f1ef5bb12039e448fc9a20b551e0a679524f1db108b91bf1b149cfa7c6755b2e6c736ef8e26
-  data.tar.gz: 94c6e15995fb34c30b161447a6604170c39c640ba0aae4a8f10f1bd613b8306f2307e950d2bc285e414aeb2974d606a4afbcd0f7a1534d60031cf5d2f1fdc0b7
+  metadata.gz: 08c72bd924eda54f6fc67c81c3a4b62d435ea18dd174f45b758aafd2537a840ce07205f6cfb02dcada10d81962f37ab17b84a10d93df4026dc444e220bb39614
+  data.tar.gz: 9a9094fdb1707500c4258b5eb9b89fe3764bd5fbf0be393aa30b9b622a396498ee25e88582c97e34a21f05bb72fd7046345a669b48c1fff289072ee153b3178c

data/lib/minimum/omniauth/scaffold.rb

@@ -29,9 +29,9 @@ module Minimum
 
         # routes.rb
         content = "\n  # For OmniAuth\n"
-        content += "  get \"/auth/:provider/callback\" => \"sessions#callback\"\n"
-        content += "  get \"/auth/failure\"            => \"sessions#failure\"\n"
-        content += "  get \"/logout\"                  => \"sessions#destroy\", as: :logout\n"
+        content += "  get '/auth/:provider/callback', to: 'sessions#callback'\n"
+        content += "  get '/auth/failure',            to: 'sessions#failure'\n"
+        content += "  get '/logout',                  to: 'sessions#destroy', as: :logout\n"
         content += "\n"
         insert_into_file "config/routes.rb", content.force_encoding('ASCII-8BIT'), after: "Rails.application.routes.draw do\n"
         insert_into_file "config/routes.rb", "  root to: 'top#index'\n", after: "Rails.application.routes.draw do\n"
@@ -73,14 +73,14 @@ module Minimum
         # assets
         copy_file "#{@@template_path}/stylesheets/scaffolds.css.scss", "app/assets/stylesheets/scaffolds.css.scss"
 
-        # README
-        begin
-          copy_file "#{@@current_path}/README.md", 'README_BACKUP.md'
-          remove_file "#{@@current_path}/README.md"
-        rescue => e
-          e.tapp
-        end
-        copy_file "#{@@template_path}/README.md", "README.md"
+        # # README
+        # begin
+        #   copy_file "#{@@current_path}/README.md", 'README_BACKUP.md'
+        #   remove_file "#{@@current_path}/README.md"
+        # rescue => e
+        #   e.tapp
+        # end
+        # copy_file "#{@@template_path}/README.md", "README.md"
 
         # .gitignore
         content = "\n# Add\n"

data/lib/minimum/omniauth/scaffold/templates/README.md

@@ -39,7 +39,7 @@ CAPTCHA入力後「Create your Twitter application」を押下
 
 ### ローカル用Twitterキー設定
 
-Create: config/settings.local.yml
+- Create: config/settings.local.yml
 
 ```ruby
 # Twitter OAuth Local Setting
@@ -51,28 +51,28 @@ twitter_secret: "YOUR_CONSUMER_SECRET"
 
 ### Rails起動
 
-Gemインストール
+- Gemインストール
 
 ```
 bundle install --without production
 ```
 
-ローカルDB作成
+- ローカルDB作成
 
 ```
-rake db:setup
+bundle exec rake db:migrate
 ```
 
-ローカルサーバ起動
+- ローカルサーバ起動
 
 ```
 bundle exec rails s
 ```
 
-ページアクセス
+- ページアクセス
 
 ```
-http://0.0.0.0:3000/
+http://localhost:3000/
 ```
 
 ## Copyright

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

@@ -1,9 +1,8 @@
-  before_action :authenticate           # ログイン認証
-  before_action :reset_session_expires  # セッション有効期限延長
+  before_action :authenticate
+  before_action :reset_session_expires
 
   private
 
-  # ログイン認証
   def authenticate
     unless signed_in?
       session[:request_url] = request.url
@@ -12,18 +11,15 @@
     end
   end
 
-  # セッション期限延長
   def reset_session_expires
     request.session_options[:expire_after] = 2.weeks
   end
 
-  # ログインユーザ
   def current_user
     @current_user ||= User.find_by(id: session[:user_id])
   end
   helper_method :current_user
 
-  # ログイン／ユーザ登録済みチェック
   def signed_in?
     User.where(id: session[:user_id]).exists?
   end

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

@@ -1,19 +1,16 @@
 class SessionsController < ApplicationController
   skip_before_action :authenticate
 
-  # ログイン
   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)
 
-    # ユーザ取得or作成
     user = User.find_by(id: authentication.user_id) || User.create_with_auth(authentication, request)
 
     session[:user_id] = user.id
     flash[:notice]    = "ログインしました。"
 
-    # 保管URLへリダイレクト
     unless session[:request_url].blank?
       redirect_to session[:request_url]
       session[:request_url] = nil
@@ -23,16 +20,15 @@ class SessionsController < ApplicationController
     redirect_to :root and return
   end
 
-  # ログアウト
   def destroy
     session[:user_id] = nil
 
     redirect_to :root, notice: "ログアウトしました。" and return
   end
 
-  # ログインエラー
   def failure
     flash[:alert] = 'Auth Failure'
+
     redirect_to :root and return
   end
 end

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

@@ -1,7 +1,6 @@
 class TopController < ApplicationController
   skip_before_action :authenticate
 
-  # トップ
   def index
   end
 end

data/lib/minimum/omniauth/scaffold/templates/initializers/omniauth.rb

@@ -1,6 +1,5 @@
 Rails.application.config.middleware.use OmniAuth::Builder do
   # 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

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

@@ -4,7 +4,7 @@ class CreateUsers < ActiveRecord::Migration
       t.string    :name
       t.string    :image
       t.string    :email
-      t.boolean   :admin_flag, default: false
+      t.boolean   :admin_flag, default: false, null: false
       t.string    :last_login_provider
       t.timestamp :last_login_at
       t.text      :user_agent

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

@@ -1,56 +1,53 @@
 class Authentication < ActiveRecord::Base
   belongs_to :user, optional: true
 
-  # バリデーション
   validates :provider, presence: true
-  validates :uid, presence: true
+  validates :uid,      presence: true
 
-  # auth情報更新
   def auth_update(auth)
-    case auth["provider"]
-    when "facebook"
+    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"
+    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
+    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.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.email    = auth['info']['email']    if auth['info']['email'].present?
     self.gender   = gender                   if gender.present?
     self.location = location                 if location.present?
     self.save!
   end
 
   class << self
-    # auth情報登録
     def create_with_omniauth(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"]
+      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?
+      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?
+      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!

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

@@ -2,7 +2,6 @@ class User < ActiveRecord::Base
   has_many :authentications
 
   class << self
-    # ユーザ作成
     def create_with_auth(authentication, request)
       user = User.new
       user.name                = (authentication.nickname.presence || authentication.name)

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

@@ -1,13 +1,5 @@
-# Provider Page
-twitter_page:  "https://twitter.com/"
-facebook_page: "https://www.facebook.com/"
-github_page:   "https://github.com/"
+app_name: 'YOUR_APP_NAME'
 
-# アプリケーション名
-app_name: "YOUR_APP_NAME"
-
-# プログラマTwitterID
-programmer_twitter_id: "PROGRAMMER_TWITTER_ID"
-
-# 曜日
-weekday: ["日", "月", "火", "水", "木", "金", "土"]
+twitter_page:  'https://twitter.com/'
+facebook_page: 'https://www.facebook.com/'
+github_page:   'https://github.com/'

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

@@ -2,10 +2,11 @@
 %html
   %head
     %title= Settings.app_name
-    = stylesheet_link_tag    'application', media: 'all'
-    = javascript_include_tag 'application'
     = csrf_meta_tags
-  %body
+
+    = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload'
+    = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
+  %body{ class: [controller_name, action_name], id: [controller_name, action_name] }
     = link_to Settings.app_name, :root
 
     - if signed_in?
@@ -27,9 +28,4 @@
     %br/
 
     %center
-      Developed by
-      = link_to "@#{Settings.programmer_twitter_id}", "https://twitter.com/#{Settings.programmer_twitter_id}/", target: '_blank'
-
-      -# Licence by
-      -# %a{ href: 'https://creativecommons.org/licenses/by-nc-sa/2.1/jp/', target: '_blank' }
-      -#   CC BY-NC-SA 2.1
+      Developed by YOUR_NAME

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

@@ -1,7 +1,7 @@
 module Minimum
   module Omniauth
     module Scaffold
-      VERSION = '0.4.3'
+      VERSION = '0.4.4'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minimum-omniauth-scaffold
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - shu0115
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,11 +139,8 @@ files:
 - lib/minimum/omniauth/scaffold/templates/rails_config/settings.yml
 - lib/minimum/omniauth/scaffold/templates/rails_config/test.yml
 - lib/minimum/omniauth/scaffold/templates/stylesheets/scaffolds.css.scss
-- lib/minimum/omniauth/scaffold/templates/views/_user_icon.html.erb
 - lib/minimum/omniauth/scaffold/templates/views/_user_icon.html.haml
-- lib/minimum/omniauth/scaffold/templates/views/application.html.erb
 - lib/minimum/omniauth/scaffold/templates/views/application.html.haml
-- lib/minimum/omniauth/scaffold/templates/views/index.html.erb
 - lib/minimum/omniauth/scaffold/templates/views/index.html.haml
 - lib/minimum/omniauth/scaffold/version.rb
 - minimum-omniauth-scaffold.gemspec

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

@@ -1,3 +0,0 @@
-<% if user.present? %>
-  <%= 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

@@ -1,28 +0,0 @@
-<%= link_to Settings.app_name, :root %>
-
-<% 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 %>
-<% else %>
-  <%# 未ログイン %>
-  Login:
-  <%= link_to "Twitter", "/auth/twitter" %>
-  <%= link_to "Facebook", "/auth/facebook" %>
-  <%= link_to "GitHub", "/auth/github" %>
-<% end %>
-
-<%# 通知／エラーメッセージ %>
-<%= simple_format(flash[:notice], style: "color: green;") if flash[:notice].present? %>
-<%= simple_format(flash[:alert], style: "color: red;") if flash[:alert].present? %>
-
-<%= 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>

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

@@ -1,2 +0,0 @@
-
-<h1>Welcome to <%= Settings.app_name %>.</h1>