decidim-initiatives 0.11.2 → 0.12.0.pre

data/lib/decidim/initiatives/participatory_space.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 Decidim.register_participatory_space(:initiatives) do |participatory_space|
+  participatory_space.stylesheet = "decidim/initiatives/initiatives"
+
   participatory_space.context(:public) do |context|
     context.engine = Decidim::Initiatives::Engine
     context.layout = "layouts/decidim/initiative"
@@ -15,7 +17,13 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
     Decidim::Initiative.where(organization: organization)
   end
 
+  participatory_space.register_resource(:initiative) do |resource|
+    resource.model_class_name = "Decidim::Initiative"
+    resource.card = "decidim/initiatives/initiative"
+  end
+
   participatory_space.model_class_name = "Decidim::Initiative"
+  participatory_space.permissions_class_name = "Decidim::Initiatives::Permissions"
 
   participatory_space.seeds do
     seeds_root = File.join(__dir__, "..", "..", "..", "db", "seeds")
@@ -38,20 +46,20 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
       end
     end
 
-    7.times do
+    Decidim::Initiative.states.keys.each do |state|
       Decidim::Initiative.skip_callback(:save, :after, :notify_state_change, raise: false)
       Decidim::Initiative.skip_callback(:create, :after, :notify_creation, raise: false)
 
       initiative = Decidim::Initiative.create!(
         title: Decidim::Faker::Localized.sentence(3),
         description: Decidim::Faker::Localized.sentence(25),
-        scoped_type: Decidim::InitiativesTypeScope.reorder("RANDOM()").first,
-        state: "published",
+        scoped_type: Decidim::InitiativesTypeScope.reorder(Arel.sql("RANDOM()")).first,
+        state: state,
         signature_type: "online",
         signature_start_time: DateTime.current - 7.days,
         signature_end_time:  DateTime.current + 7.days,
         published_at: DateTime.current - 7.days,
-        author: Decidim::User.reorder("RANDOM()").first,
+        author: Decidim::User.reorder(Arel.sql("RANDOM()")).first,
         organization: organization
       )
 

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

@@ -25,7 +25,7 @@ FactoryBot.define do
     published_at { Time.current }
     state "published"
     signature_type "online"
-    signature_start_time { Time.now.utc }
+    signature_start_time { Time.now.utc - 1.hour }
     signature_end_time { Time.now.utc + 120.days }
 
     scoped_type do
@@ -52,6 +52,10 @@ FactoryBot.define do
       signature_end_time nil
     end
 
+    trait :published do
+      state "published"
+    end
+
     trait :accepted do
       state "accepted"
     end
@@ -64,6 +68,14 @@ FactoryBot.define do
       state "rejected"
     end
 
+    trait :online do
+      signature_type "online"
+    end
+
+    trait :offline do
+      signature_type "offline"
+    end
+
     trait :acceptable do
       signature_start_time { Time.now.utc - 3.months }
       signature_end_time { Time.now.utc - 2.months }
@@ -104,6 +116,10 @@ FactoryBot.define do
     user { create(:user, :confirmed, organization: initiative.organization) }
     state "accepted"
 
+    trait :accepted do
+      state "accepted"
+    end
+
     trait :requested do
       state "requested"
     end

data/lib/decidim/initiatives/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-initiatives version.
   module Initiatives
     def self.version
-      "0.11.2"
+      "0.12.0.pre"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-initiatives
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0.pre
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-verifications
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 description: Citizen initiatives plugin for decidim.
 email:
 - jsperezg@gmail.com
@@ -132,6 +132,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/admin_decidim_initiatives_manifest.js
+- app/assets/config/decidim_initiatives_manifest.css
 - app/assets/config/decidim_initiatives_manifest.js
 - app/assets/javascripts/decidim/initiatives/admin/invite_users.js
 - app/assets/javascripts/decidim/initiatives/application.js
@@ -139,11 +140,16 @@ files:
 - app/assets/javascripts/decidim/initiatives/scoped_type.js
 - app/assets/javascripts/decidim/initiatives/social_share.js
 - app/assets/stylesheet/decidim/initiatives/admin.css.scss
-- app/assets/stylesheet/decidim/initiatives/application.css.scss
+- app/assets/stylesheet/decidim/initiatives/initiatives.scss
 - app/assets/stylesheet/decidim/initiatives/popularity_item.css.scss
 - app/assets/stylesheet/decidim/initiatives/print-initiative.css.scss
 - app/assets/stylesheet/decidim/initiatives/social_share.css.scss
 - app/assets/stylesheet/decidim/initiatives/statistics.css.scss
+- app/cells/decidim/initiatives/initiative_cell.rb
+- app/cells/decidim/initiatives/initiative_m/author.erb
+- app/cells/decidim/initiatives/initiative_m/footer.erb
+- app/cells/decidim/initiatives/initiative_m/tags.erb
+- app/cells/decidim/initiatives/initiative_m_cell.rb
 - app/commands/decidim/initiatives/admin/create_initiative_type.rb
 - app/commands/decidim/initiatives/admin/create_initiative_type_scope.rb
 - app/commands/decidim/initiatives/admin/publish_initiative.rb
@@ -158,7 +164,6 @@ files:
 - app/commands/decidim/initiatives/vote_initiative.rb
 - app/constraints/decidim/initiatives/current_component.rb
 - app/constraints/decidim/initiatives/current_initiative.rb
-- app/controllers/concerns/decidim/initiatives/action_authorization.rb
 - app/controllers/concerns/decidim/initiatives/admin/initiative_admin.rb
 - app/controllers/concerns/decidim/initiatives/needs_initiative.rb
 - app/controllers/concerns/decidim/initiatives/orderable.rb
@@ -171,6 +176,7 @@ files:
 - app/controllers/decidim/initiatives/admin/initiatives_controller.rb
 - app/controllers/decidim/initiatives/admin/initiatives_type_scopes_controller.rb
 - app/controllers/decidim/initiatives/admin/initiatives_types_controller.rb
+- app/controllers/decidim/initiatives/application_controller.rb
 - app/controllers/decidim/initiatives/committee_requests_controller.rb
 - app/controllers/decidim/initiatives/create_initiative_controller.rb
 - app/controllers/decidim/initiatives/initiative_types_controller.rb
@@ -180,6 +186,7 @@ files:
 - app/controllers/decidim/initiatives/initiatives_type_scopes_controller.rb
 - app/events/decidim/initiatives/create_initiative_event.rb
 - app/events/decidim/initiatives/endorse_initiative_event.rb
+- app/events/decidim/initiatives/milestone_completed_event.rb
 - app/forms/decidim/initiatives/admin/initiative_form.rb
 - app/forms/decidim/initiatives/admin/initiative_type_form.rb
 - app/forms/decidim/initiatives/admin/initiative_type_scope_form.rb
@@ -191,21 +198,13 @@ files:
 - app/helpers/decidim/initiatives/initiatives_helper.rb
 - app/mailers/decidim/initiatives/initiatives_mailer.rb
 - app/models/decidim/initiative.rb
-- app/models/decidim/initiatives/abilities/admin/attachments_ability.rb
-- app/models/decidim/initiatives/abilities/admin/committee_admin_ability.rb
-- app/models/decidim/initiatives/abilities/admin/committee_user_ability.rb
-- app/models/decidim/initiatives/abilities/admin/components_ability.rb
-- app/models/decidim/initiatives/abilities/admin/initiative_admin_ability.rb
-- app/models/decidim/initiatives/abilities/admin/initiative_type_ability.rb
-- app/models/decidim/initiatives/abilities/admin/initiative_user_ability.rb
-- app/models/decidim/initiatives/abilities/current_user_ability.rb
-- app/models/decidim/initiatives/abilities/everyone_ability.rb
-- app/models/decidim/initiatives/abilities/non_logged_user_ability.rb
-- app/models/decidim/initiatives/abilities/vote_ability.rb
 - app/models/decidim/initiatives_committee_member.rb
 - app/models/decidim/initiatives_type.rb
 - app/models/decidim/initiatives_type_scope.rb
 - app/models/decidim/initiatives_vote.rb
+- app/permissions/decidim/initiatives/admin/permissions.rb
+- app/permissions/decidim/initiatives/permissions.rb
+- app/presenters/decidim/initiative_presenter.rb
 - app/presenters/decidim/initiatives/admin_log/initiative_presenter.rb
 - app/presenters/decidim/initiatives/initiative_stats_presenter.rb
 - app/queries/decidim/initiatives/admin/manageable_initiatives.rb
@@ -258,7 +257,6 @@ files:
 - app/views/decidim/initiatives/initiatives/_result.html.erb
 - app/views/decidim/initiatives/initiatives/_statistics.html.erb
 - app/views/decidim/initiatives/initiatives/_supports.html.erb
-- app/views/decidim/initiatives/initiatives/_supports_count.html.erb
 - app/views/decidim/initiatives/initiatives/_tags.html.erb
 - app/views/decidim/initiatives/initiatives/_vote_button.html.erb
 - app/views/decidim/initiatives/initiatives/_vote_cabin.html.erb
@@ -322,7 +320,7 @@ files:
 - db/migrate/20171031183855_add_offline_votes_to_initiative.rb
 - db/migrate/20171102094250_drop_initiative_description_index.rb
 - db/migrate/20171102094556_create_initiative_description_index.rb
