decidim-core 0.0.1 → 0.0.2

data/app/helpers/decidim/omniauth_helper.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+module Decidim
+  # Helper that provides methods to enable or disable omniauth buttons
+  module OmniauthHelper
+    # Public: returns true if the social provider is enabled
+    def social_provider_enabled?(provider)
+      Rails.application.secrets.dig(:omniauth, provider.to_s, "enabled")
+    end
+
+    # Public: returns true if any provider is enabled
+    def any_social_provider_enabled?
+      User.omniauth_providers.any? do |provider|
+        social_provider_enabled? provider
+      end
+    end
+
+    # Public: normalize providers names to they can be used for buttons
+    # and icons.
+    def normalize_provider_name(provider)
+      provider.to_s.split("_").first
+    end
+  end
+end

data/app/helpers/decidim/paginate_helper.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+module Decidim
+  # Helper to paginate collections.
+  module PaginateHelper
+    # Displays pagination links for the given collection, setting the correct
+    # theme. This mostly acts as a proxy for the underlying pagination engine.
+    #
+    # collection - a collection of elements that need to be paginated
+    # paginate_params - a Hash with options to delegate to the pagination helper.
+    def decidim_paginate(collection, paginate_params)
+      # Kaminari uses url_for to generate the url, but this doesn't play nice with our engine system
+      # and unless we remove these params they are added again as query string :(
+      default_params = {
+        participatory_process_id: nil,
+        feature_id: nil
+      }
+
+      paginate collection, theme: "decidim", params: paginate_params.merge(default_params)
+    end
+  end
+end

data/app/helpers/decidim/participatory_process_helper.rb

@@ -12,5 +12,19 @@ module Decidim
       dates = [participatory_process_step.start_date, participatory_process_step.end_date]
       dates.map { |date| date ? localize(date.to_date, format: :default) : "?" }.join(" - ")
     end
+
+    # Public: Returns an icon given an instance of a Feature. It defaults to
+    # a question mark when no icon is found.
+    #
+    # feature - The feature to generate the icon for.
+    #
+    # Returns an HTML tag with the icon.
+    def feature_icon(feature)
+      if feature.manifest.icon
+        external_icon feature.manifest.icon
+      else
+        icon "question-mark"
+      end
+    end
   end
 end

data/app/helpers/decidim/participatory_process_steps_helper.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+module Decidim
+  # Helper that provides a single method to give a class to a
+  # ParticipatoryProcessStep depending on their date.
+  module ParticipatoryProcessStepsHelper
+    # Returns the class for the given step depending on their end_date.
+    #
+    # step - the given ParticipatoryProcessStep
+    # past - a Boolean indicating if the step is past or not
+    #
+    # Returns a String.
+    def step_class(step, past)
+      status = past ? "" : "timeline__item--inactive"
+      step.active? ? "timeline__item--current" : status
+    end
+  end
+end

data/app/mailers/decidim/decidim_devise_mailer.rb

@@ -17,8 +17,8 @@ module Decidim
       with_user(user) do
         @token = token
 
-        if opts[:invitation_instructions] == "organization_admin_invitation_instructions"
-          opts[:subject] = I18n.t("devise.mailer.organization_admin_invitation_instructions.subject", organization: user.organization.name)
+        if opts[:invitation_instructions]
+          opts[:subject] = I18n.t("devise.mailer.#{opts[:invitation_instructions]}.subject", organization: user.organization.name)
         end
       end
 

data/app/models/decidim/feature.rb

@@ -11,6 +11,8 @@ module Decidim
 
     validates :participatory_process, presence: true
 
+    after_initialize :default_values
+
     # Public: Finds the manifest this feature is associated to.
     #
     # Returns a FeatureManifest.
@@ -26,5 +28,43 @@ module Decidim
     def manifest=(manifest)
       self.manifest_name = manifest.name
     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 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
+
+    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/app/models/decidim/identity.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Store user's social identities
+  class Identity < ApplicationRecord
+    belongs_to :user, foreign_key: :decidim_user_id, class_name: Decidim::User
+
+    validates :user, presence: true
+    validates :provider, presence: true
+    validates :uid, presence: true, uniqueness: { scope: :provider }
+  end
+end

data/app/models/decidim/organization.rb

@@ -6,7 +6,9 @@ module Decidim
   class Organization < ApplicationRecord
     has_many :participatory_processes, foreign_key: "decidim_organization_id", class_name: Decidim::ParticipatoryProcess, inverse_of: :organization
     has_many :static_pages, foreign_key: "decidim_organization_id", class_name: Decidim::StaticPage, inverse_of: :organization
