minimum-omniauth-scaffold 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 342dc584a9e265365ef9429611f7f3c96929a65e
-  data.tar.gz: a8c3de60e803ecb5db700b1eb123df12bb2d6437
+  metadata.gz: 33892c60d2859d617507140936a030ec64dabc25
+  data.tar.gz: 1368589131c08029d0e2374109e2fa971365aa76
 SHA512:
-  metadata.gz: c96ab22403702d67e0735771ed2994f824f1b3f12c424cdb86b646588e2bbf8cfeb7358871fac1fcb021f023b16d0d45ee38e48e649ad427ea2a17ef622ef364
-  data.tar.gz: 03c664e9aedca10ee739fb290b0e80a0fe4b785678fef5a18624f1b4a2b76e56ac426620c1e2fd83a54c80e0198f6c005984350e4d6b34f035f635e3e681b1b1
+  metadata.gz: 3158e5392c0bcec58f4f7d2e45cda5083860ea88780c5afe2362e155bef373311006d5a3f0ea47c35600b456148182115a4430350f5008f800758d376602783f
+  data.tar.gz: e20e4edf4c4d02c354f63e90b9508e29ba3bb53dfb99a5f81db0a1ac4a2ec2262c91ae046681207d43f393cff3446ba679840468ec6335c5086e090702d7fedd

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

@@ -1,19 +1,16 @@
-  before_filter :authorize              # ログイン認証
+  before_filter :authenticate           # ログイン認証
   before_filter :reset_session_expires  # セッション有効期限延長
 
   private
 
   # ログイン認証
-  def authorize
-    # セッション／トップコントローラ以外で
-    if params[:controller] != "sessions" and params[:controller] != "top"
-      unless user_signed_in?
-        # リクエストURL保管
-        session[:request_url] = request.url
+  def authenticate
+    unless signed_in?
+      # リクエストURL保管
+      session[:request_url] = request.url
 
-        # ルートヘリダイレクト
-        redirect_to :root and return
-      end
+      # ルートヘリダイレクト
+      redirect_to :root and return
     end
   end
 
@@ -29,7 +26,7 @@
   helper_method :current_user
 
   # ユーザ登録チェック
-  def user_signed_in?
+  def signed_in?
     User.where( id: session[:user_id] ).exists?
   end
-  helper_method :user_signed_in?
+  helper_method :signed_in?

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

@@ -1,4 +1,6 @@
 class SessionsController < ApplicationController
+  skip_before_filter :authenticate
+
   # ログイン
   def callback
     auth = request.env["omniauth.auth"]

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

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

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

@@ -11,3 +11,6 @@ programmer_twitter_id: "PROGRAMMER_TWITTER_ID"
 
 # デザイナーTwitterID
 designer_twitter_id: "DESIGNER_TWITTER_ID"
+
+# 曜日
+weekday: ["日", "月", "火", "水", "木", "金", "土"]

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

@@ -1,6 +1,6 @@
 <%= link_to Settings.app_name, :root %>
 
-<% if user_signed_in? %>
+<% if signed_in? %>
   <%# ログイン済み %>
   <%= render partial: '/layouts/user_icon', locals: { user: current_user, size: "18x18", klass: "margin_minus2" } %>
   <%= link_to( "Top", root_path ) %>

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

@@ -1,7 +1,7 @@
 module Minimum
   module Omniauth
     module Scaffold
-      VERSION = "0.1.4"
+      VERSION = "0.1.5"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minimum-omniauth-scaffold
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - shu0115