decidim-core 0.10.1 → 0.11.0.pre1

data/lib/decidim/page_finder.rb

@@ -21,7 +21,7 @@ module Decidim
     #
     # Returns a Decidim::Page or nil.
     def page
-      @page ||= organization.static_pages.where(slug: page_id).first
+      @page ||= organization.static_pages.find_by(slug: page_id)
     end
 
     private

data/lib/decidim/participatory_space_manifest.rb

@@ -24,7 +24,7 @@ module Decidim
 
     attribute :query_type, String, default: "Decidim::Core::ParticipatorySpaceType"
 
-    # A String with the feature's icon. The icon must be stored in the
+    # A String with the component's icon. The icon must be stored in the
     # engine's assets path.
     attribute :icon, String
 
@@ -56,14 +56,14 @@ module Decidim
       @contexts.fetch(name)
     end
 
-    # Public: A block that gets called when seeding for this feature takes place.
+    # Public: A block that gets called when seeding for this component takes place.
     #
     # Returns nothing.
     def seeds(&block)
       @seeds = block
     end
 
-    # Public: Creates the seeds for this features in order to populate the database.
+    # Public: Creates the seeds for this components in order to populate the database.
     #
     # Returns nothing.
     def seed!

data/lib/decidim/participatory_space_resourceable.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # Participatory Space Resourceable is a concern with the
+  # features needed when you want to link a space
+  # (for example `Participatory Process`) to another space (`Assembly`).
+  #
+  # The main difference between the two concerns `Resourceable` and
+  # `ParticipatorySpaceResourceable` is that the first one is linking
+  # component types between them, for example `Budgets` with `Proposals` and
+  # therefore depend on a `Component`.
+  #
+  # The second one, `ParticipatorySpaceResourceable`, it is used for linking
+  # `ParticipatorySpaces` to each other, and therefore don't depend on a
+  # `Component` but rather that they depend to the `Organization`.
+
+  module ParticipatorySpaceResourceable
+    extend ActiveSupport::Concern
+
+    included do
+      # An association with all the links that point to this model.
+      has_many :participatory_space_resource_links_to, as: :to, class_name: "Decidim::ParticipatorySpaceLink"
+
+      # An association with all the links that are originated from this model.
+      has_many :participatory_space_resource_links_from, as: :from, class_name: "Decidim::ParticipatorySpaceLink"
+
+      # Finds all the linked resources to or from this model for a given resource
+      # name and link name.
+      #
+      # resource_name - The String name of the resource manifest exposed by a feature.
+      # link_name     - The String name of the link between this model and the target resource.
+
+      def linked_participatory_space_resources(resource_name, link_name)
+        klass = "Decidim::#{resource_name.to_s.classify}"
+        klass = klass.constantize
+        from = klass
+               .joins(:participatory_space_resource_links_from)
+               .where(decidim_participatory_space_links: { name: link_name, to_id: id, to_type: self.class.name })
+
+        to = klass
+             .joins(:participatory_space_resource_links_to)
+             .where(decidim_participatory_space_links: { name: link_name, from_id: id, from_type: self.class.name })
+
+        klass.where(id: from).or(klass.where(id: to))
+      end
+
+      def participatory_space_sibling_scope(participatory_space_name)
+        manifest = Decidim.find_participatory_space_manifest(participatory_space_name)
+        return self.class.none unless manifest
+
+        scope = manifest.participatory_spaces.call(organization)
+
+        scope
+      end
+
+      # Links the given resources to this model, replaces any previous links with the same name.
+      #
+      # resources - An Array or ActiveRecord::Base object to link to.
+      # link_name - The String name to use as the name between the resources.
+      # data      - An optional Hash to add to the link.
+      #
+      # Returns nothing.
+      def link_participatory_spaces_resources(resources, link_name, data = {})
+        transaction do
+          participatory_space_resource_links_from.where(name: link_name).delete_all
+          Array.wrap(resources).each do |resource|
+            Decidim::ParticipatorySpaceLink.create!(
+              from: self,
+              to: resource,
+              name: link_name,
+              data: data
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/decidim/publicable.rb

@@ -31,7 +31,7 @@ module Decidim
     end
 
     #
-    # Public: Publishes this feature
+    # Public: Publishes this component
     #
     # Returns true if the record was properly saved, false otherwise.
     def publish!
@@ -39,7 +39,7 @@ module Decidim
     end
 
     #
-    # Public: Unpublishes this feature
+    # Public: Unpublishes this component
     #
     # Returns true if the record was properly saved, false otherwise.
     def unpublish!

data/lib/decidim/query_extensions.rb

@@ -44,8 +44,8 @@ module Decidim
         argument :id, !types.ID, "The ID of the component to be found"
 
         resolve lambda { |_, args, ctx|
-                  feature = Decidim::Feature.published.find_by(id: args[:id])
-                  feature&.organization == ctx[:current_organization] ? feature : nil
+                  component = Decidim::Component.published.find_by(id: args[:id])
+                  component&.organization == ctx[:current_organization] ? component : nil
                 }
       end
 

data/lib/decidim/rectify_ext.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Rectify
+  class FormatAttributesHash
+    private
+
+    def convert_indexed_hashes_to_arrays(attributes_hash)
+      array_attributes.each do |array_attribute|
+        name = array_attribute.name
+        attribute = attributes_hash[name]
+        next unless attribute.is_a?(Hash)
+
+        attributes_hash[name] = transform_values_for_type(
+          attribute.values,
+          array_attribute.member_type.primitive
+        )
+      end
+    end
+
+    def transform_values_for_type(values, element_type)
+      return values unless element_type < Rectify::Form
+
+      values.map do |value|
+        self.class.new(element_type.attribute_set).format(value)
+      end
+    end
+
+    def array_attributes
+      attribute_set.select { |attribute| attribute.primitive == Array }
+    end
+  end
+end

data/lib/decidim/reportable.rb

@@ -3,7 +3,7 @@
 require "active_support/concern"
 
 module Decidim
-  # A concern with the features needed when you want a model to be reportable
+  # A concern with the components needed when you want a model to be reportable
   module Reportable
     extend ActiveSupport::Concern
 

data/lib/decidim/resource_manifest.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 module Decidim
-  # Features inside a component can expose different Resources, these resources
-  # will be used to be linked between each other and other possible features.
+  # Components inside a component can expose different Resources, these resources
+  # will be used to be linked between each other and other possible components.
   #
   # This class sets a scheme to expose these resources. It shouldn't be
-  # used directly, you should use `register_resource` inside a feature.
+  # used directly, you should use `register_resource` inside a component.
   #
   # Example:
-  #   feature.register_resource do |resource|
+  #   component.register_resource do |resource|
   #     resource.model_class = Decidim::MyEngine::MyModel
   #     resource.template    = "decidim/myengine/myengine/linked_models"
   #   end
@@ -20,8 +20,8 @@ module Decidim
     # The name of the resource we are exposing.
     attribute :name, String
 
-    # The parent feature manifest
-    attribute :feature_manifest, Decidim::FeatureManifest
+    # The parent component manifest
+    attribute :component_manifest, Decidim::ComponentManifest
 
     # The ActiveRecord class name of the model we're exposing
     attribute :model_class_name, String
@@ -33,20 +33,20 @@ module Decidim
     # The template to use to render the collection of a resource.
     attribute :template, String
 
-    validates :feature_manifest, :model_class_name, :route_name, presence: true
+    validates :component_manifest, :model_class_name, :route_name, presence: true
 
     # Finds an ActiveRecord::Relation of the resource `model_class`, scoped to the
-    # given feature. This way you can find resources from another engine without
+    # given component. This way you can find resources from another engine without
     # actually coupling both engines.
     #
-    # feature - a Decidim::Feature
+    # component - a Decidim::Component
     #
     # Returns an ActiveRecord::Relation.
-    def resource_scope(feature)
-      feature_ids = Decidim::Feature.where(participatory_space: feature.participatory_space, manifest_name: feature_manifest.name).pluck(:id)
-      return model_class.none if feature_ids.empty?
+    def resource_scope(component)
+      component_ids = Decidim::Component.where(participatory_space: component.participatory_space, manifest_name: component_manifest.name).pluck(:id)
+      return model_class.none if component_ids.empty?
 
-      model_class.where(feature: feature_ids)
+      model_class.where(component: component_ids)
     end
 
     # Finds the current class with the given `model_class_name`

data/lib/decidim/resourceable.rb

@@ -3,7 +3,7 @@
 require "active_support/concern"
 
 module Decidim
-  # A concern with the features needed when you want a model to be able to create
+  # A concern with the components needed when you want a model to be able to create
   # links from it to another resource.
   module Resourceable
     extend ActiveSupport::Concern
@@ -18,7 +18,7 @@ module Decidim
       # Finds all the linked resources to or from this model for a given resource
       # name and link name.
       #
-      # resource_name - The String name of the resource manifest exposed by a feature.
+      # resource_name - The String name of the resource manifest exposed by a component.
       # link_name     - The String name of the link between this model and the target resource.
       #
       # Returns an ActiveRecord::Relation.
@@ -39,14 +39,14 @@ module Decidim
       # Builds an ActiveRecord::Relation in order to load all the resources
       # that are in the same parent as this model.
       #
-      # resource_name - The String name of the resource manifest exposed by a feature.
+      # resource_name - The String name of the resource manifest exposed by a component.
       #
       # Returns an ActiveRecord::Relation.
       def sibling_scope(resource_name)
         manifest = Decidim.find_resource_manifest(resource_name)
         return self.class.none unless manifest
 
-        scope = manifest.resource_scope(feature)
+        scope = manifest.resource_scope(component)
         scope = scope.where("#{self.class.table_name}.id != ?", id) if manifest.model_class == self.class
 
         scope
@@ -85,13 +85,13 @@ module Decidim
 
     class_methods do
       # Finds the name of the classes that have been linked to this model for the given
-      # `feature`.
+      # `component`.
       #
-      # feature - a Decidim::Feature instance where the links will be scoped to.
+      # component - a Decidim::Component instance where the links will be scoped to.
       #
       # Returns an Array of Strings.
-      def linked_classes_for(feature)
-        scope = where(feature: feature)
+      def linked_classes_for(component)
+        scope = where(component: component)
 
         from = scope
                .joins(:resource_links_from)

data/lib/decidim/scopable.rb

@@ -3,7 +3,7 @@
 require "active_support/concern"
 
 module Decidim
-  # A concern with the features needed when you want a model to have a scope.
+  # A concern with the components needed when you want a model to have a scope.
   #
   # The including model needs to implement the following interface:
   #

data/lib/decidim/{scopable_feature.rb → scopable_component.rb}

@@ -4,7 +4,7 @@ require "active_support/concern"
 
 module Decidim
   # This concern contains the logic related to scopes included by components.
-  module ScopableFeature
+  module ScopableComponent
     extend ActiveSupport::Concern
 
     included do

data/lib/decidim/settings_manifest.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # This class serves as a DSL that enables specifying an arbitrary settings
-  # to a feature, so the admin panel can show a standarized UI to configure them.
+  # to a component, so the admin panel can show a standarized UI to configure them.
   #
   class SettingsManifest
     attr_reader :attributes

data/lib/decidim/stats_registry.rb

@@ -22,7 +22,7 @@ module Decidim
     # options - A hash of options
     #         * primary: Whether the stat is primary or not.
     #         * priority: The priority of the stat used for render issues.
-    # block - A block that receive the features to filter out the stat.
+    # block - A block that receive the components to filter out the stat.
     def register(name, options = {}, &block)
       stat = @stats.detect { |s| s[:name] == name }
       raise StandardError, "Stats '#{name}' is already registered." if stat.present?

data/lib/decidim/view_model.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ViewModel < Cell::ViewModel
+    include ActionView::Helpers::TranslationHelper
+    include ::Cell::Translation
+    include Decidim::ResourceHelper
+  end
+end

data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.fr.js

@@ -9,6 +9,9 @@
 		daysMin: ["D", "L", "Ma", "Me", "J", "V", "S", "D"],
 		months: ["Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"],
 		monthsShort: ["Jan", "Fev", "Mar", "Avr", "Mai", "Jui", "Jul", "Aou", "Sep", "Oct", "Nov", "Dec"],
-		today: "Aujourd'hui"
+		today: "Aujourd'hui",
+		clear: "Effacer",
+		weekStart: 1,
+		format: "dd/mm/yyyy"
 	};
 }(jQuery));