-    has_many :scopes, foreign_key: "decidim_organization_id", class_name: Decidim::Scope, inverse_of: :organization
+    has_many :scopes, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: Decidim::Scope, inverse_of: :organization
+    has_many :admins, -> { where("roles @> ?", "{admin}") }, foreign_key: "decidim_organization_id", class_name: Decidim::User
+    has_many :users, foreign_key: "decidim_organization_id", class_name: Decidim::User
 
     validates :name, :host, uniqueness: true
 
@@ -16,14 +18,5 @@ module Decidim
     def homepage_big_url
       homepage_image.big.url
     end
-
-    # Fetches the admins of the given organization.
-    #
-    # Returns an ActiveRecord::Relation.
-    def admins
-      @admins ||= Decidim::User
-                  .where(organization: self)
-                  .where("roles @> ?", "{admin}")
-    end
   end
 end

data/app/models/decidim/user.rb

@@ -5,10 +5,12 @@ module Decidim
   # A User is a citizen that wants to join the platform to participate.
   class User < ApplicationRecord
     devise :invitable, :database_authenticatable, :registerable, :confirmable,
-           :recoverable, :rememberable, :trackable, :decidim_validatable
+           :recoverable, :rememberable, :trackable, :decidim_validatable,
+           :omniauthable, omniauth_providers: [:facebook, :twitter, :google_oauth2]
 
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: Decidim::Organization
     has_many :authorizations, foreign_key: "decidim_user_id", class_name: Decidim::Authorization, inverse_of: :user
+    has_many :identities, foreign_key: "decidim_user_id", class_name: Decidim::Identity
 
     ROLES = %w(admin moderator official).freeze
 

data/app/models/decidim/user_group.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A UserGroup is an organization of citizens
+  class UserGroup < ApplicationRecord
+    has_many :users, through: :memberships, class_name: Decidim::User, foreign_key: :decidim_user_id
+    has_many :memberships, class_name: Decidim::UserGroupMembership, foreign_key: :decidim_user_group_id
+
+    validates :name, presence: true
+    validates :document_number, presence: true
+    validates :phone, presence: true
+
+    # Public: Mark the user group as verified
+    def verify!
+      update_attribute(:verified, true)
+    end
+  end
+end

data/app/models/decidim/user_group_membership.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A UserGroupMembership associate user with user groups
+  class UserGroupMembership < ApplicationRecord
+    belongs_to :user, class_name: Decidim::User, foreign_key: :decidim_user_id
+    belongs_to :user_group, class_name: Decidim::UserGroup, foreign_key: :decidim_user_group_id
+  end
+end

data/app/services/decidim/authorization_handler.rb

@@ -2,9 +2,12 @@
 module Decidim
   # This is the base class for authorization handlers, all implementations
   # should inherit from it.
-  # Each AuthorizationHandler must define an `authorized?` method that will be
-  # used to check if the authorization is valid or not. When it is valid a new
-  # authorization will be created for the user.
+  # Each AuthorizationHandler is a form that will be used to check if the
+  # authorization is valid or not. When it is valid a new authorization will
+  # be created for the user.
+  #
+  # Feel free to use validations to assert fields against a remote API,
+  # local database, or whatever.
   #
   # It also sets two default attributes, `user` and `handler_name`.
   class AuthorizationHandler < Form
@@ -15,6 +18,13 @@ module Decidim
     # infer the class name of the authorization handler.
     attribute :handler_name, String
 
+    # A unique ID to be implemented by the authorization handler that ensures
+    # no duplicates are created. This uniqueness check will be skipped if
+    # unique_id returns nil.
+    def unique_id
+      nil
+    end
+
     # THe attributes of the handler that should be exposed as form input when
     # rendering the handler in a form.
     #
@@ -23,16 +33,6 @@ module Decidim
       attributes.except(:id, :user).keys
     end
 
-    # Whether the authorization is valid or not. Each AuthorizationHandler
-    # implementation must implemement this method. This is were you check for
-    # validation errors or against third party systems to validate the
-    # authorization.
-    #
-    # Returns a Boolean.
-    def authorized?
-      raise NotImplementedError
-    end
-
     # The String partial path so Rails can render the handler as a form. This
     # is useful if you want to have a custom view to render the form instead of
     # the default view.