-- db/migrate/20171109132011_enable_pg_extensions.rb
+- db/migrate/20171109132011_enable_pg_trgm_extension_for_initiatives.rb
 - db/migrate/20171204094639_drop_decidim_initiatives_extra_data.rb
 - db/migrate/20171204103119_remove_requires_validation_from_decidim_initiatives_type.rb
 - db/migrate/20171214161410_add_unique_on_votes.rb
@@ -353,9 +351,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.1
 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

data/app/controllers/concerns/decidim/initiatives/action_authorization.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require "active_support/concern"
-
-module Decidim
-  module Initiatives
-    module ActionAuthorization
-      extend ActiveSupport::Concern
-
-      included do
-        helper_method :action_authorization
-      end
-
-      # Public: Returns the authorization object for an authorization.
-      #
-      # action_name - The action to authorize against.
-      #
-      # Returns an AuthorizationStatus
-      def action_authorization(action_name)
-        return AuthorizationStatus.new(:ok) if can?(action_name.to_sym, Initiative)
-
-        AuthorizationStatus.new(:denied)
-      end
-
-      class AuthorizationStatus
-        attr_reader :code
-
-        def initialize(code)
-          @code = code.to_sym
-        end
-
-        def ok?
-          @code == :ok
-        end
-      end
-    end
-  end
-end

data/app/models/decidim/initiatives/abilities/admin/attachments_ability.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Initiatives
-    module Abilities
-      module Admin
-        # Defines the abilities related to user able to administer attachments
-        # for an initiative.
-        # Intended to be used with `cancancan`.
-        class AttachmentsAbility
-          include CanCan::Ability
-
-          attr_reader :user, :context
-
-          def initialize(user, context)
-            return unless user
-
-            @user = user
-            @context = context
-
-            define_abilities
-          end
-
-          private
-
-          def define_abilities
-            return if user.admin?
-            return unless context[:current_participatory_space].is_a? Initiative
-
-            can :read, Decidim::Attachment do |attachment|
-              attachment.attached_to.is_a?(Decidim::Initiative) &&
-                attachment.attached_to.has_authorship?(user)
-            end
-
-            can :create, Decidim::Attachment if has_initiatives?(user)
-            can :update, Decidim::Attachment do |attachment|
-              attachment.attached_to.is_a?(Decidim::Initiative) &&
-                attachment.attached_to.has_authorship?(user)
-            end
-
-            can :destroy, Decidim::Attachment do |attachment|
-              attachment.attached_to.is_a?(Decidim::Initiative) &&
-                attachment.attached_to.has_authorship?(user)
-            end
-          end
-
-          def has_initiatives?(user)
-            initiatives = InitiativesCreated.by(user) | InitiativesPromoted.by(user)
-            initiatives.any?
-          end
-        end
-      end
-    end
-  end
-end

data/app/models/decidim/initiatives/abilities/admin/committee_admin_ability.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Initiatives
-    module Abilities
-      module Admin
-        # Defines the abilities related to admin users able to administer
-        # promotal committee membership requests.
-        # Intended to be used with `cancancan`.
-        class CommitteeAdminAbility
-          include CanCan::Ability
-
-          attr_reader :user, :context
-
-          def initialize(user, context)
-            return unless user&.admin?
-
-            @user = user
-            @context = context
-
-            can :manage_membership, Decidim::Initiative
-            can :index, InitiativesCommitteeMember
-
-            can :approve, InitiativesCommitteeMember do |request|
-              !request.accepted?
-            end
-
-            can :revoke, InitiativesCommitteeMember do |request|
-              !request.rejected?
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/app/models/decidim/initiatives/abilities/admin/committee_user_ability.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Initiatives
-    module Abilities
-      module Admin
-        # Defines the abilities related to plain users able to administer
-        # promotal committee membership requests.
-        # Intended to be used with `cancancan`.
-        class CommitteeUserAbility
-          include CanCan::Ability
-
-          attr_reader :user, :context
-
-          def initialize(user, context)
-            return unless user
-            return if user&.admin?
-
-            @user = user
-            @context = context
-
-            can :manage_membership, Decidim::Initiative do |initiative|
-              initiative.has_authorship?(user)
-            end
-
-            can :index, InitiativesCommitteeMember if has_initiatives?(user)
-            can :approve, InitiativesCommitteeMember do |request|
-              request.initiative.has_authorship?(user) &&
-                !request.initiative.published? &&
-                !request.accepted?
-            end
-
-            can :revoke, InitiativesCommitteeMember do |request|
-              request.initiative.has_authorship?(user) &&
-                !request.initiative.published? &&
-                !request.rejected?
-            end
-          end
-
-          private
-
-          def has_initiatives?(user)
-            initiatives = InitiativesCreated.by(user) | InitiativesPromoted.by(user)
-            initiatives.any?
-          end
-        end
-      end
-    end
-  end
-end