minimum-omniauth-scaffold 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33892c60d2859d617507140936a030ec64dabc25
-  data.tar.gz: 1368589131c08029d0e2374109e2fa971365aa76
+  metadata.gz: b58db84863bddeda53dfe1deb1be497cf6f7e5c6
+  data.tar.gz: f4cc21e109fa18c68b743c351bc01ef07991a133
 SHA512:
-  metadata.gz: 3158e5392c0bcec58f4f7d2e45cda5083860ea88780c5afe2362e155bef373311006d5a3f0ea47c35600b456148182115a4430350f5008f800758d376602783f
-  data.tar.gz: e20e4edf4c4d02c354f63e90b9508e29ba3bb53dfb99a5f81db0a1ac4a2ec2262c91ae046681207d43f393cff3446ba679840468ec6335c5086e090702d7fedd
+  metadata.gz: a461ee413262ac5570b5aba564e000de4be6a54fd7e035cd39139c6dfb7ef4740730ba62832007d5e75fbea23d00961cdda2c513c6d0e3ea4c83a4451e6626b9
+  data.tar.gz: 65fdc8f07dac7d6c9c704cb7fc5a5786ac53f91b44a3812e902d56d39a5496fdf49568032d89d8cfe03da08a170d071a710cae4de6bdabc6c2c0bd2550bdf741

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

@@ -8,6 +8,7 @@ class CreateUsers < ActiveRecord::Migration
       t.string :image
       t.string :email
       t.string :location
+      t.string :gender
       t.string :token
       t.string :secret
 

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

@@ -1,6 +1,4 @@
 class User < ActiveRecord::Base
-#  attr_accessible :provider, :uid, :name, :nickname, :image, :email, :location, :token, :secret
-
   # auth情報更新
   def auth_update( auth )
     if auth["provider"] == "facebook"
@@ -9,12 +7,13 @@ class User < ActiveRecord::Base
       image_path = auth["info"]["image"]
     end
 
-    if self.name != auth["info"]["name"] or self.nickname != auth["info"]["nickname"] or self.image != image_path or self.email != auth["info"]["email"] or self.location != auth["info"]["location"]
+    if self.name != auth["info"]["name"] or self.nickname != auth["info"]["nickname"] or self.image != image_path or self.email != auth["info"]["email"]
       self.name     = auth["info"]["name"]
       self.nickname = auth["info"]["nickname"]
       self.image    = image_path
       self.email    = auth["info"]["email"]
-      self.location = auth["info"]["location"]
+      self.gender   = auth["extra"]["raw_info"]["gender"]
+      self.location = auth["info"]["location"] || auth["extra"]["raw_info"]["location"]
       self.save!
     end
   end
@@ -40,6 +39,11 @@ class User < ActiveRecord::Base
       user.secret = auth['credentials']['secret']
     end
 
+    if auth["extra"].present? and auth["extra"]["raw_info"].present?
+      user.gender   = auth["extra"]["raw_info"]["gender"]
+      user.location = auth["extra"]["raw_info"]["location"] if user.location.blank?
+    end
+
     user.save!
 
     return user

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minimum-omniauth-scaffold
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - shu0115
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler