decidim-initiatives 0.28.3 → 0.29.0.rc1

data/lib/decidim/initiatives/menu.rb

@@ -5,6 +5,17 @@ module Decidim
     class Menu
       def self.register_menu!
         Decidim.menu :menu do |menu|
+          menu.add_item :initiatives,
+                        I18n.t("menu.initiatives", scope: "decidim"),
+                        decidim_initiatives.initiatives_path,
+                        position: 2.4,
+                        active: %r{^/(initiatives|create_initiative)},
+                        if: Decidim::InitiativesType.joins(:scopes).where(organization: current_organization).any?
+        end
+      end
+
+      def self.register_mobile_menu!
+        Decidim.menu :mobile_menu do |menu|
           menu.add_item :initiatives,
                         I18n.t("menu.initiatives", scope: "decidim"),
                         decidim_initiatives.initiatives_path,
@@ -21,7 +32,7 @@ module Decidim
                         decidim_initiatives.initiatives_path,
                         position: 30,
                         active: :inclusive,
-                        if: !Decidim::InitiativesType.joins(:scopes).where(organization: current_organization).all.empty?
+                        if: Decidim::InitiativesType.joins(:scopes).where(organization: current_organization).any?
         end
       end
 

data/lib/decidim/initiatives/seeds.rb

@@ -7,30 +7,13 @@ module Decidim
   module Initiatives
     class Seeds < Decidim::Seeds
       def call
-        organization = Decidim::Organization.first
+        create_content_block!
 
-        Decidim::ContentBlock.create(
-          organization:,
-          weight: 33,
-          scope_name: :homepage,
-          manifest_name: :highlighted_initiatives,
-          published_at: Time.current
-        )
-
-        3.times do |n|
-          type = Decidim::InitiativesType.create!(
-            title: Decidim::Faker::Localized.sentence(word_count: 5),
-            description: Decidim::Faker::Localized.sentence(word_count: 25),
-            organization:,
-            banner_image: ::Faker::Boolean.boolean(true_ratio: 0.5) ? banner_image : nil # Keep after organization
-          )
+        3.times do |_n|
+          type = create_initiative_type!
 
           organization.top_scopes.each do |scope|
-            Decidim::InitiativesTypeScope.create(
-              type:,
-              scope:,
-              supports_required: (n + 1) * 1000
-            )
+            create_initiative_type_scope!(scope:, type:)
           end
         end
 
@@ -38,58 +21,100 @@ module Decidim
           Decidim::Initiative.skip_callback(:save, :after, :notify_state_change, raise: false)
           Decidim::Initiative.skip_callback(:create, :after, :notify_creation, raise: false)
 
-          params = {
-            title: Decidim::Faker::Localized.sentence(word_count: 3),
-            description: Decidim::Faker::Localized.sentence(word_count: 25),
-            scoped_type: Decidim::InitiativesTypeScope.all.sample,
-            state:,
-            signature_type: "online",
-            signature_start_date: Date.current - 7.days,
-            signature_end_date: Date.current + 7.days,
-            published_at: 7.days.ago,
-            author: Decidim::User.all.sample,
-            organization:
-          }
-
-          initiative = Decidim.traceability.perform_action!(
-            "publish",
-            Decidim::Initiative,
-            organization.users.first,
-            visibility: "all"
-          ) do
-            Decidim::Initiative.create!(params)
-          end
-          initiative.add_to_index_as_search_resource
-
-          if %w(published rejected accepted).include? state
-            users = []
-            rand(50).times do
-              author = (Decidim::User.all - users).sample
-              initiative.votes.create!(author:, scope: initiative.scope, hash_id: SecureRandom.hex)
-              users << author
-            end
-          end
+          initiative = create_initiative!(state:)
+
+          create_initiative_votes!(initiative:) if %w(published rejected accepted).include? state
 
           Decidim::Comments::Seed.comments_for(initiative)
 
           create_attachment(attached_to: initiative, filename: "city.jpeg")
 
           Decidim::Initiatives.default_components.each do |component_name|
-            component = Decidim::Component.create!(
-              name: Decidim::Components::Namer.new(initiative.organization.available_locales, component_name).i18n_name,
-              manifest_name: component_name,
-              published_at: Time.current,
-              participatory_space: initiative
-            )
-
-            next unless component_name.in? ["pages", :pages]
-
-            Decidim::Pages::CreatePage.call(component) do
-              on(:invalid) { raise "Cannot create page" }
-            end
+            create_component!(initiative:, component_name:)
           end
         end
       end
