minimum-omniauth-scaffold 0.1.10 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e4c6257e1b1be005843a1c89e7cd072ccdacff2
-  data.tar.gz: 8cef10adc8d4bce93c3259e76e7fa329dfa98273
+  metadata.gz: 95c5062c1e0686de1fd6c70f74cb5f7f64f940fe
+  data.tar.gz: c406d7a6cf6faf23f6365dd7cc4502f4158610d9
 SHA512:
-  metadata.gz: 494e627c8181280efba5c85bfaea12c27fe91d7fb22cb7b2abe69c47b966964147f0107bbf5b7ae616c888efd3f4d22ce7c7cf0bc309077266ef39a6381076d5
-  data.tar.gz: 1c6c705c9205b060ec892a80c1b1ba0b23ba3f17c5cb5c10835c2af48671e5a4ed31ef7d0da39e92e4de107369b304d4a6277796541b3c7a1ad111b6003d6725
+  metadata.gz: a4643d4474da688ac6fb31a83351763124e81a3fb51eb377d718a4d29c282c4280e5e16cb437dbe9ccfdbd7285b39acb8b1c9e1156198d068d3cc2cf5e464a53
+  data.tar.gz: 6ec0c22bb2837e778dd1ecb524b7c2007a4bb0e9f03426913241687986435c6a071b9436ee6432b90dc87332e8ecb0276d4d080ce4ae8fa3fa6fbbcf3bc864bb

data/README.md

@@ -65,7 +65,7 @@ rails g minimum:omniauth:scaffold
 rake db:migrate
 ```
 
-### キー作成
+### 開発用キー作成
 
 * Twitter
   * [Create an application | Twitter Developers](https://dev.twitter.com/apps/new)
@@ -97,6 +97,8 @@ github_secret:    "Client Secret"
 
 ## Heroku環境変数設定
 
+※Production用キーを別途作成
+
 * Twitter
 
 ```

data/lib/minimum/omniauth/scaffold.rb

@@ -10,86 +10,84 @@ require 'awesome_print'
 module Minimum
   module Omniauth
     class ScaffoldGenerator < Rails::Generators::Base
-      @@template_path = source_root File.expand_path( "../scaffold/templates", __FILE__ )
+      @@template_path = source_root File.expand_path("../scaffold/templates", __FILE__)
 
       def generate_scaffold
         app_name = Rails.application.class.name.split('::').first
 
-        # ----- rails_config ----- #
-        copy_file( "#{@@template_path}/rails_config/rails_config.rb", "config/initializers/rails_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" )
-        copy_file( "#{@@template_path}/rails_config/development.yml", "config/settings/development.yml" )
-        copy_file( "#{@@template_path}/rails_config/production.yml", "config/settings/production.yml" )
-        copy_file( "#{@@template_path}/rails_config/test.yml", "config/settings/test.yml" )
+        ## rails_config
+        copy_file "#{@@template_path}/rails_config/rails_config.rb", "config/initializers/rails_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"
+        copy_file "#{@@template_path}/rails_config/development.yml", "config/settings/development.yml"
+        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 ----- #
-        copy_file( "#{@@template_path}/initializers/omniauth.rb", "config/initializers/omniauth.rb" )
+        ## 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"
         content += "  get \"/logout\"                  => \"sessions#destroy\", as: :logout\n"
         content += "\n"
