surveyor 0.6.9 → 0.6.10

data/README.md

@@ -7,12 +7,12 @@ Surveyor is a rails (gem) plugin, that brings surveys to your rails app. Before
 As a plugin:
 
     sudo gem install haml
-    script/plugin install git://github.com/breakpointer/surveyor.git -r 'tag v0.6.9'
+    script/plugin install git://github.com/breakpointer/surveyor.git -r 'tag v0.6.10'
 
 Or as a gem plugin:
   
   # in environment.rb
-  config.gem "surveyor", :version => '>=0.6.9', :source => 'http://gemcutter.org'
+  config.gem "surveyor", :version => '>=0.6.10', :source => 'http://gemcutter.org'
   
     sudo gem install gemcutter
     gem tumble

data/VERSION

@@ -1 +1 @@
-0.6.9
+0.6.10

data/app/controllers/surveyor_controller.rb

@@ -40,6 +40,7 @@ class SurveyorController < ApplicationController
       @survey = Survey.with_sections.find_by_id(@response_set.survey_id)
       @sections = @survey.sections
       @section = params[:section] ? @sections.with_includes.find(section_id_from(params[:section])) || @sections.with_includes.first : @sections.with_includes.first
+      @questions = @section.questions.in_order
     else
       flash[:notice] = "Unable to find your responses to the survey"
       redirect_to(available_surveys_path)

data/app/models/question.rb

@@ -8,6 +8,7 @@ class Question < ActiveRecord::Base
 
   # Scopes
   default_scope :order => "display_order ASC"
+  named_scope :in_order, {:order => "display_order ASC"}
   
   # Validations
   validates_presence_of :text, :survey_section_id, :display_order

data/app/views/surveyor/edit.html.haml

@@ -20,12 +20,12 @@
       %span.title= @section.title
       .questions
         - group_questions ||= []
-        - @section.questions.each_with_index do |question, index|
+        - @questions.each_with_index do |question, index|
           - unless question.part_of_group?
             = render(:partial => "/partials/question", :locals => {:question => question, :response_set => @response_set})
           - else # gather up the group questions
             - group_questions << question
-            - if (index + 1 >= @section.questions.size) or (question.question_group_id != @section.questions[index + 1].question_group_id)
+            - if (index + 1 >= @questions.size) or (question.question_group_id != @questions[index + 1].question_group_id)
               - # this is the last question of the section, or the group
               = render(:partial => "/partials/question_group", :locals => {:question_group => question.question_group, :response_set => @response_set, :group_questions => group_questions})
               - group_questions = []

data/surveyor.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{surveyor}
-  s.version = "0.6.9"
+  s.version = "0.6.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Chamberlain", "Mark Yoon"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: surveyor
 version: !ruby/object:Gem::Version 
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors: 
 - Brian Chamberlain