ucb_rails 0.0.4 → 0.0.5

data/app/models/ucb_rails/user.rb

@@ -5,8 +5,16 @@ class UcbRails::User < ActiveRecord::Base
   
   before_validation :set_first_last_name
   
-  def admin!
-    update_attribute(:admin, true)
+  def active?
+    !inactive?
+  end
+  
+  def admin!(_admin=true)
+    update_attribute(:admin, _admin)
+  end
+  
+  def inactive!(_inactive=true)
+    update_attribute(:inactive, _inactive)
   end
   
   def self.active

data/app/models/ucb_rails/user_ldap_service.rb

@@ -3,11 +3,14 @@ class UcbRails::UserLdapService
   class << self
     
     def create_user_from_uid(uid)
+      UcbRails.logger.debug "create_user_from_uid #{uid}"
+      
       ldap_entry = UcbRails::LdapPerson::Finder.find_by_uid!(uid)
       create_user_from_ldap_entry(ldap_entry)
     end
     
     def create_user_from_ldap_entry(ldap_entry)
+      UcbRails.logger.debug "create_user_from_ldap_entry #{ldap_entry.uid}"
       
       UcbRails::User.create! do |u|
         u.uid = ldap_entry.uid
@@ -15,13 +18,19 @@ class UcbRails::UserLdapService
         u.last_name = ldap_entry.last_name
         u.email = ldap_entry.email
         u.phone = ldap_entry.phone
-        
       end
+    end
+
+    def update_user_from_uid(uid)
+      UcbRails.logger.debug "update_user_from_uid #{uid}"
       
+      ldap_entry = UcbRails::LdapPerson::Finder.find_by_uid!(uid)
+      update_user_from_ldap_entry(ldap_entry)
     end
-    
+
     def update_user_from_ldap_entry(ldap_entry)
-      # ldap_entry = UcbRails::LdapPerson::Finder.find_by_uid!(uid)
+      UcbRails.logger.debug "update_user_from_ldap_entry #{ldap_entry.uid}"
+      
       UcbRails::User.find_by_uid!(ldap_entry.uid).tap do |user|
         user.first_name = ldap_entry.first_name
         user.last_name = ldap_entry.last_name
@@ -33,9 +42,9 @@ class UcbRails::UserLdapService
     
     def create_or_update_user(uid)
       if user = UcbRails::User.find_by_uid(uid)
-        update_user(uid)
+        update_user_from_uid(uid)
       else
-        create_user(uid)
+        create_user_from_uid(uid)
       end
     end
     

data/lib/ucb_rails/version.rb

@@ -1,3 +1,3 @@
 module UcbRails
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucb_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -64,33 +64,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: omniauth-cas
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement