decidim-budgets 0.28.2 → 0.29.0.rc1

data/config/locales/zh-CN.yml

@@ -75,7 +75,6 @@ zh-CN:
         back_to: 返回 %{component_name}
         close_modal: 关闭模式
         continue: 继续
-        more_information: 更多信息
       budgets_list:
         cancel_order:
           more_than_one: 删除您对 %{name} 的投票并开始

data/config/locales/zh-TW.yml

@@ -155,7 +155,6 @@ zh-TW:
         back_to: 返回 %{component_name}
         close_modal: 關閉視窗
         continue: 繼續
-        more_information: 更多資訊
       budgets_list:
         cancel_order:
           more_than_one: 刪除您對於 %{name} 的投票並重新開始

data/decidim-budgets.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.1.0"
+  s.required_ruby_version = "~> 3.2.0"
 
   s.name = "decidim-budgets"
   s.summary = "Decidim budgets module"

data/lib/decidim/budgets/project_serializer.rb

@@ -37,6 +37,7 @@ module Decidim
           comments: project.comments_count,
           created_at: project.created_at,
           url: project.polymorphic_resource_url({}),
+          address: project.address,
           related_proposals:,
           related_proposal_titles:,
           related_proposal_urls:

data/lib/decidim/budgets/seeds.rb

@@ -13,25 +13,59 @@ module Decidim
       end
 
       def call
+        component = create_component!
+
+        rand(1...3).times do
+          create_budget!(component:)
+        end
+
+        Decidim::Budgets::Budget.where(component:).each do |budget|
+          rand(2...4).times do
+            project = create_project!(budget:)
+
+            create_attachments!(attached_to: project)
+
+            Decidim::Comments::Seed.comments_for(project)
+          end
+        end
+      end
+
+      def create_component!
         landing_page_content = Decidim::Faker::Localized.localized do
           "<h2>#{::Faker::Lorem.sentence}</h2>" \
             "<p>#{::Faker::Lorem.paragraph}</p>" \
             "<p>#{::Faker::Lorem.paragraph}</p>"
         end
 
-        component = Decidim::Component.create!(
+        params = {
           name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :budgets).i18n_name,
           manifest_name: :budgets,
           published_at: Time.current,
           participatory_space:,
           settings: {
+            geocoding_enabled: [true, false].sample,
             landing_page_content:,
             more_information_modal: Decidim::Faker::Localized.paragraph(sentence_count: 4),
             workflow: Decidim::Budgets.workflows.keys.sample
           }
-        )
+        }
 
-        rand(1...3).times do
+        Decidim.traceability.perform_action!(
+          "publish",
+          Decidim::Component,
+          admin_user,
+          visibility: "all"
+        ) do
+          Decidim::Component.create!(params)
+        end
+      end
+
+      def create_budget!(component:)
+        Decidim.traceability.perform_action!(
+          "create",
+          Decidim::Budgets::Budget,
+          admin_user
+        ) do
           Decidim::Budgets::Budget.create!(
             component:,
             title: Decidim::Faker::Localized.sentence(word_count: 2),
@@ -41,27 +75,34 @@ module Decidim
             total_budget: ::Faker::Number.number(digits: 8)
           )
         end
+      end
 
-        Decidim::Budgets::Budget.where(component:).each do |budget|
-          rand(2...4).times do
-            project = Decidim::Budgets::Project.create!(
-              budget:,
-              scope: participatory_space.organization.scopes.sample,
-              category: participatory_space.categories.sample,
-              title: Decidim::Faker::Localized.sentence(word_count: 2),
-              description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-                Decidim::Faker::Localized.paragraph(sentence_count: 3)
-              end,
-              budget_amount: ::Faker::Number.between(from: Integer(budget.total_budget * 0.7), to: budget.total_budget)
-            )
+      def create_project!(budget:)
+        params = {
+          budget:,
+          scope: participatory_space.organization.scopes.sample,
+          category: participatory_space.categories.sample,
+          title: Decidim::Faker::Localized.sentence(word_count: 2),
+          description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+            Decidim::Faker::Localized.paragraph(sentence_count: 3)
+          end,
+          budget_amount: ::Faker::Number.between(from: Integer(budget.total_budget * 0.7), to: budget.total_budget)
+        }
 
-            attachment_collection = create_attachment_collection(collection_for: project)
-            create_attachment(attached_to: project, filename: "Exampledocument.pdf", attachment_collection:)
-            create_attachment(attached_to: project, filename: "city.jpeg")
-            create_attachment(attached_to: project, filename: "Exampledocument.pdf")
+        if budget.component.settings.geocoding_enabled?
+          params = params.merge(
+            address: "#{::Faker::Address.street_address} #{::Faker::Address.zip} #{::Faker::Address.city}",
+            latitude: ::Faker::Address.latitude,
+            longitude: ::Faker::Address.longitude
+          )
+        end
 
-            Decidim::Comments::Seed.comments_for(project)
-          end
+        Decidim.traceability.perform_action!(
+          "create",
+          Decidim::Budgets::Project,
+          admin_user
+        ) do
+          Decidim::Budgets::Project.create!(params)
         end
       end
     end

data/lib/decidim/budgets/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-budgets version.
   module Budgets
     def self.version
-      "0.28.2"
+      "0.29.0.rc1"
     end
   end
 end

data/lib/decidim/budgets/workflows/base.rb

@@ -17,7 +17,7 @@ module Decidim
           budgets.one?
         end
 
-        # Public: Return the lonenly budget resource of the component
+        # Public: Return the single budget resource of the component
         #
         # Returns an ActiveRecord.
         def single

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-budgets
 version: !ruby/object:Gem::Version
-  version: 0.28.2
+  version: 0.29.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -18,70 +18,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        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.2
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc1
 description: A budgets component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -132,7 +132,6 @@ files:
 - app/commands/decidim/budgets/admin/create_order_reminders.rb
 - app/commands/decidim/budgets/admin/create_project.rb
 - app/commands/decidim/budgets/admin/destroy_budget.rb
-- app/commands/decidim/budgets/admin/destroy_project.rb
 - app/commands/decidim/budgets/admin/import_proposals_to_budgets.rb
 - app/commands/decidim/budgets/admin/update_budget.rb
 - app/commands/decidim/budgets/admin/update_project.rb
@@ -371,14 +370,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 budgets module

data/app/commands/decidim/budgets/admin/destroy_project.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Budgets
-    module Admin
-      # This command is executed when the user deletes a Project from the admin
-      # panel.
-      class DestroyProject < Decidim::Command
-        # Initializes an UpdateProject Command.
-        #
-        # project - The current instance of the project to be destroyed.
-        # current_user - the user that performs the action
-        def initialize(project, current_user)
-          @project = project
-          @current_user = current_user
-        end
-
-        # Performs the action.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          destroy_project
-          broadcast(:ok)
-        end
-
-        private
-
-        attr_reader :project, :current_user
-
-        def destroy_project
-          Decidim.traceability.perform_action!(
-            :delete,
-            project,
-            current_user
-          ) do
-            project.destroy!
-          end
-        end
-      end
-    end
-  end
-end