omniauth-aai 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b87c117309a3290ee4e37f6bc414b56fbdd0ffa
-  data.tar.gz: bc2eaaa59d130f957972955afb53e12184670d3f
+  metadata.gz: 34d1882cfde2f04a63e7078eb4a75fde89e0eda4
+  data.tar.gz: abca5c42f1b63dab8d9fd0cf0bdddc700b8bf7c0
 SHA512:
-  metadata.gz: 16a90ab2ded25d5764ea7d6a703eb7ebda78077981b8d842fcc29f3ea1c90b38ca6543b014ebb96335c935ff05c8e437b1b77429e1dd570d98bd443c76aaa5a5
-  data.tar.gz: a365df4adf2fbceecabdcd5f72ad0c9b88b22774218957a8040580a8db82294570fc2ff8ba71dbef4818f3a30725b9e7821b13726d6d72670747aedc9ccef263
+  metadata.gz: fef01337e15a26af5e0b1235289d155ffc7a4050190230049a14c73c684adff16e16aec1b86e3242c4903b5ca04303f7152716f045af2e46e09b84adcfa49f3f
+  data.tar.gz: 1afc814febb19cfd71ffb88a874fe20d49a9f9804da992a24c824d9e3f4e597b35d08e581651c804763eb7dcb323a3a421c3bbc9536c887a2759c7e68bca0e41

data/lib/generators/aai/templates/user.rb

@@ -1,7 +1,5 @@
 class User <%= options[:persist]  ? "< ActiveRecord::Base" : "" %>
 <% if options[:persist] -%>
-  # attr_accessible :uid
-  # attr_accessor :aai
   PERSISTENT = true
 
   def self.update_or_create_with_omniauth_aai(omniauth_aai)
@@ -20,24 +18,12 @@ class User <%= options[:persist]  ? "< ActiveRecord::Base" : "" %>
     end
   end
 
-<% else -%>
-  attr_accessor :aai, :uid
-  PERSISTENT = false
-<% end -%>
-
   def name
-    aai[:info][:name]
+    "#{first_name} #{last_name}"
   rescue
     nil
   end
 
-  def email
-    aai[:info][:email]
-  rescue
-    nil
-  end
-
-<% if options[:persist] -%>
   def marshal
     self.uid
   end
@@ -49,7 +35,23 @@ class User <%= options[:persist]  ? "< ActiveRecord::Base" : "" %>
   def unmarshal(session_data)
     self.reload
   end
+
 <% else -%>
+  attr_accessor :aai, :uid
+  PERSISTENT = false
+
+  def name
+    aai[:info][:name]
+  rescue
+    nil
+  end
+
+  def email
+    aai[:info][:email]
+  rescue
+    nil
+  end
+
   def marshal
     {
       id: self.uid,

data/lib/omniauth-aai/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Aai
-    VERSION = "0.6.8"
+    VERSION = "0.6.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-aai
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Christian Rohrer