minimum-omniauth-scaffold 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdaf73cb4c1edcd2047dd434c02679512eda2513
-  data.tar.gz: 0cb571e798b03c4c90ad8d0045c6960a29e69eee
+  metadata.gz: 01d9f75658c40d0a9b44a607b3413f817012a86e
+  data.tar.gz: aea95f89fa362e318c3a493fc7701d985d88a965
 SHA512:
-  metadata.gz: 8dcb903956226d1dde8cf2af054874ed87c04213da51fdc029b11749d2760caa2f6be23433e5c0a466b97f9bf992f20d40cc22f945468762cc75cfd4d7455e83
-  data.tar.gz: 6300f337a14f665f37e48a36904f186104d769c247ea40cd9077ab4763dcaa16cc4023f7a20a4364de7e1f727387dcbc678344102e627f275752218929814ffb
+  metadata.gz: 2ef6d2ffcb602d75cccb9a9686851a4b827d0e60d126bebfaf10b17571299e230466d502853a91f47a538488cda308d171f6a89342bdb7463da451c61e8bca27
+  data.tar.gz: 58931d8661f393c6dfb75a3b2780b791d9f9563a08448913b9dc2eaf14c8d539f8b35510dbf5623610714af9c9f8b7ce928d5c6be09fe7558e9a792f2a524722

data/lib/minimum/omniauth/scaffold.rb

@@ -15,7 +15,7 @@ module Minimum
       def generate_scaffold
         app_name = Rails.application.class.name.split('::').first
 
-        ## rails_config
+        # rails_config
         copy_file "#{@@template_path}/rails_config/config.rb", "config/initializers/config.rb"
         copy_file "#{@@template_path}/rails_config/settings.yml", "config/settings.yml"
         copy_file "#{@@template_path}/rails_config/settings.local.yml", "config/settings.local.yml"
@@ -23,10 +23,10 @@ module Minimum
         copy_file "#{@@template_path}/rails_config/production.yml", "config/settings/production.yml"
         copy_file "#{@@template_path}/rails_config/test.yml", "config/settings/test.yml"
 
-        ## omniauth
+        # omniauth
         copy_file "#{@@template_path}/initializers/omniauth.rb", "config/initializers/omniauth.rb"
 
-        ## routes.rb
+        # routes.rb
         content = "\n  # For OmniAuth\n"
         content += "  get \"/auth/:provider/callback\" => \"sessions#callback\"\n"
         content += "  get \"/auth/failure\"            => \"sessions#failure\"\n"
@@ -35,59 +35,44 @@ module Minimum
         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"
 
-        # ## application.rb
-        # content = "    config.time_zone = 'Tokyo'\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\nI18n.enforce_available_locales = true\n", after: "# config.i18n.default_locale = :de\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" )
-
-        # ## production.rb
-        # insert_into_file( "config/environments/production.rb", "  config.force_ssl = true\n", after: "# config.force_ssl = true\n" )  # 強制SSL設定
-
-        # ## development.rb
-        # gsub_file "config/environments/development.rb", /(config.assets.debug = true)+/, "# config.assets.debug = true"  # コメントアウト追加
-        # insert_into_file( "config/environments/development.rb", "  config.assets.debug = false\n", after: "config.assets.debug = true\n" )  # false設定追加
-
-        ## ja.yml
+        # ja.yml
         copy_file "#{@@template_path}/locales/ja.yml", "config/locales/ja.yml"
         copy_file "#{@@template_path}/locales/translation_ja.yml", "config/locales/translation_ja.yml"
 
-        ## migration
+        # 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
+        # models
         copy_file "#{@@template_path}/models/user.rb", "app/models/user.rb"
         copy_file "#{@@template_path}/models/authentication.rb", "app/models/authentication.rb"
 
-        ## controllers
+        # controllers
         content = File.read("#{@@template_path}/controllers/application_controller.rb", encoding: Encoding::UTF_8)
         insert_into_file "app/controllers/application_controller.rb", content.force_encoding('ASCII-8BIT'), after: "protect_from_forgery with: :exception\n"
         copy_file "#{@@template_path}/controllers/sessions_controller.rb", "app/controllers/sessions_controller.rb"
         copy_file "#{@@template_path}/controllers/top_controller.rb", "app/controllers/top_controller.rb"
 
-        ## views
+        # views
         # content = File.read( "#{@@template_path}/views/application.html.erb", encoding: Encoding::UTF_8 )
         # gsub_file "app/views/layouts/application.html.erb", /(<%= yield %>)+/, content.force_encoding('ASCII-8BIT')
         # gsub_file "app/views/layouts/application.html.erb", Regexp.new("<title>#{app_name}</title>"), "<title><%= Settings.app_name %></title>"
 
-        # copy_file 'app/views/layouts/application.html.erb', 'app/views/layouts/_____application.html.erb'
+        copy_file 'app/views/layouts/application.html.erb', 'app/views/layouts/application_BACKUP.html.erb'
         remove_file 'app/views/layouts/application.html.erb'
         copy_file "#{@@template_path}/views/application.html.haml", 'app/views/layouts/application.html.haml'
         copy_file "#{@@template_path}/views/_user_icon.html.haml", "app/views/layouts/_user_icon.html.haml"
         copy_file "#{@@template_path}/views/index.html.haml", "app/views/top/index.html.haml"
 
-        ## assets
+        # assets
         copy_file "#{@@template_path}/stylesheets/scaffolds.css.scss", "app/assets/stylesheets/scaffolds.css.scss"
 
-        ## README
+        # README
+        copy_file 'README.rdoc', 'README_BACKUP.rdoc'
         remove_file 'README.rdoc'
         copy_file "#{@@template_path}/README.md", "README.md"
 
-        ## .gitignore
+        # .gitignore
         content = "\n# Add\n"
         content += ".DS_Store\n"
         content += "vendor/bundle\n"

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

@@ -6,10 +6,8 @@
   # ログイン認証
   def authenticate
     unless signed_in?
-      # リクエストURL保管
       session[:request_url] = request.url
 
-      # ルートヘリダイレクト
       redirect_to :root and return
     end
   end

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

@@ -1,5 +1,5 @@
 class Authentication < ActiveRecord::Base
-  belongs_to :user
+  belongs_to :user, optional: true
 
   # バリデーション
   validates :provider, presence: true
@@ -26,40 +26,36 @@ class Authentication < ActiveRecord::Base
     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)
+  class << self
     # 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']
+    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"]
+      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
-
-    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,26 +1,22 @@
 class User < ActiveRecord::Base
   has_many :authentications
 
-  private
-
-  # ユーザ作成
-  def self.create_with_auth(authentication, request)
+  class << self
     # ユーザ作成
-    user = User.new
-    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.user_agent          = request.env['HTTP_USER_AGENT'] rescue 'error'
-
-    # データ保存
-    user.save!
+    def create_with_auth(authentication, request)
+      user = User.new
+      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.user_agent          = request.env['HTTP_USER_AGENT'] rescue 'error'
+      user.save!
 
-    # auth紐付け
-    authentication.user_id = user.id
-    authentication.save!
+      authentication.user_id = user.id
+      authentication.save!
 
-    return user
+      return user
+    end
   end
 end

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

@@ -9,8 +9,5 @@ app_name: "YOUR_APP_NAME"
 # プログラマTwitterID
 programmer_twitter_id: "PROGRAMMER_TWITTER_ID"
 
-# デザイナーTwitterID
-designer_twitter_id: "DESIGNER_TWITTER_ID"
-
 # 曜日
 weekday: ["日", "月", "火", "水", "木", "金", "土"]

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

@@ -2,10 +2,10 @@
 %html
   %head
     %title= Settings.app_name
-    = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
-    = javascript_include_tag 'application', 'data-turbolinks-track' => true
+    = stylesheet_link_tag    'application', media: 'all'
+    = javascript_include_tag 'application'
     = csrf_meta_tags
-  %body{ 'data-no-turbolink' => true }
+  %body
     = link_to Settings.app_name, :root
 
     - if signed_in?
@@ -28,13 +28,8 @@
 
     %center
       Developed by
-      = succeed "," do
-        %a{ href: "https://twitter.com/#{Settings.programmer_twitter_id}/", target: '_blank' }
-          = "@#{Settings.programmer_twitter_id}"
-      Designed by
-      = succeed "," do
-        %a{ href: "https://twitter.com/#{Settings.designer_twitter_id}/", target: '_blank' }
-          = "@#{Settings.designer_twitter_id}"
-      Licence by
-      %a{ href: 'https://creativecommons.org/licenses/by-nc-sa/2.1/jp/', target: '_blank' }
-        CC BY-NC-SA 2.1
+      = 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

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

@@ -1,7 +1,7 @@
 module Minimum
   module Omniauth
     module Scaffold
-      VERSION = '0.3.0'
+      VERSION = '0.4.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minimum-omniauth-scaffold
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - shu0115
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Minimum OmniAuth Scaffold