decidim-direct_verifications 0.20 → 0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9f466181031acf9fe03bd55ef1f1ae1e407707acc0b22a639576523eebe90ae
-  data.tar.gz: 3071bc96c9e22c9ca06ce14f3ce81b1280a54dcb3a4478abb0ef02531c2f6c23
+  metadata.gz: cbf6bc3adf56db3268520dc976ecf5e24791667d27d41e43f43be7a1de122b15
+  data.tar.gz: 63bc2221b993503c21037f62195021967eed48f3d0d35ce1f25ceb2bd27e899a
 SHA512:
-  metadata.gz: 490468f076bdc3f270d8f853f0c809bc6aac17f989d4984538550107e963fab25b52ae5bb30ed76856747e67740976dc3a027d49b0f916a339565b409f606751
-  data.tar.gz: 8e9b5c8d40c075d34e41f3711d9c5740e0ecc62bd916ec6d3a4b9afa80855d1ca1c260a13eda183feca9aefa2066b5682ba9e0a80c300a36844cab79b53896d0
+  metadata.gz: c90a4d69fd3640640efb62102de8a218ba2f57e01725bb89f81a6c7adc384c0e937ded80f8049b2448cc2b60eedfa37c71f24bdf74288c9d4efe63c69a5dccb1
+  data.tar.gz: fee38887199f7a345e64a62f7389262785435d6686aef02ee39a75359314dbc9b9d43465689d122c3b539811c2fde2abce0917e08584a73be4077e33c6cdfd22

data/README.md

@@ -2,8 +2,7 @@
 
 ![[CI] Test](https://github.com/Platoniq/decidim-verifications-direct_verifications/workflows/%5BCI%5D%20Test/badge.svg)
 [![Maintainability](https://api.codeclimate.com/v1/badges/2195deb4de6c6354a6bc/maintainability)](https://codeclimate.com/github/Platoniq/decidim-verifications-direct_verifications/maintainability)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/2195deb4de6c6354a6bc/test_coverage)](https://codeclimate.com/github/Platoniq/decidim-verifications-direct_verifications/test_coverage)
-
+[![codecov](https://codecov.io/gh/Platoniq/decidim-verifications-direct_verifications/branch/master/graph/badge.svg?token=FR1zkV71S2)](https://codecov.io/gh/Platoniq/decidim-verifications-direct_verifications)
 
 A [Decidim](https://github.com/decidim/decidim) that provides a verification method called `Direct verification`. Works only on the admin side, final users do not intervene in the verification process.
 

data/app/controllers/decidim/direct_verifications/verification/admin/direct_verifications_controller.rb

@@ -6,57 +6,75 @@ module Decidim
       module Admin
         class DirectVerificationsController < Decidim::Admin::ApplicationController
           include NeedsPermission
+          helper_method :workflows, :current_authorization_handler
 
           layout "decidim/admin/users"
 
           def index
             enforce_permission_to :index, :authorization
-            @authorization_handler = :direct_verifications
-            @workflows = workflows
           end
 
           def create
             enforce_permission_to :create, :authorization
 
-            @userlist = params[:userlist]
-            @workflows = workflows
-            processor = UserProcessor.new(current_organization, current_user)
-            processor.emails = extract_emails_to_hash @userlist
-            processor.authorization_handler = authorization_handler(params[:authorization_handler])
-            stats = UserStats.new(current_organization)
-            stats.authorization_handler = processor.authorization_handler
-            if params[:register]
-              processor.register_users
-              flash[:warning] = t(".registered", count: processor.emails.count,
-                                                 registered: processor.processed[:registered].count,
-                                                 errors: processor.errors[:registered].count)
-            end
-            if params[:authorize] == "in"
-              processor.authorize_users
-              flash[:notice] = t(".authorized", handler: t("#{processor.authorization_handler}.name", scope: "decidim.authorization_handlers"),
-                                                count: processor.emails.count,
-                                                authorized: processor.processed[:authorized].count,
-                                                errors: processor.errors[:authorized].count)
-            elsif params[:authorize] == "out"
-              processor.revoke_users
-              flash[:notice] = t(".revoked", handler: t("#{processor.authorization_handler}.name", scope: "decidim.authorization_handlers"),
-                                             count: processor.emails.count,
-                                             revoked: processor.processed[:revoked].count,
-                                             errors: processor.errors[:revoked].count)
-            else
-              stats.emails = processor.emails.keys
-              flash[:info] = t(".info", handler: t("#{processor.authorization_handler}.name", scope: "decidim.authorization_handlers"),
-                                        count: processor.emails.count,
-                                        authorized: stats.authorized,
-                                        unconfirmed: stats.unconfirmed,
-                                        registered: stats.registered)
-              render(action: :index) && return
-            end
+            @userslist = params[:userlist]
+            @processor = UserProcessor.new(current_organization, current_user)
+            @processor.emails = extract_emails_to_hash @userslist
+            @processor.authorization_handler = current_authorization_handler
+            @stats = UserStats.new(current_organization)
+            @stats.authorization_handler = @processor.authorization_handler
+            register_users
+            authorize_users
+            revoke_users
+
+            render(action: :index) && return if show_users_info
+
             redirect_to direct_verifications_path
           end
 
           private
 
+          def register_users
+            return unless params[:register]
+
+            @processor.register_users
+            flash[:warning] = t(".registered", count: @processor.emails.count,
+                                               registered: @processor.processed[:registered].count,
+                                               errors: @processor.errors[:registered].count)
+          end
+
+          def authorize_users
+            return unless params[:authorize] == "in"
+
+            @processor.authorize_users
+            flash[:notice] = t(".authorized", handler: t("#{@processor.authorization_handler}.name", scope: "decidim.authorization_handlers"),
+                                              count: @processor.emails.count,
+                                              authorized: @processor.processed[:authorized].count,
+                                              errors: @processor.errors[:authorized].count)
+          end
+
+          def revoke_users
+            return unless params[:authorize] == "out"
+
+            @processor.revoke_users
+            flash[:notice] = t(".revoked", handler: t("#{@processor.authorization_handler}.name", scope: "decidim.authorization_handlers"),
+                                           count: @processor.emails.count,
+                                           revoked: @processor.processed[:revoked].count,
+                                           errors: @processor.errors[:revoked].count)
+          end
+
+          def show_users_info
+            return if params[:authorize]
+
+            @stats.emails = @processor.emails.keys
+            flash.now[:info] = t(".info", handler: t("#{@processor.authorization_handler}.name", scope: "decidim.authorization_handlers"),
+                                          count: @processor.emails.count,
+                                          authorized: @stats.authorized,
+                                          unconfirmed: @stats.unconfirmed,
+                                          registered: @stats.registered)
+            true
+          end
+
           def extract_emails_to_hash(txt)
             reg = /([A-Z0-9+._-]+@[A-Z0-9._-]+\.[A-Z0-9_-]+)\b/i
             emails = {}
@@ -73,6 +91,10 @@ module Decidim
             @authorization_handler = authorization_handler.presence || :direct_verifications
           end
 
+          def current_authorization_handler
+            authorization_handler(params[:authorization_handler])
+          end
+
           def configured_workflows
             return Decidim::DirectVerifications.config.manage_workflows if Decidim::DirectVerifications.config
 

data/app/views/decidim/direct_verifications/verification/admin/direct_verifications/index.html.erb

@@ -1,40 +1,40 @@
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">
-      <%= t('admin.index.title', scope: 'decidim.direct_verifications.verification') %>
-      <%= link_to t("admin.index.stats", scope: 'decidim.direct_verifications.verification'), stats_path, class: "button tiny button--title" %>
+      <%= t("admin.index.title", scope: "decidim.direct_verifications.verification") %>
+      <%= link_to t("admin.index.stats", scope: "decidim.direct_verifications.verification"), stats_path, class: "button tiny button--title" %>
     </h2>
   </div>
   <div class="card-section">
-    <p><%= t('decidim.direct_verifications.verification.admin.new.info') %></p>
-    <%= form_tag direct_verifications_path, multipart: true, class: 'form' do %>
-      <%= label_tag :userlist, t('admin.new.textarea', scope: 'decidim.direct_verifications.verification') %>
-      <%= text_area_tag :userlist, @userlist, rows: 10 %>
+    <p><%= t("decidim.direct_verifications.verification.admin.new.info") %></p>
+    <%= form_tag direct_verifications_path, multipart: true, class: "form" do %>
+      <%= label_tag :userlist, t("admin.new.textarea", scope: "decidim.direct_verifications.verification") %>
+      <%= text_area_tag :userlist, @userslist, rows: 10 %>
       <label>
         <%= check_box_tag :register %>
-        <%= t('admin.new.register', scope: 'decidim.direct_verifications.verification') %>
+        <%= t("admin.new.register", scope: "decidim.direct_verifications.verification") %>
         <div data-alert class="callout alert hide">
-          <%= t('admin.direct_verifications.gdpr_disclaimer', scope: 'decidim.direct_verifications.verification') %>
+          <%= t("admin.direct_verifications.gdpr_disclaimer", scope: "decidim.direct_verifications.verification") %>
         </div>
       </label>
       <label>
-        <%= radio_button_tag :authorize, 'in' %>
-        <%= t('admin.new.authorize', scope: 'decidim.direct_verifications.verification') %>
+        <%= radio_button_tag :authorize, "in" %>
+        <%= t("admin.new.authorize", scope: "decidim.direct_verifications.verification") %>
       </label>
       <label>
-        <%= radio_button_tag :authorize, 'out' %>
-        <%= t('admin.new.revoke', scope: 'decidim.direct_verifications.verification') %>
+        <%= radio_button_tag :authorize, "out" %>
+        <%= t("admin.new.revoke", scope: "decidim.direct_verifications.verification") %>
       </label>
       <label>
-        <%= radio_button_tag :authorize, 'check', true %>
-        <%= t('admin.new.check', scope: 'decidim.direct_verifications.verification') %>
+        <%= radio_button_tag :authorize, "check", true %>
+        <%= t("admin.new.check", scope: "decidim.direct_verifications.verification") %>
       </label>
 
-      <%= label_tag :authorization_handler, t('admin.new.authorization_handler', scope: 'decidim.direct_verifications.verification') %>
+      <%= label_tag :authorization_handler, t("admin.new.authorization_handler", scope: "decidim.direct_verifications.verification") %>
 
-      <%= select_tag :authorization_handler, options_for_select(@workflows, @authorization_handler) %>
+      <%= select_tag :authorization_handler, options_for_select(workflows, current_authorization_handler) %>
 
-      <%= submit_tag t('admin.new.submit', scope: 'decidim.direct_verifications.verification'), class: 'button' %>
+      <%= submit_tag t("admin.new.submit", scope: "decidim.direct_verifications.verification"), class: "button" %>
 
     <% end %>
 

data/app/views/decidim/direct_verifications/verification/admin/stats/index.html.erb

@@ -1,15 +1,15 @@
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">
-      <%= t('admin.index.stats', scope: 'decidim.direct_verifications.verification') %>
-      <%= link_to t("admin.index.title", scope: 'decidim.direct_verifications.verification'), direct_verifications_path, class: "button tiny button--title" %>
+      <%= t("admin.index.stats", scope: "decidim.direct_verifications.verification") %>
+      <%= link_to t("admin.index.title", scope: "decidim.direct_verifications.verification"), direct_verifications_path, class: "button tiny button--title" %>
     </h2>
   </div>
   <div class="card-section">
     <table class="table-list">
       <thead>
         <tr>
-          <th><%= t("admin.new.authorization_handler", scope: 'decidim.direct_verifications.verification') %></th>
+          <th><%= t("admin.new.authorization_handler", scope: "decidim.direct_verifications.verification") %></th>
           <th><%= t(".registered") %></th>
           <th><%= t(".authorized") %></th>
           <th><%= t(".unconfirmed") %></th>

data/lib/decidim/direct_verifications/tests/verification_controller_examples.rb

@@ -4,52 +4,60 @@ shared_examples_for "checking users" do |params|
   context "when check without mails" do
     it "renders the index with info message" do
       params[:userlist] = ""
-      post :create, params: params
-      expect(flash[:info]).not_to be_empty
-      expect(flash[:info]).to include("0 users detected")
-      expect(subject).to render_template("decidim/direct_verifications/verification/admin/direct_verifications/index")
+      perform_enqueued_jobs do
+        post :create, params: params
+        expect(flash[:info]).not_to be_empty
+        expect(flash[:info]).to include("0 users detected")
+        expect(subject).to render_template("decidim/direct_verifications/verification/admin/direct_verifications/index")
+      end
     end
   end
 
   context "when check with mails" do
     it "renders the index with info message" do
       params[:userlist] = "mail@example.com"
-      post :create, params: params
-      expect(flash[:info]).not_to be_empty
-      expect(flash[:info]).to include("1 users detected")
-      expect(subject).to render_template("decidim/direct_verifications/verification/admin/direct_verifications/index")
+      perform_enqueued_jobs do
+        post :create, params: params
+        expect(flash[:info]).not_to be_empty
+        expect(flash[:info]).to include("1 users detected")
+        expect(subject).to render_template("decidim/direct_verifications/verification/admin/direct_verifications/index")
+      end
     end
   end
 end
 
 shared_examples_for "registering users" do |params|
-  context "when send valid emails" do
+  context "when there are valid emails" do
     it "creates warning message" do
-      post :create, params: params
-      expect(flash[:warning]).not_to be_empty
-      expect(flash[:warning]).to include("1 detected")
-      expect(flash[:warning]).to include("0 errors")
-      expect(flash[:warning]).to include("1 users")
-      expect(flash[:warning]).to include("registered")
+      perform_enqueued_jobs do
+        post :create, params: params
+        expect(flash[:warning]).not_to be_empty
+        expect(flash[:warning]).to include("1 detected")
+        expect(flash[:warning]).to include("0 errors")
+        expect(flash[:warning]).to include("1 users")
+        expect(flash[:warning]).to include("registered")
+      end
     end
   end
 end
 
 shared_examples_for "authorizing users" do |params|
-  context "when send valid emails" do
+  context "when there are valid emails" do
     it "creates notice message" do
-      post :create, params: params
-      expect(flash[:notice]).not_to be_empty
-      expect(flash[:notice]).to include("1 detected")
-      expect(flash[:notice]).to include("0 errors")
-      expect(flash[:notice]).to include("1 users")
-      expect(flash[:notice]).to include("verified")
+      perform_enqueued_jobs do
+        post :create, params: params
+        expect(flash[:notice]).not_to be_empty
+        expect(flash[:notice]).to include("1 detected")
+        expect(flash[:notice]).to include("0 errors")
+        expect(flash[:notice]).to include("1 users")
+        expect(flash[:notice]).to include("verified")
+      end
     end
   end
 end
 
 shared_examples_for "revoking users" do |params|
-  context "when send valid emails" do
+  context "when there are valid emails" do
     it "creates notice message" do
       create(
         :authorization,
@@ -57,12 +65,14 @@ shared_examples_for "revoking users" do |params|
         name: verification_type,
         user: authorized_user
       )
-      post :create, params: params
-      expect(flash[:notice]).not_to be_empty
-      expect(flash[:notice]).to include("1 detected")
-      expect(flash[:notice]).to include("0 errors")
-      expect(flash[:notice]).to include("1 users")
-      expect(flash[:notice]).to include("revoked")
+      perform_enqueued_jobs do
+        post :create, params: params
+        expect(flash[:notice]).not_to be_empty
+        expect(flash[:notice]).to include("1 detected")
+        expect(flash[:notice]).to include("0 errors")
+        expect(flash[:notice]).to include("1 users")
+        expect(flash[:notice]).to include("revoked")
+      end
     end
   end
 end

data/lib/decidim/direct_verifications/version.rb

@@ -3,8 +3,8 @@
 module Decidim
   # This holds the decidim-direct_verifications version.
   module DirectVerifications
-    VERSION = "0.20"
-    DECIDIM_VERSION = "0.20.0"
-    MIN_DECIDIM_VERSION = ">= 0.17.0"
+    VERSION = "0.21"
+    DECIDIM_VERSION = "0.21"
+    MIN_DECIDIM_VERSION = "~> 0.21.0"
   end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: decidim-direct_verifications
 version: !ruby/object:Gem::Version
-  version: '0.20'
+  version: '0.21'
 platform: ruby
 authors:
 - Ivan Vergés
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.21.0
 description: Provides a verification method that also registers users directly in
   the platform. Can be used to mass verificate user with other verification handlers
 email: