decidim-direct_verifications 0.17.7 → 0.17.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/decidim/direct_verifications/verification/admin/direct_verifications_controller.rb +9 -7
  3. data/lib/decidim/direct_verifications/user_stats.rb +2 -2
  4. data/lib/decidim/direct_verifications/version.rb +2 -2
  5. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: fdece320908b5c93c6b1312fae64fbb23814d8c48e99bd258cdee55dcb2b37b3
4
- data.tar.gz: 0d70c5cf75fd68c848ce52328589cce67524197f5cc95dbcbd2ff5cc7d559ed5
3
+ metadata.gz: e4928cec1e6b6d4f5e09fd2235e38b4e7a0fe411dc4be792a25d5bff2a8ef5b6
4
+ data.tar.gz: 978ba2b8a55151a524643df8268e2f0435f329edc46acad48c3fe463f5382150
5
5
  SHA512:
6
- metadata.gz: ce76ca5c3dcf855eba9f1ecd0d963bfb03791a80ed9fbee729e891932a96390b94df9ca748e19f73aaefb03afd5f55b0a1b873eb470eccf3d67b9e116118d23f
7
- data.tar.gz: 761e7647eeb5d859c17694a8c681d9538cd6ffd680071d7f9f4cbe7d3aa3c718fac5451ed9624fdfad8a0e5101cd95690a3cce3d3e514e11ba7d2fa708478082
6
+ metadata.gz: f9435b6e219c4c49c2d19899fe7482524ca101545f9099dd2b09a7a7c33a0d662ce0b60dace84582912b1e91c8969843b2263404e4730c31043908da455f345a
7
+ data.tar.gz: 42dc907a3fd1bfc59194a31007c6ed083a5b5610790bde8f32a50ef83ee5fed8ed8e4a215adb8586bb7e1e096a9244e5aa48c0a0973b0d1afce1f409ddc9cd3d
data/app/controllers/decidim/direct_verifications/verification/admin/direct_verifications_controller.rb CHANGED
@@ -58,13 +58,15 @@ module Decidim
58
58
  private
59
59
 
60
60
  def extract_emails_to_hash(txt)
61
- reg = /([^@\r\n]*)\b([A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,})\b/i
62
- txt.scan(reg).map do |m|
63
- [
64
- m[1].delete("<>").strip,
65
- m[0].gsub(/[^[:print:]]|[\"\$\<\>\|\\]/, "").strip
66
- ]
67
- end .to_h
61
+ reg = /([A-Z0-9+._-]+@[A-Z0-9._-]+\.[A-Z0-9_-]+)\b/i
62
+ emails = {}
63
+ txt.split(/[\r\n;,]/).each do |line|
64
+ reg.match line do |m|
65
+ n = line.split(m[0]).first
66
+ emails[m[0]] = (n.presence || "").gsub(/[^[:print:]]|[\"\$\<\>\|\\]/, "").strip
67
+ end
68
+ end
69
+ emails
68
70
  end
69
71
 
70
72
  def authorization_handler(authorization_handler)
data/lib/decidim/direct_verifications/user_stats.rb CHANGED
@@ -39,7 +39,7 @@ module Decidim
39
39
  if authorization_handler.empty?
40
40
  filter = { decidim_organization_id: organization.id }
41
41
  filter[:email] = emails unless emails.empty?
42
- return User.where(filter)
42
+ return User.where(filter).where.not(email: '')
43
43
  end
44
44
  authorized_users(false)
45
45
  end
@@ -53,7 +53,7 @@ module Decidim
53
53
  q = q.where("decidim_authorizations.granted_at >= :date", date: Time.current - expires_in) if expires_in
54
54
  end
55
55
  end
56
- q = q.where("decidim_users.decidim_organization_id=:org", org: organization.id)
56
+ q = q.where("decidim_users.decidim_organization_id=:org and decidim_users.email!=''", org: organization.id)
57
57
  return q if emails.empty?
58
58
  q.where("decidim_users.email IN (:emails)", emails: emails)
59
59
  end
data/lib/decidim/direct_verifications/version.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  module Decidim
4
4
  # This holds the decidim-direct_verifications version.
5
5
  module DirectVerifications
6
- VERSION = "0.17.7"
7
- DECIDIM_VERSION = ">= 0.17.0"
6
+ VERSION = "0.17.8"
7
+ DECIDIM_VERSION = ">= 0.17.1"
8
8
  end
9
9
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: decidim-direct_verifications
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.17.7
4
+ version: 0.17.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ivan Vergés
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-04-08 00:00:00.000000000 Z
11
+ date: 2019-06-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: decidim-admin
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: 0.17.0
19
+ version: 0.17.1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - ">="
25
25
  - !ruby/object:Gem::Version
26
- version: 0.17.0
26
+ version: 0.17.1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: decidim-core
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: 0.17.0
33
+ version: 0.17.1
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: 0.17.0
40
+ version: 0.17.1
41
41
  description: Provides a verification method that also registers users directly in
42
42
  the platform. Can be used to mass verificate user with other verification handlers
43
43
  email: