decidim-cdtb 0.4.1 → 0.5.0

data/README.md

@@ -221,11 +221,26 @@ bundle exec rake cdtb:participatory_spaces:add_content_blocks[['extra_data relat
 
 ```
 
+##### Usually executed when upgrading to Decidim 0.28
+
+To add extra_data and related_documents to content blocks in participatory spaces
+
+```
+bundle exec rake cdtb:participatory_spaces:add_content_blocks[extra_data]
+bundle exec rake cdtb:participatory_spaces:add_content_blocks[related_documents]
+```
+
+To move images to a new content block in participatory spaces
+
+```
+bundle exec rake cdtb:participatory_spaces:move_images_to_content_block
+```
+
 #### Move banner images to hero content block
 
 In previous versions of Decidim (0.27 and previous) banner images are in participatory space configuration. Now, this image is in a content block but for old spaces are in configuration yet.
 
-This task move the banner image to a hero content block.
+This task moves the banner image to a hero content block.
 
 Spaces supported:
 

data/decidim-cdtb.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description = "A gem to help managing Decidim applications."
   spec.homepage = "https://github.com/CodiTramuntana/decidim-module-cdtb"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.0.7"
+  spec.required_ruby_version = ">= 3.1.7"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
@@ -34,6 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-progressbar"
 
   spec.add_development_dependency "decidim-dev", Decidim::Cdtb::DECIDIM_MIN_VERSION
-  spec.add_development_dependency "faker"
   spec.metadata["rubygems_mfa_required"] = "true"
 end

data/lib/decidim/cdtb/fixes/nickname_fixer.rb

@@ -7,12 +7,15 @@ module Decidim
       #
       class NicknameFixer < ::Decidim::Cdtb::Task
         def initialize
+          regex= Decidim::UserBaseEntity::REGEXP_NICKNAME.source.gsub("\\z", "\\Z")
+          @query= Decidim::User.where.not("nickname ~ ?", regex)
+
           progress_bar= { title: "Decidim::User" }
-          super("FIX NICKNAMES", progress_bar: progress_bar)
+          super("FIX NICKNAMES", progress_bar:)
         end
 
         def prepare_execution(_ctx)
-          @num_users= Decidim::User.count
+          @num_users= @query.count
           log_task_info("Checking #{@num_users} users...")
         end
 
@@ -23,7 +26,7 @@ module Decidim
         def do_execution(context)
           progress_bar= context[:progress_bar]
 
-          Decidim::User.find_each do |user|
+          @query.find_each do |user|
             Decidim::User.validators_on(:nickname).each do |validator|
               validator.validate_each(user, :nickname, user.nickname)
             end

data/lib/decidim/cdtb/fixes/you_tube_embeds_fixer.rb

@@ -23,7 +23,7 @@ module Decidim
 
         def initialize
           progress_bar= { title: self.class.name }
-          super("FIX YOUTUBE EMBEDS", progress_bar: progress_bar)
+          super("FIX YOUTUBE EMBEDS", progress_bar:)
         end
 
         attr_reader :num_fixed

data/lib/decidim/cdtb/participatory_spaces/add_content_blocks.rb

@@ -13,7 +13,7 @@ module Decidim
           progress_bar= { title: self.class.name }
           @processed_models = processed_models
           @content_block_names = content_block_names
-          super("ADD CONTENT BLOCKS", progress_bar: progress_bar)
+          super("ADD CONTENT BLOCKS", progress_bar:)
         end
 
         attr_reader :num_added

data/lib/decidim/cdtb/participatory_spaces/manages_content_blocks.rb

@@ -18,7 +18,7 @@ module Decidim
           log_task_step("Adding #{content_block_name} to #{space.slug}[#{space.id}]")
           Decidim::ContentBlock.create(
             decidim_organization_id: space.organization.id,
-            weight: weight,
+            weight:,
             scope_name: scope_name(space),
             scoped_resource_id: space.id,
             manifest_name: content_block_name,
@@ -39,7 +39,7 @@ module Decidim
         end
 
         def current_space_content_blocks(scope_name, organization, scoped_resource_id)
-          Decidim::ContentBlock.for_scope(scope_name, organization: organization).where(scoped_resource_id: scoped_resource_id)
+          Decidim::ContentBlock.for_scope(scope_name, organization:).where(scoped_resource_id:)
         end
 
         def manifest_for(resource)

data/lib/decidim/cdtb/participatory_spaces/move_images_to_content_block.rb

@@ -12,7 +12,7 @@ module Decidim
         def initialize(processed_models)
           progress_bar= { title: self.class.name }
           @processed_models = processed_models
-          super("MOVING IMAGES...", progress_bar: progress_bar)
+          super("MOVING IMAGES...", progress_bar:)
         end
 
         attr_reader :num_added

data/lib/decidim/cdtb/spam/user_spam_detector.rb

@@ -17,7 +17,7 @@ module Decidim
         def initialize(organization = nil)
           @organization = organization
           progress_bar = { title: "Decidim::User" }
-          super("SPAM DETECTOR", progress_bar: progress_bar)
+          super("SPAM DETECTOR", progress_bar:)
         end
 
         def prepare_execution(_ctx)

data/lib/decidim/cdtb/storage/local_sharding.rb

@@ -11,7 +11,7 @@ module Decidim
       class LocalSharding < ::Decidim::Cdtb::Task
         def initialize
           progress_bar= { title: "ActiveStorage::Blob" }
-          super("S3 to local: DO SHARDING", progress_bar: progress_bar)
+          super("S3 to local: DO SHARDING", progress_bar:)
         end
 
         def prepare_execution(_ctx)

data/lib/decidim/cdtb/task.rb

@@ -29,7 +29,7 @@ module Decidim
         init
         ctx= {}
         prepare_execution(ctx)
-        ctx[:progress_bar]= ProgressBar.create(total: total_items, title: title) if has_progress?
+        ctx[:progress_bar]= ProgressBar.create(total: total_items, title:) if has_progress?
         do_execution(ctx)
         end_execution(ctx)
         finish

data/lib/decidim/cdtb/upgrades/upgrade_modules_task.rb

@@ -8,7 +8,7 @@ module Decidim
       class UpgradeModulesTask < ::Decidim::Cdtb::Task
         def initialize
           progress_bar= { title: "Modules" }
-          super("UPGRADE MODULES", progress_bar: progress_bar)
+          super("UPGRADE MODULES", progress_bar:)
         end
 
         def prepare_execution(_ctx)

data/lib/decidim/cdtb/upgrades/validate_migrations_task.rb

@@ -12,7 +12,7 @@ module Decidim
 
         def initialize
           progress_bar= { title: "Modules" }
-          super("VALIDATE MODULES MIGRATIONS", progress_bar: progress_bar)
+          super("VALIDATE MODULES MIGRATIONS", progress_bar:)
         end
 
         def prepare_execution(_ctx)

data/lib/decidim/cdtb/users/remover.rb

@@ -11,7 +11,7 @@ module Decidim
           @csv_path = csv_path
           @reporter_user_email = reporter_user_email
           progress_bar = { title: "Decidim::User" }
-          super("USER REMOVER", progress_bar: progress_bar)
+          super("USER REMOVER", progress_bar:)
         end
 
         def prepare_execution(_ctx); end

data/lib/decidim/cdtb/version.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Cdtb
-    VERSION = "0.4.1"
-    DECIDIM_MIN_VERSION = ">= 0.27.0"
+    VERSION = "0.5.0"
+    DECIDIM_MIN_VERSION = ">= 0.28.0"
   end
 end

data/lib/decidim/cdtb.rb

@@ -11,6 +11,8 @@ module Decidim
 
     class Error < StandardError; end
 
+    STRFTIME_FORMAT= "%d/%m/%Y %H:%M:%S"
+
     config_accessor :spam_words do
       %w[viagra sex game free crypto crack xxx luck girls vip download]
     end

data/lib/tasks/anonymize.rake

@@ -12,7 +12,7 @@ namespace :cdtb do
 
     def with_progress(collection, name:)
       total = collection.count
-      progressbar = create_progress_bar(total: total)
+      progressbar = create_progress_bar(total:)
 
       puts "Anonymizing #{total} #{name}...\n"
       skip_logs do
@@ -27,7 +27,7 @@ namespace :cdtb do
       ProgressBar.create(
         progress_mark: " ",
         remainder_mark: "\u{FF65}",
-        total: total,
+        total:,
         format: "%a %e %b\u{15E7}%i %p%% %t"
       )
     end
@@ -73,7 +73,7 @@ namespace :cdtb do
           identity.update_columns(uid: "anonymized-identity-#{identity.id}")
         end
 
-        Decidim::Authorization.where(user: user).find_each do |authorization|
+        Decidim::Authorization.where(user:).find_each do |authorization|
           authorization.update_columns(unique_id: authorization.id)
         end
       end

data/lib/tasks/census.rake

@@ -51,7 +51,7 @@ namespace :cdtb do
                             else
                               Decidim::Organization.find(arguments.first)
                             end
-      handler.with_context(current_organization: current_organization)
+      handler.with_context(current_organization:)
 
       credentials= arguments.map { |arg| arg.split(":") }
       puts "Setting credentials: #{credentials}"

data/lib/tasks/fix_youtube_embeds.rake

@@ -15,7 +15,7 @@ namespace :cdtb do
         exit(-1)
       end
 
-      fixer= ::Decidim::Cdtb::Fixes::YouTubeEmbedsFixer.new
+      fixer= Decidim::Cdtb::Fixes::YouTubeEmbedsFixer.new
       fixer.execute!
     end
   end

data/lib/tasks/multitenants.rake

@@ -5,7 +5,7 @@
 #
 namespace :cdtb do
   require "decidim/cdtb/tasks_utils"
-  include ::Decidim::Cdtb::TasksUtils
+  include Decidim::Cdtb::TasksUtils
 
   desc <<~EODESC
     Finds information about the Organization, or Organizations, searching by the :host_term argument ignorecase.

data/lib/tasks/participatory_spaces.rake

@@ -42,7 +42,7 @@ namespace :cdtb do
         return "Please, select an option"
       end
 
-      adder = ::Decidim::Cdtb::ParticipatorySpaces::AddContentBlocks.new(processed_models, content_block_names)
+      adder = Decidim::Cdtb::ParticipatorySpaces::AddContentBlocks.new(processed_models, content_block_names)
       adder.execute!
     end
 
@@ -81,7 +81,7 @@ namespace :cdtb do
         return "Please, select an option"
       end
 
-      adder = ::Decidim::Cdtb::ParticipatorySpaces::MoveImagesToContentBlock.new(processed_models)
+      adder = Decidim::Cdtb::ParticipatorySpaces::MoveImagesToContentBlock.new(processed_models)
       adder.execute!
     end
   end

data/lib/tasks/spam.rake

@@ -6,7 +6,7 @@ namespace :cdtb do
     task :users, %i[org_id] => :environment do |_task, args|
       organization = args.org_id.present? ? Decidim::Organization.find(args.org_id) : nil
 
-      detector = ::Decidim::Cdtb::Spam::UserSpamDetector.new(organization)
+      detector = Decidim::Cdtb::Spam::UserSpamDetector.new(organization)
       detector.execute!
     end
   end

data/lib/tasks/storage.rake

@@ -5,7 +5,7 @@
 #
 namespace :cdtb do
   require "decidim/cdtb/tasks_utils"
-  include ::Decidim::Cdtb::TasksUtils
+  include Decidim::Cdtb::TasksUtils
   require "decidim/cdtb/storage/local_sharding"
 
   # To migrate from S3 to local storage.

data/lib/tasks/upgrade.rake

@@ -6,13 +6,13 @@
 namespace :cdtb do
   namespace :upgrades do
     require "decidim/cdtb/tasks_utils"
-    include ::Decidim::Cdtb::TasksUtils
+    include Decidim::Cdtb::TasksUtils
 
     desc <<~EODESC
       Validates that migrations from all gems in the Gemfile have been installed.
     EODESC
     task validate_migrations: [:environment] do
-      task= ::Decidim::Cdtb::Upgrades::ValidateMigrationsTask.new
+      task= Decidim::Cdtb::Upgrades::ValidateMigrationsTask.new
       task.execute!
       raise("There are pending migrations") if task.pending_migrations?
     end

data/lib/tasks/users.rake

@@ -8,7 +8,7 @@ namespace :cdtb do
       Fix Decidim::User's nicknames.
     EODESC
     task fix_nicknames: [:environment] do
-      fixer= ::Decidim::Cdtb::Fixes::NicknameFixer.new
+      fixer= Decidim::Cdtb::Fixes::NicknameFixer.new
       fixer.execute!
     end
 
@@ -16,8 +16,39 @@ namespace :cdtb do
       Remove Decidim::User's by IDs in a CSV.
     EODESC
     task :remove, %i[csv_path reporter_user_email] => [:environment] do |_taks, args|
-      service = ::Decidim::Cdtb::Users::Remover.new(args.csv_path, args.reporter_user_email)
+      service = Decidim::Cdtb::Users::Remover.new(args.csv_path, args.reporter_user_email)
       service.execute!
     end
+
+    desc <<~EODESC
+      Exports the list of admins to a CSV file. If +org_id+ is set, filters by that organization.
+    EODESC
+    task :list_admins, %i[org_id] => [:environment] do |_taks, args|
+      organization_id= args.org_id
+
+      query= Decidim::User.includes(:organization).where(admin: true)
+      filename= "admins"
+
+      if organization_id.present?
+        query= query.where(organization_id:)
+        filename+= "-org#{organization_id}"
+      end
+
+      CSV.open("#{filename}.csv", "wb") do |csv|
+        csv << ["ID", "Organization ID", "Organization", "Name", "Email", "Created at", "Last sign in at"]
+
+        query.find_each do |admin|
+          csv << [
+            admin.id,
+            admin.organization.id,
+            admin.organization.name,
+            admin.name,
+            admin.email,
+            admin.created_at.strftime(Decidim::Cdtb::STRFTIME_FORMAT),
+            admin.last_sign_in_at&.strftime(Decidim::Cdtb::STRFTIME_FORMAT)
+          ]
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-cdtb
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Oliver Valls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-21 00:00:00.000000000 Z
+date: 2025-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.28.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.28.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.28.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.27.0
-- !ruby/object:Gem::Dependency
-  name: faker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.28.0
 description: A gem to help managing Decidim applications.
 email:
 - 199462+tramuntanal@users.noreply.github.com
@@ -151,14 +137,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.7
+      version: 3.1.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: CodiTramuntana's Decidim Toolbelt (cdtb).