+
+      def create_content_block!
+        Decidim::ContentBlock.create(
+          organization:,
+          weight: 33,
+          scope_name: :homepage,
+          manifest_name: :highlighted_initiatives,
+          published_at: Time.current
+        )
+      end
+
+      def create_initiative_type!
+        Decidim::InitiativesType.create!(
+          title: Decidim::Faker::Localized.sentence(word_count: 5),
+          description: Decidim::Faker::Localized.sentence(word_count: 25),
+          organization:,
+          banner_image: ::Faker::Boolean.boolean(true_ratio: 0.5) ? banner_image : nil # Keep after organization
+        )
+      end
+
+      def create_initiative_type_scope!(scope:, type:)
+        n = rand(3)
+        Decidim::InitiativesTypeScope.create(
+          type:,
+          scope:,
+          supports_required: (n + 1) * 1000
+        )
+      end
+
+      def create_initiative!(state:)
+        published_at = %w(published rejected accepted).include?(state) ? 7.days.ago : nil
+
+        params = {
+          title: Decidim::Faker::Localized.sentence(word_count: 3),
+          description: Decidim::Faker::Localized.sentence(word_count: 25),
+          scoped_type: Decidim::InitiativesTypeScope.all.sample,
+          state:,
+          signature_type: "online",
+          signature_start_date: Date.current - 7.days,
+          signature_end_date: Date.current + 7.days,
+          published_at:,
+          author: Decidim::User.all.sample,
+          organization:
+        }
+
+        initiative = Decidim.traceability.perform_action!(
+          "publish",
+          Decidim::Initiative,
+          organization.users.first,
+          visibility: "all"
+        ) do
+          Decidim::Initiative.create!(params)
+        end
+        initiative.add_to_index_as_search_resource
+
+        initiative
+      end
+
+      def create_initiative_votes!(initiative:)
+        users = []
+        rand(50).times do
+          author = (Decidim::User.all - users).sample
+          initiative.votes.create!(author:, scope: initiative.scope, hash_id: SecureRandom.hex)
+          users << author
+        end
+      end
+
+      def create_component!(initiative:, component_name:)
+        component = Decidim::Component.create!(
+          name: Decidim::Components::Namer.new(initiative.organization.available_locales, component_name).i18n_name,
+          manifest_name: component_name,
+          published_at: Time.current,
+          participatory_space: initiative
+        )
+
+        return unless component_name.in? ["pages", :pages]
+
+        Decidim::Pages::CreatePage.call(component) do
+          on(:invalid) { raise "Cannot create page" }
+        end
+      end
     end
   end
 end

data/lib/decidim/initiatives/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-initiatives version.
   module Initiatives
     def self.version
-      "0.28.3"
+      "0.29.0.rc1"
     end
   end
 end

data/lib/decidim/initiatives.rb

@@ -17,18 +17,6 @@ module Decidim
       true
     end
 
-    # Public Setting that defines the similarity minimum value to consider two
-    # initiatives similar. Defaults to 0.25.
-    config_accessor :similarity_threshold do
-      0.25
-    end
-
-    # Public Setting that defines how many similar initiatives will be shown.
-    # Defaults to 5.
-    config_accessor :similarity_limit do
-      5
-    end
-
     # Minimum number of committee members required to pass the initiative to
     # technical validation phase. Only applies to initiatives created by
     # individuals.

data/lib/tasks/decidim_initiatives.rake

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 namespace :decidim_initiatives do
-  desc "Check validating initiatives and moves all without changes for a configured time to discarded state"
+  desc "Checks validating initiatives and moves all without changes for a configured time to discarded state"
   task check_validating: :environment do
     Decidim::Initiatives::OutdatedValidatingInitiatives
       .for(Decidim::Initiatives.max_time_in_validating_state)
       .each(&:discarded!)
   end
 
-  desc "Check published initiatives and moves to accepted/rejected state depending on the votes collected when the signing period has finished"
+  desc "Checks published initiatives and moves to accepted/rejected state depending on the votes collected when the signing period has finished"
   task check_published: :environment do
     Decidim::Initiatives::SupportPeriodFinishedInitiatives.new.each do |initiative|
       if initiative.supports_goal_reached?
@@ -19,7 +19,7 @@ namespace :decidim_initiatives do
     end
   end
 
-  desc "Notify progress on published initiatives"
+  desc "Notifies progress on published initiatives"
   task notify_progress: :environment do
     Decidim::Initiative
       .published

data/lib/tasks/initiatives/upgrade/decidim_initiatives_upgrade_tasks.rake

@@ -1,17 +1,15 @@
 # frozen_string_literal: true
 
-namespace :decidim do
-  namespace :initiatives do
-    namespace :upgrade do
-      desc "Fix the broken pages"
-      task fix_broken_pages: :environment do
-        Decidim::Initiative.find_each do |initiative|
-          initiative.components.where(manifest_name: "pages").each do |component|
-            next unless Decidim::Pages::Page.where(component:).empty?
+namespace :decidim_initiatives do
+  namespace :upgrade do
+    desc "Fixes the broken pages"
+    task fix_broken_pages: :environment do
+      Decidim::Initiative.find_each do |initiative|
+        initiative.components.where(manifest_name: "pages").each do |component|
+          next unless Decidim::Pages::Page.where(component:).empty?
 
-            Decidim::Pages::CreatePage.call(component) do
-              on(:invalid) { raise "Cannot create page" }
-            end
+          Decidim::Pages::CreatePage.call(component) do
+            on(:invalid) { raise "Cannot create page" }
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-initiatives
 version: !ruby/object:Gem::Version
-  version: 0.28.3
+  version: 0.29.0.rc1
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-verifications
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: hexapdf
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
 description: Participants initiatives plugin for decidim.
 email:
 - jsperezg@gmail.com
@@ -232,7 +232,6 @@ files:
 - app/forms/decidim/initiatives/admin/initiatives_settings_form.rb
 - app/forms/decidim/initiatives/committee_member_form.rb
 - app/forms/decidim/initiatives/initiative_form.rb
-- app/forms/decidim/initiatives/previous_form.rb
 - app/forms/decidim/initiatives/select_initiative_type_form.rb
 - app/forms/decidim/initiatives/vote_form.rb
 - app/helpers/decidim/initiatives/admin/initiatives_helper.rb
@@ -280,7 +279,6 @@ files:
 - app/queries/decidim/initiatives/initiatives_promoted.rb
 - app/queries/decidim/initiatives/organization_prioritized_initiatives.rb
 - app/queries/decidim/initiatives/outdated_validating_initiatives.rb
-- app/queries/decidim/initiatives/similar_initiatives.rb
 - app/queries/decidim/initiatives/support_period_finished_initiatives.rb
 - app/queries/decidim/initiatives/user_authorizations.rb
 - app/serializers/decidim/initiatives/initiative_serializer.rb
@@ -544,14 +542,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Decidim initiatives module

data/app/forms/decidim/initiatives/previous_form.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Initiatives
-    # A form object used to collect the title and description for an initiative.
-    class PreviousForm < Form
-      include TranslatableAttributes
-
-      mimic :initiative
-
-      attribute :title, String
-      attribute :description, String
-      attribute :type_id, Integer
-
-      validates :title, :description, presence: true
-      validates :title, length: { maximum: 150 }
-      validates :type_id, presence: true
-
-      def type
-        @type ||= type_id ? Decidim::InitiativesType.find(type_id) : context.initiative.type
-      end
-    end
-  end
-end

data/app/queries/decidim/initiatives/similar_initiatives.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Initiatives
-    # Class uses to retrieve similar initiatives types.
-    class SimilarInitiatives < Decidim::Query
-      include Decidim::TranslationsHelper
-      include CurrentLocale
-
-      # Syntactic sugar to initialize the class and return the queried objects.
-      #
-      # organization - Decidim::Organization
-      # form - Decidim::Initiatives::PreviousForm
-      def self.for(organization, form)
-        new(organization, form).query
-      end
-
-      # Initializes the class.
-      #
-      # organization - Decidim::Organization
-      # form - Decidim::Initiatives::PreviousForm
-      def initialize(organization, form)
-        @organization = organization
-        @form = form
-      end
-
-      # Retrieves similar initiatives
-      def query
-        Initiative
-          .published
-          .where(organization: @organization)
-          .where(
-            Arel.sql("GREATEST(#{title_similarity}, #{description_similarity}) >= ?").to_s,
-            translated_attribute(form.title),
-            translated_attribute(form.description),
-            Decidim::Initiatives.similarity_threshold
-          )
-          .limit(Decidim::Initiatives.similarity_limit)
-      end
-
-      private
-
-      attr_reader :form
-
-      def title_similarity
-        "similarity(title->>'#{current_locale}', ?)"
-      end
-
-      def description_similarity
-        "similarity(description->>'#{current_locale}', ?)"
-      end
-    end
-  end
-end