decidim-surveys 0.10.1 → 0.11.0.pre1

data/lib/decidim/surveys/engine.rb

@@ -15,6 +15,10 @@ module Decidim
         root to: "surveys#show"
       end
 
+      initializer "decidim_surveys.assets" do |app|
+        app.config.assets.precompile += %w(decidim_surveys_manifest.js)
+      end
+
       initializer "decidim_surveys.inject_abilities_to_user" do |_app|
         Decidim.configure do |config|
           config.abilities += ["Decidim::Surveys::Abilities::CurrentUserAbility"]
@@ -24,7 +28,7 @@ module Decidim
       initializer "decidim_changes" do
         Decidim::SettingsChange.subscribe "surveys" do |changes|
           Decidim::Surveys::SettingsChangeJob.perform_later(
-            changes[:feature_id],
+            changes[:component_id],
             changes[:previous_settings],
             changes[:current_settings]
           )

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

@@ -4,8 +4,8 @@ require "decidim/core/test/factories"
 require "decidim/participatory_processes/test/factories"
 
 FactoryBot.define do
-  factory :surveys_feature, parent: :feature do
-    name { Decidim::Features::Namer.new(participatory_space.organization.available_locales, :surveys).i18n_name }
+  factory :surveys_component, parent: :component do
+    name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :surveys).i18n_name }
     manifest_name :surveys
     participatory_space { create(:participatory_process, :with_steps) }
   end
@@ -18,22 +18,38 @@ FactoryBot.define do
       end
     end
     tos { Decidim::Faker::Localized.sentence(4) }
-    feature { build(:surveys_feature) }
+    component { build(:surveys_component) }
   end
 
   factory :survey_question, class: Decidim::Surveys::SurveyQuestion do
+    transient do
+      answer_options []
+    end
+
     body { Decidim::Faker::Localized.sentence }
     mandatory false
     position 0
-    question_type Decidim::Surveys::SurveyQuestion::TYPES.first
-    answer_options []
+    question_type { Decidim::Surveys::SurveyQuestion::TYPES.first }
     survey
+
+    before(:create) do |question, evaluator|
+      evaluator.answer_options.each do |answer_option|
+        question.answer_options.build(
+          body: answer_option["body"],
+          free_text: answer_option["free_text"]
+        )
+      end
+    end
   end
 
   factory :survey_answer, class: Decidim::Surveys::SurveyAnswer do
-    body { Decidim::Faker::Localized.sentence }
+    body { "hola" }
     survey
     question { create(:survey_question, survey: survey) }
     user { create(:user, organization: survey.organization) }
   end
+
+  factory :survey_answer_option, class: Decidim::Surveys::SurveyAnswerOption do
+    body { Decidim::Faker::Localized.sentence }
+  end
 end

data/lib/decidim/surveys/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-surveys version.
   module Surveys
     def self.version
-      "0.10.1"
+      "0.11.0.pre1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-surveys
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0.pre1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,70 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
-- !ruby/object:Gem::Dependency
-  name: jquery-tmpl-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 0.11.0.pre1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 description: A surveys component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -94,10 +80,14 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/admin/decidim_surveys_manifest.js
+- app/assets/config/decidim_surveys_manifest.js
 - app/assets/images/decidim/surveys/icon.svg
-- app/assets/javascripts/decidim/surveys/admin/auto_label_by_position.component.js.es6
-- app/assets/javascripts/decidim/surveys/admin/dynamic_fields.component.js.es6
+- app/assets/javascripts/decidim/surveys/admin/auto_buttons_by_min_items.component.js.es6
+- app/assets/javascripts/decidim/surveys/admin/auto_select_options_by_total_items.component.js.es6
 - app/assets/javascripts/decidim/surveys/admin/surveys.js.es6
+- app/assets/javascripts/decidim/surveys/autosortable_checkboxes.component.js.es6
+- app/assets/javascripts/decidim/surveys/option_attached_inputs.component.js.es6
+- app/assets/javascripts/decidim/surveys/surveys.js.es6
 - app/assets/stylesheets/decidim/surveys/surveys.scss
 - app/commands/decidim/surveys/admin/update_survey.rb
 - app/commands/decidim/surveys/answer_survey.rb
@@ -108,9 +98,10 @@ files:
 - app/controllers/decidim/surveys/surveys_controller.rb
 - app/events/decidim/surveys/closed_survey_event.rb
 - app/events/decidim/surveys/opened_survey_event.rb
+- app/forms/decidim/surveys/admin/survey_answer_option_form.rb
 - app/forms/decidim/surveys/admin/survey_form.rb
-- app/forms/decidim/surveys/admin/survey_question_answer_option_form.rb
 - app/forms/decidim/surveys/admin/survey_question_form.rb
+- app/forms/decidim/surveys/survey_answer_choice_form.rb
 - app/forms/decidim/surveys/survey_answer_form.rb
 - app/forms/decidim/surveys/survey_form.rb
 - app/helpers/decidim/surveys/admin/application_helper.rb
@@ -121,12 +112,15 @@ files:
 - app/models/decidim/surveys/application_record.rb
 - app/models/decidim/surveys/survey.rb
 - app/models/decidim/surveys/survey_answer.rb
+- app/models/decidim/surveys/survey_answer_choice.rb
+- app/models/decidim/surveys/survey_answer_option.rb
 - app/models/decidim/surveys/survey_question.rb
 - app/queries/decidim/surveys/survey_user_answers.rb
 - app/views/decidim/surveys/admin/surveys/_answer_option.html.erb
 - app/views/decidim/surveys/admin/surveys/_form.html.erb
 - app/views/decidim/surveys/admin/surveys/_question.html.erb
 - app/views/decidim/surveys/admin/surveys/edit.html.erb
+- app/views/decidim/surveys/surveys/_answer.html.erb
 - app/views/decidim/surveys/surveys/show.html.erb
 - config/locales/ca.yml
 - config/locales/en.yml
@@ -150,11 +144,20 @@ files:
 - db/migrate/20170522075938_add_mandatory_to_surveys_questions.rb
 - db/migrate/20170524122229_add_question_type_to_surveys_questions.rb
 - db/migrate/20170525132233_add_answer_options_to_surveys_questions.rb
+- db/migrate/20180305133837_rename_features_to_components_at_surveys.rb
+- db/migrate/20180314225829_add_max_choices_to_survey_questions.rb
+- db/migrate/20180321141024_add_description_to_decidim_survey_questions.rb
+- db/migrate/20180405014929_add_choices_to_decidim_survey_answers.rb
+- db/migrate/20180405015012_create_decidim_survey_answer_options.rb
+- db/migrate/20180405015147_create_decidim_survey_answer_choices.rb
+- db/migrate/20180405015258_add_free_text_to_survey_answer_options.rb
+- db/migrate/20180405015314_add_custom_body_to_survey_answer_choices.rb
+- db/migrate/20180406201818_add_position_to_decidim_survey_answer_choices.rb
 - lib/decidim/surveys.rb
 - lib/decidim/surveys/admin.rb
 - lib/decidim/surveys/admin_engine.rb
+- lib/decidim/surveys/component.rb
 - lib/decidim/surveys/engine.rb
-- lib/decidim/surveys/feature.rb
 - lib/decidim/surveys/survey_user_answers_serializer.rb
 - lib/decidim/surveys/test/factories.rb
 - lib/decidim/surveys/version.rb
@@ -173,9 +176,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 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.3

data/app/assets/javascripts/decidim/surveys/admin/auto_label_by_position.component.js.es6

@@ -1,33 +0,0 @@
-((exports) => {
-  class AutoLabelByPositionComponent {
-    constructor(options = {}) {
-      this.listSelector = options.listSelector;
-      this.labelSelector = options.labelSelector;
-      this.onPositionComputed = options.onPositionComputed;
-
-      this.run();
-    }
-
-    run() {
-      const $list = $(this.listSelector);
-
-      $list.each((idx, el) => {
-        const $label = $(el).find(this.labelSelector);
-        const labelContent = $label.html();
-
-        if (labelContent.match(/#(\d+)/)) {
-          $label.html(labelContent.replace(/#(\d+)/, `#${idx + 1}`));
-        } else {
-          $label.html(`${labelContent} #${idx + 1}`);
-        }
-
-        if (this.onPositionComputed) {
-          this.onPositionComputed(el, idx);
-        }
-      });
-    }
-  }
-
-  exports.DecidimAdmin = exports.DecidimAdmin || {};
-  exports.DecidimAdmin.AutoLabelByPositionComponent = AutoLabelByPositionComponent;
-})(window);

data/app/assets/javascripts/decidim/surveys/admin/dynamic_fields.component.js.es6

@@ -1,95 +0,0 @@
-((exports) => {
-  class DynamicFieldsComponent {
-    constructor(options = {}) {
-      this.templateId = options.templateId;
-      this.wrapperSelector = options.wrapperSelector;
-      this.containerSelector = options.containerSelector;
-      this.fieldSelector = options.fieldSelector;
-      this.addFieldButtonSelector = options.addFieldButtonSelector;
-      this.removeFieldButtonSelector = options.removeFieldButtonSelector;
-      this.onAddField = options.onAddField;
-      this.onRemoveField = options.onRemoveField;
-      this.tabsPrefix = options.tabsPrefix;
-      this._compileTemplate();
-      this._bindEvents();
-    }
-
-    _compileTemplate() {
-      $.template(this.templateId, $(`#${this.templateId}`).html());
-    }
-
-    _bindEvents() {
-      $(this.wrapperSelector).on('click', this.addFieldButtonSelector, (event) =>
-        this._bindSafeEvent(event, () => this._addField())
-      );
-
-      $(this.wrapperSelector).on('click', this.removeFieldButtonSelector, (event) =>
-        this._bindSafeEvent(event, (target) => this._removeField(target))
-      );
-    }
-
-    _bindSafeEvent(event, cb) {
-      event.preventDefault();
-      event.stopPropagation();
-
-      try {
-        return cb(event.target);
-      } catch (error) {
-        console.error(error); // eslint-disable-line no-console
-        return error;
-      }
-    }
-
-    _addField() {
-      const $container = $(this.wrapperSelector).find(this.containerSelector);
-      const uid = this._getUID();
-      const tabsId = `${this.tabsPrefix}-${uid}`;
-
-      const $newField = $.tmpl(this.templateId, { tabsId });
-
-      $newField.attr('id', `${tabsId}-field`);
-      $newField.find('[disabled]').attr('disabled', false);
-      $newField.find('ul.tabs').attr('data-tabs', true);
-
-      $newField.appendTo($container);
-      $newField.foundation();
-
-      if (this.onAddField) {
-        this.onAddField($newField);
-      }
-    }
-
-    _removeField(target) {
-      const $target = $(target);
-      const $removedField = $target.parents(this.fieldSelector);
-      const idInput = $removedField.find('input').filter((idx, input) => input.name.match(/id/));
-
-      if (idInput.length > 0) {
-        const deletedInput = $removedField.find('input').filter((idx, input) => input.name.match(/delete/));
-
-        if (deletedInput.length > 0) {
-          $(deletedInput[0]).val(true);
-        }
-
-        $removedField.addClass('hidden');
-        $removedField.hide();
-      } else {
-        $removedField.remove();
-      }
-
-      if (this.onRemoveField) {
-        this.onRemoveField($removedField);
-      }
-    }
-
-    _getUID() {
-      return `${new Date().getTime()}-${Math.floor(Math.random() * 1000000)}`;
-    }
-  }
-
-  exports.DecidimAdmin = exports.DecidimAdmin || {};
-  exports.DecidimAdmin.DynamicFieldsComponent = DynamicFieldsComponent;
-  exports.DecidimAdmin.createDynamicFields = (options) => {
-    return new DynamicFieldsComponent(options);
-  };
-})(window);

data/app/forms/decidim/surveys/admin/survey_question_answer_option_form.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Surveys
-    module Admin
-      # This class holds a Form to update survey question answer options
-      class SurveyQuestionAnswerOptionForm < Decidim::Form
-        include TranslatableAttributes
-
-        attribute :body, String
-        translatable_attribute :body, String
-      end
-    end
-  end
-end