decidim-proposals 0.15.2 → 0.16.0

data/lib/decidim/proposals/doc_to_markdown.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "doc2text"
+require "tempfile"
+
+module Decidim
+  module Proposals
+    # This class parses a participatory text document in markdown and
+    # produces Proposals in the form of sections and articles.
+    #
+    # This implementation uses Redcarpet Base renderer.
+    # Redcarpet::Render::Base performs a callback for every block it finds, what MarkdownToProposals
+    # does is to implement callbacks for the blocks which it is interested in performing some actions.
+    #
+    class DocToMarkdown
+      MARKDOWN_MIME_TYPE = "text/markdown"
+      ODT_MIME_TYPE = "application/vnd.oasis.opendocument.text"
+      DOCX_MIME_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+
+      # Public: Initializes the serializer with a proposal.
+      def initialize(doc, mime_type)
+        @doc = doc
+        @transformer = case mime_type
+                       # when MARKDOWN_MIME_TYPE
+                       # no transformer required
+                       when ODT_MIME_TYPE
+                         # convert libreoffice odt to markdown
+                         OdtToMarkdown.new(doc)
+                       when DOCX_MIME_TYPE
+                         # convert word 2013 docx to markdown
+                         DocxToMarkdown.new(doc)
+                       end
+      end
+
+      def to_md
+        @transformer ? @transformer.to_md : @doc
+      end
+    end
+  end
+end

data/lib/decidim/proposals/engine.rb

@@ -32,6 +32,7 @@ module Decidim
           end
           resource :proposal_vote, only: [:create, :destroy]
           resource :proposal_widget, only: :show, path: "embed"
+          resources :versions, only: [:show, :index]
         end
         resources :collaborative_drafts, except: [:destroy] do
           get :compare, on: :collection
@@ -62,21 +63,7 @@ module Decidim
 
       initializer "decidim_proposals.view_hooks" do
         Decidim.view_hooks.register(:participatory_space_highlighted_elements, priority: Decidim::ViewHooks::MEDIUM_PRIORITY) do |view_context|
-          published_components = Decidim::Component.where(participatory_space: view_context.current_participatory_space).published
-          proposals = Decidim::Proposals::Proposal.published.not_hidden.except_withdrawn
-                                                  .where(component: published_components)
-                                                  .order_randomly(rand * 2 - 1)
-                                                  .limit(Decidim::Proposals.config.participatory_space_highlighted_proposals_limit)
-
-          next unless proposals.any?
-
-          view_context.extend Decidim::Proposals::ApplicationHelper
-          view_context.render(
-            partial: "decidim/participatory_spaces/highlighted_proposals",
-            locals: {
-              proposals: proposals
-            }
-          )
+          view_context.cell("decidim/proposals/highlighted_proposals", view_context.current_participatory_space)
         end
 
         if defined? Decidim::ParticipatoryProcesses
@@ -191,26 +178,56 @@ module Decidim
       end
 
       initializer "decidim_proposals.register_metrics" do
-        Decidim.metrics_registry.register(
-          :proposals,
-          "Decidim::Proposals::Metrics::ProposalsMetricManage",
-          Decidim::MetricRegistry::HIGHLIGHTED,
-          2
-        )
-
-        Decidim.metrics_registry.register(
-          :accepted_proposals,
-          "Decidim::Proposals::Metrics::AcceptedProposalsMetricManage",
-          Decidim::MetricRegistry::NOT_HIGHLIGHTED,
-          3
-        )
-
-        Decidim.metrics_registry.register(
-          :votes,
-          "Decidim::Proposals::Metrics::VotesMetricManage",
-          Decidim::MetricRegistry::HIGHLIGHTED,
-          3
-        )
+        Decidim.metrics_registry.register(:proposals) do |metric_registry|
+          metric_registry.manager_class = "Decidim::Proposals::Metrics::ProposalsMetricManage"
+
+          metric_registry.settings do |settings|
+            settings.attribute :highlighted, type: :boolean, default: true
+            settings.attribute :scopes, type: :array, default: %w(home participatory_process)
+            settings.attribute :weight, type: :integer, default: 2
+            settings.attribute :stat_block, type: :string, default: "medium"
+          end
+        end
+
+        Decidim.metrics_registry.register(:accepted_proposals) do |metric_registry|
+          metric_registry.manager_class = "Decidim::Proposals::Metrics::AcceptedProposalsMetricManage"
+
+          metric_registry.settings do |settings|
+            settings.attribute :highlighted, type: :boolean, default: false
+            settings.attribute :scopes, type: :array, default: %w(home participatory_process)
+            settings.attribute :weight, type: :integer, default: 3
+            settings.attribute :stat_block, type: :string, default: "small"
+          end
+        end
+
+        Decidim.metrics_registry.register(:votes) do |metric_registry|
+          metric_registry.manager_class = "Decidim::Proposals::Metrics::VotesMetricManage"
+
+          metric_registry.settings do |settings|
+            settings.attribute :highlighted, type: :boolean, default: true
+            settings.attribute :scopes, type: :array, default: %w(home participatory_process)
+            settings.attribute :weight, type: :integer, default: 3
+            settings.attribute :stat_block, type: :string, default: "medium"
+          end
+        end
+
+        Decidim.metrics_registry.register(:endorsements) do |metric_registry|
+          metric_registry.manager_class = "Decidim::Proposals::Metrics::EndorsementsMetricManage"
+
+          metric_registry.settings do |settings|
+            settings.attribute :highlighted, type: :boolean, default: false
+            settings.attribute :scopes, type: :array, default: %w(participatory_process)
+            settings.attribute :weight, type: :integer, default: 4
+            settings.attribute :stat_block, type: :string, default: "medium"
+          end
+        end
+
+        Decidim.metrics_operation.register(:participants, :proposals) do |metric_operation|
+          metric_operation.manager_class = "Decidim::Proposals::Metrics::ProposalParticipantsMetricMeasure"
+        end
+        Decidim.metrics_operation.register(:followers, :proposals) do |metric_operation|
+          metric_operation.manager_class = "Decidim::Proposals::Metrics::ProposalFollowersMetricMeasure"
+        end
       end
     end
   end

