decidim 0.1.0 → 0.2.0

data/decidim-pages/lib/decidim/pages.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "decidim/pages/admin"
 require "decidim/pages/engine"
 require "decidim/pages/admin_engine"

data/decidim-pages/lib/decidim/pages/admin.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Pages
     # This module contains all the domain logic associated to Decidim's Pages

data/decidim-pages/lib/decidim/pages/admin_engine.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Pages
     # This is the admin interface for `decidim-pages`. It lets you edit and

data/decidim-pages/lib/decidim/pages/engine.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Pages
     # This is the engine that runs on the public interface of `decidim-pages`.

data/decidim-pages/lib/decidim/pages/feature.rb

@@ -19,6 +19,12 @@ Decidim.register_feature(:pages) do |feature|
     end
   end
 
+  feature.on(:copy) do |context|
+    Decidim::Pages::CopyPage.call(context) do
+      on(:invalid) { raise "Can't duplicate page" }
+    end
+  end
+
   feature.register_stat :comments_count, tag: :comments do |features, start_at, end_at|
     pages = Decidim::Pages::Page.where(feature: features)
     pages = pages.where("created_at >= ?", start_at) if start_at.present?

data/decidim-pages/spec/commands/copy_page_spec.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Pages
+    describe CopyPage, :db do
+      describe "call" do
+        let(:feature) { create(:feature, manifest_name: "pages") }
+        let!(:page) { create(:page, feature: feature) }
+        let(:new_feature) { create(:feature, manifest_name: "pages") }
+        let(:context) { { new_feature: new_feature, old_feature: feature } }
+        let(:command) { described_class.new(context) }
+
+        describe "when the page is not duplicated" do
+          before do
+            allow(Page).to receive(:create!).and_raise(ActiveRecord::RecordInvalid)
+          end
+
+          it "broadcasts invalid" do
+            expect { command.call }.to broadcast(:invalid)
+          end
+
+          it "doesn't duplicate the page" do
+            expect do
+              command.call
+            end.not_to change { Page.count }
+          end
+        end
+
+        describe "when the page is duplicated" do
+          it "broadcasts ok" do
+            expect { command.call }.to broadcast(:ok)
+          end
+
+          it "duplicates the page and its values" do
+            expect(Page).to receive(:create!).with(feature: new_feature, body: page.body).and_call_original
+
+            expect do
+              command.call
+            end.to change { Page.count }.by(1)
+          end
+        end
+      end
+    end
+  end
+end

data/decidim-pages/spec/commands/create_page_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "spec_helper"
 
 module Decidim

data/decidim-pages/spec/commands/destroy_page_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "spec_helper"
 
 module Decidim

data/decidim-pages/spec/commands/update_page_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "spec_helper"
 
 module Decidim

data/decidim-pages/spec/factories.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "decidim/core/test/factories"
 require "decidim/comments/test/factories"
 

data/decidim-pages/spec/features/admin_spec.rb

@@ -1,5 +1,5 @@
-# coding: utf-8
 # frozen_string_literal: true
+
 require "spec_helper"
 
 describe "Edit a page", type: :feature do

data/decidim-pages/spec/features/comments_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "spec_helper"
 
 describe "Comments", type: :feature, perform_enqueued: true do

data/decidim-pages/spec/features/page_show_spec.rb

@@ -1,5 +1,5 @@
-# coding: utf-8
 # frozen_string_literal: true
+
 require "spec_helper"
 
 describe "Show a page", type: :feature do

data/decidim-pages/spec/forms/page_form_spec.rb

@@ -1,5 +1,5 @@
-# coding: utf-8
 # frozen_string_literal: true
+
 require "spec_helper"
 
 module Decidim

data/decidim-pages/spec/i18n_spec.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require "decidim/dev/test/i18n_shared_examples"
+
+RSpec.describe "I18n sanity" do
+  include_examples "I18n sanity"
+end

data/decidim-pages/spec/models/page_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "spec_helper"
 
 module Decidim

data/decidim-pages/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
 require "decidim/dev/test/base_spec_helper"
 

data/decidim-proposals/Rakefile

@@ -1,2 +1,3 @@
 # frozen_string_literal: true
+
 require "decidim/dev/common_rake"

data/decidim-proposals/app/commands/decidim/proposals/admin/answer_proposal.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     module Admin

data/decidim-proposals/app/commands/decidim/proposals/admin/create_proposal.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     module Admin

data/decidim-proposals/app/commands/decidim/proposals/create_proposal.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # A command with all the business logic when a user creates a new proposal.

data/decidim-proposals/app/commands/decidim/proposals/create_proposal_export.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # A command with all the business logic when a user creates a new proposal.

data/decidim-proposals/app/controllers/concerns/decidim/proposals/orderable.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Proposals
+    # Common logic to ordering resources
+    module Orderable
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :order, :available_orders, :random_seed
+
+        private
+
+        # Gets how the proposals should be ordered based on the choice made by the user.
+        def order
+          @order ||= detect_order(params[:order]) || default_order
+        end
+
+        # Available orders based on enabled settings
+        def available_orders
+          @available_orders ||= begin
+            available_orders = %w(random recent)
+            available_orders << "most_voted" if votes_visible?
+            available_orders
+          end
+        end
+
+        def default_order
+          if current_settings.votes_blocked?
+            detect_order("most_voted")
+          else
+            "random"
+          end
+        end
+
+        def votes_visible?
+          current_settings.votes_enabled? && !current_settings.votes_hidden?
+        end
+
+        # Returns: A random float number between -1 and 1 to be used as a random seed at the database.
+        def random_seed
+          @random_seed ||= (params[:random_seed] ? params[:random_seed].to_f : (rand * 2 - 1))
+        end
+
+        def detect_order(candidate)
+          available_orders.detect { |order| order == candidate }
+        end
+
+        def reorder(proposals)
+          case order
+          when "random"
+            proposals.order_randomly(random_seed)
+          when "most_voted"
+            proposals.order(proposal_votes_count: :desc)
+          when "recent"
+            proposals.order(created_at: :desc)
+          end
+        end
+      end
+    end
+  end
+end

