minimum-omniauth-scaffold 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9edb2d59ecf23e33b00268e92b5bc16a7b1f4dcf
-  data.tar.gz: ae237f9a91e52a9382a0417cad0b4c56ffdb32b3
+  metadata.gz: 342dc584a9e265365ef9429611f7f3c96929a65e
+  data.tar.gz: a8c3de60e803ecb5db700b1eb123df12bb2d6437
 SHA512:
-  metadata.gz: ebb83022d112f0264a95b67f4bfd09eca88dee6148d607d284bd4d911a29a48fe1d6d2b8336a8a25bf3b5d27ff5be08c9a1682490d31cbf118cf2120a6b5cad3
-  data.tar.gz: 84c11cdd3bfc8b25e41eeb33b1c691f18cc9ab799ff438478deddb82de294c371ae039dcd4a64fded9d6458528a947c564d5a5f304ce286a915143b91e824e01
+  metadata.gz: c96ab22403702d67e0735771ed2994f824f1b3f12c424cdb86b646588e2bbf8cfeb7358871fac1fcb021f023b16d0d45ee38e48e649ad427ea2a17ef622ef364
+  data.tar.gz: 03c664e9aedca10ee739fb290b0e80a0fe4b785678fef5a18624f1b4a2b76e56ac426620c1e2fd83a54c80e0198f6c005984350e4d6b34f035f635e3e681b1b1

data/lib/minimum/omniauth/scaffold.rb

@@ -42,9 +42,9 @@ module Minimum
 #        content += "    config.active_record.default_timezone = :local\n"
         insert_into_file( "config/application.rb", content.force_encoding('ASCII-8BIT'), after: "# config.time_zone = 'Central Time (US & Canada)'\n" )
         insert_into_file( "config/application.rb", "    config.i18n.default_locale = :ja\n", after: "# config.i18n.default_locale = :de\n" )
-        content = "    # For Heroku\n"
-        content += "    config.assets.initialize_on_precompile = false\n"
-        content += "\n    # For Tapp\n"
+#        content = "    # For Heroku\n"
+#        content += "    config.assets.initialize_on_precompile = false\n"
+        content = "    # For Tapp\n"
         content += "    Tapp.config.default_printer = :awesome_print\n"
         content += "\n"
         insert_into_file( "config/application.rb", content.force_encoding('ASCII-8BIT'), after: "class Application < Rails::Application\n" )

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

@@ -7,8 +7,7 @@
   def authorize
     # セッション／トップコントローラ以外で
     if params[:controller] != "sessions" and params[:controller] != "top"
-      # 未ログインであれば
-      if current_user.blank?
+      unless user_signed_in?
         # リクエストURL保管
         session[:request_url] = request.url
 
@@ -28,3 +27,9 @@
     @current_user ||= User.where( id: session[:user_id] ).first
   end
   helper_method :current_user
+
+  # ユーザ登録チェック
+  def user_signed_in?
+    User.where( id: session[:user_id] ).exists?
+  end
+  helper_method :user_signed_in?

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

@@ -1,6 +1,6 @@
 <%= link_to Settings.app_name, :root %>
 
-<% if current_user.present? %>
+<% if user_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.3"
+      VERSION = "0.1.4"
     end
   end
 end

metadata

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