decidim-core 0.4.3 → 0.4.4

data/lib/decidim/abilities/participatory_process_role_ability.rb

@@ -13,7 +13,10 @@ module Decidim
         # Define abilities if the user is not an admin and has at least one process to manage.
         if not_admin? && has_manageable_processes?
           define_abilities
-          define_participatory_process_abilities if current_participatory_process && can_manage_process?(current_participatory_process)
+
+          if current_participatory_process && can_manage_process?(current_participatory_process)
+            define_participatory_process_abilities
+          end
         end
       end
 

data/lib/decidim/core.rb

@@ -18,9 +18,11 @@ module Decidim
   autoload :Reportable, "decidim/reportable"
   autoload :Authorable, "decidim/authorable"
   autoload :Notifiable, "decidim/notifiable"
+  autoload :Publicable, "decidim/publicable"
   autoload :Features, "decidim/features"
   autoload :HasAttachments, "decidim/has_attachments"
   autoload :FeatureValidator, "decidim/feature_validator"
+  autoload :HasSettings, "decidim/has_settings"
   autoload :HasFeature, "decidim/has_feature"
   autoload :HasScope, "decidim/has_scope"
   autoload :HasCategory, "decidim/has_category"
@@ -32,6 +34,7 @@ module Decidim
   autoload :Menu, "decidim/menu"
   autoload :MenuItem, "decidim/menu_item"
   autoload :MenuRegistry, "decidim/menu_registry"
+  autoload :ManifestRegistry, "decidim/manifest_registry"
   autoload :Abilities, "decidim/abilities"
 
   include ActiveSupport::Configurable
@@ -49,7 +52,11 @@ module Decidim
       railtie.load_seed
     end
 
-    Decidim.feature_manifests.each(&:seed!)
+    Decidim::ParticipatoryProcess.find_each do |process|
+      Decidim.feature_manifests.each do |feature|
+        feature.seed!(process)
+      end
+    end
 
     I18n.available_locales = original_locale
   end
@@ -62,7 +69,8 @@ module Decidim
   config_accessor :mailer_sender
 
   # Exposes a configuration option: an Array of `cancancan`'s Ability classes
-  # that will be automatically included to the base `Decidim::Ability` class.
+  # that will be automatically included to the base `Decidim::Abilities::BaseAbility`
+  # class.
   config_accessor :abilities do
     []
   end
@@ -138,19 +146,16 @@ module Decidim
   # name - A Symbol with the feature's unique name.
   #
   # Returns nothing.
-  def self.register_feature(name)
-    manifest = FeatureManifest.new(name: name.to_sym)
-    yield(manifest)
-    manifest.validate!
-    feature_manifests << manifest
+  def self.register_feature(name, &block)
+    feature_registry.register(name, &block)
   end
 
-  # Public: Finds all the registered feature manifest's via the
-  # `register_feature` method.
+  # Public: Finds all registered feature manifest's via the `register_feature`
+  # method.
   #
   # Returns an Array[FeatureManifest].
   def self.feature_manifests
-    @feature_manifests ||= Set.new
+    feature_registry.manifests
   end
 
   # Public: Finds a feature manifest by the feature's name.
@@ -159,8 +164,7 @@ module Decidim
   #
   # Returns a FeatureManifest if found, nil otherwise.
   def self.find_feature_manifest(name)
-    name = name.to_sym
-    feature_manifests.find { |manifest| manifest.name == name }
+    feature_registry.find(name.to_sym)
   end
 
   # Public: Finds a resource manifest by the resource's name.
@@ -170,16 +174,12 @@ module Decidim
   #
   # Returns a ResourceManifest if found, nil otherwise.
   def self.find_resource_manifest(resource_name_or_klass)
-    resource_manifests.find do |manifest|
-      manifest.model_class == resource_name_or_klass || manifest.name.to_s == resource_name_or_klass.to_s
-    end
+    feature_registry.find_resource_manifest(resource_name_or_klass)
   end
 
-  # Private: Stores all the resource manifest across all feature manifest.
-  #
-  # Returns an Array[ResourceManifest]
-  def self.resource_manifests
-    @resource_manifests ||= feature_manifests.flat_map(&:resource_manifests)
+  # Public: Stores the registry of features
+  def self.feature_registry
+    @feature_registry ||= ManifestRegistry.new(:features)
   end
 
   # Public: Stores an instance of StatsRegistry

data/lib/decidim/core/api/decidim_type.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
-  # This type represents a ParticipatoryProcess.
+  # This type represents a Decidim's global property.
   DecidimType = GraphQL::ObjectType.define do
     name "Decidim"
     description "Decidim's framework-related properties."

data/lib/decidim/core/api/process_step_type.rb

