qwester 0.2.2 → 0.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Njk1Yzc3YmU1NzA5MDQxN2RiOWY4NjU4NTY4ODcwMmU1MWUwMjdmYw==
+  data.tar.gz: !binary |-
+    ODVkMDE2ZjNhODUyYjU4YjRiMGI5ZGQwMWM2YTNlNjI4YThhOWYzOA==
+SHA512:
+  metadata.gz: !binary |-
+    N2RjNGJhNDk3ZjlhZmU0M2E3MWNlNzc4YjkyNDA3ZTQ1NmJiY2VmMjNmNzFk
+    ZDMzYzQ2MGFiOThjZDg5ZWM0MWQ0MzgwOWZhOTliMzE5N2JkMGI3YzgyYjg0
+    YjgwNjRkNDhkMTQyMzQ2ODAxNDNlNThmOWQ0MzliNjJkY2JjNTE=
+  data.tar.gz: !binary |-
+    M2VhNGE3N2UzMGQ1NTgxNDM3N2MyNGE3YWQwY2Q4ZmIxNjU2ZTgxZWM3YWVm
+    ZjY1Yzc4OTE2N2JmMGVkY2U0MzIzYzY2NzE5MzA1MDYzNDFjZGM1NDg4OTRl
+    NTI3MmNmZDJiM2UwY2RlMjIyZDUxMzM2MTMwNTk2NGE2N2MwNTc=

data/app/models/qwester/answer.rb

@@ -1,6 +1,9 @@
 module Qwester
   class Answer < ActiveRecord::Base
-    attr_accessible :value, :question_id, :position, :weighting
+    if Qwester.rails_version == '3'
+      attr_accessible :value, :question_id, :position, :weighting
+    end
+
 
     DEFAULT_VALUE = 'Not applicable'
     STANDARD_VALUES = ['Yes', 'No', DEFAULT_VALUE]

data/app/models/qwester/answer_store.rb

@@ -1,5 +1,8 @@
 module Qwester
   class AnswerStore < ActiveRecord::Base