data/lib/decidim/proposals/odt_to_markdown.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require "doc2text"
+require "tempfile"
+
+module Decidim
+  module Proposals
+    # This class parses a participatory text document in markdown and
+    # produces Proposals in the form of sections and articles.
+    #
+    # This implementation uses Redcarpet Base renderer.
+    # Redcarpet::Render::Base performs a callback for every block it finds, what MarkdownToProposals
+    # does is to implement callbacks for the blocks which it is interested in performing some actions.
+    #
+    class OdtToMarkdown
+      # Public: Initializes the serializer with a proposal.
+      def initialize(doc)
+        @doc = doc
+      end
+
+      def to_md
+        doc_file = doc_to_tmp_file
+        md_file = transform_to_md_file(doc_file)
+        md_file.read
+      end
+
+      #-----------------------------------------------------
+
+      private
+
+      #-----------------------------------------------------
+
+      def doc_to_tmp_file
+        file = Tempfile.new("doc-to-markdown-odt", encoding: "ascii-8bit")
+        file.write(@doc)
+        file
+      end
+
+      def transform_to_md_file(doc_file)
+        md_file = Tempfile.new
+        Doc2Text::Odt::Document.parse_and_save doc_file, md_file
+        md_file
+      end
+    end
+  end
+end

data/lib/decidim/proposals/proposal_serializer.rb

@@ -16,23 +16,33 @@ module Decidim
       # Public: Exports a hash with the serialized data for this proposal.
       def serialize
         {
-          id: @proposal.id,
+          id: proposal.id,
           category: {
-            id: @proposal.category.try(:id),
-            name: @proposal.category.try(:name)
+            id: proposal.category.try(:id),
+            name: proposal.category.try(:name)
           },
           scope: {
-            id: @proposal.scope.try(:id),
-            name: @proposal.scope.try(:name)
+            id: proposal.scope.try(:id),
+            name: proposal.scope.try(:name)
+          },
+          participatory_space: {
+            id: proposal.participatory_space.id,
+            url: Decidim::ResourceLocatorPresenter.new(proposal.participatory_space).url
           },
-          title: present(@proposal).title,
-          body: present(@proposal).body,
-          supports: @proposal.proposal_votes_count,
-          comments: @proposal.comments.count,
-          published_at: @proposal.published_at,
-          url: url,
           component: { id: component.id },
-          meeting_urls: meetings
+          title: present(proposal).title,
+          body: present(proposal).body,
+          state: proposal.state.to_s,
+          reference: proposal.reference,
+          supports: proposal.proposal_votes_count,
+          endorsements: proposal.endorsements.count,
+          comments: proposal.comments.count,
+          attachments: proposal.attachments.count,
+          followers: proposal.followers.count,
+          published_at: proposal.published_at,
+          url: url,
+          meeting_urls: meetings,
+          related_proposals: related_proposals
         }
       end
 
@@ -45,11 +55,17 @@ module Decidim
       end
 
       def meetings
-        @proposal.linked_resources(:meetings, "proposals_from_meeting").map do |meeting|
+        proposal.linked_resources(:meetings, "proposals_from_meeting").map do |meeting|
           Decidim::ResourceLocatorPresenter.new(meeting).url
         end
       end
 
+      def related_proposals
+        proposal.linked_resources(:proposals, "copied_from_component").map do |proposal|
+          Decidim::ResourceLocatorPresenter.new(proposal).url
+        end
+      end
+
       def url
         Decidim::ResourceLocatorPresenter.new(proposal).url
       end

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

