helena 1.1.0 → 1.3.0

data/app/models/helena/answer.rb

@@ -4,7 +4,7 @@ module Helena
 
     field :code,        type: String
     field :ip_address,  type: String
-    field :created_at,  type: DateTime, default: -> { DateTime.now }
+    field :created_at,  type: DateTime, default: -> { Time.now }
 
     embedded_in :session, inverse_of: :answers
 
@@ -17,7 +17,7 @@ module Helena
 
     def self.answer_class_for(value)
       case value
-      when Fixnum
+      when Integer
         Helena::IntegerAnswer
       when TrueClass
         Helena::BooleanAnswer
@@ -41,7 +41,9 @@ module Helena
     end
 
     def self.integer?(str)
-      Integer(str) rescue false
+      Integer(str)
+    rescue StandardError
+      false
     end
   end
 end

data/app/models/helena/concerns/application_model.rb

@@ -1,6 +1,6 @@
 module Helena
   module Concerns
-    module  ApplicationModel
+    module ApplicationModel
       extend ActiveSupport::Concern
 
       include Mongoid::Document

data/app/models/helena/question.rb

@@ -11,7 +11,7 @@ module Helena
       Helena::Questions::CheckboxGroup,
       Helena::Questions::RadioMatrix,
       Helena::Questions::BipolarRadioMatrix
-    ]
+    ].freeze
 
     belongs_to :question_group, inverse_of: :questions
 

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,  autosave: true
+    has_many :questions, inverse_of: :question_group, class_name: 'Helena::Question', dependent: :destroy, autosave: true
 
     orderable scope: :version
 

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

@@ -9,7 +9,7 @@ module Helena
 
       def validate_answers_in(answers)
         errors = {}
-        errors[code] = :blank if sub_questions.map { |sub_question| answers[sub_question.code] == 0 }.all? && required
+        errors[code] = :blank if sub_questions.map { |sub_question| answers[sub_question.code].zero? }.all? && required
         errors
       end
     end

data/app/models/helena/session.rb

@@ -24,7 +24,7 @@ module Helena
     end
 
     def answers_as_yaml=(yaml)
-      parsed_answers = YAML.load yaml
+      parsed_answers = YAML.safe_load yaml
       update_answers parsed_answers
       remove_unparsed_answers parsed_answers
     end
@@ -46,8 +46,6 @@ module Helena
       Hash[*answers.map { |answer| [answer[:code], answer[:value]] }.flatten]
     end
 
-    private
-
     def self.answer_codes
       answer_codes = []
       all.each do |session|
@@ -56,6 +54,8 @@ module Helena
       answer_codes
     end
 
+    private
+
     def generate_token(size)
       SecureRandom.base64(size).delete('/+=')[0, size]
     end

data/app/models/helena/version.rb

@@ -12,7 +12,7 @@ module Helena
 
     belongs_to :survey
 
-    has_many :question_groups, inverse_of: :version, dependent: :destroy, class_name: 'Helena::QuestionGroup',  autosave: true
+    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'
 
     embeds_one :survey_detail, class_name: 'Helena::SurveyDetail'

data/config/initializers/simple_form_bootstrap.rb

@@ -1,5 +1,5 @@
 # Use this setup block to configure all options available in SimpleForm.
-SimpleForm.setup do |config|
+SimpleForm.setup do |config| # rubocop:disable Metrics/BlockLength
   config.error_notification_class = 'alert alert-danger'
   config.button_class = 'btn btn-default'
   config.boolean_label_class = nil

data/db/seeds.rb

@@ -1,8 +1,8 @@
-require 'factory_girl'
+require 'factory_bot'
 require 'faker'
 require 'helena/survey_importer'
 
-include FactoryGirl::Syntax::Methods
+include FactoryBot::Syntax::Methods
 
 puts 'Cleaning database ...'
 Mongoid.purge!
@@ -20,18 +20,19 @@ def publish(version)
   published_version.save
   published_version
 end
+
 # rubocop:disable Metrics/MethodLength
 def generate_sessions(survey, version)
-  3.times { survey.sessions << build(:session, version: version, updated_at: DateTime.now - rand(999), completed: false) }
+  3.times { survey.sessions << build(:session, version: version, updated_at: Time.now - rand(999), completed: false) }
 
   3.times do
-    session = build :session, version: version, updated_at: DateTime.now - rand(999), completed: true
+    session = build :session, version: version, updated_at: Time.now - rand(999), completed: true
     version.question_groups.map(&:questions).flatten.each do |question|
       case question
       when Helena::Questions::ShortText
-        session.answers << build(:string_answer, code: question.code, value: Faker::Skill.tech_skill)
+        session.answers << build(:string_answer, code: question.code, value: Faker::Lorem.word)
       when Helena::Questions::LongText
-        session.answers << build(:string_answer, code: question.code, value: Faker::Skill.tech_skill)
+        session.answers << build(:string_answer, code: question.code, value: Faker::Lorem.word)
       when Helena::Questions::RadioGroup
         session.answers << Helena::Answer.build_generic(question.code, question.labels.sample.value, Faker::Internet.ip_v4_address)
       when Helena::Questions::CheckboxGroup

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,22 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", " ~> 4.2"
+gem "mongoid-rspec", :group => [:development, :test]
+
+group :development, :test do
+  gem "pry"
+  gem "pry-byebug"
+  gem "ruby-progressbar"
+  gem "better_errors"
+  gem "launchy"
+  gem "binding_of_caller"
+  gem "selenium-webdriver"
+  gem "simple_form"
+  gem "jquery-rails"
+  gem "bootstrap-sass"
+  gem "shoulda-matchers"
+end
+
+gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile.lock