data/vendor/assets/javascripts/form_datepicker.js.es6

@@ -1,11 +1,11 @@
 ((exports) => {
   const formDatePicker = () => {
-    $('[data-datepicker]').each((_index, node) => {
-      const language = $('html').attr('lang') || 'en';
-      const initialDate = $(node).data('startdate') || '';
-      const pickTime = $(node).data('timepicker') === '';
+    $("[data-datepicker]").each((_index, node) => {
+      const language = $("html").attr("lang") || "en";
+      const initialDate = $(node).data("startdate") || "";
+      const pickTime = $(node).data("timepicker") === "";
       const languageProps = $(node).fdatepicker.dates[language] && $(node).fdatepicker.dates[language].format;
-      let format = languageProps || 'mm/dd/yyyy';
+      let format = languageProps || "mm/dd/yyyy";
 
       if (pickTime) {
         format = `${format}, hh:ii`;
@@ -17,14 +17,14 @@
         language,
         pickTime,
         disableDblClickSelection: true,
-        leftArrow: '<<',
-        rightArrow: '>>'
-      }).on('changeDate', (ev) => {
+        leftArrow: "<<",
+        rightArrow: ">>"
+      }).on("changeDate", (ev) => {
         let newDate = "";
         if (ev.date !== null) {
-          newDate = exports.moment.utc(ev.date).format('YYYY-MM-DDTHH:mm:ss');
+          newDate = exports.moment.utc(ev.date).format("YYYY-MM-DDTHH:mm:ss");
         }
-        $(ev.target).siblings('input').val(newDate);
+        $(ev.target).siblings("input").val(newDate);
       });
     });
   };