@@ -2,6 +2,7 @@
 
 require "decidim/core/test/factories"
 require "decidim/participatory_processes/test/factories"
+require "decidim/meetings/test/factories"
 
 FactoryBot.define do
   factory :proposal_component, parent: :component do
@@ -159,6 +160,24 @@ FactoryBot.define do
       end
     end
 
+    trait :with_geocoding_and_collaborative_drafts_enabled do
+      settings do
+        {
+          geocoding_enabled: true,
+          collaborative_drafts_enabled: true
+        }
+      end
+    end
+
+    trait :with_attachments_allowed_and_collaborative_drafts_enabled do
+      settings do
+        {
+          attachments_allowed: true,
+          collaborative_drafts_enabled: true
+        }
+      end
+    end
+
     trait :with_minimum_votes_per_user do
       transient do
         minimum_votes_per_user { 3 }
@@ -170,6 +189,7 @@ FactoryBot.define do
         }
       end
     end
+
     trait :with_participatory_texts_enabled do
       settings do
         {
@@ -177,6 +197,48 @@ FactoryBot.define do
         }
       end
     end
+
+    trait :with_amendments_enabled do
+      settings do
+        {
+          amendments_enabled: true
+        }
+      end
+    end
+
+    trait :with_amendments_and_participatory_texts_enabled do
+      settings do
+        {
+          participatory_texts_enabled: true,
+          amendments_enabled: true
+        }
+      end
+    end
+
+    trait :with_comments_disabled do
+      settings do
+        {
+          comments_enabled: false
+        }
+      end
+    end
+
+    trait :with_extra_hashtags do
+      transient do
+        automatic_hashtags { "AutoHashtag AnotherAutoHashtag" }
+        suggested_hashtags { "SuggestedHashtag AnotherSuggestedHashtag" }
+      end
+
+      step_settings do
+        {
+          participatory_space.active_step.id => {
+            automatic_hashtags: automatic_hashtags,
+            suggested_hashtags: suggested_hashtags,
+            creation_enabled: true
+          }
+        }
+      end
+    end
   end
 
   factory :proposal, class: "Decidim::Proposals::Proposal" do
@@ -217,6 +279,14 @@ FactoryBot.define do
       end
     end
 
+    trait :official_meeting do
+      after :build do |proposal|
+        proposal.coauthorships.clear
+        component = create(:meeting_component, participatory_space: proposal.component.participatory_space)
+        proposal.coauthorships.build(author: build(:meeting, component: component))
+      end
+    end
+
     trait :evaluating do
       state { "evaluating" }
       answered_at { Time.current }
@@ -323,4 +393,10 @@ FactoryBot.define do
       state { "withdrawn" }
     end
   end
+
+  factory :participatory_text, class: "Decidim::Proposals::ParticipatoryText" do
+    title { Faker::Hacker.say_something_smart }
+    description { Faker::Lorem.sentences(3).join("\n") }
+    component { create(:proposal_component) }
+  end
 end

data/lib/decidim/proposals/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -60,28 +60,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
+- !ruby/object:Gem::Dependency
+  name: doc2text
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -144,84 +158,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -242,6 +256,7 @@ files:
 - app/assets/images/decidim/proposals/icon.svg
 - app/assets/javascripts/decidim/proposals/add_proposal.js.es6
 - app/assets/javascripts/decidim/proposals/admin/proposals.es6
+- app/assets/javascripts/decidim/proposals/admin/proposals_form.js.es6
 - app/assets/javascripts/decidim/proposals/identity_selector_dialog.js.es6
 - app/assets/javascripts/decidim/proposals/social_share.js
 - app/assets/javascripts/decidim/proposals/utils.js.es6
@@ -254,8 +269,15 @@ files:
 - app/cells/decidim/proposals/collaborative_draft_m_cell.rb
 - app/cells/decidim/proposals/endorsers_list/show.erb
 - app/cells/decidim/proposals/endorsers_list_cell.rb
+- app/cells/decidim/proposals/highlighted_proposals/show.erb
+- app/cells/decidim/proposals/highlighted_proposals_cell.rb
+- app/cells/decidim/proposals/highlighted_proposals_for_component/show.erb
+- app/cells/decidim/proposals/highlighted_proposals_for_component_cell.rb
 - app/cells/decidim/proposals/irreversible_action_modal/show.erb
 - app/cells/decidim/proposals/irreversible_action_modal_cell.rb
+- app/cells/decidim/proposals/participatory_text_proposal/buttons.erb
+- app/cells/decidim/proposals/participatory_text_proposal/show.erb
+- app/cells/decidim/proposals/participatory_text_proposal_cell.rb
 - app/cells/decidim/proposals/proposal_activity_cell.rb
 - app/cells/decidim/proposals/proposal_cell.rb
 - app/cells/decidim/proposals/proposal_link_to_collaborative_draft/show.erb
