omniauth-scaffold 0.1.15 → 0.1.16

data/Gemfile

@@ -1,4 +1,9 @@
 source 'https://rubygems.org'
 
+# gem 'omniauth-twitter'
+# gem 'omniauth-facebook'
+# gem 'omniauth-github'
+# gem 'rails_config'
+
 # Specify your gem's dependencies in omniauth-scaffold.gemspec
 gemspec

data/lib/omniauth-scaffold/templates/application_controller.rb

@@ -3,9 +3,6 @@ class ApplicationController < ActionController::Base
 
   protect_from_forgery
 
-  # httpsリダイレクト
-  before_filter :ssl_redirect if Rails.env.production?
-
   # ログイン認証
   before_filter :authorize
 
@@ -14,18 +11,6 @@ class ApplicationController < ActionController::Base
 
   private
 
-  #--------------#
-  # ssl_redirect #
-  #--------------#
-  # httpsへリダイレクト(Production環境のみ)
-  def ssl_redirect
-    unless request.env["HTTP_X_FORWARDED_PROTO"].to_s == "https"
-      request.env["HTTP_X_FORWARDED_PROTO"] = "https"
-
-      redirect_to request.url and return
-    end
-  end
-
   #-----------#
   # authorize #
   #-----------#

data/lib/omniauth-scaffold/templates/create_users.rb

@@ -4,7 +4,7 @@ class CreateUsers < ActiveRecord::Migration
       t.string :provider
       t.string :uid
       t.string :name
-      t.string :screen_name
+      t.string :nickname
       t.string :image
       t.string :token
       t.string :secret

data/lib/omniauth-scaffold/templates/user.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 class User < ActiveRecord::Base
-  attr_accessible :provider, :uid, :name, :screen_name, :image, :token, :secret
+  attr_accessible :provider, :uid, :name, :nickname, :image, :token, :secret
 
   private
 
@@ -10,16 +10,16 @@ class User < ActiveRecord::Base
   def self.create_with_omniauth( auth )
     user = User.new
     user[:provider] = auth["provider"]
-    user[:uid] = auth["uid"]
+    user[:uid]      = auth["uid"]
 
     unless auth["info"].blank?
-      user[:name] = auth["info"]["name"]
-      user[:screen_name] = auth["info"]["nickname"]
-      user[:image] = auth["info"]["image"]
+      user[:name]     = auth["info"]["name"]
+      user[:nickname] = auth["info"]["nickname"]
+      user[:image]    = auth["info"]["image"]
     end
 
     unless auth["credentials"].blank?
-      user.token = auth['credentials']['token']
+      user.token  = auth['credentials']['token']
       user.secret = auth['credentials']['secret']
     end
 

data/lib/omniauth-scaffold/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Scaffold
-    VERSION = "0.1.15"
+    VERSION = "0.1.16"
   end
 end

data/lib/omniauth-scaffold.rb

@@ -1,6 +1,10 @@
 # coding: utf-8
 require "omniauth-scaffold/version"
 require 'rails/generators'
+# require 'omniauth-twitter'
+# require 'omniauth-facebook'
+# require 'omniauth-github'
+# require 'rails_config'
 
 module Omniauth
   module Generators
@@ -32,7 +36,7 @@ module Omniauth
         content += "  match \"/logout\" => \"sessions#destroy\", :as => :logout\n"
         insert_into_file( "config/routes.rb", content.force_encoding('ASCII-8BIT'), after: "# first created -> highest priority.\n" )
         insert_into_file( "config/routes.rb", "  root to: 'top#index'\n", after: "# root :to => 'welcome#index'\n" )
-        insert_into_file( "config/routes.rb", "  match ':controller(/:action(/:id))(.:format)'\n", after: "# match ':controller(/:action(/:id))(.:format)'\n" )
+#        insert_into_file( "config/routes.rb", "  match ':controller(/:action(/:id))(.:format)'\n", after: "# match ':controller(/:action(/:id))(.:format)'\n" )
 
         # ----- application.rb ----- #
         content = "    config.time_zone = 'Tokyo'\n"
@@ -43,12 +47,15 @@ module Omniauth
         content += "    config.assets.initialize_on_precompile = false\n"
         insert_into_file( "config/application.rb", content.force_encoding('ASCII-8BIT'), after: "config.assets.version = '1.0'\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', 5, 1*1024*1024 )  # 1MB * 5\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" )
+        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( "templates/ja.yml", "config/locales/ja.yml" )

data/omniauth-scaffold.gemspec

@@ -1,5 +1,8 @@
 # -*- encoding: utf-8 -*-
 require File.expand_path('../lib/omniauth-scaffold/version', __FILE__)
+require 'omniauth-twitter'
+require 'omniauth-facebook'
+require 'omniauth-github'
 
 Gem::Specification.new do |gem|
   gem.authors       = ["shu0115"]
@@ -14,4 +17,8 @@ Gem::Specification.new do |gem|
   gem.name          = "omniauth-scaffold"
   gem.require_paths = ["lib"]
   gem.version       = Omniauth::Scaffold::VERSION
+
+  gem.add_dependency 'omniauth-twitter'
+  gem.add_dependency 'omniauth-facebook'
+  gem.add_dependency 'omniauth-github'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-scaffold
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000 Z
-dependencies: []
+date: 2012-10-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: omniauth-twitter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: omniauth-facebook
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: omniauth-github
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Scaffold for OmniAuth.
 email:
 - raisondetre0115@gmail.com
@@ -65,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: OmniAuth Scaffold