-        insert_into_file( "config/routes.rb", content.force_encoding('ASCII-8BIT'), after: "Application.routes.draw do\n" )
-        insert_into_file( "config/routes.rb", "  root to: 'top#index'\n", after: "Application.routes.draw do\n" )
-
-        # ----- application.rb ----- #
-        content = "    config.time_zone = 'Tokyo'\n"
-#        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\nI18n.enforce_available_locales = true\n", after: "# config.i18n.default_locale = :de\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" )
-
-        # ----- production.rb ----- #
-        insert_into_file( "config/environments/production.rb", "  config.force_ssl = true\n", after: "# config.force_ssl = true\n" )  # 強制SSL設定
-
-        # ----- development.rb ----- #
-#        content = "\n  # For LogRotate\n"
-#        content += "  config.logger = Logger.new( 'log/development.log', 3, 10*1024*1024 )  # 10MB * 3\n"
-#        insert_into_file( "config/environments/development.rb", content.force_encoding('ASCII-8BIT'), after: "config.assets.debug = true\n" )
-        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 ----- #
-        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 ----- #
-        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 ----- #
-        copy_file( "#{@@template_path}/models/user.rb", "app/models/user.rb" )
-        copy_file( "#{@@template_path}/models/authentication.rb", "app/models/authentication.rb" )
-
-        # ----- 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 ----- #
-        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( "#{@@template_path}/views/_user_icon.html.erb", "app/views/layouts/_user_icon.html.erb" )
-        copy_file( "#{@@template_path}/views/index.html.erb", "app/views/top/index.html.erb" )
-
-        # ----- assets ----- #
-        copy_file( "#{@@template_path}/stylesheets/scaffolds.css.scss", "app/assets/stylesheets/scaffolds.css.scss" )
-
-        # ----- README ----- #
-        remove_file( 'README.rdoc' )
-        copy_file( "#{@@template_path}/README.md", "README.md" )
-
-        # ----- .gitignore ----- #
+        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
+        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
+        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
+        copy_file "#{@@template_path}/models/user.rb", "app/models/user.rb"
+        copy_file "#{@@template_path}/models/authentication.rb", "app/models/authentication.rb"
+
+        ## 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
+        # 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'
+        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
+        copy_file "#{@@template_path}/stylesheets/scaffolds.css.scss", "app/assets/stylesheets/scaffolds.css.scss"
+
+        ## README
+        remove_file 'README.rdoc'
+        copy_file "#{@@template_path}/README.md", "README.md"
+
+        ## .gitignore
         content = "\n# Add\n"
         content += ".DS_Store\n"
         content += "vendor/bundle\n"
@@ -98,7 +96,7 @@ module Minimum
         content += "config/settings.local.yml\n"
         content += "config/settings/*.local.yml\n"
         content += "config/environments/*.local.yml\n"
-        append_file( ".gitignore", content.force_encoding('ASCII-8BIT') )
+        append_file ".gitignore", content.force_encoding('ASCII-8BIT')
       end
     end
   end

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

@@ -1,5 +1,5 @@
-  before_filter :authenticate           # ログイン認証
-  before_filter :reset_session_expires  # セッション有効期限延長
+  before_action :authenticate           # ログイン認証
+  before_action :reset_session_expires  # セッション有効期限延長
 
   private
 

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

@@ -1,5 +1,5 @@
 class SessionsController < ApplicationController
-  skip_before_filter :authenticate
+  skip_before_action :authenticate
 
   # ログイン
   def callback
@@ -8,7 +8,7 @@ class SessionsController < ApplicationController
     authentication.auth_update(auth)
 
     # ユーザ取得or作成
-    user = User.find_by(id: authentication.user_id) || User.create_with_auth(authentication)
+    user = User.find_by(id: authentication.user_id) || User.create_with_auth(authentication, request)
 
     session[:user_id] = user.id
     flash[:notice]    = "ログインしました。"

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

@@ -1,5 +1,5 @@
 class TopController < ApplicationController
-  skip_before_filter :authenticate
+  skip_before_action :authenticate
 
   # トップ
   def index

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

@@ -7,6 +7,7 @@ class CreateUsers < ActiveRecord::Migration
       t.boolean   :admin_flag, default: false
       t.string    :last_login_provider
       t.timestamp :last_login_at
+      t.text      :user_agent
 
       t.timestamps
     end

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

@@ -4,7 +4,7 @@ class User < ActiveRecord::Base
   private
 
   # ユーザ作成
-  def self.create_with_auth(authentication)
+  def self.create_with_auth(authentication, request)
     # ユーザ作成
     user = User.new
     user.name                = (authentication.nickname.presence || authentication.name)
@@ -12,6 +12,7 @@ class User < ActiveRecord::Base
     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!

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

@@ -0,0 +1,2 @@
+- 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)

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

@@ -0,0 +1,40 @@
+!!!
+%html
+  %head
+    %title= Settings.app_name
+    = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
+    = javascript_include_tag 'application', 'data-turbolinks-track' => true
+    = csrf_meta_tags
+  %body{ 'data-no-turbolink' => true }
+    = 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'
+
+    = 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
+      = 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

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

@@ -0,0 +1 @@
+%h1= "Welcome to #{Settings.app_name}"

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

@@ -1,7 +1,7 @@
 module Minimum
   module Omniauth
     module Scaffold
-      VERSION = '0.1.10'
+      VERSION = '0.2.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minimum-omniauth-scaffold
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
 platform: ruby
 authors:
 - shu0115
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,8 +154,11 @@ files:
 - 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
 homepage: https://github.com/shu0115/minimum-omniauth-scaffold