decidim-proposals 0.25.0 → 0.26.0.rc2

data/lib/decidim/proposals/proposal_serializer.rb

@@ -33,17 +33,20 @@ module Decidim
           component: { id: component.id },
           title: proposal.title,
           body: proposal.body,
+          address: proposal.address,
+          latitude: proposal.latitude,
+          longitude: proposal.longitude,
           state: proposal.state.to_s,
           reference: proposal.reference,
           answer: ensure_translatable(proposal.answer),
           supports: proposal.proposal_votes_count,
           endorsements: {
-            total_count: proposal.endorsements.count,
+            total_count: proposal.endorsements.size,
             user_endorsements: user_endorsements
           },
           comments: proposal.comments_count,
-          attachments: proposal.attachments.count,
-          followers: proposal.followers.count,
+          attachments: proposal.attachments.size,
+          followers: proposal.follows.size,
           published_at: proposal.published_at,
           url: url,
           meeting_urls: meetings,

data/lib/decidim/proposals/test/factories.rb

@@ -214,14 +214,6 @@ FactoryBot.define do
       end
     end
 
-    trait :with_card_image_allowed do
-      settings do
-        {
-          allow_card_image: true
-        }
-      end
-    end
-
     trait :with_extra_hashtags do
       transient do
         automatic_hashtags { "AutoHashtag AnotherAutoHashtag" }
@@ -297,7 +289,7 @@ FactoryBot.define do
       proposal.body = Decidim::ContentProcessor.parse_with_processor(:hashtag, proposal.body, current_organization: proposal.organization).rewrite
 
       if proposal.component
-        users = evaluator.users || [create(:user, organization: proposal.component.participatory_space.organization)]
+        users = evaluator.users || [create(:user, :confirmed, organization: proposal.component.participatory_space.organization)]
         users.each_with_index do |user, idx|
           user_group = evaluator.user_groups[idx]
           proposal.coauthorships.build(author: user, user_group: user_group)

data/lib/decidim/proposals/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.25.0"
+      "0.26.0.rc2"
     end
   end
 end

data/lib/decidim/proposals.rb

@@ -4,6 +4,7 @@ require "decidim/proposals/admin"
 require "decidim/proposals/api"
 require "decidim/proposals/engine"
 require "decidim/proposals/admin_engine"
+require "decidim/proposals/import"
 require "decidim/proposals/component"
 
 module Decidim
@@ -11,7 +12,6 @@ module Decidim
   # allows users to create proposals in a participatory process.
   module Proposals
     autoload :ProposalSerializer, "decidim/proposals/proposal_serializer"
-    autoload :ProposalCreator, "decidim/proposals/proposal_creator"
     autoload :CommentableProposal, "decidim/proposals/commentable_proposal"
     autoload :CommentableCollaborativeDraft, "decidim/proposals/commentable_collaborative_draft"
     autoload :MarkdownToProposals, "decidim/proposals/markdown_to_proposals"

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.0.rc2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.26.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.26.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.26.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.26.0.rc2
 - !ruby/object:Gem::Dependency
   name: doc2text
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -80,84 +80,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.26.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.26.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.26.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.26.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.26.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.26.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.26.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.26.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.26.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.26.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.26.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.26.0.rc2
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -289,6 +289,7 @@ files:
 - app/forms/decidim/proposals/admin/proposal_base_form.rb
 - app/forms/decidim/proposals/admin/proposal_form.rb
 - app/forms/decidim/proposals/admin/proposal_note_form.rb
+- app/forms/decidim/proposals/admin/proposals_file_import_form.rb
 - app/forms/decidim/proposals/admin/proposals_fork_form.rb
 - app/forms/decidim/proposals/admin/proposals_import_form.rb
 - app/forms/decidim/proposals/admin/proposals_merge_form.rb
@@ -365,6 +366,7 @@ files:
 - app/services/decidim/proposals/proposal_builder.rb
 - app/services/decidim/proposals/proposal_search.rb
 - app/validators/proposal_length_validator.rb
+- app/views/decidim/proposals/admin/imports/_proposals_fields.html.erb
 - app/views/decidim/proposals/admin/participatory_texts/_article-preview.html.erb
 - app/views/decidim/proposals/admin/participatory_texts/_bulk-actions.html.erb
 - app/views/decidim/proposals/admin/participatory_texts/index.html.erb
