surveyor 0.19.2 → 0.19.3

data/CHANGELOG

@@ -1,3 +1,12 @@
+0.19.3
+
+* add authenticity token into ajax requests. closes #120
+* Adding the custom_class attribute to text answer fields. Fixes #113.
+* reverting some styles
+* Add padding to dependent questions
+* Change colors in surveyor.sass
+* Fix dependent questions css and alternate column color in grid questions
+
 0.19.2
 
 * quiz example

data/README.md

@@ -1,6 +1,10 @@
 # Surveys On Rails
 
-Surveyor is a ruby gem and developer tool that brings surveys into Rails applications. Surveys are written in the Surveyor DSL (Domain Specific Language). Before Rails 2.3, it was implemented as a Rails Engine. It also existed previously as a plugin. Today it is a gem only.
+Surveyor is a ruby gem and developer tool that brings surveys into Rails applications. Surveys are written in the Surveyor DSL (Domain Specific Language). 
+
+Before Rails 2.3, it was implemented as a Rails Engine. It also existed previously as a plugin. Today it is a gem only.
+
+The rails3 branch is functional for use with Rails 3.
 
 ## Why you might want to use Surveyor
 

data/VERSION

@@ -1 +1 @@
-0.19.2
+0.19.3

data/app/helpers/surveyor_helper.rb

@@ -63,6 +63,12 @@ module SurveyorHelper
     else type_sym
     end
   end
+  def generate_pick_none_input_html(response_class, default_value, css_class)
+    html = {}
+    html[:class] = css_class unless css_class.blank?
+    html[:value] = default_value if response_class.blank?
+    html
+  end
   
   # Responses
   def response_for(response_set, question, answer = nil, response_group = nil)

data/app/views/partials/_answer.html.haml

@@ -14,6 +14,6 @@
   - when "none"
     - if %w(date datetime time float integer string text).include? a.response_class
       = ff.quiet_input :answer_id, :input_html => {:class => a.css_class, :value => a.id}
-      = ff.input rc_to_attr(a.response_class), :as => rc_to_as(a.response_class), :label => a.split_or_hidden_text(:pre).blank? ? false : a.split_or_hidden_text(:pre), :hint => a.split_or_hidden_text(:post), :input_html => (r.as(a.response_class).blank? ? {:value => a.default_value} : {})
+      = ff.input rc_to_attr(a.response_class), :as => rc_to_as(a.response_class), :label => a.split_or_hidden_text(:pre).blank? ? false : a.split_or_hidden_text(:pre), :hint => a.split_or_hidden_text(:post), :input_html => generate_pick_none_input_html(r.as(a.response_class), a.default_value, a.css_class)
     - else
       = a.text

data/app/views/partials/_question_group.html.haml

@@ -5,6 +5,10 @@
     - when :grid
       %li
         %table
+          %col.pre
+          - qs.first.answers.each do |a| 
+            %col{:class => cycle("odd", "even")}
+          %col.post
           %tbody
             - qs.each_slice(10) do |ten_questions| # header row every 10
               %tr
@@ -27,4 +31,4 @@
       = submit_tag("+ add row", :name => "section[#{@section.id}][g_#{g.id}]", :class => "add_row")
     - else # :inline
       - qs.each do |q|
-        = render q.custom_renderer || "/partials/question", :g => g, :q => q, :f => f
+        = render q.custom_renderer || "/partials/question", :g => g, :q => q, :f => f

data/features/step_definitions/surveyor_steps.rb

