helena 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99c25cfaf9b02dab3d017489cfee174c802b6049
-  data.tar.gz: 26f27f12b6d08d631418cc7e7846f5b726f53c0a
+  metadata.gz: 390dd724977bdba8cd62758efcccd35fce495eee
+  data.tar.gz: e7ad85893364a0853ed95d85bbe94ab7d524dda1
 SHA512:
-  metadata.gz: 61ac7c30e3374da1053c12c35c05825cb7b812fdc66c5ea3118f20cce9345616c2c1e07d260eedc0dc380a04b4b5f62180c1cf54723909fe17aca6d622d1bc39
-  data.tar.gz: a7c729ae4775d4928e8934b4fef8fde8cc14e8fcf946522f22c8fbdb8b28d9ed4b05b3ec149f8e6326631c499b7aef39b80f90b8716f382c89fd7e024971fd4f
+  metadata.gz: 29c53f9f7e399ed5a64a41e93710de9f00c87da442ea194aaa0ce3d400043e202d0a0ef6a7cb46f161c27d82a92951481ed02af2e89ef8cd95fc5994daf2dca8
+  data.tar.gz: 7ad9e37117d15ab0f403d0d1df08fd59912a1ee60c23f2725cc20e25572e8c5277285bb54417d0e696e6ef50d880eade07b33c1fc8b2059e4a51f8b19bfc9259

data/Gemfile

@@ -27,4 +27,5 @@ group :development, :test do
   gem 'bootstrap-sass'
   gem 'breadcrumbs_on_rails'
   gem 'coveralls', require: false
+  gem 'shoulda-matchers'
 end

data/Gemfile.lock

@@ -1,152 +1,176 @@
 PATH
   remote: .
   specs:
-    helena (1.0.0.rc1)
+    helena (1.0.0.rc2)
       bootstrap-sass (~> 3.2)
       breadcrumbs_on_rails (~> 2.3)
       haml-rails (~> 0.5)
       jquery-rails (~> 3.1)
-      mongoid (~> 4.0.0.rc2)
+      mongoid (~> 4.0)
       mongoid-simple-tags (~> 0.1)
       mongoid_orderable (~> 4.1)
       rails (~> 4.1)
       rails-i18n (~> 4.0)
-      sass-rails (~> 4.0.3)
+      responders (~> 2.0)
+      sass-rails (~> 5.0)
       simple_form (~> 3.1.0.rc2)
-      slim (~> 2.1.0)
+      slim (~> 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.7)
-      actionview (= 4.1.7)
-      activesupport (= 4.1.7)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    actionview (4.1.7)
-      activesupport (= 4.1.7)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.7)
-      activesupport (= 4.1.7)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
-    activerecord (4.1.7)
-      activemodel (= 4.1.7)
-      activesupport (= 4.1.7)
-      arel (~> 5.0.0)
-    activesupport (4.1.7)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
-    arel (5.0.1.20140414130214)
-    better_errors (2.0.0)
+    addressable (2.3.8)
+    arel (6.0.0)
+    autoprefixer-rails (5.1.10)
+      execjs
+      json
+    better_errors (2.1.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (3.3.0.1)
-      sass (~> 3.2)
+    bootstrap-sass (3.3.4.1)
+      autoprefixer-rails (>= 5.0.0.1)
+      sass (>= 3.2.19)
     breadcrumbs_on_rails (2.3.0)
     bson (2.3.0)
     builder (3.2.2)
-    byebug (3.5.1)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-      slop (~> 3.6)
+    byebug (4.0.5)
+      columnize (= 0.9.0)
     capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.5.5)
