dm-ldap-adapter 0.4.6 → 0.4.7

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. checksums.yaml +7 -0
  2. data/lib/adapters/ldap_adapter.rb +14 -0
  3. data/lib/ldap/conditions_2_filter.rb +2 -2
  4. metadata +138 -167
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 24e4cf1f07ce6e474774a19c3a9b44013d98d108
4
+ data.tar.gz: 57f1a9efcf90ddadc65fa00a454ff7b155726503
5
+ SHA512:
6
+ metadata.gz: c14e3f2bef8a94329e80c314f93aa7d6212745b87e7c6b867cdf0f89e323a10803b88908e842963436ac892973c58c695cae241d5c0203db3ab578705dbea2a1
7
+ data.tar.gz: 9b31f0a0f3e701effe8000fc9d945e5f23ed7237c4032e25f5ce286690d5bedcb9b8b812f028629078cab25f42cf17bb728c69b22604cb5abe2cf614eb5297a2
data/lib/adapters/ldap_adapter.rb CHANGED
@@ -44,6 +44,12 @@ module Ldap
44
44
  })
45
45
  end
46
46
 
47
+ if not options[:encryption].nil? then
48
+ @config.update(
49
+ :encryption => {:method=>options[:encryption][:method], :tls_options=>options[:encryption][:tls_options]}
50
+ )
51
+ end
52
+
47
53
  if not options[:adapter_options].nil? then
48
54
  options[:adapter_options].each do |k,v|
49
55
  @config[k.to_sym] = v
@@ -157,6 +163,8 @@ module DataMapper
157
163
  # assume a single value here !!!
158
164
  val = c.send(:dumped_value)
159
165
  ldap_conditions << [comparator, c.subject.field, val[1, val.size - 2]]
166
+ elsif c.subject.is_a? ::DataMapper::Property::Boolean
167
+ ldap_conditions << [comparator, c.subject.field, c.send(:dumped_value) ? 'TRUE' : 'FALSE']
160
168
  else
161
169
  ldap_conditions << [comparator, c.subject.field, c.send(:dumped_value)]
162
170
  end
@@ -280,6 +288,12 @@ module DataMapper
280
288
  array_actions
281
289
  end
282
290
  else
291
+ value = case value
292
+ when NilClass then nil
293
+ when TrueClass then 'TRUE'
294
+ when FalseClass then 'FALSE'
295
+ else value
296
+ end
283
297
  if resource.model.multivalue_field == property.field.to_sym
284
298
  if value.nil?
285
299
  actions << [:delete, field, resource.attribute_get(property.name).to_s]
data/lib/ldap/conditions_2_filter.rb CHANGED
@@ -26,7 +26,7 @@ module Ldap
26
26
  when :like
27
27
  Net::LDAP::Filter.eq( cc[1].to_s, cc[2].to_s.gsub(/%/, "*").gsub(/_/, "*").gsub(/\*\*/, "*") )
28
28
  else
29
- logger.error(cc[0].to_s + " needs coding")
29
+ @@logger.error(cc[0].to_s + " needs coding")
30
30
  end
31
31
  if f
32
32
  f = f | ff
@@ -75,7 +75,7 @@ module Ldap
75
75
  when :like
76
76
  f = Net::LDAP::Filter.eq( cond[1].to_s, c.to_s.gsub(/%/, "*").gsub(/_/, "*").gsub(/\*\*/, "*") )
77
77
  else
78
- logger.error(cond[0].to_s + " needs coding")
78
+ @@logger.error(cond[0].to_s + " needs coding")
79
79
  end
80
80
  filters << f if f
81
81
  end
metadata CHANGED
@@ -1,224 +1,195 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: dm-ldap-adapter
3
- version: !ruby/object:Gem::Version
4
- hash: 3
5
- prerelease:
6
- segments:
7
- - 0
8
- - 4
9
- - 6
10
- version: 0.4.6
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.4.7
11
5
  platform: ruby
12
- authors:
6
+ authors:
13
7
  - mkristian
14
8
  - xertres
15
9
  autorequire:
16
10
  bindir: bin
17
11
  cert_chain: []
18
-
19
- date: 2013-04-10 00:00:00 Z
20
- dependencies:
21
- - !ruby/object:Gem::Dependency
12
+ date: 2018-01-06 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
22
15
  name: net-ldap
23
- prerelease: false
24
- requirement: &id001 !ruby/object:Gem::Requirement
25
- none: false
26
- requirements:
27
- - - ~>
28
- - !ruby/object:Gem::Version
29
- hash: 15
30
- segments:
31
- - 0
32
- - 2
33
- version: "0.2"
16
+ requirement: !ruby/object:Gem::Requirement
17
+ requirements:
18
+ - - "~>"
19
+ - !ruby/object:Gem::Version
20
+ version: '0.16'
34
21
  type: :runtime
35
- version_requirements: *id001
36
- - !ruby/object:Gem::Dependency
37
- name: slf4r
38
22
  prerelease: false
39
- requirement: &id002 !ruby/object:Gem::Requirement
40
- none: false
41
- requirements:
42
- - - ~>
43
- - !ruby/object:Gem::Version
44
- hash: 11
45
- segments:
46
- - 0
47
- - 4
48
- - 2
23
+ version_requirements: !ruby/object:Gem::Requirement
24
+ requirements:
25
+ - - "~>"
26
+ - !ruby/object:Gem::Version
27
+ version: '0.16'
28
+ - !ruby/object:Gem::Dependency
29
+ name: slf4r
30
+ requirement: !ruby/object:Gem::Requirement
31
+ requirements:
32
+ - - "~>"
33
+ - !ruby/object:Gem::Version
49
34
  version: 0.4.2
50
35
  type: :runtime
51
- version_requirements: *id002
52
- - !ruby/object:Gem::Dependency
53
- name: dm-core
54
36
  prerelease: false
55
- requirement: &id003 !ruby/object:Gem::Requirement
56
- none: false
57
- requirements:
58
- - - ~>
59
- - !ruby/object:Gem::Version
60
- hash: 15
61
- segments:
62
- - 1
63
- - 0
64
- version: "1.0"
37
+ version_requirements: !ruby/object:Gem::Requirement
38
+ requirements:
39
+ - - "~>"
40
+ - !ruby/object:Gem::Version
41
+ version: 0.4.2
42
+ - !ruby/object:Gem::Dependency
43
+ name: dm-core
44
+ requirement: !ruby/object:Gem::Requirement
45
+ requirements:
46
+ - - "~>"
47
+ - !ruby/object:Gem::Version
48
+ version: '1.0'
65
49
  type: :runtime
66
- version_requirements: *id003
67
- - !ruby/object:Gem::Dependency
68
- name: dm-transactions
69
50
  prerelease: false
70
- requirement: &id004 !ruby/object:Gem::Requirement
71
- none: false
72
- requirements:
73
- - - ~>
74
- - !ruby/object:Gem::Version
75
- hash: 15
76
- segments:
77
- - 1
78
- - 0
79
- version: "1.0"
51
+ version_requirements: !ruby/object:Gem::Requirement
52
+ requirements:
53
+ - - "~>"
54
+ - !ruby/object:Gem::Version
55
+ version: '1.0'
56
+ - !ruby/object:Gem::Dependency
57
+ name: dm-transactions
58
+ requirement: !ruby/object:Gem::Requirement
59
+ requirements:
60
+ - - "~>"
61
+ - !ruby/object:Gem::Version
62
+ version: '1.0'
80
63
  type: :runtime
81
- version_requirements: *id004
82
- - !ruby/object:Gem::Dependency
83
- name: dm-sqlite-adapter
84
64
  prerelease: false