@@ -32,3 +32,7 @@ Then /^question "([^"]*)" should have a dependency with rule "([^"]*)"$/ do |qr,
   q.dependency.should_not be_nil
   q.dependency.rule.should == rule
 end
+
+Then /^the element "([^"]*)" should have the class "([^"]*)"$/ do |selector, css_class|
+  response.should have_selector(selector, :class => css_class)
+end

data/features/surveyor.feature

@@ -79,4 +79,23 @@ Feature: Survey creation
         end
       end
     """
-    Then question "1" should have correct answer "oink"
+    Then question "1" should have correct answer "oink"
+    
+  Scenario: Custom css class
+    Given the survey
+    """
+      survey "Movies" do
+        section "First" do
+          q "What is your favorite movie?"
+          a :string, :custom_class => "my_custom_class"
+          q "What is your favorite state?"
+          a :string
+        end
+      end
+    """
+    When I start the "Movies" survey
+    Then the element "input[type='text']:first" should have the class "my_custom_class"
+    # Then the element "input[type='text']:last" should not contain the class attribute
+    
+    
+    

data/generators/surveyor/templates/assets/javascripts/jquery.surveyor.js

@@ -12,7 +12,7 @@ jQuery(document).ready(function(){
   // }else{
   //  // Other browsers just use the change event on the form
   jQuery("form#survey_form input, form#survey_form select, form#survey_form textarea").change(function(){
-    question_data = $(this).parents('fieldset[id^="q_"]').find("input, select, textarea").serialize();
+    question_data = $(this).parents('fieldset[id^="q_"]').find("input, select, textarea").add($("form#survey_form input[name='authenticity_token']")).serialize();
     // console.log(unescape(question_data));
     $.ajax({ type: "PUT", url: $(this).parents('form#survey_form').attr("action"), data: question_data, dataType: 'json', success: successfulSave })
   });

data/generators/surveyor/templates/assets/stylesheets/sass/surveyor.sass

@@ -2,7 +2,7 @@
 !surveyor_flash_background_color = #FFF1A8
 !surveyor_color = #FFFFF1 
 !surveyor_text_color = #333333
-
+!surveyor_dependent_color = #FFFFDF
 !surveyor_menus_active_color = #EBEBCC
 !surveyor_menus_border_color = #ccc
 
@@ -54,10 +54,13 @@ body
   // question groups
   fieldset.g_inline fieldset
     :display inline
-  fieldset.g_grid li.surveyor_radio label
-    :visibility hidden
-    input
-      :visibility visible
+  fieldset.g_grid
+    table
+      :border-collapse collapse
+    li.surveyor_radio label
+      :visibility hidden
+      input
+        :visibility visible
   fieldset.g_repeater
     ol fieldset
       :display inline
@@ -68,7 +71,8 @@ body
   .survey_section>fieldset>ol
     :padding-left 1em  
   fieldset
-    :padding 5px 0 10px 0
+    :padding-top 5px
+    :margin-bottom 10px
     ol
       fieldset
         :vertical-align top
@@ -91,11 +95,21 @@ body
       :margin 0 3px
     input[type="text"], textarea
       :font-size 0.8em
+
+  fieldset.q_hidden
+    :display none
+  fieldset.q_dependent
+    :background-color= !surveyor_dependent_color
+    legend
+      :background-color= !surveyor_dependent_color
+      :padding 3px 3px 3px 0
+
+    
     
   // buttons
   input[type="submit"]
     :font-size 1em
-    :border 0px
+    :border 1px
     :padding 5px
     :cursor pointer
     :background-color= !background_color

data/surveyor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{surveyor}
-  s.version = "0.19.2"
+  s.version = "0.19.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Chamberlain", "Mark Yoon"]
-  s.date = %q{2011-02-09}
+  s.date = %q{2011-03-18}
   s.email = %q{yoon@northwestern.edu}
   s.extra_rdoc_files = [
     "README.md"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: surveyor
 version: !ruby/object:Gem::Version 
-  hash: 87
+  hash: 85
   prerelease: false
   segments: 
   - 0
   - 19
-  - 2
-  version: 0.19.2
+  - 3
+  version: 0.19.3
 platform: ruby
 authors: 
 - Brian Chamberlain
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 -06:00
+date: 2011-03-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency