decidim-core 0.2.0 → 0.3.0

data/lib/decidim/has_category.rb

@@ -8,7 +8,9 @@ module Decidim
     extend ActiveSupport::Concern
 
     included do
-      belongs_to :category, foreign_key: "decidim_category_id", class_name: "Decidim::Category"
+      has_one :categorization, as: :categorizable
+      has_one :category, through: :categorization
+
       validate :category_belongs_to_organization
 
       private

data/lib/decidim/has_scope.rb

@@ -3,12 +3,15 @@
 require "active_support/concern"
 
 module Decidim
-  # A concern with the features needed when you want a model to be have a scope.
+  # A concern with the features needed when you want a model to have a scope.
   module HasScope
     extend ActiveSupport::Concern
 
     included do
-      belongs_to :scope, foreign_key: "decidim_scope_id", class_name: "Decidim::Scope"
+      belongs_to :scope,
+                 foreign_key: "decidim_scope_id",
+                 class_name: "Decidim::Scope",
+                 optional: true
       validate :scope_belongs_to_organization
 
       private

data/lib/decidim/query_extensions.rb

@@ -15,7 +15,7 @@ module Decidim
           type !types[ProcessType]
           description "Lists all processes."
 
-          resolve ->(_obj, _args, ctx) {
+          resolve lambda { |_obj, _args, ctx|
             OrganizationParticipatoryProcesses.new(ctx[:current_organization])
           }
         end
@@ -24,7 +24,7 @@ module Decidim
           type SessionType
           description "Return's information about the logged in user"
 
-          resolve ->(_obj, _args, ctx) {
+          resolve lambda { |_obj, _args, ctx|
             ctx[:current_user]
           }
         end

data/lib/decidim/reportable.rb

@@ -36,10 +36,10 @@ module Decidim
         moderation&.report_count&.positive?
       end
 
-      # Public: The reported content
+      # Public: The reported content url
       #
-      # Returns html content
-      def reported_content
+      # Returns String
+      def reported_content_url
         raise NotImplementedError
       end
     end

data/lib/decidim/stats_registry.rb

@@ -20,7 +20,7 @@ module Decidim
     #
     # name - The name of the stat
     # options - A hash of options
-    #         * primary: Wether the stat is primary or not.
+    #         * 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.
     def register(name, options = {}, &block)
@@ -69,7 +69,7 @@ module Decidim
     # Public: Creates a new registry with the filtered stats
     #
     # conditions - A hash of conditions
-    #            * primary: Wether the stat is primary or not.
+    #            * primary: Whether the stat is primary or not.
     #            * priority: The priority of the stat used for render issues.
     #
     # Returns a new StatsRegistry with the filtered stats

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

@@ -0,0 +1,14 @@
+/**
+ * French translation for foundation-datepicker
+ * Nico Mollet <nico.mollet@gmail.com>
+ */
+;(function($){
+	$.fn.fdatepicker.dates['fr'] = {
+		days: ["Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi", "Dimanche"],
+		daysShort: ["Dim", "Lun", "Mar", "Mer", "Jeu", "Ven", "Sam", "Dim"],
+		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"
+	};
+}(jQuery));

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

@@ -0,0 +1,14 @@
+/**
+ * Italian translation for foundation-datepicker
+ * Enrico Rubboli <rubboli@gmail.com>
+ */
+;(function($){
+	$.fn.fdatepicker.dates['it'] = {
+		days: ["Domenica", "Lunedi", "Martedi", "Mercoledi", "Giovedi", "Venerdi", "Sabato", "Domenica"],
+		daysShort: ["Dom", "Lun", "Mar", "Mer", "Gio", "Ven", "Sab", "Dom"],
+		daysMin: ["Do", "Lu", "Ma", "Me", "Gi", "Ve", "Sa", "Do"],
+		months: ["Gennaio", "Febbraio", "Marzo", "Aprile", "Maggio", "Giugno", "Luglio", "Agosto", "Settembre", "Ottobre", "Novembre", "Dicembre"],
+		monthsShort: ["Gen", "Feb", "Mar", "Apr", "Mag", "Giu", "Lug", "Ago", "Set", "Ott", "Nov", "Dic"],
+		today: "Oggi"
+	};
+}(jQuery));

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

@@ -0,0 +1,14 @@
+/**
+ * Dutch translation for foundation-datepicker
+ * Reinier Goltstein <mrgoltstein@gmail.com>
+ */
+;(function($){
+	$.fn.fdatepicker.dates['nl'] = {
+		days: ["Zondag", "Maandag", "Dinsdag", "Woensdag", "Donderdag", "Vrijdag", "Zaterdag", "Zondag"],
+		daysShort: ["Zo", "Ma", "Di", "Wo", "Do", "Vr", "Za", "Zo"],
+		daysMin: ["Zo", "Ma", "Di", "Wo", "Do", "Vr", "Za", "Zo"],
+		months: ["Januari", "Februari", "Maart", "April", "Mei", "Juni", "Juli", "Augustus", "September", "Oktober", "November", "December"],
+		monthsShort: ["Jan", "Feb", "Mrt", "Apr", "Mei", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"],
+		today: "Vandaag"
+	};
+}(jQuery));

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,28 +18,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.1.1
+- !ruby/object:Gem::Dependency
+  name: rails-i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: devise-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -438,70 +452,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -534,6 +548,7 @@ files:
 - app/assets/images/decidim/icons.svg
 - app/assets/images/decidim/process.svg
 - app/assets/javascripts/decidim.js.es6
+- app/assets/javascripts/decidim/account_form.js.es6
 - app/assets/javascripts/decidim/append_elements.js.es6
 - app/assets/javascripts/decidim/editor.js.es6
 - app/assets/javascripts/decidim/filters.js.es6
@@ -612,6 +627,7 @@ files:
 - app/commands/decidim/create_omniauth_registration.rb
 - app/commands/decidim/create_registration.rb
 - app/commands/decidim/create_report.rb
+- app/commands/decidim/destroy_account.rb
 - app/commands/decidim/invite_user.rb
 - app/commands/decidim/invite_user_again.rb
 - app/commands/decidim/remove_user_role.rb
@@ -652,6 +668,7 @@ files:
 - app/controllers/decidim/static_map_controller.rb
 - app/controllers/decidim/widgets_controller.rb
 - app/forms/decidim/account_form.rb
+- app/forms/decidim/delete_account_form.rb
 - app/forms/decidim/form.rb
 - app/forms/decidim/invite_admin_form.rb
 - app/forms/decidim/notifications_settings_form.rb
@@ -700,8 +717,8 @@ files:
 - app/models/decidim/application_record.rb
 - app/models/decidim/attachment.rb
 - app/models/decidim/authorization.rb
+- app/models/decidim/categorization.rb
 - app/models/decidim/category.rb
-- app/models/decidim/component.rb
 - app/models/decidim/feature.rb
 - app/models/decidim/identity.rb
 - app/models/decidim/moderation.rb
@@ -720,6 +737,7 @@ files:
 - app/presenters/decidim/home_stats_presenter.rb
 - app/presenters/decidim/menu_item_presenter.rb
 - app/presenters/decidim/menu_presenter.rb
+- app/presenters/decidim/resource_locator_presenter.rb
 - app/queries/decidim/highlighted_participatory_processes.rb
 - app/queries/decidim/organization_participatory_processes.rb
 - app/queries/decidim/organization_prioritized_participatory_processes.rb
@@ -745,6 +763,7 @@ files:
 - app/validators/geocoding_validator.rb
 - app/views/decidim/account/_password_fields.html.erb
 - app/views/decidim/account/_user_groups.html.erb
+- app/views/decidim/account/delete.html.erb
 - app/views/decidim/account/show.html.erb
 - app/views/decidim/application/_attachments.html.erb
 - app/views/decidim/application/_documents.html.erb
@@ -846,6 +865,7 @@ files:
 - config/locales/eu.yml
 - config/locales/fi.yml
 - config/locales/fr.yml
+- config/locales/it.yml
 - config/locales/nl.yml
 - config/routes.rb
 - config/secrets.yml
@@ -916,6 +936,11 @@ files:
 - db/migrate/20170405094028_add_organization_to_identities.rb
 - db/migrate/20170405094258_change_decidim_identities_provider_uid_index_uniqueness.rb
 - db/migrate/20170529150743_add_rejected_at_to_user_groups.rb
+- db/migrate/20170605140421_add_deleted_fields_to_users.rb
+- db/migrate/20170606102659_set_email_unique_in_organization_conditional.rb
+- db/migrate/20170608142521_add_organization_to_user_groups.rb
+- db/migrate/20170612070905_add_uniqueness_to_name_and_document_number_to_user_groups.rb
+- db/migrate/20170612100253_create_decidim_categorizations.rb
 - db/seeds.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
@@ -993,6 +1018,9 @@ files:
 - vendor/assets/javascripts/datepicker-locales/foundation-datepicker.es.js
 - vendor/assets/javascripts/datepicker-locales/foundation-datepicker.eu.js
 - vendor/assets/javascripts/datepicker-locales/foundation-datepicker.fi.js
+- vendor/assets/javascripts/datepicker-locales/foundation-datepicker.fr.js
+- vendor/assets/javascripts/datepicker-locales/foundation-datepicker.it.js
+- vendor/assets/javascripts/datepicker-locales/foundation-datepicker.nl.js
 - vendor/assets/javascripts/form_datepicker.js.es6
 - vendor/assets/javascripts/foundation-datepicker.js
 - vendor/assets/javascripts/leaflet-svg-icon.js

data/app/models/decidim/component.rb

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # A Component represents the association between a participatory process and a
-  # Component Engine. It configures how that component should behave, its name,
-  # and other relevant fields.
-  class Component < ApplicationRecord
-    belongs_to :feature, foreign_key: "decidim_feature_id"
-
-    belongs_to :step,
-               foreign_key: "decidim_participatory_process_step_id",
-               class_name: "Decidim::ParticipatoryProcessStep"
-
-    has_one :participatory_process, through: :feature
-
-    validates :feature, :step, :manifest, presence: true
-
-    validate :manifest_belongs_to_feature
-    validate :participatory_process_is_valid
-
-    # Public: Finds the manifest this particular component is associated to.
-    #
-    # Returns a ComponentManifest.
-    def manifest
-      Decidim.find_component_manifest(manifest_name)
-    end
-
-    # Public: Assigns a manifest to this component.
-    #
-    # manifest - The ComponentManifest for this Component.
-    #
-    # Returns nothing.
-    def manifest=(manifest)
-      self.manifest_name = manifest.name
-    end
-
-    private
-
-    def manifest_belongs_to_feature
-      return if feature&.manifest&.component_manifests&.include?(manifest)
-
-      errors.add(:manifest, I18n.t("errors.messages.invalid_manifest"))
-    end
-
-    def participatory_process_is_valid
-      return if !step&.participatory_process || !feature&.participatory_process
-      return if feature.participatory_process == step.participatory_process
-
-      errors.add(:manifest, I18n.t("errors.messages.invalid_participatory_process"))
-    end
-  end
-end