@@ -444,6 +446,7 @@ files:
 - app/views/decidim/proposals/versions/index.html.erb
 - app/views/decidim/proposals/versions/show.html.erb
 - config/assets.rb
+- config/brakeman.ignore
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
@@ -510,6 +513,7 @@ files:
 - config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
+- config/locales/val-ES.yml
 - config/locales/vi-VN.yml
 - config/locales/vi.yml
 - config/locales/zh-CN.yml
@@ -584,10 +588,14 @@ files:
 - lib/decidim/proposals/component.rb
 - lib/decidim/proposals/doc_to_markdown.rb
 - lib/decidim/proposals/engine.rb
+- lib/decidim/proposals/import.rb
+- lib/decidim/proposals/import/proposal_answer_creator.rb
+- lib/decidim/proposals/import/proposal_creator.rb
+- lib/decidim/proposals/import/proposals_answers_verifier.rb
+- lib/decidim/proposals/import/proposals_verifier.rb
 - lib/decidim/proposals/markdown_to_proposals.rb
 - lib/decidim/proposals/odt_to_markdown.rb
 - lib/decidim/proposals/participatory_text_section.rb
-- lib/decidim/proposals/proposal_creator.rb
 - lib/decidim/proposals/proposal_serializer.rb
 - lib/decidim/proposals/test/capybara_proposals_picker.rb
 - lib/decidim/proposals/test/factories.rb
@@ -597,7 +605,7 @@ homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -608,12 +616,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Decidim proposals module
 test_files: []

data/lib/decidim/proposals/proposal_creator.rb

@@ -1,98 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Proposals
-    # This class is responsible for creating the imported proposals
-    # and must be included in proposals component's import manifest.
-    class ProposalCreator < Decidim::Admin::Import::Creator
-      # Retuns the resource class to be created with the provided data.
-      def self.resource_klass
-        Decidim::Proposals::Proposal
-      end
-
-      # Produces a proposal from parsed data
-      #
-      # Returns a proposal
-      def produce
-        resource.add_coauthor(context[:current_user], user_group: context[:user_group])
-
-        resource
-      end
-
-      # Saves the proposal
-      def finish!
-        super # resource.save!
-        notify(resource)
-        publish(resource)
-      end
-
-      private
-
-      attr_reader :context
-
-      def resource
-        @resource ||= Decidim::Proposals::Proposal.new(
-          category: category,
-          scope: scope,
-          title: title,
-          body: body,
-          component: component,
-          published_at: Time.current
-        )
-      end
-
-      def category
-        id = data.has_key?(:category) ? data[:category]["id"] : data[:"category/id"].to_i
-        Decidim::Category.find_by(id: id)
-      end
-
-      def scope
-        id = data.has_key?(:scope) ? data[:scope]["id"] : data[:"scope/id"].to_i
-        Decidim::Scope.find_by(id: id)
-      end
-
-      def title
-        locale_hasher("title", available_locales)
-      end
-
-      def body
-        locale_hasher("body", available_locales)
-      end
-
-      def available_locales
-        @available_locales ||= component.participatory_space.organization.available_locales
-      end
-
-      def component
-        context[:current_component]
-      end
-
-      def notify(proposal)
-        return if proposal.coauthorships.empty?
-
-        Decidim::EventsManager.publish(
-          event: "decidim.events.proposals.proposal_published",
-          event_class: Decidim::Proposals::PublishProposalEvent,
-          resource: proposal,
-          followers: coauthors_followers(proposal)
-        )
-      end
-
-      def publish(proposal)
-        Decidim::EventsManager.publish(
-          event: "decidim.events.proposals.proposal_published",
-          event_class: Decidim::Proposals::PublishProposalEvent,
-          resource: proposal,
-          followers: proposal.participatory_space.followers - coauthors_followers(proposal),
-          extra: {
-            participatory_space: true
-          }
-        )
-      end
-
-      def coauthors_followers(proposal)
-        @coauthors_followers ||= proposal.authors.flat_map(&:followers)
-      end
-    end
-  end
-end