ucb_orgs 0.0.1 → 1.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +5 -5
  2. data/.gitignore +1 -0
  3. data/lib/ucb_orgs/CHANGELOG.md +7 -0
  4. data/lib/ucb_orgs/concerns/org_unit.rb +2 -2
  5. data/lib/ucb_orgs/syncer.rb +10 -9
  6. data/lib/ucb_orgs/version.rb +1 -1
  7. data/ucb_orgs.gemspec +3 -4
  8. metadata +20 -34
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: e4844c4ae70974f3946582344232605c9dc93f00
4
- data.tar.gz: b0e1d755652ff7172cd099a43e1053f2021a9f6b
2
+ SHA256:
3
+ metadata.gz: 3bba692cb4a7d058615f51a5f32ad6cf3d063bb5a075ff7fa3a29f806be8fa2e
4
+ data.tar.gz: 47051c4d292b8c375240e33adb1f7cf736d193190dada533ccbe0e7023085d05
5
5
  SHA512:
6
- metadata.gz: 1ef72e2169fdfacd5dc7cb455477a6f3846991c02fe0eb077aadf52c6268398e0175835812f7481788f3a70ed0b6d6b783d36f90958b8f0ff7b3ad224f184300
7
- data.tar.gz: ca8feca9fab74d14d98f140444fb6d4804b847352a20ad148136b625c0d5b178e5429765cb04e8538989d0b9f31568758117818fa195729f4e553101ff942606
6
+ metadata.gz: 7c12866bf66010031ae642f1478cd636b3123bedff14c8d0217ffb8b1d8d9d021e4892a9a0fe94e734e00448ffa351185a91513c2b6788c6b9187cd36e45595e
7
+ data.tar.gz: 47e875f5eedfb499b234ae4c7d414f59cda7f79a812821d233ce83bcd21f3a1a8b8a3160e7c6ccef1934b83edb9e70851f90a0bfc859ad1d7990030a77ebb7ce
data/.gitignore CHANGED
@@ -9,3 +9,4 @@
9
9
 
10
10
  # rspec failure tracking
11
11
  .rspec_status
12
+ .gem
data/lib/ucb_orgs/CHANGELOG.md ADDED
@@ -0,0 +1,7 @@
1
+ ## 1.1.0
2
+
3
+ - Remove calls to `update_attributes`. ([PR #1](https://github.com/ucb-ist-eas/ucb_orgs/pull/1))
4
+
5
+ ## 1.0.0
6
+
7
+ - Initial release
data/lib/ucb_orgs/concerns/org_unit.rb CHANGED
@@ -1,14 +1,14 @@
1
1
  module UcbOrgs
2
2
  module Concerns
3
3
  module OrgUnit
4
- extend ActiveSupport::Concern
4
+ extend ::ActiveSupport::Concern
5
5
 
6
6
  module ClassMethods
7
7
 
8
8
  def load_from_csv(csv_filename)
9
9
  CSV.foreach(csv_filename, headers: true) do |row|
10
10
  org_unit = UcbOrgs::OrgUnit.find_or_create_by(code: row['CODE'])
11
- org_unit.update_attributes(
11
+ org_unit.update(
12
12
  name: row['NAME'],
13
13
  level: row['LEVEL'].to_i,
14
14
  level_2: row['LEVEL_2'],
data/lib/ucb_orgs/syncer.rb CHANGED
@@ -29,8 +29,8 @@ module UcbOrgs
29
29
  end
30
30
 
31
31
  def sync
32
- UCB::LDAP::Org.root_node # force load of whole tree
33
- self.ldap_org_entries = UCB::LDAP::Org.flattened_tree
32
+ ::UCB::LDAP::Org.root_node # force load of whole tree
33
+ self.ldap_org_entries = ::UCB::LDAP::Org.flattened_tree
34
34
 
35
35
  sync_orgs
36
36
  delete_not_found_in_ldap
@@ -39,9 +39,9 @@ module UcbOrgs
39
39
  private
40
40
 
41
41
  def sync_orgs
42
- ldap_org_entries.each_with_index do |ldap_org_entry, index|
42
+ ldap_org_entries.each do |ldap_org_entry|
43
43
  begin
44
- sync_org(ldap_org_entry, index)
44
+ sync_org(ldap_org_entry)
45
45
  rescue Exception => e
46
46
  raise UcbOrgs::SyncError.new(ldap_org_entry.try(:code), e)
47
47
  end
@@ -58,10 +58,11 @@ module UcbOrgs
58
58
  .delete_all
59
59
  end
60
60
 
61
- def sync_org(ldap_org_entry, index)
62
- UcbOrgs::OrgUnit.find_or_initialize_by(code: ldap_org_entry.code).tap do |dept|
63
- dept.update_attributes!(
64
- code: nb_to_string(ldap_org_entry.code),
61
+ def sync_org(ldap_org_entry)
62
+ code = nb_to_string(ldap_org_entry.code)
63
+ UcbOrgs::OrgUnit.find_or_initialize_by(code: code).tap do |org|
64
+ org.update!(
65
+ code: code,
65
66
  name: nb_to_string(ldap_org_entry.name),
66
67
  level: ldap_org_entry.level,
67
68
  level_2: nb_to_string(ldap_org_entry.level_2_code),
@@ -74,7 +75,7 @@ module UcbOrgs
74
75
  end
75
76
 
76
77
  # Net-Ldap returns Net::BER::BerIdentifiedString.
77
- # Explicityly confert to String.
78
+ # Explicityly convert to String.
78
79
  def nb_to_string(nb)
79
80
  nb.nil? ? nil : nb.to_s
80
81
  end
data/lib/ucb_orgs/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module UcbOrgs
2
- VERSION = "0.0.1"
2
+ VERSION = "1.1.0"
3
3
  end
data/ucb_orgs.gemspec CHANGED
@@ -20,9 +20,8 @@ Gem::Specification.new do |spec|
20
20
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
21
21
  spec.require_paths = ["lib"]
22
22
 
23
- spec.add_dependency "ucb_ldap"
23
+ spec.add_dependency "ucb_ldap", "~> 3.0"
24
24
 
25
- spec.add_development_dependency "bundler", "~> 1.16"
26
- spec.add_development_dependency "rake", "~> 10.0"
27
- spec.add_development_dependency "rspec", "~> 3.0"
25
+ spec.add_development_dependency "rails", "> 5.0"
26
+ spec.add_development_dependency "rspec"
28
27
  end
metadata CHANGED
@@ -1,72 +1,58 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ucb_orgs
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.1
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Darin Wilson
8
- autorequire:
8
+ autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2018-09-07 00:00:00.000000000 Z
11
+ date: 2024-03-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: ucb_ldap
15
- requirement: !ruby/object:Gem::Requirement
16
- requirements:
17
- - - ">="
18
- - !ruby/object:Gem::Version
19
- version: '0'
20
- type: :runtime
21
- prerelease: false
22
- version_requirements: !ruby/object:Gem::Requirement
23
- requirements:
24
- - - ">="
25
- - !ruby/object:Gem::Version
26
- version: '0'
27
- - !ruby/object:Gem::Dependency
28
- name: bundler
29
15
  requirement: !ruby/object:Gem::Requirement
30
16
  requirements:
31
17
  - - "~>"
32
18
  - !ruby/object:Gem::Version
33
- version: '1.16'
34
- type: :development
19
+ version: '3.0'
20
+ type: :runtime
35
21
  prerelease: false
36
22
  version_requirements: !ruby/object:Gem::Requirement
37
23
  requirements:
38
24
  - - "~>"
39
25
  - !ruby/object:Gem::Version
40
- version: '1.16'
26
+ version: '3.0'
41
27
  - !ruby/object:Gem::Dependency
42
- name: rake
28
+ name: rails
43
29
  requirement: !ruby/object:Gem::Requirement
44
30
  requirements:
45
- - - "~>"
31
+ - - ">"
46
32
  - !ruby/object:Gem::Version
47
- version: '10.0'
33
+ version: '5.0'
48
34
  type: :development
49
35
  prerelease: false
50
36
  version_requirements: !ruby/object:Gem::Requirement
51
37
  requirements:
52
- - - "~>"
38
+ - - ">"
53
39
  - !ruby/object:Gem::Version
54
- version: '10.0'
40
+ version: '5.0'
55
41
  - !ruby/object:Gem::Dependency
56
42
  name: rspec
57
43
  requirement: !ruby/object:Gem::Requirement
58
44
  requirements:
59
- - - "~>"
45
+ - - ">="
60
46
  - !ruby/object:Gem::Version
61
- version: '3.0'
47
+ version: '0'
62
48
  type: :development
63
49
  prerelease: false
64
50
  version_requirements: !ruby/object:Gem::Requirement
65
51
  requirements:
66
- - - "~>"
52
+ - - ">="
67
53
  - !ruby/object:Gem::Version
68
- version: '3.0'
69
- description:
54
+ version: '0'
55
+ description:
70
56
  email:
71
57
  - darinwilson@gmail.com
72
58
  executables: []
@@ -84,6 +70,7 @@ files:
84
70
  - bin/console
85
71
  - bin/setup
86
72
  - lib/ucb_orgs.rb
73
+ - lib/ucb_orgs/CHANGELOG.md
87
74
  - lib/ucb_orgs/concerns/org_unit.rb
88
75
  - lib/ucb_orgs/migrations/20171211220534_create_org_units.rb
89
76
  - lib/ucb_orgs/org_unit.rb
@@ -96,7 +83,7 @@ homepage: https://github.com/ucb-ist-eas/ucb_orgs
96
83
  licenses:
97
84
  - MIT
98
85
  metadata: {}
99
- post_install_message:
86
+ post_install_message:
100
87
  rdoc_options: []
101
88
  require_paths:
102
89
  - lib
@@ -111,9 +98,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
111
98
  - !ruby/object:Gem::Version
112
99
  version: '0'
113
100
  requirements: []
114
- rubyforge_project:
115
- rubygems_version: 2.5.1
116
- signing_key:
101
+ rubygems_version: 3.2.33
102
+ signing_key:
117
103
  specification_version: 4
118
104
  summary: Rails extension that manages UCB org unit data
119
105
  test_files: []