qwester 0.2.0 → 0.2.1

data/README.rdoc

@@ -255,37 +255,4 @@ initializer:
 
     Qwester.active_admin_menu = 'none'
 
-See test/dummy/config/initializers/qwester.rb for an example
-
-You will also need to add the following to your config/routes so that you can
-reorder items:
-
-    namespace :admin do
-      resources :questionnaires do
-        resources :questions, :only => [:move_up, :move_down] do
-          member do
-            get :move_up
-            get :move_down
-          end
-        end
-      end
-
-      resources :questions do
-        resources :answers, :only => [:move_up, :move_down, :remove] do
-          member do
-            get :move_up
-            get :move_down
-            get :remove
-          end
-        end
-      end
-
-      resources :rule_sets do
-        resources :answers, :only => [:add, :delete] do
-          member do
-            put :add
-            put :delete
-          end
-        end
-      end
-    end
+See test/dummy/config/initializers/qwester.rb for an example

data/app/models/qwester/presentation.rb

@@ -2,11 +2,16 @@ module Qwester
   class Presentation < ActiveRecord::Base
     attr_accessible :description, :name, :title, :questionnaire_ids, :default
     
-    has_many :presentation_questionnaires
+    has_many(
+      :presentation_questionnaires,
+      :order => 'position'
+    )
     
     has_many(
       :questionnaires,
-      :through => :presentation_questionnaires
+      :through => :presentation_questionnaires,
+      :uniq => true,
+      :order => 'position'
     )
     accepts_nested_attributes_for :questionnaires
     
@@ -41,5 +46,31 @@ module Qwester
       self.title = self.name.humanize unless self.title.present?
     end
     
+    def method_missing(symbol, *args, &block)
+      if symbol.to_sym == :position || acts_as_list_method?(symbol)
+        pass_acts_as_list_method_to(presentation_questionnaires, symbol, args.first)
+      else
+        super
+      end
+    end
+
+  #  Allows acts_as_list methods to be used within the questionnaire. 
+  #  
+  #  Usage: 
+  #  
+  #       questionnaire.move_to_top(question)
+  #       questionnaire.last?(question)
+  # 
+    def pass_acts_as_list_method_to(presentation_questionnaires, symbol, questionnaire)
+      raise "A Questionnaire is needed to identify the PresentationQuesti" unless questionnaire.kind_of? Questionnaire
+      presentation_questionnaire = presentation_questionnaires.where(:questionnaire_id => questionnaire.id).first
+      presentation_questionnaire.send(symbol) if presentation_questionnaire
+    end
+
+    def acts_as_list_method?(symbol)
+      methods = ActiveRecord::Acts::List::InstanceMethods.instance_methods + ActiveRecord::Acts::List::InstanceMethods.private_instance_methods
+      methods.include?(symbol.to_sym)
+    end
+    
   end
 end

data/app/models/qwester/presentation_questionnaire.rb

@@ -4,5 +4,7 @@ module Qwester
     
     belongs_to :presentation
     belongs_to :questionnaire
+    
+    acts_as_list :scope => :presentation
   end
 end

data/app/models/qwester/questionnaire.rb

@@ -46,35 +46,22 @@ module Qwester
 
     private
     def method_missing(symbol, *args, &block)
-      if acts_as_list_method?(symbol)
-        pass_method_to_questionnaires_question(symbol, args.first)
-      else
+      if symbol.to_sym == :position || acts_as_list_method?(symbol)
+        pass_acts_as_list_method_to_questionnaires_question(symbol, args.first) 
+      else 
         super
       end
     end
 
   #  Allows acts_as_list methods to be used within the questionnaire. 
-  #  If questions were the act_as_list object, you could do things like this
-  #   
-  #       questionnaire.questions.last.move_higher
-  #       
-  #   However, as questions are used on multiple questionnaires and they
-  #   need to be independently sortable within each questionnaire, it is the
-  #   through table model QuestionnairesQuestion that acts_as_list. To change
-  #   position the change must be made in the context of the questionnaire. 
-  #   pass_method_to_questionnaires_question in combination with method_missing,
-  #   allows you to pass to a questionnaire the acts_as_list method together with
-  #   the question it needs to effect. The equivalent move_higher call then becomes:
-  #   
-  #       questionnaire.move_higher(questionnaire.questions.last)
-  #       
-  #   You can also do:
-  #   
+  #  
+  #  Usage: 
+  #  
   #       questionnaire.move_to_top(question)
   #       questionnaire.last?(question)
   # 
-    def pass_method_to_questionnaires_question(symbol, question)
-      raise "A Question is needed to identify QuestionnairesQuestion" unless question.kind_of? Question
+    def pass_acts_as_list_method_to_questionnaires_question(symbol, question)
+      raise "A Question is needed to identify the QuestionnairesQuestion" unless question.kind_of? Question
       questionnaires_question = questionnaires_questions.where(:question_id => question.id).first
       questionnaires_question.send(symbol) if questionnaires_question
     end