+    childprocess (0.5.6)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
-    columnize (0.8.9)
-    connection_pool (2.0.0)
-    coveralls (0.7.1)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    database_cleaner (1.3.0)
+    columnize (0.9.0)
+    connection_pool (2.2.0)
+    coveralls (0.8.0)
+      multi_json (~> 1.10)
+      rest-client (>= 1.6.8, < 2)
+      simplecov (~> 0.9.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
+    database_cleaner (1.4.1)
     debug_inspector (0.0.2)
-    debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
+    domain_name (0.5.24)
+      unf (>= 0.0.5, < 1.0.0)
     easy_translate (0.5.0)
       json
       thread
       thread_safe
     erubis (2.7.0)
+    execjs (2.5.2)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    ffaker (1.25.0)
-    ffi (1.9.6)
-    haml (4.0.5)
+    ffaker (1.32.1)
+    ffi (1.9.8)
+    globalid (0.3.5)
+      activesupport (>= 4.1.0)
+    haml (4.0.6)
       tilt
-    haml-rails (0.5.3)
+    haml-rails (0.9.0)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
-      haml (>= 3.1, < 5.0)
+      haml (>= 4.0.6, < 5.0)
+      html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    highline (1.6.21)
-    hike (1.2.3)
-    i18n (0.6.11)
-    i18n-tasks (0.7.8)
+    highline (1.7.1)
+    html2haml (2.0.0)
+      erubis (~> 2.7.0)
+      haml (~> 4.0.0)
+      nokogiri (~> 1.6.0)
+      ruby_parser (~> 3.5)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    i18n (0.7.0)
+    i18n-tasks (0.8.2)
       activesupport
       easy_translate (>= 0.5.0)
       erubis
       highline
       i18n
-      slop (>= 3.5.0)
       term-ansicolor
       terminal-table
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    json (1.8.2)
     launchy (2.4.3)
       addressable (~> 2.3)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (2.4.3)
-    mini_portile (0.6.1)
-    minitest (5.4.2)
-    mongoid (4.0.0)
+    mini_portile (0.6.2)
+    minitest (5.6.0)
+    mongoid (4.0.2)
       activemodel (~> 4.0)
       moped (~> 2.0.0)
       origin (~> 2.1)
       tzinfo (>= 0.3.37)
-    mongoid-rspec (2.0.0.rc1)
+    mongoid-rspec (2.0.0)
       mongoid (~> 4.0.0)
       rake
-      rspec (~> 3.0)
+      rspec (~> 3.1)
     mongoid-simple-tags (0.1.3)
       json (~> 1.8)
       mongoid (>= 3.0.3)
-    mongoid_orderable (4.1.0)
+    mongoid_orderable (4.1.1)
       mongoid
-    moped (2.0.1)
+    moped (2.0.4)
       bson (~> 2.2)
       connection_pool (~> 2.0)
       optionable (~> 0.2.0)
-    multi_json (1.10.1)
-    netrc (0.8.0)
-    nokogiri (1.6.4.1)
+    multi_json (1.11.0)
+    netrc (0.10.3)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     optionable (0.2.0)
     origin (2.1.1)
@@ -154,104 +178,123 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (2.0.0)
-      byebug (~> 3.4)
+    pry-byebug (3.1.0)
+      byebug (~> 4.0)
       pry (~> 0.10)
-    quiet_assets (1.0.3)
+    quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    rack (1.6.0)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.7)
-      actionmailer (= 4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
-      activemodel (= 4.1.7)
-      activerecord (= 4.1.7)
-      activesupport (= 4.1.7)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.7)
-      sprockets-rails (~> 2.0)
-    rails-i18n (4.0.3)
+      railties (= 4.2.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.6)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    rails-i18n (4.0.4)
       i18n (~> 0.6)
       railties (~> 4.0)