@@ -9,11 +9,11 @@ module Decidim
     field :id, !types.ID, "The unique ID of this step."
 
     field :process do
-      type ProcessType
+      type !ProcessType
       description "The participatory process in which this step belongs to."
       property :participatory_process
     end
 
-    field :title, TranslatedFieldType, "The title of this step"
+    field :title, !TranslatedFieldType, "The title of this step"
   end
 end

data/lib/decidim/core/api/process_type.rb

@@ -8,7 +8,7 @@ module Decidim
 
     field :id, !types.ID, "The Process' unique ID"
 
-    field :title, TranslatedFieldType, "The title of this process."
+    field :title, !TranslatedFieldType, "The title of this process."
 
     connection :steps, ProcessStepType.connection_type do
       description "All the steps of this process."

data/lib/decidim/core/api/session_type.rb

@@ -10,7 +10,7 @@ module Decidim
       resolve ->(obj, _args, _ctx) { obj }
     end
 
-    field :verifiedUserGroups, !types[UserGroupType], "The current user verified user groups" do
+    field :verifiedUserGroups, !types[!UserGroupType], "The current user verified user groups" do
       resolve ->(obj, _args, _ctx) { obj.user_groups.verified }
     end
   end

data/lib/decidim/core/api/translated_field_type.rb

@@ -7,17 +7,17 @@ module Decidim
     description "A translated field"
 
     field :locales do
-      type types[types.String]
+      type types[!types.String]
       description "Lists all the locales in which this translation is available"
       resolve ->(obj, _args, _ctx) { obj.keys }
     end
 
     field :translations do
-      type !types[LocalizedStringType]
+      type !types[!LocalizedStringType]
       description "All the localized strings for this translation."
 
       argument :locales do
-        type types[types.String]
+        type types[!types.String]
         description "A list of locales to scope the translations to."
       end
 

data/lib/decidim/core/test.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/core/test/shared_examples/authorable"
+require "decidim/core/test/shared_examples/publicable"
 require "decidim/core/test/shared_examples/localised_email"
 require "decidim/core/test/shared_examples/has_attachments"
 require "decidim/core/test/shared_examples/has_feature"

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

@@ -153,7 +153,11 @@ FactoryGirl.define do
     end
 
     trait :process_admin do
-      transient { participatory_process nil }
+      transient do
+        participatory_process { create(:participatory_process) }
+      end
+
+      organization { participatory_process.organization }
 
       after(:create) do |user, evaluator|
         create :participatory_process_user_role,
@@ -162,11 +166,26 @@ FactoryGirl.define do
                role: :admin
       end
     end
+
+    trait :process_collaborator do
+      transient do
+        participatory_process { create(:participatory_process) }
+      end
+
+      organization { participatory_process.organization }
+
+      after(:create) do |user, evaluator|
+        create :participatory_process_user_role,
+               user: user,
+               participatory_process: evaluator.participatory_process,
+               role: :collaborator
+      end
+    end
   end
 
   factory :participatory_process_user_role, class: Decidim::ParticipatoryProcessUserRole do
     user
-    participatory_process
+    participatory_process { create :participatory_process, organization: user.organization }
     role "admin"
   end
 

data/lib/decidim/core/test/shared_examples/publicable.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples_for "publicable" do
+  let(:factory_name) { described_class.name.demodulize.underscore.to_sym }
+
+  let!(:published) do
+    create(factory_name, published_at: Time.zone.now)
+  end
+
+  let!(:unpublished) do
+    create(factory_name, published_at: nil)
+  end
+
+  describe ".published" do
+    let(:scope) { described_class.send(:published) }
+
+    it { expect(scope).to eq([published]) }
+  end
+
+  describe ".unpublished" do
+    let(:scope) { described_class.send(:unpublished) }
+
+    it { expect(scope).to eq([unpublished]) }
+  end
+end

data/lib/decidim/core/version.rb

@@ -3,7 +3,7 @@
 # This holds Decidim's version and the Rails version on which it depends.
 module Decidim
   def self.version
-    "0.4.3"
+    "0.4.4"
   end
 
   def self.rails_version

data/lib/decidim/feature_manifest.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "decidim/features/settings_manifest"
+require "decidim/settings_manifest"
 require "decidim/features/export_manifest"
 
 module Decidim
@@ -92,15 +92,15 @@ module Decidim
     # Public: Creates the seeds for this features in order to populate the database.
     #
     # Returns nothing.
-    def seed!
-      @seeds&.call
+    def seed!(process)
+      @seeds&.call(process)
     end
 
     # Public: Adds configurable attributes for this feature, scoped to a name. It
