ucb_rails 0.0.4 → 0.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/app/models/ucb_rails/user.rb +10 -2
  2. data/app/models/ucb_rails/user_ldap_service.rb +14 -5
  3. data/lib/ucb_rails/version.rb +1 -1
  4. metadata +10 -10
data/app/models/ucb_rails/user.rb CHANGED
@@ -5,8 +5,16 @@ class UcbRails::User < ActiveRecord::Base
5
5
 
6
6
  before_validation :set_first_last_name
7
7
 
8
- def admin!
9
- update_attribute(:admin, true)
8
+ def active?
9
+ !inactive?
10
+ end
11
+
12
+ def admin!(_admin=true)
13
+ update_attribute(:admin, _admin)
14
+ end
15
+
16
+ def inactive!(_inactive=true)
17
+ update_attribute(:inactive, _inactive)
10
18
  end
11
19
 
12
20
  def self.active
data/app/models/ucb_rails/user_ldap_service.rb CHANGED
@@ -3,11 +3,14 @@ class UcbRails::UserLdapService
3
3
  class << self
4
4
 
5
5
  def create_user_from_uid(uid)
6
+ UcbRails.logger.debug "create_user_from_uid #{uid}"
7
+
6
8
  ldap_entry = UcbRails::LdapPerson::Finder.find_by_uid!(uid)
7
9
  create_user_from_ldap_entry(ldap_entry)
8
10
  end
9
11
 
10
12
  def create_user_from_ldap_entry(ldap_entry)
13
+ UcbRails.logger.debug "create_user_from_ldap_entry #{ldap_entry.uid}"
11
14
 
12
15
  UcbRails::User.create! do |u|
13
16
  u.uid = ldap_entry.uid
@@ -15,13 +18,19 @@ class UcbRails::UserLdapService
15
18
  u.last_name = ldap_entry.last_name
16
19
  u.email = ldap_entry.email
17
20
  u.phone = ldap_entry.phone
18
-
19
21
  end
22
+ end
23
+
24
+ def update_user_from_uid(uid)
25
+ UcbRails.logger.debug "update_user_from_uid #{uid}"
20
26
 
27
+ ldap_entry = UcbRails::LdapPerson::Finder.find_by_uid!(uid)
28
+ update_user_from_ldap_entry(ldap_entry)
21
29
  end
22
-
30
+
23
31
  def update_user_from_ldap_entry(ldap_entry)
24
- # ldap_entry = UcbRails::LdapPerson::Finder.find_by_uid!(uid)
32
+ UcbRails.logger.debug "update_user_from_ldap_entry #{ldap_entry.uid}"
33
+
25
34
  UcbRails::User.find_by_uid!(ldap_entry.uid).tap do |user|
26
35
  user.first_name = ldap_entry.first_name
27
36
  user.last_name = ldap_entry.last_name
@@ -33,9 +42,9 @@ class UcbRails::UserLdapService
33
42
 
34
43
  def create_or_update_user(uid)
35
44
  if user = UcbRails::User.find_by_uid(uid)
36
- update_user(uid)
45
+ update_user_from_uid(uid)
37
46
  else
38
- create_user(uid)
47
+ create_user_from_uid(uid)
39
48
  end
40
49
  end
41
50
 
data/lib/ucb_rails/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module UcbRails
2
- VERSION = "0.0.4"
2
+ VERSION = "0.0.5"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ucb_rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.4
4
+ version: 0.0.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-06-18 00:00:00.000000000 Z
12
+ date: 2013-06-19 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -64,33 +64,33 @@ dependencies:
64
64
  requirement: !ruby/object:Gem::Requirement
65
65
  none: false
66
66
  requirements:
67
- - - ! '>='
67
+ - - '='
68
68
  - !ruby/object:Gem::Version
69
- version: '0'
69
+ version: 1.1.1
70
70
  type: :runtime
71
71
  prerelease: false
72
72
  version_requirements: !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
- - - ! '>='
75
+ - - '='
76
76
  - !ruby/object:Gem::Version
77
- version: '0'
77
+ version: 1.1.1
78
78
  - !ruby/object:Gem::Dependency
79
79
  name: omniauth-cas
80
80
  requirement: !ruby/object:Gem::Requirement
81
81
  none: false
82
82
  requirements:
83
- - - ! '>='
83
+ - - '='
84
84
  - !ruby/object:Gem::Version
85
- version: '0'
85
+ version: 1.0.0
86
86
  type: :runtime
87
87
  prerelease: false
88
88
  version_requirements: !ruby/object:Gem::Requirement
89
89
  none: false
90
90
  requirements:
91
- - - ! '>='
91
+ - - '='
92
92
  - !ruby/object:Gem::Version
93
- version: '0'
93
+ version: 1.0.0
94
94
  - !ruby/object:Gem::Dependency
95
95
  name: haml-rails
96
96
  requirement: !ruby/object:Gem::Requirement