-    railties (4.1.7)
-      actionpack (= 4.1.7)
-      activesupport (= 4.1.7)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    rest-client (1.7.2)
+    rake (10.4.2)
+    responders (2.1.0)
+      railties (>= 4.2.0, < 5)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-collection_matchers (1.0.0)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-collection_matchers (1.1.2)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rspec-core (3.2.3)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-rails (3.1.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    ruby-progressbar (1.7.0)
-    rubyzip (1.1.6)
-    sass (3.2.19)
-    sass-rails (4.0.4)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-rails (3.2.1)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    ruby-progressbar (1.7.5)
+    ruby_parser (3.6.6)
+      sexp_processor (~> 4.1)
+    rubyzip (1.1.7)
+    sass (3.4.13)
+    sass-rails (5.0.2)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.2)
-      sprockets (~> 2.8, < 2.12)
-      sprockets-rails (~> 2.0)
-    selenium-webdriver (2.44.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (~> 1.1)
+    selenium-webdriver (2.45.0)
       childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    simple_form (3.1.0.rc2)
+    sexp_processor (4.5.0)
+    shoulda-matchers (2.8.0)
+      activesupport (>= 3.0.0)
+    simple_form (3.1.0)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
-    simplecov (0.9.1)
+    simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    slim (2.1.0)
-      temple (~> 0.6.9)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
+    slim (3.0.3)
+      temple (~> 0.7.3)
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
-    sprockets (2.11.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+    sprockets (3.0.1)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.0)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    temple (0.6.10)
+    temple (0.7.5)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     terminal-table (1.4.5)
     thor (0.19.1)
-    thread (0.1.4)
-    thread_safe (0.3.4)
+    thread (0.2.0)
+    thread_safe (0.3.5)
     tilt (1.4.1)
-    tins (1.3.3)
+    tins (1.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    websocket (1.2.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
+    websocket (1.2.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -280,4 +323,5 @@ DEPENDENCIES
   rspec-rails (~> 3)
   ruby-progressbar
   selenium-webdriver
+  shoulda-matchers
   simple_form

data/README.md

@@ -29,7 +29,7 @@ Add this line to your routes will and you will be good to go!
 
     mount Helena::Engine => '/helena'
 
-Since Version 1.0 the admin interface is no longer a part of the gem and was extracted to http://github.com/gurix/helena-admin.
+Since Version 1.0 the admin interface is no longer a part of the gem and was extracted to http://github.com/gurix/helena_administration.
 
 ## TODOS
 * Support more question types, i.e Dates, Numeric inputs with validation, emails, ...

data/app/controllers/helena/sessions_controller.rb

@@ -1,9 +1,10 @@
 module Helena
+  # TODO: Needs refactoring, is really ugly atm :-(
   class SessionsController < ApplicationController
-    respond_to :html
-
-    before_filter :load_session, only: [:edit, :update]
-    after_filter :update_last_question_group_id, only: :update
+    before_action :load_session, only: [:edit, :update]
+    before_action :update_answers, only: :update
+    before_action :answer_errors, only: :update
+    after_action :update_last_question_group_id, only: :update
 
     def show
       @session = Helena::Session.find_by view_token: params[:token]
@@ -24,9 +25,6 @@ module Helena
     end
 
     def update
-      @answers = update_answers
-      @errors = answer_errors
-
       if @question_group.last? && @errors.blank?
         @session.update_attribute :completed, true
         render 'end_message'
@@ -43,6 +41,7 @@ module Helena
       @session = Helena::Session.find_by token: params[:token]
       @survey = @session.survey
       @version = @survey.versions.find @session.version_id
+      render text: 'Version not active', status: '404' unless @version && @version.active
       @question_group = question_group
     end
 
@@ -69,18 +68,18 @@ module Helena
     end
 
     def update_answers
-      return session_answers unless session_params
-
-      @question_group.question_codes.each do |question_code|
-        @session.answers.where(code: question_code).delete
+      if session_params
+        @question_group.question_codes.each do |question_code|
+          @session.answers.where(code: question_code).delete
 
-        value = session_params[:answers][question_code]
+          value = session_params[:answers][question_code]
 
-        next if value.blank?
+          next if value.blank?
 
-        @session.answers << Helena::Answer.build_generic(question_code, value, request.remote_ip)
+          @session.answers << Helena::Answer.build_generic(question_code, value, request.remote_ip)
+        end
       end
-      session_answers
+      @answers = session_answers
     end
 
     def answer_errors
@@ -90,11 +89,11 @@ module Helena
           errors[question_code] = t("errors.messages.#{error_message}")
         end
       end
-      errors
+      @errors = errors
     end
 
     def session_report
-      Slim::Template.new { @version.session_report }.render.html_safe if @version.session_report
+      Slim::Template.new { @version.session_report }.render(self).html_safe if @version.session_report
     end
 
     def update_last_question_group_id

data/app/models/helena/label.rb

@@ -11,7 +11,6 @@ module Helena
 
     orderable
 
-    validates :text, presence: true
     validates :value, presence: true
     validates :value, uniqueness: true
   end

data/app/models/helena/question.rb

@@ -3,21 +3,20 @@ module Helena
     include Helena::Concerns::ApplicationModel
     include Mongoid::Orderable
 
-    CODE_FORMAT = /\A[a-z]([-\w]{,498}[a-z\d])?\Z/
-
     TYPES = [
       Helena::Questions::ShortText,
       Helena::Questions::LongText,
       Helena::Questions::StaticText,
       Helena::Questions::RadioGroup,
       Helena::Questions::CheckboxGroup,
-      Helena::Questions::RadioMatrix
+      Helena::Questions::RadioMatrix,
+      Helena::Questions::BipolarRadioMatrix
     ]
 
     belongs_to :question_group, inverse_of: :questions
 
-    embeds_many :labels, class_name: 'Helena::Label'
-    embeds_many :sub_questions, class_name: 'Helena::SubQuestion'
+    embeds_many :labels, class_name: 'Helena::Label', cascade_callbacks: true
+    embeds_many :sub_questions, class_name: 'Helena::SubQuestion', cascade_callbacks: true
 
     accepts_nested_attributes_for :labels, allow_destroy: true, reject_if: :reject_labels
     accepts_nested_attributes_for :sub_questions, allow_destroy: true, reject_if: :reject_sub_questions
@@ -28,10 +27,6 @@ module Helena
     orderable scope: :question_group
 
     validates :code, presence: true
-
-    # consist of lowercase characters or digits, not starting with a digit or underscore and not ending with an underscore
-    # foo_32: correct, 32_foo: incorrect, _bar: incorrect, bar_: incorrect, FooBaar: incorrect
-    validates :code, format: { with: CODE_FORMAT }
     validate :uniqueness_of_code
 
     def includes_labels?

data/app/models/helena/questions/bipolar_radio_matrix.rb

@@ -0,0 +1,6 @@
+module Helena
+  module Questions
+    class BipolarRadioMatrix < RadioMatrix
+    end
+  end
+end

data/app/models/helena/sub_question.rb

@@ -12,10 +12,17 @@ module Helena
 
     orderable
 
-    validates :code, format: { with: Helena::Question::CODE_FORMAT }
     validate :uniqueness_of_code
     validates :text, presence: true, uniqueness: true
 
+    def splitted?
+      parts.size > 1
+    end
+
+    def parts
+      text.split '|'
+    end
+
     def uniqueness_of_code
       question_code_occurences = question.question_group.version.question_code_occurences
 

data/app/views/helena/questions/_bipolar_radio_matrix.html.haml

@@ -0,0 +1,33 @@
+- label_width = "#{60 / question.labels.count}%"
+
+.radio_matrix.form-group{ class: "#{'has-error' if errors.present?}" }
+  %label{class: "#{'text-danger' if errors.present?}"}
+    != question.question_text
+    = ' *' if question.required
+  .table-responsive
+    %table.table
+      %thead
+        %tr
+          %th
+          - question.labels.each do |label|
+            %th{ width: label_width }
+              = label.text
+          %th
+
+      %tbody
+        - question.sub_questions.each do |sub_question|
+          %tr
+            %td.text-right
+              = sub_question.parts.first
+              - if errors[sub_question.code]
+                .help-block.text-danger= errors[sub_question.code]
+            - question.labels.each do |label|
+              - checked = answers[sub_question.code].to_s == label.value.to_s if answers[sub_question.code].present?
+              - checked ||= (label.preselected? ? true : false)
+              %td{ width: label_width }
+                %label
+                  = form.simple_fields_for :answers do |answer_form|
+                    = answer_form.radio_button sub_question.code, label.value, checked: checked
+                  %span.hide-text= label.text
+            %td
+              = sub_question.parts.last if sub_question.splitted?

data/app/views/helena/questions/_checkbox_group.html.haml

@@ -1,6 +1,6 @@
 .checkbox_group.form-group{ class: "#{'has-error' if errors[question.code]}" }
   %label
-    = question.question_text
+    != question.question_text
     = ' *' if question.required
   = form.simple_fields_for :answers do |answer_form|
     - question.sub_questions.each do |sub_question|

data/app/views/helena/questions/_long_text.html.haml

@@ -1,6 +1,6 @@
 .long_text.form-group{ class: "#{'has-error' if errors[question.code]}" }
   %label
-    = question.question_text
+    != question.question_text
     = ' *' if question.required
   = form.simple_fields_for :answers do |answer_form|
     = answer_form.text_area question.code, value: answers[question.code], class: 'form-control'

data/app/views/helena/questions/_radio_group.html.haml

@@ -1,6 +1,6 @@
 .radio_group.form-group{ class: "#{'has-error' if errors[question.code]}" }
   %label
-    = question.question_text
+    != question.question_text
     = ' *' if question.required
   - question.labels.each do |label|
     .radio

data/app/views/helena/questions/_radio_matrix.html.haml

@@ -1,6 +1,8 @@
+- label_width = "#{80 / question.labels.count}%"
+
 .radio_matrix.form-group{ class: "#{'has-error' if errors.present?}" }
   %label{class: "#{'text-danger' if errors.present?}"}
-    = question.question_text
+    != question.question_text
     = ' *' if question.required
   .table-responsive
     %table.table
@@ -8,19 +10,19 @@
         %tr
           %th
           - question.labels.each do |label|
-            %th{ width: "#{80 / question.labels.count}%" }
+            %th{ width: label_width }
               = label.text
       %tbody
         - question.sub_questions.each do |sub_question|
           %tr
             %td
-              = sub_question.text
+              = sub_question.parts.first
               - if errors[sub_question.code]
                 .help-block.text-danger= errors[sub_question.code]
             - question.labels.each do |label|
               - checked = answers[sub_question.code].to_s == label.value.to_s if answers[sub_question.code].present?
               - checked ||= (label.preselected? ? true : false)
-              %td{ width: "#{80 / question.labels.count}%" }
+              %td{ width: label_width }
                 %label
                   = form.simple_fields_for :answers do |answer_form|
                     = answer_form.radio_button sub_question.code, label.value, checked: checked

data/app/views/helena/questions/_short_text.html.haml

@@ -1,6 +1,6 @@
 .short_text.form-group{ class: "#{'has-error' if errors[question.code]}" }
   %label
-    = question.question_text
+    != question.question_text
     = ' *' if question.required
   = form.simple_fields_for :answers do |answer_form|
     = answer_form.text_field question.code, value: answers[question.code], class: 'form-control'

data/app/views/helena/sessions/edit.html.slim

@@ -1,4 +1,4 @@
-= render 'progressbar' if @version.settings && @version.settings[:display_progressbar]
+= render 'progressbar' if @version.settings && @version.settings[:display_progressbar] == "1"
 #survey_content
   h1.survey_title
     = @version.survey_detail.title

data/config/locales/en.yml

@@ -7,7 +7,7 @@ en:
     add: Add
     show: Show
     required: '* indicates required fields'
-    code_hint: The code must consist only of lowercase letters, numbers and underscores. Don't begin with a digit or an underscore and don't end with an underscore.
+    code_hint: The code should consist only of lowercase letters, numbers and underscores. Don't begin with a digit or an underscore and don't end with an underscore.
     move_up: Move up
     move_down: Move down
     untitled: Untitled
@@ -17,4 +17,3 @@ en:
     updated: "'%{resource}' successfully updated"
     created: "'%{resource}' successfully created"
     error: Ooopss... something is wrong, please check your input
-

data/config/locales/models/question/en.yml

@@ -29,9 +29,13 @@ en:
         one: Radio Matrix
         other: Radio Matrice
 
+      'helena/questions/bipolar_radio_matrix':
+        one: Bipolar Radio Matrix
+        other: Bipolar Radio Matrice
+
       'helena/questions/checkbox_matrix':
-              one: Checkbox Matrix
-              other: Checkbox Matrice
+        one: Checkbox Matrix
+        other: Checkbox Matrice
 
     attributes:
       'helena/question':

data/helena.gemspec

@@ -20,17 +20,18 @@ survey/test development, longitudinal studies and instant feedback.'
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")
 
   s.add_dependency 'rails', '~> 4.1'
-  s.add_dependency 'mongoid', '~> 4.0.0.rc2'
+  s.add_dependency 'mongoid', '~> 4.0'
   s.add_dependency 'mongoid_orderable', '~> 4.1'
   s.add_dependency 'mongoid-simple-tags', '~> 0.1'
   s.add_dependency 'haml-rails', '~> 0.5'
-  s.add_dependency 'slim', '~> 2.1.0'
+  s.add_dependency 'slim', '~> 3.0'
   s.add_dependency 'jquery-rails', '~> 3.1'
-  s.add_dependency 'sass-rails', '~> 4.0.3' # version needed here http://stackoverflow.com/questions/22392862/undefined-method-environment-for-nilnilclass-when-importing-bootstrap
+  s.add_dependency 'sass-rails', '~> 5.0'
   s.add_dependency 'bootstrap-sass', '~> 3.2'
   s.add_dependency 'simple_form', '~> 3.1.0.rc2'
   s.add_dependency 'breadcrumbs_on_rails', '~> 2.3'
   s.add_dependency 'rails-i18n', '~> 4.0'
+  s.add_dependency 'responders', '~> 2.0'
 
   s.add_development_dependency 'rspec-rails', '~> 3'
   s.add_development_dependency 'rspec-collection_matchers', '~> 1'

data/lib/helena/survey_importer.rb

@@ -14,7 +14,7 @@ module Helena
 
     def create_survey
       @survey = Helena::Survey.new @parsed.except('versions')
-      return unless @survey.save
+      return unless @survey.save!
       return unless @parsed['versions']
       @parsed['versions'].each { |parsed_version| create_version parsed_version }
     end
@@ -22,7 +22,7 @@ module Helena
     def create_version(parsed_version)
       version = build_version(parsed_version)
 
-      return unless version.save
+      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
@@ -30,7 +30,7 @@ module Helena
     def create_question_group(version, parsed_question_group)
       question_group = version.question_groups.build parsed_question_group.last.except('questions')
       question_group.position = parsed_question_group.first
-      return unless question_group.save
+      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
@@ -38,7 +38,7 @@ module Helena
     def create_question(question_group, parsed_question)
       question = question_group.questions.build parsed_question.last
       question.position = parsed_question.first
-      question.save
+      question.save!
       question
     end
 

data/lib/helena/version.rb

@@ -1,3 +1,3 @@
 module Helena
-  VERSION = '1.0.0.rc1'
+  VERSION = '1.0.0.rc2'
 end

data/spec/controllers/helena/sessions_controller_spec.rb

@@ -4,7 +4,7 @@ describe Helena::SessionsController do
   routes { Helena::Engine.routes }
 
   let(:survey) { create :survey }
-  let(:version) { survey.versions.create version: 0 }
+  let(:version) { survey.versions.create version: 0, question_groups: [build(:question_group)] }
   let(:session) do
     create :session, survey: survey, version: version, answers: [
       build(:string_answer, code: 'string_answer_1', value: 'abc'),
@@ -12,6 +12,20 @@ describe Helena::SessionsController do
     ]
   end
 
+  context 'version not active' do
+    before { version.update_attribute :active, false }
+
+    it 'raises not found when editing' do
+      get :edit, token: session.token
+      is_expected.to respond_with :not_found
+    end
+
+    it 'raises not found when updating' do
+      patch :update, token: session.token
+      is_expected.to respond_with :not_found
+    end
+  end
+
   it 'return json result of the current session' do
     get :show, token: session.view_token, format: :json
 

data/spec/dummy/config/environments/test.rb

@@ -13,7 +13,7 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.

data/spec/dummy/config/routes.rb

@@ -1,4 +1,3 @@
 Rails.application.routes.draw do
-
   mount Helena::Engine => '/helena'
 end

data/spec/factories/helena/questions.rb

@@ -9,5 +9,6 @@ FactoryGirl.define do
     factory :radio_group_question, class: Helena::Questions::RadioGroup
     factory :checkbox_group_question, class: Helena::Questions::CheckboxGroup
     factory :radio_matrix_question, class: Helena::Questions::RadioMatrix
+    factory :bipolar_radio_matrix_question, class: Helena::Questions::BipolarRadioMatrix
   end
 end

data/spec/factories/helena/sessions.rb

@@ -4,6 +4,5 @@ FactoryGirl.define do
   end
 
   factory :session_without_token, class: Helena::Session do
-
   end
 end

data/spec/features/helena/manage_session_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 feature 'Session management' do
   let(:survey) { create :survey, name: 'dummy' }
-  let(:base_version) { survey.versions.create version: 0 }
+  let(:base_version) { survey.versions.create version: 0, active: true }
   let!(:first_question_group) { base_version.question_groups.create title: 'Question Group 1' }
 
   background do
@@ -65,11 +65,10 @@ feature 'Session management' do
                                                               position: 5)
 
     third_question_group.questions << satisfaction_matrix
-    version = Helena::VersionPublisher.publish(base_version)
-    version.settings = { display_progressbar: true }
-    version.save
 
-    session = survey.sessions.create version_id: version.id, token: 'abc'
+    base_version.update_attribute :settings,  display_progressbar: '1'
+
+    session = survey.sessions.create version_id: base_version.id, token: 'abc'
 
     visit helena.edit_session_path(session.token)
 
@@ -114,7 +113,7 @@ feature 'Session management' do
     check('Oats')
     check('Meat')
 
-    expect(page).to have_link 'Back', href: helena.edit_session_path(session.token, question_group: version.question_groups.find_by(position: 1))
+    expect(page).to have_link 'Back', href: helena.edit_session_path(session.token, question_group: base_version.question_groups.find_by(position: 1))
     expect { click_button 'Next' }.to change { session.reload.answers.count }.from(2).to(6)
     expect(session.reload.last_question_group_id).to eq third_question_group.id
 
@@ -147,7 +146,7 @@ feature 'Session management' do
     choose('session_answers_nothing_to_change_5')
     choose('session_answers_satisfied_with_life_7')
 
-    expect(page).to have_link 'Back', href: helena.edit_session_path(session.token, question_group: version.question_groups.find_by(position: 2))
+    expect(page).to have_link 'Back', href: helena.edit_session_path(session.token, question_group: base_version.question_groups.find_by(position: 2))
     expect { click_button 'Save' }.to change { session.reload.answers.count }.from(6).to(11)
   end
 
@@ -171,10 +170,7 @@ feature 'Session management' do
     short_text_question  = build :short_text_question, code: 'a_name', question_text: "What's your name?", required: true
     first_question_group.questions << short_text_question
 
-    version = Helena::VersionPublisher.publish(base_version)
-    version.save
-
-    session = survey.sessions.create version_id: version.id, token: 'abc'
+    session = survey.sessions.create version_id: base_version.id, token: 'abc'
 
     visit helena.edit_session_path(session.token)
 
@@ -200,10 +196,7 @@ feature 'Session management' do
     long_text_question  = build :long_text_question, code: 'selfdescription', question_text: 'Give a brief description of yourself', required: true
     first_question_group.questions << long_text_question
 
-    version = Helena::VersionPublisher.publish(base_version)
-    version.save
-
-    session = survey.sessions.create version_id: version.id, token: 'abc'
+    session = survey.sessions.create version_id: base_version.id, token: 'abc'
 
     visit helena.edit_session_path(session.token)
 
@@ -224,15 +217,13 @@ feature 'Session management' do
 
     first_question_group.questions << all_and_everything
 
-    version = Helena::VersionPublisher.publish(base_version)
-    version.save
-
-    session = survey.sessions.create version_id: version.id, token: 'abc'
+    session = survey.sessions.create version_id: base_version.id, token: 'abc'
 
     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("can't be blank")
   end
 
@@ -247,10 +238,7 @@ feature 'Session management' do
 
     first_question_group.questions << food_allergy
 
-    version = Helena::VersionPublisher.publish(base_version)
-    version.save
-
-    session = survey.sessions.create version_id: version.id, token: 'abc'
+    session = survey.sessions.create version_id: base_version.id, token: 'abc'
 
     visit helena.edit_session_path(session.token)
 
@@ -270,10 +258,7 @@ feature 'Session management' do
 
     first_question_group.questions << food_allergy
 
-    version = Helena::VersionPublisher.publish(base_version)
-    version.save
-
-    session = survey.sessions.create version_id: version.id, token: 'abc'
+    session = survey.sessions.create version_id: base_version.id, token: 'abc'
 
     visit helena.edit_session_path(session.token)
 
@@ -304,10 +289,7 @@ feature 'Session management' do
 
     first_question_group.questions << satisfaction_matrix
 
-    version = Helena::VersionPublisher.publish(base_version)
-    version.save
-
-    session = survey.sessions.create version_id: version.id, token: 'abc'
+    session = survey.sessions.create version_id: base_version.id, token: 'abc'
 
     visit helena.edit_session_path(session.token)
 
@@ -320,6 +302,31 @@ feature 'Session management' do
     expect(page).to have_content("can't be blank")
   end
 
+  scenario 'Displaying a bipolar radio matrix question"' do
+    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')
+    radio_matrix.labels << build(:label, value: 2, text: "can't decide")
+    radio_matrix.labels << build(:label, value: 3, text: 'Yo')
+
+    radio_matrix.sub_questions << build(:sub_question, code: 'food', text: 'Ice cream|Cookies')
+    radio_matrix.sub_questions << build(:sub_question, code: 'drugs', text: 'Weed|Booze')
+    radio_matrix.sub_questions << build(:sub_question, code: 'pets', text: 'Cats|Dogs')
+    radio_matrix.sub_questions << build(:sub_question, code: 'not_splitted', text: 'I am not splitted')
+
+    first_question_group.questions << radio_matrix
+
+    session = survey.sessions.create version_id: base_version.id, token: 'abc'
+
+    visit helena.edit_session_path(session.token)
+
+    expect(page.all('table thead tr th').size).to eq 5
+    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
+  end
+
   scenario 'Allows to define whether a user an jump back for each question group seperately' do
     second_question_group = base_version.question_groups.create title: 'Question Group 2', allow_to_go_back: true
     base_version.question_groups.create title: 'Question Group 3', allow_to_go_back: false

data/spec/lib/survey_importer_spec.rb

@@ -9,6 +9,10 @@ describe Helena::SurveyImporter do
     expect(survey.versions.first).to have_exactly(1).question_groups
     expect(survey.versions.first.question_groups.first).to have_exactly(1).questions
     expect(survey.versions.first.question_groups.first.questions.first).to have_exactly(7).labels
+    expect(survey.versions.first.question_groups.first.questions.first.labels.first.position).to eq 1
+    expect(survey.versions.first.question_groups.first.questions.first.labels.last.position).to eq 7
     expect(survey.versions.first.question_groups.first.questions.first).to have_exactly(5).sub_questions
+    expect(survey.versions.first.question_groups.first.questions.first.sub_questions.first.position).to eq 1
+    expect(survey.versions.first.question_groups.first.questions.first.sub_questions.last.position).to eq 5
   end
 end

data/spec/models/helena/answer_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Helena::Answer do
-
   let(:survey) { create :survey }
   let(:version) { build :version, survey: survey }
   let(:session) { create :session, survey: survey, version: version }
@@ -48,5 +47,4 @@ describe Helena::Answer do
       expect(Helena::Answer.build_generic('bla', 'false', '192.168.0.1')).to be_kind_of(Helena::BooleanAnswer)
     end
   end
-
 end

data/spec/models/helena/label_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe Helena::Label do
-
   it { expect(subject).to be_embedded_in(:question) }
-  it { expect(subject).to validate_presence_of(:text) }
   it { expect(subject).to validate_presence_of(:value) }
   it { expect(subject).to validate_uniqueness_of(:value) }
 

data/spec/models/helena/questions/bipolar_radio_matrix_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Helena::Questions::BipolarRadioMatrix do
+  let!(:version) { create :version, survey: create(:survey) }
+
+  let(:question_group) { build :question_group, version: version }
+
+  it 'has a valid factory' do
+    expect(build :bipolar_radio_matrix_question, question_group: question_group).to be_valid
+  end
+
+  it 'validates uniquness of label preselection' do
+    question = create :bipolar_radio_matrix_question, question_group: question_group
+    question.labels << build(:label, preselected: true)
+    question.labels << build(:label, preselected: true)
+    expect(question).not_to be_valid
+  end
+
+  it 'does not validates uniquness of label preselection for no preselection' do
+    question = create :bipolar_radio_matrix_question, question_group: question_group
+    question.labels << build(:label, preselected: false)
+    question.labels << build(:label, preselected: false)
+    expect(question).to be_valid
+  end
+
+  it 'does not validates uniquness of label preselection for one preselection' do
+    question = create :bipolar_radio_matrix_question, question_group: question_group
+    question.labels << build(:label, preselected: false)
+    question.labels << build(:label, preselected: false)
+    expect(question).to be_valid
+  end
+
+  it 'indicates that it includes sub_questions and labels' do
+    question = build :bipolar_radio_matrix_question, question_group: question_group
+
+    expect(question.includes_subquestions?).to eq true
+    expect(question.includes_labels?).to eq true
+  end
+end

data/spec/models/helena/sub_question_spec.rb

@@ -25,4 +25,22 @@ describe Helena::SubQuestion do
   it 'has a valid factory' do
     expect(build :sub_question, question: question).to be_valid
   end
+
+  describe 'splitting the sub_question text with a vertical bar "|" i.e for pair comparisions' do
+    it 'recognize splitted sub questions' do
+      normal_sub_question = build :sub_question, question: question, text: 'just an ordinary subquestion'
+
+      expect(normal_sub_question.splitted?).to be false
+
+      splitted_sub_question = build :sub_question, question: question, text: 'i am|splitted'
+
+      expect(splitted_sub_question.splitted?).to be true
+    end
+
+    it 'returns correct parts' do
+      splitted_sub_question = build :sub_question, question: question, text: 'first|last'
+
+      expect(splitted_sub_question.parts).to eq %w(first last)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helena
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Markus Graf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: mongoid_orderable
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: responders
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -302,6 +316,7 @@ files:
 - app/models/helena/label.rb
 - app/models/helena/question.rb
 - app/models/helena/question_group.rb
+- app/models/helena/questions/bipolar_radio_matrix.rb
 - app/models/helena/questions/checkbox_group.rb
 - app/models/helena/questions/long_text.rb
 - app/models/helena/questions/radio_group.rb
@@ -314,6 +329,7 @@ files:
 - app/models/helena/survey.rb
 - app/models/helena/survey_detail.rb
 - app/models/helena/version.rb
+- app/views/helena/questions/_bipolar_radio_matrix.html.haml
 - app/views/helena/questions/_checkbox_group.html.haml
 - app/views/helena/questions/_long_text.html.haml
 - app/views/helena/questions/_radio_group.html.haml
@@ -401,6 +417,7 @@ files:
 - spec/models/helena/label_spec.rb
 - spec/models/helena/question_group_spec.rb
 - spec/models/helena/question_spec.rb
+- spec/models/helena/questions/bipolar_radio_matrix_spec.rb
 - spec/models/helena/questions/checkbox_group_spec.rb
 - spec/models/helena/questions/radio_group_spec.rb
 - spec/models/helena/questions/radio_matrix_spec.rb