@@ -0,0 +1,295 @@
+PATH
+  remote: ..
+  specs:
+    helena (1.3.0)
+      bootstrap-sass (~> 3.2)
+      browser (~> 2.0)
+      haml-rails (~> 1.0)
+      jquery-rails (~> 4.0)
+      mongoid (>= 4.0)
+      mongoid-simple-tags (~> 0.1)
+      mongoid-tree (~> 2.0)
+      mongoid_orderable (~> 4.1)
+      rails (>= 4.2)
+      rails-i18n (>= 4.0)
+      responders (~> 2.0)
+      sass-rails (~> 5.0)
+      simple_form (~> 3.2)
+      slim (~> 3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.10)
+      actionview (= 4.2.10)
+      activesupport (= 4.2.10)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.10)
+      activesupport (= 4.2.10)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.10)
+      activesupport (= 4.2.10)
+      globalid (>= 0.3.0)
+    activemodel (4.2.10)
+      activesupport (= 4.2.10)
+      builder (~> 3.1)
+    activerecord (4.2.10)
+      activemodel (= 4.2.10)
+      activesupport (= 4.2.10)
+      arel (~> 6.0)
+    activesupport (4.2.10)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (6.0.4)
+    autoprefixer-rails (7.1.6)
+      execjs
+    better_errors (2.4.0)
+      coderay (>= 1.0.0)
+      erubi (>= 1.0.0)
+      rack (>= 0.9.0)
+    binding_of_caller (0.7.3)
+      debug_inspector (>= 0.0.1)
+    bootstrap-sass (3.3.7)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
+    browser (2.5.2)
+    bson (4.2.2)
+    builder (3.2.3)
+    byebug (9.1.0)
+    capybara (2.15.4)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+    childprocess (0.8.0)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    crass (1.0.2)
+    debug_inspector (0.0.3)
+    diff-lcs (1.3)
+    erubi (1.7.0)
+    erubis (2.7.0)
+    execjs (2.7.0)
+    factory_bot (4.8.2)
+      activesupport (>= 3.0.0)
+    factory_bot_rails (4.8.2)
+      factory_bot (~> 4.8.2)
+      railties (>= 3.0.0)
+    faker (1.8.4)
+      i18n (~> 0.5)
+    ffi (1.9.18)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    haml (5.0.4)
+      temple (>= 0.8.0)
+      tilt
+    haml-rails (1.0.0)
+      actionpack (>= 4.0.1)
+      activesupport (>= 4.0.1)
+      haml (>= 4.0.6, < 6.0)
+      html2haml (>= 1.0.1)
+      railties (>= 4.0.1)
+    html2haml (2.2.0)
+      erubis (~> 2.7.0)
+      haml (>= 4.0, < 6)
+      nokogiri (>= 1.6.0)
+      ruby_parser (~> 3.5)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    jquery-rails (4.3.1)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.6)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.0)
+    mini_mime (0.1.4)
+    mini_portile2 (2.3.0)
+    minitest (5.10.3)
+    mongo (2.4.3)
+      bson (>= 4.2.1, < 5.0.0)
+    mongoid (5.2.1)
+      activemodel (~> 4.0)
+      mongo (>= 2.4.1, < 3.0.0)
+      origin (~> 2.3)
+      tzinfo (>= 0.3.37)
+    mongoid-rspec (3.0.0)
+      mongoid (~> 5.0)
+      rake
+      rspec (~> 3.3)
+    mongoid-simple-tags (0.1.3)
+      json (~> 1.8)
+      mongoid (>= 3.0.3)
+    mongoid-tree (2.1.0)
+      mongoid (>= 4.0, < 7.0)
+    mongoid_orderable (4.1.1)
+      mongoid
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    origin (2.3.1)
+    pry (0.11.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.5.0)
+      byebug (~> 9.1)
+      pry (~> 0.10)
+    public_suffix (3.0.0)
+    rack (1.6.8)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.10)
+      actionmailer (= 4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
+      activemodel (= 4.2.10)
+      activerecord (= 4.2.10)
+      activesupport (= 4.2.10)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.10)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.8)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    rails-i18n (4.0.9)
+      i18n (~> 0.7)
+      railties (~> 4.0)
+    railties (4.2.10)
+      actionpack (= 4.2.10)
+      activesupport (= 4.2.10)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.2.1)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-collection_matchers (1.1.3)
+      rspec-expectations (>= 2.99.0.beta1)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    ruby-progressbar (1.9.0)
+    ruby_parser (3.10.1)
+      sexp_processor (~> 4.9)
+    rubyzip (1.2.1)
+    sass (3.5.3)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+    selenium-webdriver (3.7.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.0)
+    sexp_processor (4.10.0)
+    shoulda-matchers (3.1.2)
+      activesupport (>= 4.0.0)
+    simple_form (3.5.0)
+      actionpack (> 4, < 5.2)
+      activemodel (> 4, < 5.2)
+    slim (3.0.8)
+      temple (>= 0.7.6, < 0.9)
+      tilt (>= 1.3.3, < 2.1)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    temple (0.8.0)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tilt (2.0.8)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
+    xpath (2.1.0)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  better_errors
+  binding_of_caller
+  bootstrap-sass
+  capybara (~> 2.3)
+  factory_bot_rails
+  faker (~> 1.4)
+  helena!
+  jquery-rails
+  launchy
+  mongoid-rspec
+  pry
+  pry-byebug
+  rails (~> 4.2)
+  rspec-collection_matchers (~> 1)
+  rspec-rails (~> 3)
+  ruby-progressbar
+  selenium-webdriver
+  shoulda-matchers
+  simple_form
+
+BUNDLED WITH
+   1.16.0.pre.3

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,24 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "rails", "5.1"
+gem "mongoid", ">= 6.0"
+gem "mongoid-rspec", :git => "https://github.com/mongoid-rspec/mongoid-rspec.git", :group => [:development, :test]
+
+group :development, :test do
+  gem "pry"
+  gem "pry-byebug"
+  gem "ruby-progressbar"
+  gem "better_errors"
+  gem "launchy"
+  gem "binding_of_caller"
+  gem "selenium-webdriver"
+  gem "simple_form"
+  gem "jquery-rails"
+  gem "bootstrap-sass"
+  gem "shoulda-matchers"
+end
+
+gemspec :path => "../"