+    if Qwester.rails_version == '3'
+      attr_accessible 
+    end
 
     has_and_belongs_to_many(
       :answers,

data/app/models/qwester/presentation.rb

@@ -1,6 +1,8 @@
 module Qwester
   class Presentation < ActiveRecord::Base
-    attr_accessible :description, :name, :title, :questionnaire_ids, :default
+    if Qwester.rails_version == '3'
+      attr_accessible :description, :name, :title, :questionnaire_ids, :default
+    end
     
     has_many(
       :presentation_questionnaires,
@@ -21,7 +23,7 @@ module Qwester
     validates(
       :name, 
       :format => { 
-        :with => /^\w+$/, 
+        :with => /\A\w+\z/,
         :message => "must comprise letters or numbers with underscores separating words"
       },
       :presence => true,

data/app/models/qwester/presentation_questionnaire.rb

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

data/app/models/qwester/question.rb

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

data/app/models/qwester/questionnaire.rb

@@ -1,6 +1,8 @@
 module Qwester
   class Questionnaire < ActiveRecord::Base
-    attr_accessible :title, :description, :button_image, :question_ids
+    if Qwester.rails_version == '3'
+      attr_accessible :title, :description, :button_image, :question_ids
+    end
 
     has_many(
       :questionnaires_questions, 

data/app/models/qwester/questionnaires_question.rb

@@ -1,6 +1,8 @@
 module Qwester
   class QuestionnairesQuestion < ActiveRecord::Base
-    attr_accessible :position
+    if Qwester.rails_version == '3'
+      attr_accessible :position
+    end
 
     belongs_to :questionnaire
     belongs_to :question

data/app/models/qwester/rule_set.rb

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

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

@@ -1,21 +1,21 @@
 <h1>Questionnaires</h1>
 <div>
 <% @questionnaires.each do |questionnaire| %>
-
-  <%= link_to(
-        image_tag(questionnaire.button_image.url(:link)), 
-        questionnaire_path(questionnaire),
-        :class => 'image_link'
-      ) 
-  %>
-  <br>
-  <%= link_to(
-        questionnaire.title, 
-        questionnaire_path(questionnaire),
-        :class => 'text_link'
-      ) 
-  %>
-
+  <div class="questionnaire">
+    <%= link_to(
+          image_tag(questionnaire.button_image.url(:link)),
+          questionnaire_path(questionnaire),
+          :class => 'image_link'
+        )
+    %>
+    <br>
+    <%= link_to(
+          questionnaire.title,
+          questionnaire_path(questionnaire),
+          :class => 'text_link'
+        )
+    %>
+  </div>
 <% end %>
 </div>
 
@@ -35,5 +35,5 @@
   content_tag(
     'p', 
     link_to('Clear answers and start again', reset_questionnaires_path)
-  ) if @qwester_rule_sets.present? 
+  ) if @qwester_answer_store and @qwester_answer_store.answers.present?
 %>

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

@@ -8,8 +8,8 @@
 
 <%= form_for(@questionnaire, :url => questionnaire_path(@questionnaire)) do |form| %>
 <ul>
-<%=   form.fields_for(@questionnaire.answers, Qwester::Answer) do |answer_form| %>
-<%      @questionnaire.questions.each do |question| %>
+
+<%    @questionnaire.questions.each do |question| %>
   <li>
     <%= content_tag(
           'span', question.title,
@@ -21,8 +21,8 @@
     <%= qwester_answers_selection_list(question) %>
 
   </li>
-<%       end %>
-<%    end %>
+<%     end %>
+
 </ul>
 
 <p>

data/lib/active_admin/admin/answers.rb

@@ -6,7 +6,7 @@ module Qwester
     menu_label = "Qwester #{menu_label}" unless Qwester.active_admin_menu
     menu :parent => Qwester.active_admin_menu, :label => menu_label
 
-    actions :all, :except => [:edit]
+    actions :all, :except => [:edit, :new]
     config.batch_actions = false
     
     filter :question
@@ -59,6 +59,7 @@ module Qwester
       redirect_to admin_qwester_question_path(answer.question) 
     end
 
+
   end if defined?(ActiveAdmin)
 
 end

data/lib/active_admin/admin/presentations.rb

@@ -54,7 +54,18 @@ module Qwester
         end
         f.input :questionnaires, :as => :check_boxes, :collection => Questionnaire.all
       end
-      f.buttons
+      f.actions
+    end
+
+    controller do
+      def permitted_params
+        params.permit(
+          qwester_presentation: [
+            :name, :title, :default, :description,
+            {questionnaire_ids: []}
+          ]
+        )
+      end
     end
     
     member_action :move_up do

data/lib/active_admin/admin/questionnaires.rb

@@ -30,7 +30,18 @@ module Qwester
         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
-      f.buttons
+      f.actions
+    end
+
+    controller do
+      def permitted_params
+        params.permit(
+          qwester_questionnaire: [
+            :title, :description, :button_image,
+            {question_ids: []}
+          ]
+        )
+      end
     end
 
     show do

data/lib/active_admin/admin/questions.rb

@@ -30,11 +30,11 @@ module Qwester
 
       table :class => 'sortable_list' do
         tr do
-          th 'Value'
+          th "Value (#{Answer.weighting_alias_name.humanize})"
         end
         qwester_question.answers.each do |answer|
           tr do
-            td answer.value
+            td "#{answer.value} (#{answer.weighting})"
             td(answer.first? ? " ".html_safe : link_to('Up', move_up_admin_qwester_answer_path(answer)))
             td(answer.last? ? " ".html_safe : link_to('Down', move_down_admin_qwester_answer_path(answer)))
             td link_to('Delete', remove_admin_qwester_answer_path(answer), :confirm => "Are you sure you want to delete the answer '#{answer.value}'?")
@@ -59,7 +59,7 @@ module Qwester
         end
       end
 
-      f.buttons
+      f.actions
     end
     
     controller do
@@ -69,6 +69,15 @@ module Qwester
         @qwester_question.build_standard_answers
       end
 
+      def permitted_params
+        params.permit(
+          qwester_question: [
+            :ref, :title, :description, :multi_answer,
+            {answers_attributes: [:value, :position, :weighting]}
+          ]
+        )
+      end
+
     end
 
   end if defined?(ActiveAdmin)

data/lib/active_admin/admin/rule_sets.rb

@@ -137,7 +137,18 @@ EOF
         
       end
       
-      f.buttons
+      f.actions
+    end
+
+    controller do
+      def permitted_params
+        params.permit(
+          qwester_rule_set: [
+            :title, :description, :url, :link_text, :presentation, :rule,
+            {answer_ids: []}
+          ]
+        )
+      end
     end
     
     show do

data/lib/qwester/version.rb

@@ -1,10 +1,12 @@
 module Qwester
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end
 
 # History
 # =======
 #
+# 0.3.0 - Allows qwester to be hosted in a rails 4 app
+#
 # 0.2.2 - Removes require statements not needed in production
 #   Some gems needed to be required to run the dummy app, but these may have
 #   caused some javascript and/or asset pipeline errors in production apps.

data/lib/qwester.rb

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

data/test/dummy/app/assets/stylesheets/questionnaires.css.scss

@@ -1,3 +1,7 @@
 // Place all the styles related to the questionnaires controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+.questionnaire {
+  display: inline-block;
+}