decidim-surveys 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c7160ceecc7ac57c0cae86f9766bcc485a47374
-  data.tar.gz: cf3591ea30821b6d495c9f0b00eb25100f8c740b
+  metadata.gz: 7398eacc5fa2795d7160a478220c2a5f8a9f61df
+  data.tar.gz: ab007daf3c31a48347381a4c62321116b011f954
 SHA512:
-  metadata.gz: f440bfbc35c95363d90ef75bc1708fd4f470664ca99b6269abb4e42d69099378d28519002f5f8f9d9470ebc9ed6c46e8d5a26e1338f4f86727e6fc579c645d65
-  data.tar.gz: 59cd39dd2aa9aa863b301c25feb9cc5c996e1fc39d342debccb1067040b810137148f533d1477b63b4b823f902ceee42eda182b1b6cc0adf52884681fa28a29b
+  metadata.gz: f8151f263e185ae8b81216fc4cf8d4c29aec8f8239e39a1a804486cd5b62a145afadfb99620c30a0c03843e38adcef32ee308d4a93d81c9cf417f8c1b051857b
+  data.tar.gz: '0282749f7bfe9e267ec17c88caac0e77d4ebcc6359053cff78680c2ada7b62f123bec3be3ac8e5106044e52eb54d87afdf6222e32010ba0de84b5b406848e08e'

data/app/models/decidim/surveys/abilities/admin_ability.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Surveys
+    module Abilities
+      # Defines the abilities related to surveys for a logged in admin user.
+      # Intended to be used with `cancancan`.
+      class AdminAbility < Decidim::Abilities::AdminAbility
+        def define_abilities
+          super
+
+          can :manage, Survey
+        end
+      end
+    end
+  end
+end

data/app/models/decidim/surveys/abilities/{current_user.rb → current_user_ability.rb}

@@ -5,7 +5,7 @@ module Decidim
     module Abilities
       # Defines the abilities related to surveys for a logged in user.
       # Intended to be used with `cancancan`.
-      class CurrentUser
+      class CurrentUserAbility
         include CanCan::Ability
 
         attr_reader :user, :context

data/app/models/decidim/surveys/abilities/participatory_process_admin_ability.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Surveys
+    module Abilities
+      # Defines the abilities related to surveys for a logged in process admin user.
+      # Intended to be used with `cancancan`.
+      class ParticipatoryProcessAdminAbility < Decidim::Abilities::ParticipatoryProcessAdminAbility
+        def define_participatory_process_abilities
+          super
+
+          can :manage, Survey do |survey|
+            can_manage_process?(survey.feature.participatory_process)
+          end
+        end
+      end
+    end
+  end
+end

data/config/locales/ca.yml

@@ -58,7 +58,7 @@ ca:
           answer_survey:
             anonymous_user_message: <a href="%{sign_in_link}">Entra amb el teu compte</a> o <a href="%{sign_up_link}">dona't d'alta</a> per contestar l'enquesta.
             title: Respon a l'enquesta
-          are_you_sure: Aquesta acció no es pot desfer i no podràs editar les respostes. N'estàs segur?
+          are_you_sure: Aquesta acció no es pot desfer i no podràs editar les respostes. Segur que vols seguir?
           submit: Enviar
           survey_answered:
             body: Ja ha respost a aquesta enquesta.

data/lib/decidim/surveys/admin_engine.rb

@@ -21,8 +21,10 @@ module Decidim
 
       initializer "decidim_surveys.inject_abilities_to_user" do |_app|
         Decidim.configure do |config|
-          config.admin_abilities += ["Decidim::Surveys::Abilities::AdminUser"]
-          config.admin_abilities += ["Decidim::Surveys::Abilities::ProcessAdminUser"]
+          config.admin_abilities += [
+            "Decidim::Surveys::Abilities::AdminAbility",
+            "Decidim::Surveys::Abilities::ParticipatoryProcessAdminAbility"
+          ]
         end
       end
 

data/lib/decidim/surveys/engine.rb

@@ -17,7 +17,7 @@ module Decidim
 
       initializer "decidim_surveys.inject_abilities_to_user" do |_app|
         Decidim.configure do |config|
-          config.abilities += ["Decidim::Surveys::Abilities::CurrentUser"]
+          config.abilities += ["Decidim::Surveys::Abilities::CurrentUserAbility"]
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-surveys
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: jquery-tmpl-rails
   requirement: !ruby/object:Gem::Requirement
@@ -46,14 +46,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 description: A component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com
@@ -84,9 +84,9 @@ files:
 - app/forms/decidim/surveys/survey_answer_form.rb
 - app/forms/decidim/surveys/survey_form.rb
 - app/helpers/decidim/surveys/admin/application_helper.rb
-- app/models/decidim/surveys/abilities/admin_user.rb
-- app/models/decidim/surveys/abilities/current_user.rb
-- app/models/decidim/surveys/abilities/process_admin_user.rb
+- app/models/decidim/surveys/abilities/admin_ability.rb
+- app/models/decidim/surveys/abilities/current_user_ability.rb
+- app/models/decidim/surveys/abilities/participatory_process_admin_ability.rb
 - app/models/decidim/surveys/application_record.rb
 - app/models/decidim/surveys/survey.rb
 - app/models/decidim/surveys/survey_answer.rb

data/app/models/decidim/surveys/abilities/admin_user.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Surveys
-    module Abilities
-      # Defines the abilities related to surveys for a logged in admin user.
-      # Intended to be used with `cancancan`.
-      class AdminUser
-        include CanCan::Ability
-
-        attr_reader :user, :context
-
-        def initialize(user, context)
-          return unless user && user.role?(:admin)
-
-          @user = user
-          @context = context
-
-          can :manage, Survey
-        end
-
-        private
-
-        def current_settings
-          context.fetch(:current_settings, nil)
-        end
-
-        def feature_settings
-          context.fetch(:feature_settings, nil)
-        end
-      end
-    end
-  end
-end

data/app/models/decidim/surveys/abilities/process_admin_user.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Surveys
-    module Abilities
-      # Defines the abilities related to surveys for a logged in process admin user.
-      # Intended to be used with `cancancan`.
-      class ProcessAdminUser
-        include CanCan::Ability
-
-        attr_reader :user, :context
-
-        def initialize(user, context)
-          return unless user && !user.role?(:admin)
-
-          @user = user
-          @context = context
-
-          can :manage, Survey do |survey|
-            participatory_processes.include?(survey.feature.participatory_process)
-          end
-        end
-
-        private
-
-        def current_settings
-          context.fetch(:current_settings, nil)
-        end
-
-        def feature_settings
-          context.fetch(:feature_settings, nil)
-        end
-
-        def current_feature
-          context.fetch(:current_feature, nil)
-        end
-
-        def participatory_processes
-          @participatory_processes ||= Decidim::Admin::ManageableParticipatoryProcessesForUser.for(@user)
-        end
-      end
-    end
-  end
-end