85
- requirement: &id005 !ruby/object:Gem::Requirement
86
- none: false
87
- requirements:
88
- - - ~>
89
- - !ruby/object:Gem::Version
90
- hash: 15
91
- segments:
92
- - 1
93
- - 0
94
- version: "1.0"
65
+ version_requirements: !ruby/object:Gem::Requirement
66
+ requirements:
67
+ - - "~>"
68
+ - !ruby/object:Gem::Version
69
+ version: '1.0'
70
+ - !ruby/object:Gem::Dependency
71
+ name: dm-sqlite-adapter
72
+ requirement: !ruby/object:Gem::Requirement
73
+ requirements:
74
+ - - "~>"
75
+ - !ruby/object:Gem::Version
76
+ version: '1.0'
95
77
  type: :development
96
- version_requirements: *id005
97
- - !ruby/object:Gem::Dependency
98
- name: dm-migrations
99
78
  prerelease: false
100
- requirement: &id006 !ruby/object:Gem::Requirement
101
- none: false
102
- requirements:
103
- - - ~>
104
- - !ruby/object:Gem::Version
105
- hash: 15
106
- segments:
107
- - 1
108
- - 0
109
- version: "1.0"
79
+ version_requirements: !ruby/object:Gem::Requirement
80
+ requirements:
81
+ - - "~>"
82
+ - !ruby/object:Gem::Version
83
+ version: '1.0'
84
+ - !ruby/object:Gem::Dependency
85
+ name: dm-migrations
86
+ requirement: !ruby/object:Gem::Requirement
87
+ requirements:
88
+ - - "~>"
89
+ - !ruby/object:Gem::Version
90
+ version: '1.0'
110
91
  type: :development
111
- version_requirements: *id006
112
- - !ruby/object:Gem::Dependency
113
- name: rspec
114
92
  prerelease: false
115
- requirement: &id007 !ruby/object:Gem::Requirement
116
- none: false
117
- requirements:
118
- - - ~>
119
- - !ruby/object:Gem::Version
120
- hash: 15
121
- segments:
122
- - 2
123
- - 6
124
- version: "2.6"
93
+ version_requirements: !ruby/object:Gem::Requirement
94
+ requirements:
95
+ - - "~>"
96
+ - !ruby/object:Gem::Version
97
+ version: '1.0'
98
+ - !ruby/object:Gem::Dependency
99
+ name: rspec
100
+ requirement: !ruby/object:Gem::Requirement
101
+ requirements:
102
+ - - "~>"
103
+ - !ruby/object:Gem::Version
104
+ version: '2.6'
125
105
  type: :development
126
- version_requirements: *id007
127
- - !ruby/object:Gem::Dependency
128
- name: ruby-ldap
129
106
  prerelease: false
130
- requirement: &id008 !ruby/object:Gem::Requirement
131
- none: false
132
- requirements:
133
- - - ~>
134
- - !ruby/object:Gem::Version
135
- hash: 45
136
- segments:
137
- - 0
138
- - 9
139
- - 11
107
+ version_requirements: !ruby/object:Gem::Requirement
108
+ requirements:
109
+ - - "~>"
110
+ - !ruby/object:Gem::Version
111
+ version: '2.6'
112
+ - !ruby/object:Gem::Dependency
113
+ name: ruby-ldap
114
+ requirement: !ruby/object:Gem::Requirement
115
+ requirements:
116
+ - - "~>"
117
+ - !ruby/object:Gem::Version
140
118
  version: 0.9.11
141
119
  type: :development
142
- version_requirements: *id008
120
+ prerelease: false
121
+ version_requirements: !ruby/object:Gem::Requirement
122
+ requirements:
123
+ - - "~>"
124
+ - !ruby/object:Gem::Version
125
+ version: 0.9.11
143
126
  description: ldap adapter for datamapper which uses either net-ldap or ruby-ldap
144
- email:
127
+ email:
145
128
  - m.kristian@web.de
146
- - ""
129
+ - ''
147
130
  executables: []
148
-
149
131
  extensions: []
150
-
151
- extra_rdoc_files:
132
+ extra_rdoc_files:
152
133
  - History.txt
153
134
  - README.md
154
135
  - ldap-commands.txt
155
- files:
136
+ files:
156
137
  - History.txt
