decidim-core 0.2.0 → 0.3.0

data/db/migrate/20170206083118_rename_extra_info_on_processes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RenameExtraInfoOnProcesses < ActiveRecord::Migration[5.0]
   def change
     remove_column :decidim_participatory_processes, :developer_group

data/db/migrate/20170206142116_add_published_at_to_decidim_features.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddPublishedAtToDecidimFeatures < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_features, :published_at, :datetime

data/db/migrate/20170207091021_add_social_media_handlers_to_organization.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddSocialMediaHandlersToOrganization < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_organizations, :instagram_handler, :string

data/db/migrate/20170207093048_add_organization_logo_and_url.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class AddOrganizationLogoAndUrl < ActiveRecord::Migration[5.0]
-   def change
+  def change
     add_column :decidim_organizations, :official_img_header, :string
     add_column :decidim_organizations, :official_img_footer, :string
     add_column :decidim_organizations, :official_url, :string

data/db/migrate/20170213081133_create_decidim_newsletters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateDecidimNewsletters < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_newsletters do |t|

data/db/migrate/20170215115407_add_organization_custom_reference.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddOrganizationCustomReference < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_organizations, :reference_prefix, :string

data/db/migrate/20170220110740_remove_steps_short_description.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveStepsShortDescription < ActiveRecord::Migration[5.0]
   def change
     Decidim::ParticipatoryProcessStep.transaction do

data/db/migrate/20170221094835_add_scopes_to_processes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddScopesToProcesses < ActiveRecord::Migration[5.0]
   def change
     rename_column :decidim_participatory_processes, :scope, :meta_scope

data/db/migrate/20170228142440_add_participatory_process_groups.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddParticipatoryProcessGroups < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_participatory_process_groups do |t|

data/db/migrate/20170306144354_add_secondary_hosts_to_organizations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddSecondaryHostsToOrganizations < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_organizations, :secondary_hosts, :string, array: true, default: [], index: true

data/db/migrate/20170307084957_create_reports.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateReports < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_reports do |t|

data/db/migrate/20170308091316_create_moderations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateModerations < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_moderations do |t|

data/db/migrate/20170313095436_add_available_authorizations_to_organization.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddAvailableAuthorizationsToOrganization < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_organizations, :available_authorizations, :string, array: true, default: []

data/db/migrate/20170404132616_change_steps_end_and_start_date_to_date.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ChangeStepsEndAndStartDateToDate < ActiveRecord::Migration[5.0]
   def change
     change_column :decidim_participatory_process_steps, :start_date, :date

data/db/migrate/20170405091801_change_decidim_user_email_index_uniqueness.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ChangeDecidimUserEmailIndexUniqueness < ActiveRecord::Migration[5.0]
   def change
     remove_index :decidim_users, :email

data/db/migrate/20170405094028_add_organization_to_identities.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddOrganizationToIdentities < ActiveRecord::Migration[5.0]
   def change
     add_reference :decidim_identities, :decidim_organization, index: true, foreign_key: true

data/db/migrate/20170405094258_change_decidim_identities_provider_uid_index_uniqueness.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 class ChangeDecidimIdentitiesProviderUidIndexUniqueness < ActiveRecord::Migration[5.0]
   def change
     remove_index :decidim_identities, [:provider, :uid]
     add_index :decidim_identities, [:provider, :uid, :decidim_organization_id], unique: true,
-    name: "decidim_identities_provider_uid_organization_unique"
+                                                                                name: "decidim_identities_provider_uid_organization_unique"
 
     Decidim::Identity.includes(:user).find_each do |identity|
       identity.organization = identity.user.organization

data/db/migrate/20170529150743_add_rejected_at_to_user_groups.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddRejectedAtToUserGroups < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_user_groups, :rejected_at, :datetime

data/db/migrate/20170605140421_add_deleted_fields_to_users.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddDeletedFieldsToUsers < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_users, :delete_reason, :text
+    add_column :decidim_users, :deleted_at, :datetime
+  end
+end

data/db/migrate/20170606102659_set_email_unique_in_organization_conditional.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class SetEmailUniqueInOrganizationConditional < ActiveRecord::Migration[5.0]
+  def change
+    remove_index :decidim_users, %w(email decidim_organization_id)
+    add_index :decidim_users, %w(email decidim_organization_id), where: "(deleted_at IS NULL)", name: "index_decidim_users_on_email_and_decidim_organization_id", unique: true
+  end
+end

