decidim-sortitions 0.11.2 → 0.12.0.pre

data/lib/decidim/sortitions/component.rb

@@ -5,6 +5,7 @@ Decidim.register_component(:sortitions) do |component|
   component.admin_engine = Decidim::Sortitions::AdminEngine
   component.icon = "decidim/sortitions/icon.svg"
   # component.stylesheet = "decidim/sortitions/sortitions"
+  component.permissions_class_name = "Decidim::Sortitions::Permissions"
 
   component.on(:before_destroy) do |instance|
     raise StandardError, "Can't remove this component" if Decidim::Sortitions::Sortition.where(component: instance).any?
@@ -18,9 +19,10 @@ Decidim.register_component(:sortitions) do |component|
   end
 
   # Register an optional resource that can be referenced from other resources.
-  component.register_resource do |resource|
+  component.register_resource(:sortition) do |resource|
     resource.model_class_name = "Decidim::Sortitions::Sortition"
     resource.template = "decidim/sortitions/sortitions/linked_sortitions"
+    resource.card = "decidim/sortitions/sortition"
   end
 
   component.register_stat :sortitions_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, start_at, end_at|

data/lib/decidim/sortitions/engine.rb

@@ -21,6 +21,11 @@ module Decidim
       initializer "decidim_sorititions.assets" do |app|
         app.config.assets.precompile += %w(decidim_sortitions_manifest.js decidim_sortitions_manifest.css)
       end
+
+      initializer "decidim_sortitions.add_cells_view_paths" do
+        Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Sortitions::Engine.root}/app/cells")
+        Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Sortitions::Engine.root}/app/views") # for proposal partials
+      end
     end
   end
 end

data/lib/decidim/sortitions/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Sortitions
     def self.version
-      "0.11.2"
+      "0.12.0.pre"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-sortitions
 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-proposals
   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: social-share-button
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,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: This module makes possible to select amont a set of proposal by sortition
 email:
 - jsperezg@gmail.com
@@ -110,6 +110,10 @@ files:
 - app/assets/javascripts/decidim/sortitions/social_share.js
 - app/assets/stylesheets/decidim/sortitions/_sortitions.scss
 - app/assets/stylesheets/decidim/sortitions/social_share.css.scss
+- app/cells/decidim/sortitions/sortition_cell.rb
+- app/cells/decidim/sortitions/sortition_m/data.erb
+- app/cells/decidim/sortitions/sortition_m/footer.erb
+- app/cells/decidim/sortitions/sortition_m_cell.rb
 - app/commands/decidim/sortitions/admin/create_sortition.rb
 - app/commands/decidim/sortitions/admin/destroy_sortition.rb
 - app/commands/decidim/sortitions/admin/update_sortition.rb
@@ -125,10 +129,10 @@ files:
 - app/forms/decidim/sortitions/admin/sortition_form.rb
 - app/helpers/decidim/sortitions/admin/sortitions_helper.rb
 - app/helpers/decidim/sortitions/sortitions_helper.rb
-- app/models/decidim/sortitions/abilities/admin/admin_ability.rb
-- app/models/decidim/sortitions/abilities/admin/process_admin_ability.rb
 - app/models/decidim/sortitions/application_record.rb
 - app/models/decidim/sortitions/sortition.rb
+- app/permissions/decidim/sortitions/admin/permissions.rb
+- app/permissions/decidim/sortitions/permissions.rb
 - app/presenters/decidim/sortitions/admin_log/sortition_presenter.rb
 - app/queries/decidim/sortitions/admin/participatory_space_proposal_components.rb
 - app/queries/decidim/sortitions/admin/participatory_space_proposals.rb
@@ -209,9 +213,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/models/decidim/sortitions/abilities/admin/admin_ability.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Sortitions
-    module Abilities
-      module Admin
-        # Defines the abilities for a user in the admin section. Intended to be
-        # used with `cancancan`.
-        class AdminAbility < Decidim::Abilities::AdminAbility
-          def define_abilities
-            super
-
-            can :manage, Sortition
-            cannot :destroy, Sortition
-            can :destroy, Sortition do |sortition|
-              !sortition.cancelled?
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/app/models/decidim/sortitions/abilities/admin/process_admin_ability.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Sortitions
-    module Abilities
-      module Admin
-        class ProcessAdminAbility
-          include CanCan::Ability
-
-          attr_reader :user, :context
-
-          def initialize(user, context)
-            return unless user
-            return if user.admin?
-
-            @user = user
-            @context = context
-
-            return unless process_administrator?
-
-            can :manage, Sortition
-            cannot :destroy, Sortition
-            can :destroy, Sortition do |sortition|
-              !sortition.cancelled?
-            end
-          end
-
-          private
-
-          def process_administrator?
-            return false unless current_participatory_space.is_a? Decidim::ParticipatoryProcess
-
-            Decidim::ParticipatoryProcesses::Admin::AdminUsers
-              .for(current_participatory_space)
-              .where(id: user.id)
-              .any?
-          end
-
-          def current_participatory_space
-            @current_participatory_space ||= @context[:current_participatory_space]
-          end
-        end
-      end
-    end
-  end
-end