data/decidim-proposals/app/controllers/decidim/proposals/admin/application_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     module Admin

data/decidim-proposals/app/controllers/decidim/proposals/admin/proposal_answers_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     module Admin

data/decidim-proposals/app/controllers/decidim/proposals/admin/proposals_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     module Admin

data/decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb

@@ -7,8 +7,9 @@ module Decidim
       helper Decidim::WidgetUrlsHelper
       include FormFactory
       include FilterResource
+      include Orderable
 
-      helper_method :order, :random_seed, :geocoded_proposals
+      helper_method :geocoded_proposals
 
       before_action :authenticate_user!, only: [:new, :create]
 
@@ -64,38 +65,6 @@ module Decidim
 
       private
 
-      # Gets how the proposals should be ordered based on the choice made by the user.
-      #
-      # Note that when votes are active and hidden at the same time, the "most_voted"
-      # option is not available, so it's replaced to "random" to avoid people
-      # changing the URL manually.
-      def order
-        return @order if @order
-        @order = "random" if current_settings.votes_enabled? && current_settings.votes_hidden? && params[:order] == "most_voted"
-        @order ||= params[:order] || "random"
-      end
-
-      # Returns: A random float number between -1 and 1 to be used as a random seed at the database.
-      def random_seed
-        @random_seed ||= (params[:random_seed] ? params[:random_seed].to_f : (rand * 2 - 1))
-      end
-
-      def reorder(proposals)
-        case order
-        when "random"
-          Proposal.transaction do
-            Proposal.connection.execute("SELECT setseed(#{Proposal.connection.quote(random_seed)})")
-            proposals.order("RANDOM()").load
-          end
-        when "most_voted"
-          proposals.order(proposal_votes_count: :desc)
-        when "recent"
-          proposals.order(created_at: :desc)
-        else
-          proposals
-        end
-      end
-
       def geocoded_proposals
         @geocoded_proposals ||= search.results.not_hidden.select(&:geocoded?)
       end

data/decidim-proposals/app/forms/decidim/proposals/admin/proposal_answer_form.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     module Admin

data/decidim-proposals/app/forms/decidim/proposals/admin/proposal_form.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     module Admin

data/decidim-proposals/app/forms/decidim/proposals/proposal_form.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # A form object to be used when public users want to create a proposal.

data/decidim-proposals/app/helpers/decidim/proposals/application_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # Custom helpers, scoped to the proposals engine.
@@ -7,7 +8,6 @@ module Decidim
       include Decidim::Comments::CommentsHelper
       include PaginateHelper
       include ProposalVotesHelper
-      include ProposalOrderHelper
       include Decidim::MapHelper
       include Decidim::Proposals::MapHelper
 

data/decidim-proposals/app/helpers/decidim/proposals/map_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # This helper include some methods for rendering proposals dynamic maps.

data/decidim-proposals/app/helpers/decidim/proposals/proposal_votes_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # Simple helpers to handle markup variations for proposal votes partials

data/decidim-proposals/app/models/decidim/proposals/abilities/admin_user.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     module Abilities

data/decidim-proposals/app/models/decidim/proposals/abilities/current_user.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     module Abilities
@@ -20,7 +21,7 @@ module Decidim
           end
 
           can :unvote, Proposal do |_proposal|
-            authorized?(:vote) && voting_enabled? && vote_limit_enabled?
+            authorized?(:vote) && voting_enabled?
           end
 
           can :create, Proposal if authorized?(:create) && creation_enabled?

data/decidim-proposals/app/models/decidim/proposals/abilities/process_admin_user.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     module Abilities

data/decidim-proposals/app/models/decidim/proposals/application_record.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # Abstract class from which all models in this engine inherit.

data/decidim-proposals/app/models/decidim/proposals/proposal.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # The data store for a Proposal in the Decidim::Proposals component.
@@ -14,7 +15,7 @@ module Decidim
 
       feature_manifest_name "proposals"
 
-      has_many :votes, foreign_key: "decidim_proposal_id", class_name: ProposalVote, dependent: :destroy, counter_cache: "proposal_votes_count"
+      has_many :votes, foreign_key: "decidim_proposal_id", class_name: "ProposalVote", dependent: :destroy, counter_cache: "proposal_votes_count"
 
       validates :title, :body, presence: true
 
@@ -23,6 +24,13 @@ module Decidim
       scope :accepted,   -> { where(state: "accepted") }
       scope :rejected,   -> { where(state: "rejected") }
 
+      def self.order_randomly(seed)
+        transaction do
+          connection.execute("SELECT setseed(#{connection.quote(seed)})")
+          order("RANDOM()").load
+        end
+      end
+
       def author_name
         user_group&.name || author&.name || I18n.t("decidim.proposals.models.proposal.fields.official_proposal")
       end