data/db/migrate/20170608142521_add_organization_to_user_groups.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class AddOrganizationToUserGroups < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_user_groups, :decidim_organization_id, :integer
+
+    Decidim::UserGroup.includes(:users).find_each do |user_group|
+      user_group.organization = user_group.users.first.organization
+      user_group.save!
+    end
+
+    change_column :decidim_user_groups, :decidim_organization_id, :integer, null: false
+  end
+end

data/db/migrate/20170612070905_add_uniqueness_to_name_and_document_number_to_user_groups.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddUniquenessToNameAndDocumentNumberToUserGroups < ActiveRecord::Migration[5.0]
+  def change
+    add_index :decidim_user_groups, [:decidim_organization_id, :name], unique: true, name: "index_decidim_user_groups_names_on_organization_id"
+    add_index :decidim_user_groups, [:decidim_organization_id, :document_number], unique: true, name: "index_decidim_user_groups_document_number_on_organization_id"
+  end
+end

data/db/migrate/20170612100253_create_decidim_categorizations.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class CreateDecidimCategorizations < ActiveRecord::Migration[5.1]
+  def change
+    create_table :decidim_categorizations do |t|
+      t.references :decidim_category, foreign_key: true, null: false
+      t.references :categorizable, polymorphic: true, null: false, index: { name: "decidim_categorizations_categorizable_id_and_type" }
+
+      t.timestamps
+    end
+  end
+end

data/db/seeds.rb

@@ -15,7 +15,7 @@ if !Rails.env.production? || ENV["SEED"]
     description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
       Decidim::Faker::Localized.sentence(15)
     end,
-    homepage_image: File.new(File.join(File.dirname(__FILE__), "seeds", "homepage_image.jpg")),
+    homepage_image: File.new(File.join(__dir__, "seeds", "homepage_image.jpg")),
     default_locale: I18n.default_locale,
     available_locales: Decidim.available_locales,
     reference_prefix: Faker::Name.suffix
@@ -75,7 +75,8 @@ if !Rails.env.production? || ENV["SEED"]
         name: Faker::Company.name,
         document_number: Faker::Number.number(10),
         phone: Faker::PhoneNumber.phone_number,
-        verified_at: Time.current
+        verified_at: Time.current,
+        decidim_organization_id: user.organization.id
       )
 
       Decidim::UserGroupMembership.create!(
@@ -86,7 +87,8 @@ if !Rails.env.production? || ENV["SEED"]
       user_group = Decidim::UserGroup.create!(
         name: Faker::Company.name,
         document_number: Faker::Number.number(10),
-        phone: Faker::PhoneNumber.phone_number
+        phone: Faker::PhoneNumber.phone_number,
+        decidim_organization_id: user.organization.id
       )
 
       Decidim::UserGroupMembership.create!(
@@ -103,7 +105,7 @@ if !Rails.env.production? || ENV["SEED"]
       description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
         Decidim::Faker::Localized.paragraph(3)
       end,
-      hero_image: File.new(File.join(File.dirname(__FILE__), "seeds", "city.jpeg")),
+      hero_image: File.new(File.join(__dir__, "seeds", "city.jpeg")),
       organization: organization
     )
   end
@@ -120,8 +122,8 @@ if !Rails.env.production? || ENV["SEED"]
       description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
         Decidim::Faker::Localized.paragraph(3)
       end,
-      hero_image: File.new(File.join(File.dirname(__FILE__), "seeds", "city.jpeg")),
-      banner_image: File.new(File.join(File.dirname(__FILE__), "seeds", "city2.jpeg")),
+      hero_image: File.new(File.join(__dir__, "seeds", "city.jpeg")),
+      banner_image: File.new(File.join(__dir__, "seeds", "city2.jpeg")),
       promoted: true,
       published_at: 2.weeks.ago,
       organization: organization,
@@ -153,13 +155,13 @@ if !Rails.env.production? || ENV["SEED"]
     Decidim::Attachment.create!(
       title: Decidim::Faker::Localized.sentence(2),
       description: Decidim::Faker::Localized.sentence(5),
-      file: File.new(File.join(File.dirname(__FILE__), "seeds", "city.jpeg")),
+      file: File.new(File.join(__dir__, "seeds", "city.jpeg")),
       attached_to: process
     )
     Decidim::Attachment.create!(
       title: Decidim::Faker::Localized.sentence(2),
       description: Decidim::Faker::Localized.sentence(5),
-      file: File.new(File.join(File.dirname(__FILE__), "seeds", "Exampledocument.pdf")),
+      file: File.new(File.join(__dir__, "seeds", "Exampledocument.pdf")),
       attached_to: process
     )
     2.times do

data/lib/decidim/authorable.rb

@@ -6,8 +6,8 @@ module Decidim
     extend ActiveSupport::Concern
 
     included do
-      belongs_to :author, foreign_key: "decidim_author_id", class_name: "Decidim::User"
-      belongs_to :user_group, foreign_key: "decidim_user_group_id", class_name: "Decidim::UserGroup"
+      belongs_to :author, foreign_key: "decidim_author_id", class_name: "Decidim::User", optional: true
+      belongs_to :user_group, foreign_key: "decidim_user_group_id", class_name: "Decidim::UserGroup", optional: true
 
       validate :verified_user_group, :user_group_membership
       validate :author_belongs_to_organization

data/lib/decidim/core.rb

@@ -86,7 +86,7 @@ module Decidim
 
   # Exposes a configuration option: The application name String.
   config_accessor :available_locales do
-    %w(en ca es eu fi fr nl)
+    %w(en ca es eu it fi fr nl)
   end
 
   # Exposes a configuration option: an object to configure geocoder

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

@@ -7,6 +7,12 @@ module Decidim
     description "An author"
 
     field :name, !types.String, "The author's name"
+
     field :avatarUrl, !types.String, "The author's avatar url"
+
+    field :isVerified, !types.Boolean, "Whether the author is verified or not"
+
+    field :deleted, !types.Boolean, "Whether the author's account has been deleted or not"
+    field :isUser, !types.Boolean, "Whether the author is a user or another kind of author (User Group)"
   end
 end

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

@@ -17,5 +17,19 @@ module Decidim
     field :avatarUrl, !types.String, "The user's avatar url" do
       resolve ->(obj, _args, _ctx) { obj.avatar.url }
     end
+
+    field :isVerified, !types.Boolean, "Whether the user group is verified or not" do
+      resolve lambda { |obj, _args, _ctx|
+        obj.verified?
+      }
+    end
+
+    field :deleted, !types.Boolean, "Whether the user group's has been deleted or not" do
+      resolve ->(_obj, _args, _ctx) { false }
+    end
+
+    field :isUser, !types.Boolean, "User groups are not users" do
+      resolve ->(_obj, _args, _ctx) { false }
+    end
   end
 end

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

@@ -19,5 +19,15 @@ module Decidim
     field :organizationName, !types.String, "The user's organization name" do
       resolve ->(obj, _args, _ctx) { obj.organization.name }
     end
+
+    field :isVerified, !types.Boolean, "Whether the author is verified or not" do
+      resolve ->(_obj, _args, _ctx) { false }
+    end
+
+    field :deleted, !types.Boolean, "Whether the user's account has been deleted or not", property: :deleted?
+
+    field :isUser, !types.Boolean, "User groups are not users" do
+      resolve ->(_obj, _args, _ctx) { true }
+    end
   end
 end

data/lib/decidim/core/engine.rb

@@ -77,7 +77,7 @@ module Decidim
         app.config.exceptions_app = Decidim::Core::Engine.routes
       end
 
-      initializer "decidim_admin.inject_abilities_to_user" do |_app|
+      initializer "decidim.inject_abilities_to_user" do |_app|
         Decidim.configure do |config|
           config.abilities << "Decidim::Abilities::Everyone"
         end

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

@@ -145,6 +145,16 @@ FactoryGirl.define do
       roles ["admin"]
     end
 
+    trait :process_admin do
+      transient { participatory_process nil }
+
+      after(:create) do |user, evaluator|
+        create :participatory_process_user_role,
+               user: user,
+               participatory_process: evaluator.participatory_process
+      end
+    end
+
     trait :moderator do
       roles ["moderator"]
     end
@@ -163,6 +173,7 @@ FactoryGirl.define do
     document_number { Faker::Number.number(8) + "X" }
     phone { Faker::PhoneNumber.phone_number }
     avatar { test_file("avatar.jpg", "image/jpeg") }
+    organization
 
     transient do
       users []
@@ -266,6 +277,7 @@ FactoryGirl.define do
     title { generate(:name) }
     feature { create(:feature, manifest_name: "dummy") }
     author { create(:user, :confirmed, organization: feature.organization) }
+    category { create(:category, participatory_process: feature.participatory_process) }
   end
 
   factory :resource_link, class: Decidim::ResourceLink do

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

@@ -29,7 +29,7 @@ RSpec.shared_examples "manage moderations" do
 
       moderations.each do |moderation|
         within "tr[data-id=\"#{moderation.id}\"]" do
-          expect(page).to have_content moderation.reportable.reported_content
+          expect(page).to have_content moderation.reportable.reported_content_url
           expect(page).to have_content moderation.reports.first.reason
         end
       end
@@ -58,7 +58,7 @@ RSpec.shared_examples "manage moderations" do
         expect(page).to have_content("Resource successfully hidden")
       end
 
-      expect(page).to have_no_content(moderation.reportable.reported_content)
+      expect(page).to have_no_content(moderation.reportable.reported_content_url)
     end
   end
 
@@ -68,7 +68,7 @@ RSpec.shared_examples "manage moderations" do
 
       hidden_moderations.each do |moderation|
         within "tr[data-id=\"#{moderation.id}\"]" do
-          expect(page).to have_content moderation.reportable.reported_content
+          expect(page).to have_content moderation.reportable.reported_content_url
         end
       end
     end

data/lib/decidim/core/version.rb

@@ -3,11 +3,11 @@
 # This holds Decidim's version and the Rails version on which it depends.
 module Decidim
   def self.version
-    "0.2.0"
+    "0.3.0"
   end
 
   def self.rails_version
-    ["~> 5.0.2"]
+    ["~> 5.1.1"]
   end
 
   def self.add_default_gemspec_properties(spec)

data/lib/decidim/feature_manifest.rb

@@ -64,8 +64,7 @@ module Decidim
     #
     # event_name - A String or Symbol with the event name.
     # context    - An optional context that will be provided to the block as a
-    #              parameter. Usually the subject of the hook, mostly the
-    #              Component.
+    #              parameter. Usually the subject of the hook.
     #
     # Returns nothing.
     def run_hooks(event_name, context = nil)
@@ -182,7 +181,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.
     #

data/lib/decidim/form_builder.rb

@@ -47,7 +47,7 @@ module Decidim
 
         tabs_panels = "".html_safe
         if options[:label] != false
-          tabs_panels = content_tag(:ul, class: "tabs tabs--lang", id: "#{name}-tabs", data: { tabs: true }) do
+          tabs_panels = content_tag(:ul, class: "tabs tabs--lang", id: "#{@object_name}-#{name}-tabs", data: { tabs: true }) do
             locales.each_with_index.inject("".html_safe) do |string, (locale, index)|
               string + content_tag(:li, class: tab_element_class_for("title", index)) do
                 title = I18n.with_locale(locale) { I18n.t("name", scope: "locale") }
@@ -62,7 +62,7 @@ module Decidim
         safe_join [field_label, tabs_panels]
       end
 
-      tabs_content = content_tag(:div, class: "tabs-content", data: { tabs_content: "#{name}-tabs" }) do
+      tabs_content = content_tag(:div, class: "tabs-content", data: { tabs_content: "#{@object_name}-#{name}-tabs" }) do
         locales.each_with_index.inject("".html_safe) do |string, (locale, index)|
           string + content_tag(:div, class: tab_element_class_for("panel", index), id: "#{name}-panel-#{index}") do
             send(type, name_with_locale(name, locale), options.merge(label: false))
@@ -243,6 +243,7 @@ module Decidim
       validation_options = {}
       validation_options[:pattern] = "^(.|[\n\r]){#{min_length},#{max_length}}$" if min_length.to_i.positive? || max_length.to_i.positive?
       validation_options[:required] = options[:required] || attribute_required?(attribute)
+      validation_options[:maxlength] ||= max_length if max_length.to_i.positive?
       validation_options
     end