helena 1.3.0 → 2.1.0

data/config/locales/views/sessions/en.yml

@@ -5,6 +5,7 @@ en:
         next: Next
         save: Save
         back: Back
+        question_group_legend: Page %{page}
 
       end_message:
         message: Thank you for participating.

data/db/seeds.rb

@@ -16,7 +16,7 @@ end
 
 def publish(version)
   published_version = Helena::VersionPublisher.publish(version)
-  published_version.notes = Faker::Lorem.paragraph(1)
+  published_version.notes = Faker::Lorem.paragraph
   published_version.save
   published_version
 end

data/helena.gemspec

@@ -1,4 +1,4 @@
-$:.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 
 # Maintain your gem's version:
 require 'helena/version'
@@ -9,35 +9,30 @@ Gem::Specification.new do |s|
   s.version     = Helena::VERSION
   s.authors     = ['Markus Graf']
   s.email       = ['info@markusgraf.ch']
-  s.licenses    = ['GPL-3']
+  s.licenses    = ['GPL-3.0+']
   s.homepage    = 'https://github.com/gurix/helena'
   s.summary     = 'Helena is an online survey/test framework designed for agile
 survey/test development, longitudinal studies and instant feedback.'
   s.description = 'Helena is an online survey/test framework designed for agile
 survey/test development, longitudinal studies and instant feedback.'
 
