qwester 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Njk1Yzc3YmU1NzA5MDQxN2RiOWY4NjU4NTY4ODcwMmU1MWUwMjdmYw==
+    YWJjNjAyYzVlZDJmYTIxNzM0ZTRiMjFhMTVlYjU0YTQ2ZDhiNWZhOQ==
   data.tar.gz: !binary |-
-    ODVkMDE2ZjNhODUyYjU4YjRiMGI5ZGQwMWM2YTNlNjI4YThhOWYzOA==
+    YTU1NTBjZTA4ZjEyNjRkMzg4ZjBmN2Q0ZTJiNDI0OGM3N2ZmMjhiNg==
 SHA512:
   metadata.gz: !binary |-
-    N2RjNGJhNDk3ZjlhZmU0M2E3MWNlNzc4YjkyNDA3ZTQ1NmJiY2VmMjNmNzFk
-    ZDMzYzQ2MGFiOThjZDg5ZWM0MWQ0MzgwOWZhOTliMzE5N2JkMGI3YzgyYjg0
-    YjgwNjRkNDhkMTQyMzQ2ODAxNDNlNThmOWQ0MzliNjJkY2JjNTE=
+    NDcyNDk5Mjk1ZjZlMTMwMGJiNTg2NzExMzA1OTBiY2Q2ZjVhNjNmZGEyZWI1
+    ZmU2MDkyNjE0MjhmZDc1ZjU5NjY1ZTBjYTBiNDdmMDRiYWVmNmJiMmU5NDli
+    YzY2NmI0OWEzNjcwMzdjY2ZmNmFiMzg3NzEzMmJiNGQ0NDUzMGQ=
   data.tar.gz: !binary |-
-    M2VhNGE3N2UzMGQ1NTgxNDM3N2MyNGE3YWQwY2Q4ZmIxNjU2ZTgxZWM3YWVm
-    ZjY1Yzc4OTE2N2JmMGVkY2U0MzIzYzY2NzE5MzA1MDYzNDFjZGM1NDg4OTRl
-    NTI3MmNmZDJiM2UwY2RlMjIyZDUxMzM2MTMwNTk2NGE2N2MwNTc=
+    OTQyY2RlNjFlOGFhODI2ZjUxZDRhOGQ5ODY3MDFmZjBkNDNmMGNlYjMwNDYy
+    NTNjY2Y0MzQwYWFjN2M4YjRmNzA1ZmU0YmQ5OTk1MjJmODFlZTMyOGY2NWQy
+    ZTY3MTI3OTlkNjNkNDNiMTc2NjUzZjJhNTU4MjcxYWRiODk2ODE=

data/app/controllers/qwester/questionnaires_controller.rb

@@ -12,7 +12,11 @@ module Qwester
     def update
       @questionnaire = Qwester::Questionnaire.find(params[:id])
       update_qwester_answer_store
-      redirect_to questionnaires_path
+      if @questionnaire.errors.empty?
+        redirect_to questionnaires_path
+      else
+        render :show
+      end
     end
 
     def reset

data/app/helpers/qwester/questionnaires_helper.rb

@@ -15,12 +15,21 @@ module Qwester
     end
 
     def answer_checked(answer)
-      answer_store_answers.include? answer
+      answer_store_answers.include?(answer) || params_includes_answer(answer)
     end
 
     def answer_store_answers
       answer_store = get_qwester_answer_store
       answer_store ? answer_store.answers : []
     end
+
+    # params should be of form: "question_id"=>{"1"=>{"answer_ids"=>["1"]}}
+    def params_includes_answer(answer)
+      question_ids = params[:question_id]
+      return nil unless question_ids.kind_of? Hash
+      answers = question_ids[answer.question_id.to_s]
+      return nil unless answers.kind_of? Hash
+      answers.values.flatten.include?(answer.id.to_s)
+    end
   end
 end

data/app/models/qwester/answer.rb

@@ -1,6 +1,6 @@
 module Qwester
   class Answer < ActiveRecord::Base
-    if Qwester.rails_version == '3'
+    if Qwester.rails_three?
       attr_accessible :value, :question_id, :position, :weighting
     end
 

data/app/models/qwester/answer_store.rb

@@ -1,16 +1,18 @@
 module Qwester
   class AnswerStore < ActiveRecord::Base
-    if Qwester.rails_version == '3'
+    if Qwester.rails_three?
       attr_accessible 
     end
 
     has_and_belongs_to_many(
       :answers,
+      :class_name => 'Qwester::Answer',
       :join_table => :qwester_answer_stores_answers,
       :uniq => true
     )
     has_and_belongs_to_many(
-      :questionnaires, 
+      :questionnaires,
+      :class_name => 'Qwester::Questionnaire',
       :join_table => :qwester_answer_stores_questionnaires,
       :uniq => true
     )
@@ -38,8 +40,16 @@ module Qwester
       make_copy
     end
 
+    def completed_questionnaires
+      questionnaires.select{|q| (q.questions.collect(&:id) - completed_question_ids).empty?}
+    end
+
     private
 
+    def completed_question_ids
+      answers.collect(&:question_id)
+    end
+
     def generate_session_id
       if !self.session_id or self.session_id.empty?
         self.session_id = session_id_not_in_database

data/app/models/qwester/presentation.rb

@@ -1,6 +1,6 @@
 module Qwester
   class Presentation < ActiveRecord::Base
-    if Qwester.rails_version == '3'
+    if Qwester.rails_three?
       attr_accessible :description, :name, :title, :questionnaire_ids, :default
     end
     

data/app/models/qwester/presentation_questionnaire.rb

@@ -1,6 +1,6 @@
 module Qwester
   class PresentationQuestionnaire < ActiveRecord::Base
-    if Qwester.rails_version == '3'
+    if Qwester.rails_three?
       attr_accessible :presentation_id, :questionnaire_id
     end
     

data/app/models/qwester/question.rb

@@ -1,6 +1,6 @@
 module Qwester
   class Question < ActiveRecord::Base
-    if Qwester.rails_version == '3'
+    if Qwester.rails_three?
       attr_accessible :title, :description, :ref, :answers_attributes, :multi_answer
     end
 

data/app/models/qwester/questionnaire.rb

@@ -1,7 +1,7 @@
 module Qwester
   class Questionnaire < ActiveRecord::Base
-    if Qwester.rails_version == '3'
-      attr_accessible :title, :description, :button_image, :question_ids
+    if Qwester.rails_three?
+      attr_accessible :title, :description, :button_image, :question_ids, :must_complete
     end
 
     has_many(
@@ -11,6 +11,7 @@ module Qwester
 
     has_many(
       :questions,
+      :class_name => 'Qwester::Question',
       :uniq => true,
       :through => :questionnaires_questions,
       :order => 'position'
@@ -18,6 +19,7 @@ module Qwester
 
     has_many(
       :answers,
+      :class_name => 'Qwester::Answer',
       :through => :questions,
       :uniq => true
     )

data/app/models/qwester/questionnaires_question.rb

@@ -1,6 +1,6 @@
 module Qwester
   class QuestionnairesQuestion < ActiveRecord::Base
-    if Qwester.rails_version == '3'
+    if Qwester.rails_three?
       attr_accessible :position
     end
 

data/app/models/qwester/rule_set.rb

@@ -1,7 +1,7 @@
 require 'array_logic'
 module Qwester
   class RuleSet < ActiveRecord::Base
-    if Qwester.rails_version == '3'
+    if Qwester.rails_three?
       attr_accessible :title, :description, :answers, :url, :rule, :answer_ids, :link_text, :warning_id, :presentation
     end
 

data/app/views/qwester/questionnaires/_errors.html.erb

@@ -0,0 +1,9 @@
+<% if @questionnaire and @questionnaire.errors.present? %>
+<div class="error">
+  <h2>Error detected</h2>
+  <ul>
+  <% @questionnaire.errors.full_messages.each do |message|  %>
+    <%= content_tag('li', message, class: 'error_message') %>
+  <% end %>
+</div>
+<% end %>

data/app/views/qwester/questionnaires/show.html.erb

@@ -5,7 +5,7 @@
 <% else %> 
 <h2>Questions</h2>
 <% end %>
-
+<%= render 'errors' %>
 <%= form_for(@questionnaire, :url => questionnaire_path(@questionnaire)) do |form| %>
 <ul>
 

data/db/migrate/20131119142009_add_must_complete_to_qwester_questionnaires.rb

@@ -0,0 +1,5 @@
+class AddMustCompleteToQwesterQuestionnaires < ActiveRecord::Migration
+  def change
+    add_column :qwester_questionnaires, :must_complete, :boolean
+  end
+end

data/lib/active_admin/admin/presentations.rb

@@ -66,7 +66,7 @@ module Qwester
           ]
         )
       end
-    end
+    end unless Qwester.rails_three?
     
     member_action :move_up do
       presentation = Presentation.find(params[:id])

data/lib/active_admin/admin/questionnaires.rb

@@ -16,6 +16,9 @@ module Qwester
       column :questions do |questionnaire|
         questionnaire.questions.count
       end
+      column :must_complete do |questionnaire|
+        questionnaire.must_complete? ? 'Yes' : 'No'
+      end
       default_actions
     end
 
@@ -27,6 +30,7 @@ module Qwester
         else
           f.input :description, :input_html => { :rows => 3}
         end
+        f.input :must_complete
         f.input :button_image, :as => :file, :hint => f.template.image_tag(f.object.button_image.url(:link))
         f.input :questions, :as => :check_boxes, :collection => Question.all
       end
@@ -37,12 +41,12 @@ module Qwester
       def permitted_params
         params.permit(
           qwester_questionnaire: [
-            :title, :description, :button_image,
+            :title, :description, :button_image, :must_complete,
             {question_ids: []}
           ]
-        )
+        ) 
       end
-    end
+    end unless Qwester.rails_three?
 
     show do
       div do
@@ -55,6 +59,7 @@ module Qwester
 
       div do
         h3 'Questions'
+        para("#{qwester_questionnaire.must_complete? ? 'A' : 'Not a'}ll must be completed")
         ul :id => 'question_list'
         qwester_questionnaire.questions.each do |question|
           li do 

data/lib/active_admin/admin/questions.rb

@@ -69,6 +69,10 @@ module Qwester
         @qwester_question.build_standard_answers
       end
 
+    end
+
+    controller do
+
       def permitted_params
         params.permit(
           qwester_question: [
@@ -78,7 +82,7 @@ module Qwester
         )
       end
 
-    end
+    end unless Qwester.rails_three?
 
   end if defined?(ActiveAdmin)
 

data/lib/active_admin/admin/rule_sets.rb

@@ -149,7 +149,7 @@ EOF
           ]
         )
       end
-    end
+    end unless Qwester.rails_three?
     
     show do
       div do

data/lib/qwester/version.rb

@@ -1,10 +1,14 @@
 module Qwester
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end
 
 # History
 # =======
 #
+# 0.3.1 - Adds facility to mark as questionnaire as 'must complete'
+#   When set, all questions must be answered before a questionnaire can be
+#   successfully submitted.
+#
 # 0.3.0 - Allows qwester to be hosted in a rails 4 app
 #
 # 0.2.2 - Removes require statements not needed in production

data/lib/qwester.rb

@@ -35,5 +35,9 @@ module Qwester
   def self.rails_version
     @rails_version ||= Rails.version.split('.').first if defined? Rails
   end
+
+  def self.rails_three?
+    rails_version == '3'
+  end
   
 end

data/lib/rails/actionpack/lib/action_controller/base.rb

@@ -5,8 +5,11 @@ module ActionController
     def update_qwester_answer_store
       if params_includes_answers?
         get_qwester_answer_store(true)
-        add_answers_to_qwester_answer_store
-        add_questionnaire_to_qwester_answer_store
+        ActiveRecord::Base.transaction do
+          add_answers_to_qwester_answer_store
+          add_questionnaire_to_qwester_answer_store
+          ensure_complete_all_questionnaires_completed
+        end
       end
     end
 
@@ -95,5 +98,12 @@ module ActionController
     def add_questionnaire_to_qwester_answer_store
       @qwester_answer_store.questionnaires << @questionnaire
     end
+
+    def ensure_complete_all_questionnaires_completed
+      if @questionnaire.must_complete? and !@qwester_answer_store.completed_questionnaires.include?(@questionnaire)
+        @questionnaire.errors.add(:base, "All questions must be answered in this questionnaire")
+      end
+      raise ActiveRecord::Rollback unless @questionnaire.errors.empty?
+    end
   end
 end

data/test/dummy/config/initializers/devise.rb

@@ -1,6 +1,9 @@
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
+
+  config.secret_key = '778bf64a3ff719bae4179047012814a0ab280525f3b37e8bc9aba3b2928b2e110588950a4231070581e2155495a5bff3f252d5ce51a9dbcb25410cb76d356b57'
+
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.

data/test/dummy/db/migrate/20131119142050_add_must_complete_to_qwester_questionnaires.qwester.rb

@@ -0,0 +1,6 @@
+# This migration comes from qwester (originally 20131119142009)
+class AddMustCompleteToQwesterQuestionnaires < ActiveRecord::Migration
+  def change
+    add_column :qwester_questionnaires, :must_complete, :boolean
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130502082731) do
+ActiveRecord::Schema.define(:version => 20131119142050) do
 
   create_table "active_admin_comments", :force => true do |t|
     t.string   "resource_id",   :null => false
@@ -118,6 +118,7 @@ ActiveRecord::Schema.define(:version => 20130502082731) do
     t.string   "button_image_content_type"
     t.integer  "button_image_file_size"
     t.datetime "button_image_updated_at"
+    t.boolean  "must_complete"
   end
 
   create_table "qwester_questionnaires_questions", :force => true do |t|