decidim-core 0.0.5 → 0.0.6

data/config/routes.rb

@@ -21,6 +21,7 @@ Decidim::Core::Engine.routes.draw do
 
   resource :locale, only: [:create]
 
+  resources :participatory_process_groups, only: :show, path: "processes_groups"
   resources :participatory_processes, only: [:index, :show], path: "processes" do
     resources :participatory_process_steps, only: [:index], path: "steps"
   end
@@ -50,6 +51,7 @@ Decidim::Core::Engine.routes.draw do
 
   resources :pages, only: [:index, :show], format: false
 
+  get "/static_map", to: "static_map#show", as: :static_map
   get "/cookies/accept", to: "cookie_policy#accept", as: :accept_cookies
 
   match "/404", to: "pages#show", id: "404", via: :all
@@ -59,5 +61,7 @@ Decidim::Core::Engine.routes.draw do
     mount LetterOpenerWeb::Engine, at: "/letter_opener"
   end
 
+  resource :report, only: [:create]
+
   root to: "pages#show", id: "home"
 end

data/db/migrate/20170215115407_add_organization_custom_reference.rb

@@ -0,0 +1,11 @@
+class AddOrganizationCustomReference < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_organizations, :reference_prefix, :string
+
+    Decidim::Organization.find_each do |organization|
+      organization.update_attribute(:reference_prefix, organization.name[0])
+    end
+
+    change_column_null :decidim_organizations, :reference_prefix, false
+  end
+end

data/db/migrate/20170220110740_remove_steps_short_description.rb

@@ -0,0 +1,21 @@
+class RemoveStepsShortDescription < ActiveRecord::Migration[5.0]
+  def change
+    Decidim::ParticipatoryProcessStep.transaction do
+      Decidim::ParticipatoryProcessStep.find_each do |step|
+        step.update_attributes!(
+          description: new_description_for(step)
+        )
+      end
+
+      remove_column :decidim_participatory_process_steps, :short_description
+    end
+  end
+
+  def new_description_for(step)
+    desc = {}
+    step.description.keys.each do |locale|
+      desc[locale] = step.short_description[locale] + step.description[locale]
+    end
+    desc
+  end
+end

data/db/migrate/20170221094835_add_scopes_to_processes.rb

@@ -0,0 +1,6 @@
+class AddScopesToProcesses < ActiveRecord::Migration[5.0]
+  def change
+    rename_column :decidim_participatory_processes, :scope, :meta_scope
+    add_column :decidim_participatory_processes, :decidim_scope_id, :integer
+  end
+end

data/db/migrate/20170228142440_add_participatory_process_groups.rb

@@ -0,0 +1,15 @@
+class AddParticipatoryProcessGroups < ActiveRecord::Migration[5.0]
+  def change
+    create_table :decidim_participatory_process_groups do |t|
+      t.jsonb :name, null: false
+      t.jsonb :description, null: false
+      t.string :hero_image
+
+      t.references :decidim_organization, index: { name: "decidim_participatory_process_group_organization" }
+
+      t.timestamps
+    end
+
+    add_column :decidim_participatory_processes, :decidim_participatory_process_group_id, :integer
+  end
+end

data/db/migrate/20170306144354_add_secondary_hosts_to_organizations.rb

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

data/db/migrate/20170307084957_create_reports.rb

@@ -0,0 +1,15 @@
+class CreateReports < ActiveRecord::Migration[5.0]
+  def change
+    create_table :decidim_reports do |t|
+      t.references :decidim_moderation, null: false, index: { name: "decidim_reports_moderation" }
+      t.references :decidim_user, null: false, index: { name: "decidim_reports_user" }
+
+      t.string :reason, null: false
+      t.text :details
+
+      t.timestamps
+    end
+
+    add_index :decidim_reports, [:decidim_moderation_id, :decidim_user_id], unique: true, name: "decidim_reports_moderation_user_unique"
+  end
+end

data/db/migrate/20170308091316_create_moderations.rb

@@ -0,0 +1,12 @@
+class CreateModerations < ActiveRecord::Migration[5.0]
+  def change
+    create_table :decidim_moderations do |t|
+      t.references :decidim_participatory_process, null: false, index: { name: "decidim_moderations_participatory_process" }
+      t.references :decidim_reportable, null: false, polymorphic: true, index: { unique: true, name: "decidim_moderations_reportable" }
+      t.integer :report_count, null: false, default: 0, index: { name: "decidim_moderations_report_count" }
+      t.datetime :hidden_at, index: { name: "decidim_moderations_hidden_at" }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20170313095436_add_available_authorizations_to_organization.rb

@@ -0,0 +1,10 @@
+class AddAvailableAuthorizationsToOrganization < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_organizations, :available_authorizations, :string, array: true, default: []
+
+    handlers = Decidim.authorization_handlers.map(&:name)
+    Decidim::Organization.find_each do |org|
+      org.update_attributes(available_authorizations: handlers)
+    end
+  end
+end

data/db/seeds.rb

@@ -2,7 +2,7 @@
 if !Rails.env.production? || ENV["SEED"]
   require "decidim/faker/localized"
 
-  organization = Decidim::Organization.create!(
+  organization = Decidim::Organization.first || Decidim::Organization.create!(
     name: Faker::Company.name,
     twitter_handler: Faker::Hipster.word,
     facebook_handler: Faker::Hipster.word,
@@ -16,7 +16,8 @@ if !Rails.env.production? || ENV["SEED"]
     end,
     homepage_image: File.new(File.join(File.dirname(__FILE__), "seeds", "homepage_image.jpg")),
     default_locale: I18n.default_locale,
-    available_locales: Decidim.available_locales
+    available_locales: Decidim.available_locales,
+    reference_prefix: Faker::Name.suffix
   )
 
   3.times.each do |index|
@@ -28,7 +29,7 @@ if !Rails.env.production? || ENV["SEED"]
 
   Decidim::User.create!(
     name: Faker::Name.name,
-    email: "admin@decidim.org",
+    email: "admin@example.org",
     password: "decidim123456",
     password_confirmation: "decidim123456",
     organization: organization,
@@ -42,7 +43,7 @@ if !Rails.env.production? || ENV["SEED"]
 
   Decidim::User.create!(
     name: Faker::Name.name,
-    email: "collaborator@decidim.org",
+    email: "collaborator@example.org",
     password: "decidim123456",
     password_confirmation: "decidim123456",
     organization: organization,
@@ -56,7 +57,7 @@ if !Rails.env.production? || ENV["SEED"]
 
   Decidim::User.create!(
     name: Faker::Name.name,
-    email: "user@decidim.org",
+    email: "user@example.org",
     password: "decidim123456",
     password_confirmation: "decidim123456",
     confirmed_at: Time.current,
@@ -94,6 +95,17 @@ if !Rails.env.production? || ENV["SEED"]
     end
   end
 
+  process_groups = []
+  3.times do
+    process_groups << Decidim::ParticipatoryProcessGroup.create!(
+      name: Decidim::Faker::Localized.sentence(3),
+      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")),
+      organization: organization
+    )
+  end
 
   3.times do
     Decidim::ParticipatoryProcess.create!(
@@ -112,22 +124,20 @@ if !Rails.env.production? || ENV["SEED"]
       promoted: true,
       published_at: 2.weeks.ago,
       organization: organization,
-      scope: Decidim::Faker::Localized.word,
+      meta_scope: Decidim::Faker::Localized.word,
       developer_group: Decidim::Faker::Localized.sentence(1),
       local_area: Decidim::Faker::Localized.sentence(2),
       target: Decidim::Faker::Localized.sentence(3),
       participatory_scope: Decidim::Faker::Localized.sentence(1),
       participatory_structure: Decidim::Faker::Localized.sentence(2),
-      end_date: 2.month.from_now.at_midnight
+      end_date: 2.month.from_now.at_midnight,
+      participatory_process_group: process_groups.sample
     )
   end
 
   Decidim::ParticipatoryProcess.find_each do |process|
     Decidim::ParticipatoryProcessStep.create!(
       title: Decidim::Faker::Localized.sentence(1, false, 2),
-      short_description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        Decidim::Faker::Localized.sentence(3)
-      end,
       description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
         Decidim::Faker::Localized.paragraph(3)
       end,

data/lib/decidim/core.rb

@@ -14,6 +14,7 @@ module Decidim
   autoload :FeatureManifest, "decidim/feature_manifest"
   autoload :ResourceManifest, "decidim/resource_manifest"
   autoload :Resourceable, "decidim/resourceable"
+  autoload :Reportable, "decidim/reportable"
   autoload :Authorable, "decidim/authorable"
   autoload :Features, "decidim/features"
   autoload :HasAttachments, "decidim/has_attachments"
@@ -21,6 +22,7 @@ module Decidim
   autoload :HasFeature, "decidim/has_feature"
   autoload :HasScope, "decidim/has_scope"
   autoload :HasCategory, "decidim/has_category"
+  autoload :HasReference, "decidim/has_reference"
   autoload :Attributes, "decidim/attributes"
 
   include ActiveSupport::Configurable
@@ -77,7 +79,7 @@ module Decidim
 
   # Exposes a configuration option: The application name String.
   config_accessor :available_locales do
-    %w(en ca es)
+    %w(en ca es eu fi)
   end
 
   # Exposes a configuration option: an object to configure geocoder
@@ -91,6 +93,15 @@ module Decidim
     10.megabytes
   end
 
+  # The number of reports which an object can receive before hiding it
+  config_accessor :max_reports_before_hiding { 3 }
+
+  # A base path for the uploads. If set, make sure it ends in a slash.
+  # Uploads will be set to `<base_path>/uploads/`. This can be useful if you
+  # want to use the same uploads place for both staging and production
+  # environments, but in different folders.
+  config_accessor :base_uploads_path { nil }
+
   # Public: Registers a feature, usually held in an external library or in a
   # separate folder in the main repository. Exposes a DSL defined by
   # `Decidim::FeatureManifest`.

data/lib/decidim/core/api.rb

@@ -8,4 +8,5 @@ module Decidim
   autoload :SessionType, "decidim/core/api/session_type"
   autoload :UserGroupType, "decidim/core/api/user_group_type"
   autoload :UserType, "decidim/core/api/user_type"
+  autoload :DecidimType, "decidim/core/api/decidim_type"
 end

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+module Decidim
+  # This type represents a ParticipatoryProcess.
+  DecidimType = GraphQL::ObjectType.define do
+    name "Decidim"
+    description "Decidim's framework-related properties."
+
+    field :version, !types.String, "The current decidim's version of this deployment." do
+      resolve ->(obj, _args, _ctx) { obj.version }
+    end
+  end
+end

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

@@ -14,11 +14,5 @@ module Decidim
     end
 
     field :title, TranslatedFieldType, "The title of this step"
-
-    field :shortDescription do
-      type TranslatedFieldType
-      description "A short description of the step."
-      property :short_description
-    end
   end
 end

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

@@ -14,5 +14,9 @@ module Decidim
     field :avatarUrl, !types.String, "The user's avatar url" do
       resolve ->(obj, _args, _ctx) { obj.avatar.url }
     end
+
+    field :organizationName, !types.String, "The user's organization name" do
+      resolve ->(obj, _args, _ctx) { obj.organization.name }
+    end
   end
 end

data/lib/decidim/core/engine.rb

@@ -12,6 +12,7 @@ require "jquery-rails"
 require "sassc-rails"
 require "foundation-rails"
 require "foundation_rails_helper"
+require "autoprefixer-rails"
 require "active_link_to"
 require "rectify"
 require "carrierwave"
@@ -29,6 +30,7 @@ require "omniauth-google-oauth2"
 require "invisible_captcha"
 require "premailer/rails"
 require "nokogiri"
+require "geocoder"
 
 require "decidim/api"
 
@@ -91,6 +93,31 @@ module Decidim
       initializer "decidim.i18n_exceptions" do
         ActionView::Base.raise_on_missing_translations = true unless Rails.env.production?
       end
+
+      initializer "decidim.geocoding" do
+        if Decidim.geocoder.present?
+          Geocoder.configure(
+            # geocoding service (see below for supported options):
+            lookup: :here,
+
+            # IP address geocoding service (see below for supported options):
+            # :ip_lookup => :maxmind,
+
+            # to use an API key:
+            api_key: [Decidim.geocoder&.fetch(:here_app_id), Decidim.geocoder&.fetch(:here_app_code)]
+
+            # geocoding service request timeout, in seconds (default 3):
+            # :timeout => 5,
+
+            # set default units to kilometers:
+            # :units => :km,
+
+            # caching (see below for details):
+            # :cache => Redis.new,
+            # :cache_prefix => "..."
+          )
+        end
+      end
     end
   end
 end

data/lib/decidim/core/test.rb

@@ -5,3 +5,8 @@ require "decidim/core/test/shared_examples/has_attachments"
 require "decidim/core/test/shared_examples/has_feature"
 require "decidim/core/test/shared_examples/has_scope"
 require "decidim/core/test/shared_examples/has_category"
+require "decidim/core/test/shared_examples/has_reference"
+require "decidim/core/test/shared_examples/comments_examples"
+require "decidim/core/test/shared_examples/reportable"
+require "decidim/core/test/shared_examples/reports_examples"
+require "decidim/core/test/shared_examples/manage_moderations_examples"

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

@@ -8,7 +8,7 @@ FactoryGirl.define do
   end
 
   sequence(:email) do |n|
-    "user#{n}@decidim.org"
+    "user#{n}@example.org"
   end
 
   sequence(:slug) do |n|
@@ -31,6 +31,7 @@ FactoryGirl.define do
 
   factory :organization, class: Decidim::Organization do
     name { Faker::Company.unique.name }
+    reference_prefix { Faker::Name.suffix }
     twitter_handler { Faker::Hipster.word }
     facebook_handler { Faker::Hipster.word }
     instagram_handler { Faker::Hipster.word }
@@ -58,7 +59,7 @@ FactoryGirl.define do
     banner_image { test_file("city2.jpeg", "image/jpeg") }
     published_at { Time.current }
     organization
-    scope { Decidim::Faker::Localized.word }
+    meta_scope { Decidim::Faker::Localized.word }
     developer_group { Decidim::Faker::Localized.sentence(1) }
     local_area { Decidim::Faker::Localized.sentence(2) }
     target { Decidim::Faker::Localized.sentence(3) }
@@ -77,24 +78,44 @@ FactoryGirl.define do
       published_at { Time.current }
     end
 
+    trait :with_scope do
+      after(:create) do |participatory_process, _evaluator|
+        create(:scope,
+               organization: participatory_process.organization)
+      end
+    end
+
     trait :with_steps do
       after(:create) do |participatory_process, _evaluator|
         create(:participatory_process_step,
                active: true,
                participatory_process: participatory_process)
+        participatory_process.reload
+        participatory_process.steps.reload
       end
     end
   end
 
+  factory :participatory_process_group, class: Decidim::ParticipatoryProcessGroup do
+    name { Decidim::Faker::Localized.sentence(3) }
+    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
+    hero_image { test_file("city.jpeg", "image/jpeg") }
+    organization
+  end
+
   factory :participatory_process_step, class: Decidim::ParticipatoryProcessStep do
     title { Decidim::Faker::Localized.sentence(3) }
-    short_description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
     start_date 1.month.ago.at_midnight
     end_date 2.month.from_now.at_midnight
     position nil
     participatory_process
 
+    after(:create) do |step, _evaluator|
+      step.participatory_process.reload
+      step.participatory_process.steps.reload
+    end
+
     trait :active do
       active true
     end
@@ -139,9 +160,22 @@ FactoryGirl.define do
     phone { Faker::PhoneNumber.phone_number }
     avatar { test_file("avatar.jpg", "image/jpeg") }
 
+    transient do
+      users []
+    end
+
     trait :verified do
       verified_at { Time.current }
     end
+
+    after(:create) do |user_group, evaluator|
+      users = evaluator.users
+      next if users.empty?
+
+      users.each do |user|
+        create(:user_group_membership, user: user, user_group: user_group)
+      end
+    end
   end
 
   factory :user_group_membership, class: Decidim::UserGroupMembership do
@@ -201,6 +235,10 @@ FactoryGirl.define do
     manifest_name "dummy"
     published_at { Time.now }
 
+    after(:create) do |feature, _evaluator|
+      feature.participatory_process.steps.reload
+    end
+
     trait :unpublished do
       published_at { nil }
     end
@@ -234,6 +272,17 @@ FactoryGirl.define do
     subject { Decidim::Faker::Localized.sentence(3) }
     body { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
   end
+
+  factory :moderation, class: Decidim::Moderation do
+    reportable { build(:dummy_resource) }
+    participatory_process { reportable.feature.participatory_process }
+  end
+
+  factory :report, class: Decidim::Report do
+    moderation
+    user { build(:user, organization: moderation.reportable.organization) }
+    reason "spam"
+  end
 end
 
 def test_file(filename, content_type)