data/app/services/decidim/resource_search.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+module Decidim
+  # This is the base class to be used by other search services.
+  # Searchlight documentation: https://github.com/nathanl/searchlight
+  class ResourceSearch < Searchlight::Search
+    # Initialize the Searchlight::Search base class with the options provided.
+    #
+    # scope - The scope used to create the base query
+    # options - A hash of options to modify the search. These options will be
+    #          converted to methods by SearchLight so they can be used on filter #
+    #          methods. (Default {})
+    def initialize(scope, options = {})
+      super(options)
+      @scope = scope
+    end
+
+    # Creates the SearchLight base query.
+    # Check if the option feature was provided.
+    def base_query
+      # raise order_start_time.inspect
+      raise "Missing feature" unless feature
+
+      @scope
+        .page(options[:page] || 1)
+        .per(options[:per_page] || 12)
+        .where(feature: feature)
+    end
+
+    # Handle the category_id filter
+    def search_category_id
+      query.where(decidim_category_id: category_ids)
+    end
+
+    private
+
+    # Private: Creates an array of category ids.
+    # It contains categories' subcategories ids as well.
+    def category_ids
+      feature
+        .categories
+        .where(id: category_id)
+        .or(feature.categories.where(parent_id: category_id))
+        .pluck(:id)
+    end
+
+    # Private: Since feature is not used by a search method we need
+    # to define the method manually.
+    def feature
+      options[:feature]
+    end
+  end
+end

data/app/uploaders/decidim/organization_logo_uploader.rb

@@ -3,7 +3,7 @@ module Decidim
   # This class deals with uploading hero images to ParticipatoryProcesses.
   class OrganizationLogoUploader < ImageUploader
     version :medium do
-      process resize_to_limit: [140, 45]
+      process resize_to_limit: [500, 500]
     end
   end
 end

data/app/views/decidim/authorizations/new.html.erb

@@ -11,8 +11,10 @@
         <div class="card">
           <div class="card__content">
             <%= authorization_form_for(handler) do |form| %>
+              <%= form.error_for(:base) %>
+
               <% if lookup_context.exists?(handler.to_partial_path, [], true) %>
-                <%= render partial: handler, as: "handler", locals: { form: form } %>
+                <%= render partial: handler.to_partial_path, locals: { handler: handler, form: form } %>
               <% else %>
                 <%= form.all_fields %>
                 <div class="actions">

data/app/views/decidim/devise/omniauth_registrations/new.html.erb

@@ -0,0 +1,40 @@
+<main class="wrapper">
+<div class="row collapse">
+  <div class="row collapse">
+    <div class="columns large-8 large-centered text-center page-title">
+      <h1><%= t(".sign_up") %></h1>
+      <p>
+        <%= t(".subtitle") %>
+      </p>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="columns large-6 medium-10 medium-centered">
+      <div class="card">
+        <div class="card__content">
+          <%= form_for(@form, as: resource_name, url: omniauth_registrations_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
+            <div class="user-person">
+              <div class="field">
+                <%= f.text_field :name, help_text: t("devise.registrations.new.username_help") %>
+              </div>
+            </div>
+
+            <div class="field">
+              <%= f.email_field :email %>
+            </div>
+
+            <%= f.hidden_field :uid %>
+            <%= f.hidden_field :provider %>
+            <%= f.hidden_field :oauth_signature %>
+
+            <div class="actions">
+              <%= f.submit t(".complete_profile"), class: "button expanded" %>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+</main>

data/app/views/decidim/devise/registrations/new.html.erb

@@ -17,7 +17,12 @@
     <div class="columns large-6 medium-10 medium-centered">
       <div class="card">
         <div class="card__content">
-          <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
+          <%= form_for(@form, as: resource_name, url: registration_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
+            <fieldset class="text-center">
+              <legend class="text-center heading5"><%= t(".sign_up_as.legend") %></legend>
+              <%= f.collection_radio_buttons :sign_up_as, [["user", t(".sign_up_as.user")], ["user_group", t(".sign_up_as.user_group") ]], :first, :last %>
+            </fieldset>
+
             <div class="user-person">
               <div class="field">
                 <%= f.text_field :name, help_text: t(".username_help") %>
@@ -36,6 +41,20 @@
               <%= f.password_field :password_confirmation, autocomplete: "off" %>
             </div>
 
+            <div class="user-group-fields">
+              <div class="field">
+                <%= f.text_field :user_group_name %>
+              </div>
+
+              <div class="field">
+                <%= f.text_field :user_group_document_number %>
+              </div>
+
+              <div class="field">
+                <%= f.text_field :user_group_phone %>
+              </div>
+            </div>
+
             <fieldset>
               <div class="field">
                 <%= f.check_box :tos_agreement, label: t(".tos_agreement", link: link_to(t(".terms"), page_path("terms-and-conditions"))) %>
@@ -51,5 +70,6 @@
       </div>
     </div>
   </div>
+  <%= render "decidim/devise/shared/omniauth_buttons" %>
 </div>
 </main>

data/app/views/decidim/devise/sessions/new.html.erb

@@ -38,5 +38,6 @@
         </div>
       </div>
     </div>
+    <%= render "decidim/devise/shared/omniauth_buttons" %>
   </div>
 </main>