decidim-core 0.12.2 → 0.13.0.pre1

data/lib/decidim/exporters/csv.rb

@@ -21,7 +21,6 @@ module Decidim
             csv << headers.map { |header| resource[header] }
           end
         end
-
         ExportData.new(data, "csv")
       end
 

data/lib/decidim/form_builder.rb

@@ -261,8 +261,7 @@ module Decidim
         attribute,
         options.merge(name: nil,
                       id: "date_field_#{@object_name}_#{attribute}",
-                      data: data,
-                      readonly: true)
+                      data: data)
       )
       template += @template.hidden_field(@object_name, attribute, value: iso_value)
       template += error_and_help_text(attribute, options)

data/lib/decidim/nicknamizable.rb

@@ -26,8 +26,19 @@ module Decidim
       # * Trims length so it fits validation constraints.
       # * Disambiguates it so it's unique.
       #
-      def nicknamize(name)
-        disambiguate(name.parameterize(separator: "_")[nickname_length_range])
+      # name - the String to nicknamize
+      # scope - a Hash with extra values to scope the nickname to
+      #
+      # Example to nicknamize a user name, scoped to the organization:
+      #
+      #    nicknamize(user_name, organization: current_organization)
+      #
+      def nicknamize(name, scope = {})
+        return unless name
+        disambiguate(
+          name.parameterize(separator: "_")[nickname_length_range],
+          scope
+        )
       end
 
       private
@@ -36,11 +47,11 @@ module Decidim
         (0...nickname_max_length)
       end
 
-      def disambiguate(name)
+      def disambiguate(name, scope)
         candidate = name
 
         2.step do |n|
-          return candidate unless exists?(nickname: candidate)
+          return candidate unless exists?(scope.merge(nickname: candidate))
 
           candidate = numbered_variation_of(name, n)
         end

data/lib/decidim/participable.rb

@@ -53,6 +53,13 @@ module Decidim
         admins_query.for(self)
       end
 
+      # Public: Returns an ActiveRecord::Relation of all the users that can
+      # moderate the space. This is used when notifying of flagged/hidden
+      # content.
+      def moderators
+        admins
+      end
+
       def allows_steps?
         respond_to?(:steps)
       end

data/lib/decidim/participatory_space_manifest.rb

@@ -24,6 +24,10 @@ module Decidim
 
     attribute :query_type, String, default: "Decidim::Core::ParticipatorySpaceType"
 
+    # An array with the name of the classes that will be exported with
+    # the data portability feature for this component. For example, `Decidim::<MyModule>::<MyClass>``
+    attribute :data_portable_entities, Array, default: []
+
     # A String with the component's icon. The icon must be stored in the
     # engine's assets path.
     attribute :icon, String

data/lib/devise/models/decidim_newsletterable.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Devise
+  module Models
+    # Newsletterable adds all needed validations to acomplish GDPR standards
+    # in newsletter notification mailing
+    #
+    # Validates that all users with notifications activated have Opt-in in
+    # some time
+    module DecidimNewsletterable
+      GDPR_DATE = Time.zone.parse("2018-05-25 00:00 +02:00")
+
+      def newsletter_opt_in_notify
+        unless newsletter_opt_in_valid?
+          set_newsletter_token!
+          Decidim::NewslettersOptInJob.perform_later(self, newsletter_token)
+        end
+      end
+
+      def newsletter_opt_in_validate
+        set_newsletter_opt_in! if newsletter_notifications_at.blank?
+      end
+
+      protected
+
+      # Checks if Opt-in is valid or not
+      # An user with notifications activated, must have an Opt-in
+      def newsletter_opt_in_valid?
+        newsletter_notifications_at > GDPR_DATE
+      end
+
+      # Fill token value with some random value
+      # Removes opt_int timestamp
+      # Deactivate newsletter notifications
+      def set_newsletter_token
+        self.newsletter_notifications_at = nil
+        self.newsletter_token = SecureRandom.base58(24)
+      end
+
+      # Sets token and Opt-in values & saves
+      def set_newsletter_token!
+        set_newsletter_token
+        save
+      end
+
+      # Fill Opt-in value with current time &
+      # removes any token involved
+      def set_newsletter_opt_in
+        self.newsletter_notifications_at = Time.zone.now
+        self.newsletter_token = ""
+      end
+
+      # Sets Opt-in and token values & saves
+      def set_newsletter_opt_in!
+        set_newsletter_opt_in
+        save
+      end
+    end
+  end
+end

data/lib/tasks/decidim_tasks.rake

@@ -81,4 +81,33 @@ namespace :decidim do
       log.info "RightToBeForgotten: --------------- END #{Time.current}"
     end
   end
+
+  desc "Check and notify users to update her newsletter notifications settings"
+  task check_users_newsletter_opt_in: :environment do
+    print %(
+> This will send an email to all the users that have marked the newsletter by default. This should only be run if you were using Decidim before v0.11
+  If you have any doubts regarding this feature, please check the releases notes for this version  https://github.com/decidim/decidim/releases/tag/v0.12
+  Are you sure you want to do that? [y/N]: )
+    input = $stdin.gets.chomp
+    if input.casecmp("y").zero?
+      puts %(  Continue...)
+      Decidim::User.where("newsletter_notifications_at < ?", Time.zone.parse("2018-05-25 00:00 +02:00")).find_each(&:newsletter_opt_in_notify)
+    else
+      puts %(  Execution cancelled...)
+    end
+  end
+
+  desc "Deletes the data portability file inside tmp/data-portability folder."
+  task delete_data_portability_files: :environment do
+    puts "DELETE DATA PORTABILITY FILES: -------------- START"
+    path = Decidim::DataPortabilityUploader.new.store_dir
+    Dir.glob(Rails.root.join(path, "*")).each do |filename|
+      next unless File.mtime(filename) < Decidim.data_portability_expiry_time.ago
+      File.delete(filename)
+      puts "------"
+      puts "!! deleting #{filename}"
+      puts "------"
+    end
+    puts "DELETE DATA PORTABILITY FILES: --------------- END"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.0.pre1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -290,6 +290,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.8'
+- !ruby/object:Gem::Dependency
+  name: nobspw
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
@@ -420,14 +434,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -504,20 +518,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: sassc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.11.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
@@ -620,30 +620,30 @@ dependencies:
   name: decidim-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.a
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.a
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.a
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.a
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -798,6 +798,7 @@ files:
 - app/cells/decidim/card/show.erb
 - app/cells/decidim/card_cell.rb
 - app/cells/decidim/card_m/author.erb
+- app/cells/decidim/card_m/authors.erb
 - app/cells/decidim/card_m/badge.erb
 - app/cells/decidim/card_m/comments_counter.erb
 - app/cells/decidim/card_m/data.erb
@@ -809,6 +810,8 @@ files:
 - app/cells/decidim/card_m/status.erb
 - app/cells/decidim/card_m/tags.erb
 - app/cells/decidim/card_m_cell.rb
+- app/cells/decidim/collapsible_authors/show.erb
+- app/cells/decidim/collapsible_authors_cell.rb
 - app/cells/decidim/collapsible_list/show.erb
 - app/cells/decidim/collapsible_list_cell.rb
 - app/cells/decidim/fingerprint/show.erb
@@ -819,6 +822,9 @@ files:
 - app/cells/decidim/followers_cell.rb
 - app/cells/decidim/following/show.erb
 - app/cells/decidim/following_cell.rb
+- app/cells/decidim/invitations_toggle/content.erb
+- app/cells/decidim/invitations_toggle/label.erb
+- app/cells/decidim/invitations_toggle_cell.rb
 - app/cells/decidim/notifications/show.erb
 - app/cells/decidim/notifications_cell.rb
 - app/cells/decidim/progress_bar/show.erb
@@ -827,6 +833,8 @@ files:
 - app/cells/decidim/tags/scope.erb
 - app/cells/decidim/tags/show.erb
 - app/cells/decidim/tags_cell.rb
+- app/cells/decidim/toggle/show.erb
+- app/cells/decidim/toggle_cell.rb
 - app/cells/decidim/tos_page/announcement.erb
 - app/cells/decidim/tos_page/refuse_btn_modal.erb
 - app/cells/decidim/tos_page/sticky_form.erb
@@ -840,6 +848,7 @@ files:
 - app/commands/decidim/create_report.rb
 - app/commands/decidim/delete_follow.rb
 - app/commands/decidim/destroy_account.rb
+- app/commands/decidim/invite_friends.rb
 - app/commands/decidim/invite_user.rb
 - app/commands/decidim/invite_user_again.rb
 - app/commands/decidim/messaging/reply_to_conversation.rb
@@ -868,6 +877,7 @@ files:
 - app/controllers/decidim/application_controller.rb
 - app/controllers/decidim/components/base_controller.rb
 - app/controllers/decidim/cookie_policy_controller.rb
+- app/controllers/decidim/data_portability_controller.rb
 - app/controllers/decidim/devise/confirmations_controller.rb
 - app/controllers/decidim/devise/invitations_controller.rb
 - app/controllers/decidim/devise/omniauth_registrations_controller.rb
@@ -880,9 +890,11 @@ files:
 - app/controllers/decidim/doorkeeper/tokens_controller.rb
 - app/controllers/decidim/errors_controller.rb
 - app/controllers/decidim/follows_controller.rb
+- app/controllers/decidim/invitations_controller.rb
 - app/controllers/decidim/locales_controller.rb
 - app/controllers/decidim/messaging/conversations_controller.rb
 - app/controllers/decidim/newsletters_controller.rb
+- app/controllers/decidim/newsletters_opt_in_controller.rb
 - app/controllers/decidim/notifications_controller.rb
 - app/controllers/decidim/notifications_settings_controller.rb
 - app/controllers/decidim/own_user_groups_controller.rb
@@ -900,6 +912,7 @@ files:
 - app/forms/decidim/delete_account_form.rb
 - app/forms/decidim/follow_form.rb
 - app/forms/decidim/form.rb
+- app/forms/decidim/invitations_form.rb
 - app/forms/decidim/invite_user_form.rb
 - app/forms/decidim/messaging/conversation_form.rb
 - app/forms/decidim/messaging/message_form.rb
@@ -914,6 +927,7 @@ files:
 - app/helpers/decidim/attachments_helper.rb
 - app/helpers/decidim/authorization_form_helper.rb
 - app/helpers/decidim/card_helper.rb
+- app/helpers/decidim/cells_helper.rb
 - app/helpers/decidim/cells_paginate_helper.rb
 - app/helpers/decidim/component_path_helper.rb
 - app/helpers/decidim/cookies_helper.rb
@@ -947,8 +961,10 @@ files:
 - app/helpers/decidim/view_hooks_helper.rb
 - app/helpers/decidim/widget_urls_helper.rb
 - app/jobs/decidim/application_job.rb
+- app/jobs/decidim/data_portability_export_job.rb
 - app/jobs/decidim/email_notification_generator_job.rb
 - app/jobs/decidim/export_job.rb
+- app/jobs/decidim/newsletters_opt_in_job.rb
 - app/jobs/decidim/notification_generator_for_recipient_job.rb
 - app/jobs/decidim/notification_generator_job.rb
 - app/mailers/concerns/decidim/localised_mailer.rb
@@ -957,6 +973,7 @@ files:
 - app/mailers/decidim/export_mailer.rb
 - app/mailers/decidim/messaging/conversation_mailer.rb
 - app/mailers/decidim/newsletter_mailer.rb
+- app/mailers/decidim/newsletters_opt_in_mailer.rb
 - app/mailers/decidim/notification_mailer.rb
 - app/mailers/decidim/reported_mailer.rb
 - app/middleware/decidim/current_organization.rb
@@ -969,6 +986,7 @@ files:
 - app/models/decidim/authorization.rb
 - app/models/decidim/categorization.rb
 - app/models/decidim/category.rb
+- app/models/decidim/coauthorship.rb
 - app/models/decidim/component.rb
 - app/models/decidim/follow.rb
 - app/models/decidim/identity.rb
@@ -1070,6 +1088,7 @@ files:
 - app/uploaders/decidim/attachment_uploader.rb
 - app/uploaders/decidim/avatar_uploader.rb
 - app/uploaders/decidim/banner_image_uploader.rb
+- app/uploaders/decidim/data_portability_uploader.rb
 - app/uploaders/decidim/hero_image_uploader.rb
 - app/uploaders/decidim/homepage_image_uploader.rb
 - app/uploaders/decidim/image_uploader.rb
@@ -1090,6 +1109,8 @@ files:
 - app/views/decidim/application/_documents.html.erb
 - app/views/decidim/application/_photos.html.erb
 - app/views/decidim/cookie_policy/accept.js.erb
+- app/views/decidim/data_portability/export.html.erb
+- app/views/decidim/data_portability/show.html.erb
 - app/views/decidim/devise/confirmations/new.html.erb
 - app/views/decidim/devise/invitations/edit.html.erb
 - app/views/decidim/devise/omniauth_registrations/new.html.erb
@@ -1105,8 +1126,10 @@ files:
 - app/views/decidim/doorkeeper/authorizations/new.html.erb
 - app/views/decidim/errors/internal_server_error.html.erb
 - app/views/decidim/errors/not_found.html.erb
+- app/views/decidim/export_mailer/data_portability_export.html.erb
 - app/views/decidim/export_mailer/export.html.erb
 - app/views/decidim/follows/update_button.js.erb
+- app/views/decidim/invitations/index.html.erb
 - app/views/decidim/messaging/conversation_mailer/new_conversation.html.erb
 - app/views/decidim/messaging/conversation_mailer/new_message.html.erb
 - app/views/decidim/messaging/conversations/_message.html.erb
@@ -1121,6 +1144,7 @@ files:
 - app/views/decidim/newsletter_mailer/newsletter.html.erb
 - app/views/decidim/newsletters/show.html.erb
 - app/views/decidim/newsletters/unsubscribe.html.erb
+- app/views/decidim/newsletters_opt_in_mailer/notify.html.erb
 - app/views/decidim/notification_mailer/event_received.html.erb
 - app/views/decidim/notifications_settings/show.html.erb
 - app/views/decidim/own_user_groups/index.html.erb
@@ -1176,6 +1200,8 @@ files:
 - app/views/devise/mailer/invite_admin.text.erb
 - app/views/devise/mailer/invite_collaborator.html.erb
 - app/views/devise/mailer/invite_collaborator.text.erb
+- app/views/devise/mailer/invite_friend.html.erb
+- app/views/devise/mailer/invite_friend.text.erb
 - app/views/devise/mailer/invite_private_user.html.erb
 - app/views/devise/mailer/invite_private_user.text.erb
 - app/views/devise/mailer/organization_admin_invitation_instructions.html.erb
@@ -1325,8 +1351,10 @@ files:
 - db/migrate/20180308113207_doorkeeper_models.rb
 - db/migrate/20180314085339_rename_maximum_votes_per_proposal_to_threshold_per_proposal.rb
 - db/migrate/20180323102631_change_event_name_and_class_to_rename_to_publish_proposal_event.rb
+- db/migrate/20180427141253_create_coauthorships.rb
 - db/migrate/20180508111640_add_tos_version_to_organization.rb
 - db/migrate/20180508111710_add_accepted_tos_version_field_to_users.rb
+- db/migrate/20180611121852_change_newsletter_notification_type_value.rb
 - db/migrate/20180613080638_rename_missing_features_to_components.rb
 - db/seeds.rb
 - db/seeds/homepage_image.jpg
@@ -1341,6 +1369,7 @@ files:
 - lib/decidim/attributes/time_with_zone.rb
 - lib/decidim/authorable.rb
 - lib/decidim/authorization_form_builder.rb
+- lib/decidim/coauthorable.rb
 - lib/decidim/component_manifest.rb
 - lib/decidim/component_validator.rb
 - lib/decidim/components.rb
@@ -1363,6 +1392,8 @@ files:
 - lib/decidim/core/test/shared_examples/authorable.rb
 - lib/decidim/core/test/shared_examples/authorable_interface_examples.rb
 - lib/decidim/core/test/shared_examples/categorizable_interface_examples.rb
+- lib/decidim/core/test/shared_examples/coauthorable.rb
+- lib/decidim/core/test/shared_examples/coauthorable_interface_examples.rb
 - lib/decidim/core/test/shared_examples/comments_examples.rb
 - lib/decidim/core/test/shared_examples/component_type.rb
 - lib/decidim/core/test/shared_examples/errors.rb
@@ -1386,10 +1417,23 @@ files:
 - lib/decidim/core/test/shared_examples/simple_event.rb
 - lib/decidim/core/test/shared_examples/user_localised_email_examples.rb
 - lib/decidim/core/version.rb
+- lib/decidim/data_portability.rb
+- lib/decidim/data_portability_file_reader.rb
+- lib/decidim/data_portability_file_zipper.rb
+- lib/decidim/data_portability_serializers.rb
+- lib/decidim/data_portability_serializers/data_portability_conversation_serializer.rb
+- lib/decidim/data_portability_serializers/data_portability_follow_serializer.rb
+- lib/decidim/data_portability_serializers/data_portability_identity_serializer.rb
+- lib/decidim/data_portability_serializers/data_portability_notification_serializer.rb
+- lib/decidim/data_portability_serializers/data_portability_participatory_space_private_user_serializer.rb
+- lib/decidim/data_portability_serializers/data_portability_report_serializer.rb
+- lib/decidim/data_portability_serializers/data_portability_user_group_serializer.rb
+- lib/decidim/data_portability_serializers/data_portability_user_serializer.rb
 - lib/decidim/engine_router.rb
 - lib/decidim/events.rb
 - lib/decidim/events/author_event.rb
 - lib/decidim/events/base_event.rb
+- lib/decidim/events/coauthor_event.rb
 - lib/decidim/events/email_event.rb
 - lib/decidim/events/notification_event.rb
 - lib/decidim/events/simple_event.rb
@@ -1443,6 +1487,7 @@ files:
 - lib/decidim/translatable_attributes.rb
 - lib/decidim/view_hooks.rb
 - lib/decidim/view_model.rb
+- lib/devise/models/decidim_newsletterable.rb
 - lib/devise/models/decidim_validatable.rb
 - lib/tasks/decidim_tasks.rake
 - vendor/assets/javascripts/appendAround.js
@@ -1495,9 +1540,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6