-  s.files        = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {spec}/*`.split("\n")
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {spec}/*`.split("\n")
 
-  s.add_dependency 'rails', '>= 4.2'
   s.add_dependency 'mongoid', '>= 4.0'
-  s.add_dependency 'mongoid_orderable', '~> 4.1'
   s.add_dependency 'mongoid-simple-tags', '>= 0.1.3'
-  s.add_dependency 'haml-rails', '~> 1.0'
-  s.add_dependency 'slim', '~> 3.0'
-  s.add_dependency 'jquery-rails', '~> 4.0'
-  s.add_dependency 'sass-rails', '~> 5.0'
-  s.add_dependency 'bootstrap-sass', '~> 3.2'
-  s.add_dependency 'simple_form', '~> 3.2'
+  s.add_dependency 'mongoid-tree', '>= 2.0'
+  s.add_dependency 'mongoid_orderable', '>= 5.2'
+  s.add_dependency 'rails', '>= 4.2'
   s.add_dependency 'rails-i18n', '>= 4.0'
-  s.add_dependency 'responders', '~> 2.0'
-  s.add_dependency 'browser', '~> 2.0'
-  s.add_dependency 'mongoid-tree', '~> 2.0'
+  s.add_dependency 'responders', '>= 2.0'
+  s.add_dependency 'sass-rails', '>= 5.0'
+  s.add_dependency 'simple_form', '>= 4'
+  s.add_dependency 'slim', '>= 3.0'
 
-  s.add_development_dependency 'rspec-rails', '~> 3'
-  s.add_development_dependency 'rspec-collection_matchers', '~> 1'
+  s.add_development_dependency 'capybara', '>= 2.3'
   s.add_development_dependency 'factory_bot_rails'
-  s.add_development_dependency 'faker', '~> 1.4'
-  s.add_development_dependency 'capybara', '~> 2.3'
-  s.add_development_dependency "appraisal"
+  s.add_development_dependency 'faker', '>= 1.4'
+  s.add_development_dependency 'rspec-collection_matchers', '>= 1'
+  s.add_development_dependency 'rspec-rails', '>= 3'
 end

data/lib/helena.rb

@@ -1,14 +1,11 @@
 require 'helena/engine'
-require 'haml'
 require 'helena/version_publisher'
 require 'helena/survey_importer'
 require 'mongoid'
-require 'simple_form' # TODO: Remove this when amdin interface is finally moved
 require 'mongoid_orderable'
 require 'mongoid-simple-tags'
 require 'slim'
 require 'mongoid/tree'
-require 'browser'
 
 module Helena
 end

data/lib/helena/engine.rb

@@ -5,7 +5,7 @@ module Helena
 
     # Thanks to https://github.com/thoughtbot/factory_girl_rails/pull/42
     initializer 'helena.factories', after: 'factory_bot.set_factory_paths' do
-      FactoryBot.definition_file_paths << File.expand_path('../../../spec/factories', __FILE__) if defined?(FactoryBot)
+      FactoryBot.definition_file_paths << File.expand_path('../../spec/factories/helena', __dir__) if defined?(FactoryBot)
     end
 
     config.to_prepare do

data/lib/helena/survey_importer.rb

@@ -5,7 +5,7 @@ module Helena
     attr_accessor :survey
 
     def initialize(yaml_string)
-      @parsed = YAML.safe_load yaml_string
+      @parsed = YAML.load yaml_string # rubocop:disable Security/YAMLLoad
 
       create_survey
     end
@@ -16,6 +16,7 @@ module Helena
       @survey = Helena::Survey.find_or_initialize_by @parsed.except('versions')
       return unless @survey.save!
       return unless @parsed['versions']
+
       @parsed['versions'].each { |parsed_version| create_version parsed_version }
     end
 
@@ -24,6 +25,7 @@ module Helena
       return unless version.new_record? # We ignore already imported versions
       return unless version.save!
       return unless parsed_version.last['question_groups']
+
       parsed_version.last['question_groups'].each { |parsed_question_group| create_question_group version, parsed_question_group }
     end
 
@@ -32,6 +34,7 @@ module Helena
       question_group.position = parsed_question_group.first
       return unless question_group.save!
       return unless parsed_question_group.last['questions']
+
       parsed_question_group.last['questions'].each { |parsed_question| create_question question_group, parsed_question }
     end
 

data/lib/helena/version.rb

@@ -1,3 +1,3 @@
 module Helena
-  VERSION = '1.3.0'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/spec/controllers/helena/sessions_controller_spec.rb

@@ -15,8 +15,8 @@ describe Helena::SessionsController do
   context 'version not active' do
     before { version.update_attribute :active, false }
 
-    it 'raises not found when editing' do      
-      get :edit, parametrize(token: session.token) 
+    it 'raises not found when editing' do
+      get :edit, parametrize(token: session.token)
       is_expected.to respond_with :not_found
     end
 

data/spec/dummy/Rakefile

@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path('config/application', __dir__)
 
 Dummy::Application.load_tasks

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,2 @@
+//= link helena/application.js
+//= link helena/application.css

data/spec/dummy/app/views/layouts/{application.html.haml → application.html.slim}

@@ -1,22 +1,22 @@
-!!!
-%html
-  %head
-    %title Helena
+doctype html
+html
+  head
+    title = "#{content_for(:title)} - #{t('.brand_name')}"
+
     = stylesheet_link_tag    'helena/application', media: 'all'
     = javascript_include_tag 'helena/application'
-    %meta{ name: 'viewport', content: 'initial-scale=1.0' }
     = csrf_meta_tags
 
-  %body
+  body
     .container
       - flash.each do |name, messages|
-        %div{class: "alert alert-#{name == 'notice' ? 'success' : 'danger'}"}
+        div class="alert alert-#{name}"
           - if messages.is_a?(String)
             = messages
           - else
-            %ul
+            ul
             - messages.each do |message|
-              %li= message
-      %h1.hidden
+              li= message
+      h1
         Helena
       = yield

data/spec/dummy/bin/bundle

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/spec/dummy/config/application.rb

@@ -1,11 +1,10 @@
-require File.expand_path('../boot', __FILE__)
+require File.expand_path('boot', __dir__)
 
 # Pick the frameworks you want:
 require 'action_controller/railtie'
 require 'action_mailer/railtie'
 require 'sprockets/railtie'
 require 'rails/mongoid'
-require 'browser'
 
 Bundler.require(*Rails.groups)
 require 'helena'

data/spec/dummy/config/boot.rb

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
 
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__)

data/spec/dummy/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
 
 # Initialize the Rails application.
 Dummy::Application.initialize!

data/spec/factories/helena/surveys.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :survey, class: Helena::Survey do
     sequence(:name) { |n| "Survey #{n}" }
-    language 'en'
+    language { 'en' }
   end
 end

data/spec/factories/helena/versions.rb

@@ -1,13 +1,13 @@
 FactoryBot.define do
   factory :version, class: Helena::Version do
     sequence(:version)
-    notes { Faker::Lorem.paragraphs(1).join('') }
+    notes { Faker::Lorem.paragraph }
     survey
   end
 
   factory :base_version, class: Helena::Version do
     version { 0 }
-    notes { Faker::Lorem.paragraphs(1).join('') }
+    notes { Faker::Lorem.paragraph }
     survey
   end
 end

data/spec/features/helena/manage_session_spec.rb

@@ -18,20 +18,20 @@ feature 'Session management' do
 
     second_question_group = base_version.question_groups.create title: 'Question Group 2', allow_to_go_back: true
 
-    all_and_everything = build :radio_group_question, code:           :all_and_everything,
-                                                      question_text:  'What is the answer to the Ultimate Question of Life, the Universe, and Everything?',
-                                                      position:       1
+    all_and_everything = build :radio_group_question, code: :all_and_everything,
+                                                      question_text: 'What is the answer to the Ultimate Question of Life, the Universe, and Everything?',
+                                                      position: 1
 
     all_and_everything.labels << build(:label, position: 1, text: 'Just Chuck Norris knows it', value: 'norris')
     all_and_everything.labels << build(:label, position: 2, text: 'God', value: 'god')
     all_and_everything.labels << build(:label, position: 3, text: '42', value: 42)
-    all_and_everything.labels << build(:label, position: 4, text: 'Your mom', value: 'mom', preselected: :true)
+    all_and_everything.labels << build(:label, position: 4, text: 'Your mom', value: 'mom', preselected: true)
 
     second_question_group.questions << all_and_everything
 
-    food_allergy = build :checkbox_group_question, code:           :food_allergy,
-                                                   question_text:  'What kind of food allergy do you have?',
-                                                   position:       2
+    food_allergy = build :checkbox_group_question, code: :food_allergy,
+                                                   question_text: 'What kind of food allergy do you have?',
+                                                   position: 2
 
     food_allergy.sub_questions << build(:sub_question, text: 'Garlic', code: 'garlic', position: 1, preselected: true)
     food_allergy.sub_questions << build(:sub_question, text: 'Oats', code: 'oat', position: 2)
@@ -41,10 +41,10 @@ feature 'Session management' do
 
     third_question_group = base_version.question_groups.create title: 'Question Group 3', allow_to_go_back: true
 
-    satisfaction_matrix = build :radio_matrix_question, code:          :satisfaction,
+    satisfaction_matrix = build :radio_matrix_question, code: :satisfaction,
                                                         question_text: 'Below are five statements with which you may agree or disagree.',
-                                                        required:      true,
-                                                        position:      1
+                                                        required: true,
+                                                        position: 1
 
     satisfaction_matrix.labels << build(:label, position: 1, text: 'Strongly Disagree', value: 1)
     satisfaction_matrix.labels << build(:label, position: 2, text: 'Disagree', value: 2)
@@ -57,8 +57,8 @@ feature 'Session management' do
     satisfaction_matrix.sub_questions << build(:sub_question, text: 'In most ways my life is close to my ideal.', code: 'life_is_ideal', position: 1)
     satisfaction_matrix.sub_questions << build(:sub_question, text: 'The conditions of my life are excellent.', code: 'condition', position: 2)
     satisfaction_matrix.sub_questions << build(:sub_question, text: 'I am satisfied with life.', code: 'satisfied_with_life', position: 3)
-    satisfaction_matrix.sub_questions << build(:sub_question, text:     'So far I have gotten the important things I want in life.',
-                                                              code:     'important_things',
+    satisfaction_matrix.sub_questions << build(:sub_question, text: 'So far I have gotten the important things I want in life.',
+                                                              code: 'important_things',
                                                               position: 4)
     satisfaction_matrix.sub_questions << build(:sub_question, text: 'If I could live my life over, I would change almost nothing.',
                                                               code: 'nothing_to_change',
@@ -84,8 +84,9 @@ feature 'Session management' do
 
     expect(page).not_to have_link 'Back'
 
-    fill_in 'session_answers_a_name', with: 'Hans'
-    fill_in 'session_answers_selfdescription', with: 'I am a proud man living in middle earth. Everybody is laughing at me because I do not have hairy feets.'
+    fill_in "What's your name?", with: 'Hans'
+
+    fill_in 'Give a brief description of yourself', with: 'I am a proud man living in middle earth.'
 
     expect { click_button 'Next' }.to change { session.reload.answers.count }.from(0).to(2)
     expect(session.reload.last_question_group_id).to eq second_question_group.id
@@ -174,9 +175,12 @@ feature 'Session management' do
 
     visit helena.edit_session_path(session.token)
 
-    expect(page).to have_content "What's your name? *"
+    expect(page).to have_content "What's your name?*"
     expect(page).to have_content '* indicates required fields'
-    expect { click_button 'Save' }.not_to change { session.reload.answers.count }
+    expect { click_button 'Save' }.not_to(change { session.reload.answers.count })
+    expect(page).to have_content('One or more questions have not been answered correctly.')
+    expect(page).to have_content("«What's your name?» can't be blank.")
+
     expect(page).to have_content("can't be blank")
   end
 
@@ -200,15 +204,15 @@ feature 'Session management' do
 
     visit helena.edit_session_path(session.token)
 
-    expect(page).to have_content 'Give a brief description of yourself *'
-    expect { click_button 'Save' }.not_to change { session.reload.answers.count }
+    expect(page).to have_content 'Give a brief description of yourself*'
+    expect { click_button 'Save' }.not_to(change { session.reload.answers.count })
     expect(page).to have_content("can't be blank")
   end
 
   scenario 'does not save a non selected radio group when required' do
-    all_and_everything = build :radio_group_question, code:           :all_and_everything,
-                                                      question_text:  'What is the answer to the Ultimate Question of Life, the Universe, and Everything?',
-                                                      required:       true
+    all_and_everything = build :radio_group_question, code: :all_and_everything,
+                                                      question_text: 'What is the answer to the Ultimate Question of Life, the Universe, and Everything?',
+                                                      required: true
 
     all_and_everything.labels << build(:label, value: 'norris')
     all_and_everything.labels << build(:label, value: 'god')
@@ -221,16 +225,16 @@ feature 'Session management' do
 
     visit helena.edit_session_path(session.token)
 
-    expect(page).to have_content 'What is the answer to the Ultimate Question of Life, the Universe, and Everything? *'
-    expect { click_button 'Save' }.not_to change { session.reload.answers.count }
+    expect(page).to have_content 'What is the answer to the Ultimate Question of Life, the Universe, and Everything?*'
+    expect { click_button 'Save' }.not_to(change { session.reload.answers.count })
 
     expect(page).to have_content("can't be blank")
   end
 
   scenario 'does not save when no subquestion of a checkbox group is selected if required' do
-    food_allergy = build :checkbox_group_question, code:           :food_allergy,
-                                                   question_text:  'What kind of food allergy do you have?',
-                                                   required:       true
+    food_allergy = build :checkbox_group_question, code: :food_allergy,
+                                                   question_text: 'What kind of food allergy do you have?',
+                                                   required: true
 
     food_allergy.sub_questions << build(:sub_question, text: 'Garlic', code: 'garlic')
     food_allergy.sub_questions << build(:sub_question, text: 'Oats', code: 'oat')
@@ -242,15 +246,15 @@ feature 'Session management' do
 
     visit helena.edit_session_path(session.token)
 
-    expect(page).to have_content 'What kind of food allergy do you have? *'
+    expect(page).to have_content 'What kind of food allergy do you have?*'
     expect { click_button 'Save' }.to change { session.reload.answers.map(&:value) }.from([]).to([0, 0, 0])
     expect(page).to have_content("can't be blank")
   end
 
   scenario 'saves when subquestion of a checkbox group is selected if required' do
-    food_allergy = build :checkbox_group_question, code:           :food_allergy,
-                                                   question_text:  'What kind of food allergy do you have?',
-                                                   required:       true
+    food_allergy = build :checkbox_group_question, code: :food_allergy,
+                                                   question_text: 'What kind of food allergy do you have?',
+                                                   required: true
 
     food_allergy.sub_questions << build(:sub_question, text: 'Garlic', code: 'garlic')
     food_allergy.sub_questions << build(:sub_question, text: 'Oats', code: 'oat')
@@ -262,16 +266,16 @@ feature 'Session management' do
 
     visit helena.edit_session_path(session.token)
 
-    expect(page).to have_content 'What kind of food allergy do you have? *'
+    expect(page).to have_content 'What kind of food allergy do you have?*'
     check('Oats')
     expect { click_button 'Save' }.to change { session.reload.answers.count }.from(0).to(3)
     expect(page).not_to have_content("can't be blank")
   end
 
   scenario 'does not save when radio matrix is filled out completely if required' do
-    satisfaction_matrix = build :radio_matrix_question, code:          :satisfaction,
+    satisfaction_matrix = build :radio_matrix_question, code: :satisfaction,
                                                         question_text: 'Below are five statements with which you may agree or disagree.',
-                                                        required:      true
+                                                        required: true
 
     satisfaction_matrix.labels << build(:label, value: 1)
     satisfaction_matrix.labels << build(:label, value: 2)
@@ -293,7 +297,7 @@ feature 'Session management' do
 
     visit helena.edit_session_path(session.token)
 
-    expect(page).to have_content 'Below are five statements with which you may agree or disagree. *'
+    expect(page).to have_content 'Below are five statements with which you may agree or disagree.*'
 
     choose('session_answers_satisfied_with_life_3')
 
@@ -303,7 +307,7 @@ feature 'Session management' do
   end
 
   scenario 'Displaying a bipolar radio matrix question"' do
-    radio_matrix = build :bipolar_radio_matrix_question, code:          :satisfaction,
+    radio_matrix = build :bipolar_radio_matrix_question, code: :satisfaction,
                                                          question_text: 'What do you like more?'
 
     radio_matrix.labels << build(:label, value: 1, text: 'Yo')
@@ -321,7 +325,7 @@ feature 'Session management' do
 
     visit helena.edit_session_path(session.token)
 
-    expect(page.all('table thead tr th').size).to eq 5
+    expect(page.all('table thead tr th').size).to eq 3
     expect(page.find('table tbody tr:first td:first')).to have_content 'Ice cream'
     expect(page.find('table tbody tr:last td:first')).to have_content 'I am not splitted'
     expect(page.find('table tbody tr:last td:last').text).to be_empty