-    # uses the DSL specified under `Decidim::FeatureSettingsManifest`.
+    # uses the DSL specified under `Decidim::SettingsManifest`.
     #
     # name - Either `global` or `step`
-    # &block - The DSL present on `Decidim::FeatureSettingsManifest`
+    # &block - The DSL present on `Decidim::SettingsManifest`
     #
     # Examples:
     #
@@ -112,7 +112,7 @@ module Decidim
     def settings(name = :global, &block)
       @settings ||= {}
       name = name.to_sym
-      settings = (@settings[name] ||= FeatureSettingsManifest.new)
+      settings = (@settings[name] ||= SettingsManifest.new)
       yield(settings) if block
       settings
     end

data/lib/decidim/form_builder.rb

@@ -161,7 +161,7 @@ module Decidim
     # datepicker library
     def datetime_field(attribute, options = {})
       value = object.send(attribute)
-      if value
+      if value.present?
         iso_value = value.strftime("%Y-%m-%dT%H:%M:%S")
         formatted_value = I18n.localize(value, format: :timepicker)
       end

data/lib/decidim/has_category.rb

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

data/lib/decidim/has_settings.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module HasSettings
+    extend ActiveSupport::Concern
+
+    included do
+      after_initialize :default_values
+    end
+
+    def settings
+      settings_schema(:global).new(self[:settings]["global"])
+    end
+
+    def settings=(data)
+      self[:settings]["global"] = serialize_settings(settings_schema(:global), data)
+    end
+
+    def default_step_settings
+      settings_schema(:step).new(self[:settings]["default_step"])
+    end
+
+    def default_step_settings=(data)
+      self[:settings]["default_step"] = serialize_settings(settings_schema(:step), data)
+    end
+
+    def step_settings
+      participatory_process.steps.each_with_object({}) do |step, result|
+        result[step.id.to_s] = settings_schema(:step).new(self[:settings].dig("steps", step.id.to_s))
+      end
+    end
+
+    def step_settings=(data)
+      self[:settings]["steps"] = data.each_with_object({}) do |(key, value), result|
+        result[key.to_s] = serialize_settings(settings_schema(:step), value)
+      end
+    end
+
+    def active_step_settings
+      active_step = participatory_process.active_step
+      return default_step_settings unless active_step
+
+      step_settings.fetch(active_step.id.to_s)
+    end
+
+    private
+
+    def serialize_settings(schema, value)
+      if value.respond_to?(:attributes)
+        value.attributes
+      else
+        schema.new(value)
+      end
+    end
+
+    def settings_schema(name)
+      manifest.settings(name.to_sym).schema
+    end
+
+    def default_values
+      self[:settings] ||= {}
+    end
+  end
+end

data/lib/decidim/manifest_registry.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  #
+  # Takes care of holding and serving globally registered manifests.
+  #
+  class ManifestRegistry
+    def initialize(entity)
+      @entity = entity
+    end
+
+    def register(name)
+      manifest = manifest_class.new(name: name.to_sym)
+      yield(manifest)
+      manifest.validate!
+      manifests << manifest
+    end
+
+    def manifests
+      @manifests ||= Set.new
+    end
+
+    def find(name)
+      manifests.find { |manifest| manifest.name == name }
+    end
+
+    def resource_manifests
+      @resource_manifests ||= manifests.flat_map(&:resource_manifests)
+    end
+
+    def find_resource_manifest(resource_name_or_klass)
+      resource_manifests.find do |manifest|
+        manifest.model_class == resource_name_or_klass || manifest.name.to_s == resource_name_or_klass.to_s
+      end
+    end
+
+    private
+
+    def manifest_class
+      case @entity
+      when :features then FeatureManifest
+      end
+    end
+  end
+end

data/lib/decidim/publicable.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # This concern contains the logic related to publication and promotion.
+  module Publicable
+    extend ActiveSupport::Concern
+
+    class_methods do
+      # Public: Scope to return only published records.
+      #
+      # Returns an ActiveRecord::Relation.
+      def published
+        where.not(published_at: nil)
+      end
+
+      # Public: Scope to return only unpublished records.
+      #
+      # Returns an ActiveRecord::Relation.
+      def unpublished
+        where(published_at: nil)
+      end
+    end
+
+    # Public: Checks whether the record has been published or not.
+    #
+    # Returns true if published, false otherwise.
+    def published?
+      published_at.present?
+    end
+
+    #
+    # Public: Publishes this feature
+    #
+    # Returns true if the record was properly saved, false otherwise.
+    def publish!
+      update_attribute(:published_at, Time.current)
+    end
+
+    #
+    # Public: Unpublishes this feature
+    #
+    # Returns true if the record was properly saved, false otherwise.
+    def unpublish!
+      update_attribute(:published_at, nil)
+    end
+  end
+end