157
138
  - MIT-LICENSE
158
- - ldap-commands.txt
159
- - README.md
160
- - README-example.md
161
139
  - README-bundler.md
140
+ - README-example.md
141
+ - README.md
142
+ - example/posix.rb
143
+ - ldap-commands.txt
162
144
  - lib/adapters/ldap_adapter.rb
163
145
  - lib/adapters/noop_transaction.rb
164
146
  - lib/dm-ldap-adapter.rb
165
- - lib/ldap_resource.rb
166
147
  - lib/dummy_ldap_resource.rb
167
- - lib/ldap/version.rb
168
- - lib/ldap/unboundid_ldap_facade.rb
169
- - lib/ldap/transactions.rb
170
- - lib/ldap/ruby_ldap_facade.rb
148
+ - lib/ldap/array.rb
149
+ - lib/ldap/conditions_2_filter.rb
171
150
  - lib/ldap/digest.rb
172
151
  - lib/ldap/net_ldap_facade.rb
173
- - lib/ldap/conditions_2_filter.rb
174
- - lib/ldap/array.rb
152
+ - lib/ldap/ruby_ldap_facade.rb
153
+ - lib/ldap/transactions.rb
154
+ - lib/ldap/unboundid_ldap_facade.rb
155
+ - lib/ldap/version.rb
156
+ - lib/ldap_resource.rb
157
+ - spec/assiociations_ldap_adapter_spec.rb
158
+ - spec/authentication_ldap_adapter_spec.rb
159
+ - spec/ldap_adapter_spec.rb
160
+ - spec/ldap_array_spec.rb
161
+ - spec/multi_repository_spec.rb
175
162
  - spec/multi_value_attributes_spec.rb
176
163
  - spec/sorting_spec.rb
177
- - spec/multi_repository_spec.rb
178
164
  - spec/spec_helper.rb
179
- - spec/ldap_adapter_spec.rb
180
- - spec/authentication_ldap_adapter_spec.rb
181
- - spec/assiociations_ldap_adapter_spec.rb
182
- - spec/ldap_array_spec.rb
165
+ - spec/support/group.rb
183
166
  - spec/support/group_user.rb
184
- - spec/support/user.rb
185
- - spec/support/test_contact.rb
186
167
  - spec/support/role.rb
187
- - spec/support/group.rb
188
- - example/posix.rb
168
+ - spec/support/test_contact.rb
169
+ - spec/support/user.rb
189
170
  homepage: http://github.com/mkristian/dm-ldap-adapter
190
171
  licenses: []
191
-
172
+ metadata: {}
192
173
  post_install_message:
193
- rdoc_options:
194
- - --main
174
+ rdoc_options:
175
+ - "--main"
195
176
  - README.txt
196
- require_paths:
177
+ require_paths:
197
178
  - lib
198
- required_ruby_version: !ruby/object:Gem::Requirement
199
- none: false
200
- requirements:
179
+ required_ruby_version: !ruby/object:Gem::Requirement
180
+ requirements:
201
181
  - - ">="
202
- - !ruby/object:Gem::Version
203
- hash: 3
204
- segments:
205
- - 0
206
- version: "0"
207
- required_rubygems_version: !ruby/object:Gem::Requirement
208
- none: false
209
- requirements:
182
+ - !ruby/object:Gem::Version
183
+ version: '0'
184
+ required_rubygems_version: !ruby/object:Gem::Requirement
185
+ requirements:
210
186
  - - ">="
211
- - !ruby/object:Gem::Version
212
- hash: 3
213
- segments:
214
- - 0
215
- version: "0"
187
+ - !ruby/object:Gem::Version
188
+ version: '0'
216
189
  requirements: []
217
-
218
190
  rubyforge_project:
219
- rubygems_version: 1.8.15
191
+ rubygems_version: 2.5.1
220
192
  signing_key:
221
- specification_version: 3
222
- summary: ""
193
+ specification_version: 4
194
+ summary: ''
223
195
  test_files: []
224
-