@@ -282,6 +304,7 @@ files:
 - app/commands/decidim/proposals/create_proposal_export.rb
 - app/commands/decidim/proposals/destroy_proposal.rb
 - app/commands/decidim/proposals/endorse_proposal.rb
+- app/commands/decidim/proposals/hashtags_methods.rb
 - app/commands/decidim/proposals/publish_collaborative_draft.rb
 - app/commands/decidim/proposals/publish_proposal.rb
 - app/commands/decidim/proposals/reject_access_to_collaborative_draft.rb
@@ -344,9 +367,11 @@ files:
 - app/forms/decidim/proposals/proposal_wizard_create_step_form.rb
 - app/forms/decidim/proposals/reject_access_to_collaborative_draft_form.rb
 - app/forms/decidim/proposals/request_access_to_collaborative_draft_form.rb
+- app/helpers/decidim/proposals/admin/proposals_helper.rb
 - app/helpers/decidim/proposals/application_helper.rb
 - app/helpers/decidim/proposals/collaborative_draft_cells_helper.rb
 - app/helpers/decidim/proposals/collaborative_draft_helper.rb
+- app/helpers/decidim/proposals/control_version_helper.rb
 - app/helpers/decidim/proposals/map_helper.rb
 - app/helpers/decidim/proposals/participatory_texts_helper.rb
 - app/helpers/decidim/proposals/proposal_cells_helper.rb
@@ -375,6 +400,9 @@ files:
 - app/presenters/decidim/proposals/proposal_presenter.rb
 - app/queries/decidim/proposals/filtered_proposals.rb
 - app/queries/decidim/proposals/metrics/accepted_proposals_metric_manage.rb
+- app/queries/decidim/proposals/metrics/endorsements_metric_manage.rb
+- app/queries/decidim/proposals/metrics/proposal_followers_metric_measure.rb
+- app/queries/decidim/proposals/metrics/proposal_participants_metric_measure.rb
 - app/queries/decidim/proposals/metrics/proposals_metric_manage.rb
 - app/queries/decidim/proposals/metrics/votes_metric_manage.rb
 - app/queries/decidim/proposals/similar_collaborative_drafts.rb
@@ -386,7 +414,6 @@ files:
 - app/types/decidim/proposals/proposal_type.rb
 - app/types/decidim/proposals/proposals_type.rb
 - app/views/decidim/participatory_processes/participatory_process_groups/_highlighted_proposals.html.erb
-- app/views/decidim/participatory_spaces/_highlighted_proposals.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
@@ -413,6 +440,7 @@ files:
 - app/views/decidim/proposals/collaborative_drafts/_collaborative_drafts.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_collaborator_requests.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_count.html.erb
+- app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_filters.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_filters_small_view.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_new_collaborative_draft_button.html.erb
@@ -456,6 +484,11 @@ files:
 - app/views/decidim/proposals/proposals/index.html.erb
 - app/views/decidim/proposals/proposals/index.js.erb
 - app/views/decidim/proposals/proposals/new.html.erb
+- app/views/decidim/proposals/proposals/participatory_texts/_index.html.erb
+- app/views/decidim/proposals/proposals/participatory_texts/_proposal_vote_button.html.erb
+- app/views/decidim/proposals/proposals/participatory_texts/_proposal_votes_count.html.erb
+- app/views/decidim/proposals/proposals/participatory_texts/_view_index.html.erb
+- app/views/decidim/proposals/proposals/participatory_texts/participatory_text.html.erb
 - app/views/decidim/proposals/proposals/preview.html.erb
 - app/views/decidim/proposals/proposals/show.html.erb
 - app/views/decidim/proposals/versions/_version.html.erb
@@ -520,6 +553,7 @@ files:
 - db/migrate/20181010114622_add_temporary_votes.rb
 - db/migrate/20181016132225_add_organization_as_author.rb
 - db/migrate/20181017084221_make_author_polymorhpic_for_proposal_endorsements.rb
+- db/migrate/20181026073215_add_created_in_meeting.rb
 - lib/decidim/content_parsers/proposal_parser.rb
 - lib/decidim/content_renderers/proposal_renderer.rb
 - lib/decidim/proposals.rb
@@ -528,8 +562,10 @@ files:
 - lib/decidim/proposals/commentable_collaborative_draft.rb
 - lib/decidim/proposals/commentable_proposal.rb
 - lib/decidim/proposals/component.rb
+- lib/decidim/proposals/doc_to_markdown.rb
 - lib/decidim/proposals/engine.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_serializer.rb
 - lib/decidim/proposals/test/factories.rb
@@ -554,7 +590,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Decidim proposals module