@@ -83,6 +70,5 @@ module Qwester
       ActiveRecord::Acts::List::InstanceMethods.instance_methods.include?(symbol.to_sym)
     end
 
-
   end
 end

data/db/migrate/20130502082540_add_position_to_qwester_presentation_questionnaires.rb

@@ -0,0 +1,5 @@
+class AddPositionToQwesterPresentationQuestionnaires < ActiveRecord::Migration
+  def change
+    add_column :qwester_presentation_questionnaires, :position, :integer
+  end
+end

data/lib/active_admin/admin/presentations.rb

@@ -28,6 +28,15 @@ module Qwester
         div(:style => 'display:inline-block;margin-right:20px;') do
           para image_tag(questionnaire.button_image.url(:thumbnail))
           para questionnaire.title
+          move_up_link = " "
+          move_down_link = " "
+          unless qwester_presentation.first?(questionnaire)
+            move_up_link =  link_to('<', move_up_admin_qwester_presentation_path(qwester_presentation, :questionnaire_id => questionnaire.id))
+          end
+          unless qwester_presentation.last?(questionnaire)
+            move_down_link =  link_to('>', move_down_admin_qwester_presentation_path(qwester_presentation, :questionnaire_id => questionnaire.id))
+          end
+          para [move_up_link, 'move', move_down_link].join(' ').html_safe
         end
       end
       para "Default: Will be inital presentation of quesitonnaires" if qwester_presentation.default?
@@ -48,5 +57,19 @@ module Qwester
       f.buttons
     end
     
+    member_action :move_up do
+      presentation = Presentation.find(params[:id])
+      questionnaire = Questionnaire.find(params[:questionnaire_id])
+      presentation.move_higher(questionnaire)
+      redirect_to admin_qwester_presentation_path(presentation)      
+    end
+    
+    member_action :move_down do
+      presentation = Presentation.find(params[:id])
+      questionnaire = Questionnaire.find(params[:questionnaire_id])
+      presentation.move_lower(questionnaire)
+      redirect_to admin_qwester_presentation_path(presentation)     
+    end
+    
   end
 end

data/lib/qwester/version.rb

@@ -1,10 +1,12 @@
 module Qwester
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end
 
 # History
 # =======
 # 
+# 0.2.1 - Allows questionnaires to be positioned within a presentation
+# 
 # 0.2.0 - Adds weighting to answers
 #   Weighting can be used to give some answers greater weight in comparisons.
 #   Weighting can be aliased.

data/lib/tasks/qwester_tasks.rake

@@ -1,8 +1,8 @@
 namespace :qwester do
 
-  # Usage: rake data:reset_positions RAILS_ENV=production
+  # Usage: rake data:reset_questionnaire_positions RAILS_ENV=production
   desc "Goes through each of the acts_as_list objects and resets the positions based on order they were added to the database"
-  task :reset_positions => :environment do
+  task :reset_questionnaire_positions => :environment do
 
     Qwester::Questionnaire.all.each do |questionnaire|
       first_id = questionnaire.questionnaires_questions.minimum(:id)
@@ -22,4 +22,14 @@ namespace :qwester do
     after = Qwester::AnswerStore.count
     puts "#{before - after} answer stores removed, with #{after} remaining."
   end
+  
+  desc "Reset positions of questionnaires within presentations"
+  task :reset_presentation_questionnaires_positions => :environment do
+    Qwester::Presentation.all.each do |presentation|
+      presentation.presentation_questionnaires.each_with_index do |presentation_questionnaire, index|
+        presentation_questionnaire.update_attribute(:position, index + 1)
+      end
+      puts "Presentation '#{presentation.name}' questionnaires postitioned #{presentation.presentation_questionnaires.collect(&:position)}"
+    end
+  end
 end

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

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
+Dummy::Application.config.session_store(:cookie_store, key: '_dummy_session')
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

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

@@ -5,7 +5,7 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json]
+  wrap_parameters(format: [:json])
 end
 
 # Disable root element in JSON by default.

data/test/dummy/db/migrate/20130502082731_add_position_to_qwester_presentation_questionnaires.qwester.rb

@@ -0,0 +1,6 @@
+# This migration comes from qwester (originally 20130502082540)
+class AddPositionToQwesterPresentationQuestionnaires < ActiveRecord::Migration
+  def change
+    add_column :qwester_presentation_questionnaires, :position, :integer
+  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 => 20130402085424) do
+ActiveRecord::Schema.define(:version => 20130502082731) do
 
   create_table "active_admin_comments", :force => true do |t|
     t.string   "resource_id",   :null => false
@@ -97,6 +97,7 @@ ActiveRecord::Schema.define(:version => 20130402085424) do
     t.integer  "presentation_id"
     t.datetime "created_at",       :null => false
     t.datetime "updated_at",       :null => false
+    t.integer  "position"
   end
 
   create_table "qwester_presentations", :force => true do |t|