helena 1.0.0.rc2 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 390dd724977bdba8cd62758efcccd35fce495eee
-  data.tar.gz: e7ad85893364a0853ed95d85bbe94ab7d524dda1
+  metadata.gz: acadeb9841bf21c2de938861517824219cd1e517
+  data.tar.gz: d9a338d54c6551a53b85f6f496a4ce3d11475594
 SHA512:
-  metadata.gz: 29c53f9f7e399ed5a64a41e93710de9f00c87da442ea194aaa0ce3d400043e202d0a0ef6a7cb46f161c27d82a92951481ed02af2e89ef8cd95fc5994daf2dca8
-  data.tar.gz: 7ad9e37117d15ab0f403d0d1df08fd59912a1ee60c23f2725cc20e25572e8c5277285bb54417d0e696e6ef50d880eade07b33c1fc8b2059e4a51f8b19bfc9259
+  metadata.gz: 74cb384bc70e07c17c593792da8ca7aa3c7a7b5ce7b4543a357a7e8be432cc7466412f54aeed35678495dc54fa6eec165dadc6d32abffa845d0551f9de0861ba
+  data.tar.gz: 96e6a034c109870e6bad4cbf0950ff8d38546df49395cd9e3d1424a6a22b32547d0acc3cec09caeca394ae511d7262429608d7c4784c9ca049413332df70d515

data/.travis.yml

@@ -1,6 +1,10 @@
 language: ruby
 rvm:
+  - 2.0
   - 2.1
 
 services:
   - mongodb
+
+cache: bundler
+sudo: false

data/Gemfile

@@ -15,7 +15,7 @@ group :development, :test do
   gem 'pry'
   gem 'pry-byebug'
   gem 'ruby-progressbar'
-  gem 'mongoid-rspec', '~> 2.0.0.rc1'
+  gem 'mongoid-rspec'
   gem 'quiet_assets'
   gem 'better_errors'
   gem 'launchy'

data/Gemfile.lock

@@ -1,15 +1,17 @@
 PATH
   remote: .
   specs:
-    helena (1.0.0.rc2)
+    helena (1.0.0.rc3)
       bootstrap-sass (~> 3.2)
       breadcrumbs_on_rails (~> 2.3)
-      haml-rails (~> 0.5)
-      jquery-rails (~> 3.1)
+      browser (~> 0.8)
+      haml-rails (~> 0.9)
+      jquery-rails (~> 4.0)
       mongoid (~> 4.0)
       mongoid-simple-tags (~> 0.1)
+      mongoid-tree (~> 2.0)
       mongoid_orderable (~> 4.1)
-      rails (~> 4.1)
+      rails (~> 4.2)
       rails-i18n (~> 4.0)
       responders (~> 2.0)
       sass-rails (~> 5.0)
@@ -19,44 +21,44 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
+    actionmailer (4.2.2)
+      actionpack (= 4.2.2)
+      actionview (= 4.2.2)
+      activejob (= 4.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.1)
-      actionview (= 4.2.1)
-      activesupport (= 4.2.1)
+    actionpack (4.2.2)
+      actionview (= 4.2.2)
+      activesupport (= 4.2.2)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.1)
-      activesupport (= 4.2.1)
+    actionview (4.2.2)
+      activesupport (= 4.2.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.1)
-      activesupport (= 4.2.1)
+    activejob (4.2.2)
+      activesupport (= 4.2.2)
       globalid (>= 0.3.0)
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    activemodel (4.2.2)
+      activesupport (= 4.2.2)
       builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
+    activerecord (4.2.2)
+      activemodel (= 4.2.2)
+      activesupport (= 4.2.2)
       arel (~> 6.0)
-    activesupport (4.2.1)
+    activesupport (4.2.2)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.8)
-    arel (6.0.0)
-    autoprefixer-rails (5.1.10)
+    arel (6.0.2)
+    autoprefixer-rails (5.2.1)
       execjs
       json
     better_errors (2.1.1)
@@ -65,13 +67,14 @@ GEM
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (3.3.4.1)
+    bootstrap-sass (3.3.5)
       autoprefixer-rails (>= 5.0.0.1)
       sass (>= 3.2.19)
     breadcrumbs_on_rails (2.3.0)
-    bson (2.3.0)
+    browser (0.8.0)
+    bson (3.1.0)
     builder (3.2.2)
-    byebug (4.0.5)
+    byebug (5.0.0)
       columnize (= 0.9.0)
     capybara (2.4.4)
       mime-types (>= 1.16)
@@ -84,10 +87,10 @@ GEM
     coderay (1.1.0)
     columnize (0.9.0)
     connection_pool (2.2.0)
-    coveralls (0.8.0)
-      multi_json (~> 1.10)
+    coveralls (0.8.2)
+      json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.9.1)
+      simplecov (~> 0.10.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
     database_cleaner (1.4.1)
@@ -107,7 +110,8 @@ GEM
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    ffaker (1.32.1)
+    faker (1.4.3)
+      i18n (~> 0.5)
     ffi (1.9.8)
     globalid (0.3.5)
       activesupport (>= 4.1.0)
@@ -119,7 +123,7 @@ GEM
       haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    highline (1.7.1)
+    highline (1.7.2)
     html2haml (2.0.0)
       erubis (~> 2.7.0)
       haml (~> 4.0.0)
@@ -128,7 +132,7 @@ GEM
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.7.0)
-    i18n-tasks (0.8.2)
+    i18n-tasks (0.8.3)
       activesupport
       easy_translate (>= 0.5.0)
       erubis
@@ -136,39 +140,42 @@ GEM
       i18n
       term-ansicolor
       terminal-table
-    jquery-rails (3.1.2)
-      railties (>= 3.0, < 5.0)
+    jquery-rails (4.0.4)
+      rails-dom-testing (~> 1.0)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.2)
+    json (1.8.3)
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.0.1)
+    loofah (2.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.4.3)
+    mime-types (2.6.1)
     mini_portile (0.6.2)
-    minitest (5.6.0)
+    minitest (5.7.0)
     mongoid (4.0.2)
       activemodel (~> 4.0)
       moped (~> 2.0.0)
       origin (~> 2.1)
       tzinfo (>= 0.3.37)
-    mongoid-rspec (2.0.0)
+    mongoid-rspec (2.2.0)
       mongoid (~> 4.0.0)
       rake
       rspec (~> 3.1)
     mongoid-simple-tags (0.1.3)
       json (~> 1.8)
       mongoid (>= 3.0.3)
+    mongoid-tree (2.0.0)
+      mongoid (>= 4.0, <= 5.0)
     mongoid_orderable (4.1.1)
       mongoid
-    moped (2.0.4)
-      bson (~> 2.2)
+    moped (2.0.6)
+      bson (~> 3.0)
       connection_pool (~> 2.0)
       optionable (~> 0.2.0)
-    multi_json (1.11.0)
+    multi_json (1.11.1)
     netrc (0.10.3)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
@@ -178,24 +185,24 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.1.0)
-      byebug (~> 4.0)
+    pry-byebug (3.2.0)
+      byebug (~> 5.0)
       pry (~> 0.10)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.6.0)
+    rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    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)
+    rails (4.2.2)
+      actionmailer (= 4.2.2)
+      actionpack (= 4.2.2)
+      actionview (= 4.2.2)
+      activejob (= 4.2.2)
+      activemodel (= 4.2.2)
+      activerecord (= 4.2.2)
+      activesupport (= 4.2.2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.1)
+      railties (= 4.2.2)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -208,9 +215,9 @@ GEM
     rails-i18n (4.0.4)
       i18n (~> 0.6)
       railties (~> 4.0)
-    railties (4.2.1)
-      actionpack (= 4.2.1)
-      activesupport (= 4.2.1)
+    railties (4.2.2)
+      actionpack (= 4.2.2)
+      activesupport (= 4.2.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
@@ -220,75 +227,75 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
     rspec-collection_matchers (1.1.2)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-rails (3.2.1)
+      rspec-support (~> 3.3.0)
+    rspec-rails (3.3.3)
       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)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
     ruby-progressbar (1.7.5)
-    ruby_parser (3.6.6)
+    ruby_parser (3.7.0)
       sexp_processor (~> 4.1)
     rubyzip (1.1.7)
-    sass (3.4.13)
-    sass-rails (5.0.2)
+    sass (3.4.14)
+    sass-rails (5.0.3)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)
-    selenium-webdriver (2.45.0)
+    selenium-webdriver (2.46.2)
       childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    sexp_processor (4.5.0)
+    sexp_processor (4.6.0)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
     simple_form (3.1.0)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
-    simplecov (0.9.2)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
-    slim (3.0.3)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    slim (3.0.6)
       temple (~> 0.7.3)
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
-    sprockets (3.0.1)
+    sprockets (3.2.0)
       rack (~> 1.0)
-    sprockets-rails (2.2.4)
+    sprockets-rails (2.3.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    temple (0.7.5)
-    term-ansicolor (1.3.0)
+    temple (0.7.6)
+    term-ansicolor (1.3.2)
       tins (~> 1.0)
     terminal-table (1.4.5)
     thor (0.19.1)
     thread (0.2.0)
     thread_safe (0.3.5)
     tilt (1.4.1)
-    tins (1.3.5)
+    tins (1.5.4)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unf (0.1.4)
@@ -310,12 +317,12 @@ DEPENDENCIES
   coveralls
   database_cleaner (~> 1.3)
   factory_girl_rails (~> 4.4)
-  ffaker (~> 1.23)
+  faker (~> 1.4)
   helena!
   i18n-tasks
   jquery-rails
   launchy
-  mongoid-rspec (~> 2.0.0.rc1)
+  mongoid-rspec
   pry
   pry-byebug
   quiet_assets

data/README.md

@@ -1,8 +1,8 @@
 [![Build Status](https://img.shields.io/travis/gurix/helena/master.svg?style=flat)](https://travis-ci.org/gurix/helena)
 [![Code Climate](https://img.shields.io/codeclimate/github/gurix/helena.svg?style=flat)](https://codeclimate.com/github/gurix/helena)
 [![Dependency Status](https://img.shields.io/gemnasium/gurix/helena.svg?style=flat)](https://gemnasium.com/gurix/helena)
-[![Dependency Status](https://img.shields.io/gem/v/helena.svg?style=flat)](https://rubygems.org/gems/helena)
-[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/gurix/helena?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Rubygems Version](https://img.shields.io/gem/v/helena.svg?style=flat)](https://rubygems.org/gems/helena)
+[![Coverage Status](https://coveralls.io/repos/gurix/helena/badge.svg?branch=master&service=github)](https://coveralls.io/github/gurix/helena?branch=master)
 # Helena
 Helena is an online survey/test framework designed for agile survey/test development, longitudinal studies and instant feedback.
 

data/app/models/helena/question_group.rb

@@ -5,7 +5,7 @@ module Helena
 
     belongs_to :version
 
-    has_many :questions, inverse_of: :question_group, class_name: 'Helena::Question', dependent: :destroy
+    has_many :questions, inverse_of: :question_group, class_name: 'Helena::Question', dependent: :destroy,  autosave: true
 
     orderable scope: :version
 
@@ -13,7 +13,7 @@ module Helena
     field :allow_to_go_back, type: Boolean
 
     def question_codes
-      questions.map { |question| [question.code] +  question.sub_questions.map(&:code) }.flatten
+      questions.map { |question| [question.code] + question.sub_questions.map(&:code) }.flatten
     end
   end
 end

data/app/models/helena/session.rb

@@ -14,10 +14,13 @@ module Helena
 
     validates :token, :view_token, uniqueness: true
 
+    index created_at: 1
+    index updated_at: 1
+
     before_create :reset_tokens
 
     def answers_as_yaml
-      Hash[answers.map { | answer | [answer.code, answer.value] }.sort].to_yaml
+      Hash[answers.map { |answer| [answer.code, answer.value] }.sort].to_yaml
     end
 
     def answers_as_yaml=(yaml)
@@ -33,15 +36,6 @@ module Helena
       self.view_token = generate_token(25) until unique_token_for?(:view_token)
     end
 
-    def self.to_csv
-      CSV.generate do |csv|
-        csv << fields.keys + uniq_answer_codes
-        all.each do |session|
-          csv << session.attributes.values_at(*fields.keys) + answer_values_in(session)
-        end
-      end
-    end
-
     def as_json(options)
       session = super(options)
       session[:answer] = answers_as_hash
@@ -49,19 +43,11 @@ module Helena
     end
 
     def answers_as_hash
-      answers.map { |answer| [answer[:code], answer[:value]] }.to_h
+      Hash[*answers.map { |answer| [answer[:code], answer[:value]] }.flatten]
     end
 
     private
 
-    def self.answer_values_in(session)
-      answers = []
-      answer_codes.each do |code|
-        answers << session.answers.where(code: code).first.try(&:value)
-      end
-      answers
-    end
-
     def self.answer_codes
       answer_codes = []
       all.each do |session|
@@ -70,12 +56,6 @@ module Helena
       answer_codes
     end
 
-    def self.uniq_answer_codes
-      answer_codes.map do |code|
-        fields.keys.include?(code) ? "answer_#{code}" : code
-      end
-    end
-
     def generate_token(size)
       SecureRandom.base64(size).delete('/+=')[0, size]
     end
@@ -85,7 +65,7 @@ module Helena
     end
 
     def update_answers(parsed_answers)
-      parsed_answers.each do | code, value |
+      parsed_answers.each do |code, value|
         answer = answers.where(code: code).first
         if answer
           next if answer.value == value

data/app/models/helena/version.rb

@@ -2,6 +2,7 @@ module Helena
   class Version
     include Helena::Concerns::ApplicationModel
     include Mongoid::Orderable # Needed, because the embedded objects needs this, see
+    include Mongoid::Tree
 
     field :version,        type: Integer, default: 0
     field :notes,          type: String
@@ -11,8 +12,8 @@ module Helena
 
     belongs_to :survey
 
-    has_many :question_groups, inverse_of: :version, dependent: :destroy, class_name: 'Helena::QuestionGroup'
-    has_many :sessions, inverse_of: :version, dependent: :destroy, class_name: 'Helena::Session'
+    has_many :question_groups, inverse_of: :version, dependent: :destroy, class_name: 'Helena::QuestionGroup',  autosave: true
+    has_many :sessions, inverse_of: :version, dependent: :destroy, class_name: 'Helena::Session',  autosave: true
 
     embeds_one :survey_detail, class_name: 'Helena::SurveyDetail'
 

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

@@ -1,33 +1,56 @@
 - label_width = "#{60 / question.labels.count}%"
+- mobile = (browser.mobile? || browser.tablet?) # Use a special layout for this devices
 
 .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|
+  - unless mobile
+    .table-responsive
+      %table.table
+        %thead
           %tr
-            %td.text-right
-              = sub_question.parts.first
-              - if errors[sub_question.code]
-                .help-block.text-danger= errors[sub_question.code]
+            %th
             - 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?
+              %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?
+  - if mobile
+    .mobile
+      - question.sub_questions.each do |sub_question|
+        %table.table.well
+          %tbody
+            %tr
+              %td.part= sub_question.parts.first
+            %tr
+              %td
+                - 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)
+                  .radio
+                    %label.responsive_label
+                      = form.simple_fields_for :answers do |answer_form|
+                        = answer_form.radio_button sub_question.code, label.value, checked: checked
+                        = label.text 
+                         
+              - if sub_question.splitted?
+                %tr
+                  %td.part= sub_question.parts.last

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

@@ -1,29 +1,53 @@
 - label_width = "#{80 / question.labels.count}%"
+- mobile = (browser.mobile? || browser.tablet?) # Use a special layout for this devices
 
 .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
-      %tbody
-        - question.sub_questions.each do |sub_question|
+  - unless mobile
+    .table-responsive
+      %table.table
+        %thead
           %tr
-            %td
-              = sub_question.parts.first
-              - if errors[sub_question.code]
-                .help-block.text-danger= errors[sub_question.code]
+            %th
             - 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
+              %th{ width: label_width }
+                = label.text
+        %tbody
+          - question.sub_questions.each do |sub_question|
+            %tr
+              %td
+                = 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
+    
+  - if mobile
+    .mobile
+      - question.sub_questions.each do |sub_question|
+        %table.table.well
+          %tbody
+            %tr
+              %td.part= sub_question.parts.first
+            %tr
+              %td
+                - 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)
+                  .radio
+                    %label.responsive_label
+                      = form.simple_fields_for :answers do |answer_form|
+                        = answer_form.radio_button sub_question.code, label.value, checked: checked
+                        = label.text 
+                         
+              - if sub_question.splitted?
+                %tr
+                  %td.part= sub_question.parts.last

data/app/views/helena/questions/_static_text.html.slim

@@ -1 +1,6 @@
-= question.default_value.html_safe
+.short_text.form-group
+  - if question.question_text.present?
+    label
+      = question.question_text.html_safe
+    
+  = question.default_value.html_safe

data/db/seeds.rb

@@ -1,5 +1,5 @@
 require 'factory_girl'
-require 'ffaker'
+require 'faker'
 require 'database_cleaner'
 require 'helena/survey_importer'
 

data/helena.gemspec

@@ -19,24 +19,26 @@ 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.add_dependency 'rails', '~> 4.1'
+  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'
-  s.add_dependency 'haml-rails', '~> 0.5'
+  s.add_dependency 'haml-rails', '~> 0.9'
   s.add_dependency 'slim', '~> 3.0'
-  s.add_dependency 'jquery-rails', '~> 3.1'
+  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.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_dependency 'browser', '~> 0.8'
+  s.add_dependency 'mongoid-tree', '~> 2.0'
 
   s.add_development_dependency 'rspec-rails', '~> 3'
   s.add_development_dependency 'rspec-collection_matchers', '~> 1'
   s.add_development_dependency 'factory_girl_rails', '~> 4.4'
   s.add_development_dependency 'database_cleaner', '~> 1.3'
-  s.add_development_dependency 'ffaker', '~> 1.23'
+  s.add_development_dependency 'faker', '~> 1.4'
   s.add_development_dependency 'capybara', '~> 2.3'
 end

data/lib/helena.rb

@@ -6,8 +6,8 @@ require 'mongoid'
 require 'simple_form' # TODO: Remove this when amdin interface is finally moved
 require 'mongoid_orderable'
 require 'mongoid-simple-tags'
-require 'csv'
 require 'slim'
+require 'mongoid/tree'
 
 module Helena
 end

data/lib/helena/survey_importer.rb

@@ -13,7 +13,7 @@ module Helena
     private
 
     def create_survey
-      @survey = Helena::Survey.new @parsed.except('versions')
+      @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 }
@@ -21,7 +21,7 @@ module Helena
 
     def create_version(parsed_version)
       version = build_version(parsed_version)
-
+      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 }
@@ -43,7 +43,7 @@ module Helena
     end
 
     def build_version(parsed_version)
-      version = @survey.versions.build parsed_version.last.except('question_groups')
+      version = @survey.versions.find_or_initialize_by parsed_version.last.except('question_groups', 'survey_detail')
       version.version = parsed_version.first
       version.survey_detail = parsed_version.last['survey_detail']
       version

data/lib/helena/version.rb

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

data/lib/helena/version_publisher.rb

@@ -1,12 +1,12 @@
 module Helena
   class VersionPublisher
     def self.publish(version)
-      copied_version = create_copied_version_from(version)
+      copied_version = build_copied_version_from(version)
 
       version.question_groups.each do |original_question_group|
-        question_group = copied_version.question_groups.create reset_ids(original_question_group.attributes)
+        question_group = copied_version.question_groups.build original_question_group.clone.attributes
         original_question_group.questions.each do |original_question|
-          question = question_group.questions.create reset_ids(original_question.attributes)
+          question = question_group.questions.build original_question.clone.attributes
           question.labels = original_question.labels
           question.sub_questions = original_question.sub_questions
         end
@@ -16,6 +16,7 @@ module Helena
 
     def self.adjust_copied_attributes(version, copied_version)
       copied_version.version = newest_version_of(version.survey) + 1
+      copied_version.survey_detail = version.survey_detail.attributes if version.survey_detail
       copied_version.created_at = DateTime.now
       copied_version.updated_at = DateTime.now
       copied_version.active = false
@@ -26,23 +27,9 @@ module Helena
       survey.newest_version.version
     end
 
-    def self.create_copied_version_from(version)
-      copied_version = Helena::Version.new reset_ids(version.attributes)
-      copied_version = adjust_copied_attributes(version, copied_version)
-      copied_version.survey_detail = reset_ids(version.survey_detail.attributes) if version.survey_detail
-      copied_version.save
-      copied_version
-    end
-
-    def self.reset_ids(attributes)
-      attributes.each do |key, value|
-        if key == '_id' && value.is_a?(BSON::ObjectId)
-          attributes[key] = BSON::ObjectId.new
-        elsif value.is_a?(Hash) || value.is_a?(Array)
-          attributes[key] = reset_ids(value)
-        end
-      end
-      attributes
+    def self.build_copied_version_from(version)
+      copied_version = version.clone
+      adjust_copied_attributes(version, copied_version)
     end
   end
 end

data/spec/dummy/config/application.rb

@@ -5,6 +5,7 @@ require 'action_controller/railtie'
 require 'action_mailer/railtie'
 require 'sprockets/railtie'
 require 'rails/mongoid'
+require 'browser'
 
 Bundler.require(*Rails.groups)
 require 'helena'

data/spec/lib/version_publisher_spec.rb

@@ -3,21 +3,29 @@ require 'spec_helper'
 describe Helena::VersionPublisher do
   let!(:survey) { create :survey }
   let!(:source_version) { survey.versions.create version: 42, active: true }
-  let!(:survey_detail) { source_version.survey_detail = build :survey_detail }
+  let!(:survey_detail) { source_version.survey_detail = build :survey_detail, title: 'Bla Bla' }
   let!(:question_group) { source_version.question_groups.create }
-  let!(:question) { build(:radio_matrix_question, code: 'abc', question_group: question_group) }
-  let!(:label) {  build(:label, text: 'xyz', value: 'asdf', question: question) }
-  let!(:sub_question) { build(:sub_question, text: 'ymca', code: 'cde', question: question) }
+  let!(:question) { create(:radio_matrix_question, code: 'abc', question_group: question_group) }
+  let!(:label) {  create(:label, text: 'xyz', value: 'asdf', question: question) }
+  let!(:sub_question) { create(:sub_question, text: 'ymca', code: 'cde', question: question) }
 
   it 'creates a new version' do
     allow(DateTime).to receive(:now).and_return('Tue, 24 Jun 2014 10:24:08 +0200')
 
     new_version = Helena::VersionPublisher.publish(source_version)
+    new_version.save
 
     expect(new_version.version).to eq 43
-    expect(new_version.survey_detail).to be_a Helena::SurveyDetail
+    expect(new_version.survey_detail.title).to eq 'Bla Bla'
+
     expect(new_version).to have(1).question_groups
+    expect(Helena::QuestionGroup.count).to eq 2
+    expect(new_version.question_groups.first.id).not_to eq source_version.question_groups.first.id
+
     expect(new_version.question_groups.first).to have_exactly(1).questions
+    expect(new_version.question_groups.first.questions.first.id).not_to eq source_version.question_groups.first.questions.first.id
+    expect(Helena::Question.count).to eq 2
+
     expect(new_version.question_groups.first.questions.first).to have_exactly(1).labels
     expect(new_version.question_groups.first.questions.first).to have_exactly(1).sub_questions
     expect(new_version.created_at).to eq 'Tue, 24 Jun 2014 10:24:08 +0200'

data/spec/models/helena/session_spec.rb

@@ -13,6 +13,9 @@ describe Helena::Session do
   it { expect(subject).to validate_uniqueness_of(:token) }
   it { expect(subject).to validate_uniqueness_of(:view_token) }
 
+  it { expect(subject).to have_index_for(created_at: 1) }
+  it { expect(subject).to have_index_for(updated_at: 1) }
+
   it 'has a valid factory' do
     expect(build :session).to be_valid
   end
@@ -22,17 +25,6 @@ describe Helena::Session do
     expect(create(:session_without_token).token).to eq 'a493oP'
   end
 
-  it 'exports as CSV with answers' do
-    session.answers << Helena::Answer.build_generic('a', 42, '192.168.0.1')
-    session.answers << Helena::Answer.build_generic('b', true, '192.235.0.1')
-    session.answers << Helena::Answer.build_generic('c', 'Barbra Streisand!!', '192.999.0.1')
-
-    csv = Helena::Session.to_csv
-
-    expect(csv).to include 'a,b,c'
-    expect(csv).to include '42,true,Barbra Streisand!!'
-  end
-
   describe '#answers_as_yaml and #answer_as_yaml=' do
     before do
       session.answers << Helena::Answer.build_generic('c', 'Barbra Streisand!!', '192.999.0.1')

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'ffaker'
+require 'faker'
 require 'coveralls'
 
 Coveralls.wear!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helena
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Markus Graf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +192,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: browser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: mongoid-tree
+  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
@@ -249,19 +277,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: ffaker
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -447,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Helena is an online survey/test framework designed for agile survey/test