surveyor 0.6.7 → 0.6.8

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.2'
+    script/plugin install git://github.com/breakpointer/surveyor.git -r 'tag v0.6.8'
 
 Or as a gem plugin:
   
   # in environment.rb
-  config.gem "surveyor", :version => '>=0.6.1', :source => 'http://gemcutter.org'
+  config.gem "surveyor", :version => '>=0.6.8', :source => 'http://gemcutter.org'
   
     sudo gem install gemcutter
     gem tumble

data/VERSION

@@ -1 +1 @@
-0.6.7
+0.6.8

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

@@ -5,21 +5,21 @@
 - fields_for_response(response_obj, response_group) do |response_form|
   - case renderer
   - when :any_answer
-    = response_form.survey_check_box(:selected)
+    = response_form.survey_check_box(:selected, :class => (answer.is_exclusive? ? "exclusive" : ""))
     = response_form.label("selected", answer.text) unless hide_label # This is a temp fix til I figure out why the id of the checkbox is all jacked up
   - when :any_other_and_string
-    = response_form.survey_check_box(:selected)
+    = response_form.survey_check_box(:selected, :class => (answer.is_exclusive? ? "exclusive" : ""))
     %label Other
     = response_form.text_field(:other_value)
     = response_form.text_field(:string_value)
   - when :any_string
-    = response_form.survey_check_box(:selected)
+    = response_form.survey_check_box(:selected, :class => (answer.is_exclusive? ? "exclusive" : ""))
     = response_form.label(:answer_id, answer.text)
     = response_form.text_field(:string_value, :size => 25, :maxlength => 250)
   - when :one_answer, :one_string
     - fields_for_radio(response_obj) do |radio_form|
-      = radio_form.radio_button(:answer_id, answer.id, :checked => response_obj.selected?)
-      = radio_form.label("answer_#{answer.id}", answer.text) unless hide_label
+      = radio_form.radio_button(:answer_id, answer.id, :checked => response_obj.selected?, :title => answer.text)
+      = radio_form.label("answer_#{answer.id}", answer.text, :class => (hide_label ? "hidden" : ""))
     - if renderer == :one_string
       = response_form.text_field(:string_value, :size => 25, :maxlength => 250, :autocomplete => "off")
   - when :none_date

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

@@ -24,14 +24,14 @@
 - when :grid_default
   - reset_cycle("col")
   - content_tag_for :tr, question, :class => dep_class do
-    %td.question_prefix
+    %th.question_prefix
       %span.text= split_text(question.text)[:prefix]
       %span.help= question.help_text
       = hidden_field_tag("responses[#{question.id}][question_id]", question.id)
     - question.answers.each do |answer|
       %td{:class => "#{cycle("column_highlight", "", :name => "col")}"}
         .answer= render(:partial => "/partials/answer", :locals => {:answer => answer, :question => question, :response_obj => @response_set.response_for(question.id, answer.id), :hide_label => true})
-    %td.question_postfix
+    %th.question_postfix
       %span.text= split_text(question.text)[:postfix]
 - when :repeater_default, :repeater_dropdown
   - disabled ||= false

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

@@ -16,18 +16,17 @@
           - reset_cycle("column_highlight")
           - group_questions.first.answers.each do |answer|
             %th{:class => "#{cycle("column_highlight", "", :name => "column_highlight")}"}= answer.text
-      %tfoot
-        %tr
-          %th= " "
-          - reset_cycle("column_highlight")
-          - group_questions.first.answers.each do |answer|
-            %th{:class => "#{cycle("column_highlight","", :name => "column_highlight")}"}= answer.text
       %tbody
-        - group_questions.each do |question|
+        - group_questions.each_with_index do |question, i|
           = render(:partial => "/partials/question", :locals => locals.merge({:question => question}))
+          - if i%10 == 9
+            %th= " "
+            - reset_cycle("column_highlight")
+            - group_questions.first.answers.each do |answer|
+              %th{:class => "#{cycle("column_highlight", "", :name => "column_highlight")}"}= answer.text
   - when :repeater
     %ul.repeater
-      - (response_set.count_group_responses(group_questions) + 1).times do |group_number|
+      - (response_set.count_group_responses(group_questions) + 3).times do |group_number|
         %li.repeater
           - group_questions.each do |question|
             = render(:partial => "/partials/question", :locals => locals.merge({:question => question, :response_group => group_number, :disabled => false}))

data/features/step_definitions/surveyor_steps.rb

@@ -0,0 +1,7 @@
+Given /^I am a banana$/ do
+  @me = "banana"
+end
+
+Then /^I should be a banana$/ do
+  @me.should == "banana"
+end

data/features/step_definitions/webrat_steps.rb

@@ -0,0 +1,119 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+
+# Commonly used webrat steps
+# http://github.com/brynary/webrat
+
+Given /^I am on (.+)$/ do |page_name|
+  visit path_to(page_name)
+end
+
+When /^I go to (.+)$/ do |page_name|
+  visit path_to(page_name)
+end
+
+When /^I press "([^\"]*)"$/ do |button|
+  click_button(button)
+end
+
+When /^I follow "([^\"]*)"$/ do |link|
+  click_link(link)
+end
+
+When /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |field, value|
+  fill_in(field, :with => value) 
+end
+
+When /^I select "([^\"]*)" from "([^\"]*)"$/ do |value, field|
+  select(value, :from => field) 
+end
+
+# Use this step in conjunction with Rail's datetime_select helper. For example:
+# When I select "December 25, 2008 10:00" as the date and time 
+When /^I select "([^\"]*)" as the date and time$/ do |time|
+  select_datetime(time)
+end
+
+# Use this step when using multiple datetime_select helpers on a page or 
+# you want to specify which datetime to select. Given the following view:
+#   <%= f.label :preferred %><br />
+#   <%= f.datetime_select :preferred %>
+#   <%= f.label :alternative %><br />
+#   <%= f.datetime_select :alternative %>
+# The following steps would fill out the form:
+# When I select "November 23, 2004 11:20" as the "Preferred" date and time
+# And I select "November 25, 2004 10:30" as the "Alternative" date and time
+When /^I select "([^\"]*)" as the "([^\"]*)" date and time$/ do |datetime, datetime_label|
+  select_datetime(datetime, :from => datetime_label)
+end
+
+# Use this step in conjunction with Rail's time_select helper. For example:
+# When I select "2:20PM" as the time
+# Note: Rail's default time helper provides 24-hour time-- not 12 hour time. Webrat
+# will convert the 2:20PM to 14:20 and then select it. 
+When /^I select "([^\"]*)" as the time$/ do |time|
+  select_time(time)
+end
+
+# Use this step when using multiple time_select helpers on a page or you want to
+# specify the name of the time on the form.  For example:
+# When I select "7:30AM" as the "Gym" time
+When /^I select "([^\"]*)" as the "([^\"]*)" time$/ do |time, time_label|
+  select_time(time, :from => time_label)
+end
+
+# Use this step in conjunction with Rail's date_select helper.  For example:
+# When I select "February 20, 1981" as the date
+When /^I select "([^\"]*)" as the date$/ do |date|
+  select_date(date)
+end
+
+# Use this step when using multiple date_select helpers on one page or
+# you want to specify the name of the date on the form. For example:
+# When I select "April 26, 1982" as the "Date of Birth" date
+When /^I select "([^\"]*)" as the "([^\"]*)" date$/ do |date, date_label|
+  select_date(date, :from => date_label)
+end
+
+When /^I check "([^\"]*)"$/ do |field|
+  check(field) 
+end
+
+When /^I uncheck "([^\"]*)"$/ do |field|
+  uncheck(field) 
+end
+
+When /^I choose "([^\"]*)"$/ do |field|
+  choose(field)
+end
+
+When /^I attach the file at "([^\"]*)" to "([^\"]*)"$/ do |path, field|
+  attach_file(field, path)
+end
+
+Then /^I should see "([^\"]*)"$/ do |text|
+  response.should contain(text)
+end
+
+Then /^I should not see "([^\"]*)"$/ do |text|
+  response.should_not contain(text)
+end
+
+Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value|
+  field_labeled(field).value.should =~ /#{value}/
+end
+
+Then /^the "([^\"]*)" field should not contain "([^\"]*)"$/ do |field, value|
+  field_labeled(field).value.should_not =~ /#{value}/
+end
+    
+Then /^the "([^\"]*)" checkbox should be checked$/ do |label|
+  field_labeled(label).should be_checked
+end
+
+Then /^the "([^\"]*)" checkbox should not be checked$/ do |label|
+  field_labeled(label).should_not be_checked
+end
+
+Then /^I should be on (.+)$/ do |page_name|
+  URI.parse(current_url).path.should == path_to(page_name)
+end

data/features/support/env.rb

@@ -0,0 +1,24 @@
+# Sets up the Rails environment for Cucumber
+ENV["RAILS_ENV"] ||= "cucumber"
+require File.expand_path(File.dirname(__FILE__) + '/../../../../../config/environment')
+require 'cucumber/rails/world'
+
+# Comment out the next line if you don't want Cucumber Unicode support
+require 'cucumber/formatter/unicode'
+
+# Comment out the next line if you don't want transactions to
+# open/roll back around each scenario
+Cucumber::Rails.use_transactional_fixtures
+
+# Comment out the next line if you want Rails' own error handling
+# (e.g. rescue_action_in_public / rescue_responses / rescue_from)
+Cucumber::Rails.bypass_rescue
+
+require 'webrat'
+
+Webrat.configure do |config|
+  config.mode = :rails
+end
+
+require 'cucumber/rails/rspec'
+require 'webrat/core/matchers'

data/features/support/paths.rb

@@ -0,0 +1,27 @@
+module NavigationHelpers
+  # Maps a name to a path. Used by the
+  #
+  #   When /^I go to (.+)$/ do |page_name|
+  #
+  # step definition in webrat_steps.rb
+  #
+  def path_to(page_name)
+    case page_name
+    
+    when /the homepage/
+      '/'
+    
+    # Add more mappings here.
+    # Here is a more fancy example:
+    #
+    #   when /^(.*)'s profile page$/i
+    #     user_profile_path(User.find_by_login($1))
+
+    else
+      raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
+        "Now, go and add a mapping in #{__FILE__}"
+    end
+  end
+end
+
+World(NavigationHelpers)

data/features/surveyor.feature

@@ -0,0 +1,11 @@
+Story: Logging in
+  As an anonymous user with an account
+  I want to log in to my account
+  So that I can be myself
+
+  #
+  # Log in: get form
+  #
+  Scenario: Anonymous user can get a login form.
+    Given I am a banana
+    Then I should be a banana

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

@@ -24,5 +24,17 @@ jQuery(document).ready(function(){
 		jQuery.each(responseText.hide, function(){ jQuery('#' + this).hide("fast");	});
 		return false;
 	}
+	
+	// is_exclusive checkboxes should disble sibling checkboxes
+	$('input.exclusive:checked').parents('.answer').siblings().find(':checkbox').attr('checked', false).attr('disabled', true);
+	$('input.exclusive:checkbox').click(function(){
+    var e = $(this);
+    var others = e.parents('.answer').siblings().find(':checkbox');
+    if(e.is(':checked')){
+      others.attr('checked', false).attr('disabled', true);
+    }else{
+      others.attr('disabled', false);
+    }
+  });
 
 });

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

@@ -169,18 +169,14 @@ body
     :background-color= !page_color - !subtle_shift
   table.grid
     :margin 0.5em 0.2em 0.5em 1em 
-    th
+    th, td
       :padding 0.2em 0.5em
       :text-align center
     td
-      :padding 0.2em 0.5em
       :border-bottom 2px dotted #999
       :border-color= !page_color - !emphasis_shift
-      :text-align center
-    td.question_prefix
-      :text-align left
-      :padding 0.2em
-    td.question_postfix
+    th.question_prefix, th.question_postfix
+      :padding 0.2em 0.5em
       :text-align left
       :padding 0.2em
   .question_group

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

@@ -158,18 +158,14 @@ body {
     background-color: #efefe4; }
   #surveyor table.grid {
     margin: 0.5em 0.2em 0.5em 1em; }
-    #surveyor table.grid th {
+    #surveyor table.grid th, #surveyor table.grid td {
       padding: 0.2em 0.5em;
       text-align: center; }
     #surveyor table.grid td {
-      padding: 0.2em 0.5em;
       border-bottom: 2px dotted #999;
-      border-color: #bfbfb4;
-      text-align: center; }
-    #surveyor table.grid td.question_prefix {
-      text-align: left;
-      padding: 0.2em; }
-    #surveyor table.grid td.question_postfix {
+      border-color: #bfbfb4; }
+    #surveyor table.grid th.question_prefix, #surveyor table.grid th.question_postfix {
+      padding: 0.2em 0.5em;
       text-align: left;
       padding: 0.2em; }
   #surveyor .question_group {

data/generators/surveyor/templates/migrate/create_question_groups.rb

@@ -2,8 +2,8 @@ class CreateQuestionGroups < ActiveRecord::Migration
   def self.up
     create_table :question_groups do |t|
       # Content
-      t.string :text
-      t.string :help_text
+      t.text :text
+      t.text :help_text
       
       # Display
       t.string :display_type

data/generators/test_surveyor/templates/environments/cucumber.rb

@@ -0,0 +1,21 @@
+config.cache_classes = true # This must be true for Cucumber to operate correctly!
+
+# Log error messages when you accidentally call methods on nil.
+config.whiny_nils = true
+
+# Show full error reports and disable caching
+config.action_controller.consider_all_requests_local = true
+config.action_controller.perform_caching             = false
+
+# Disable request forgery protection in test environment
+config.action_controller.allow_forgery_protection    = false
+
+# Tell Action Mailer not to deliver emails to the real world.
+# The :test delivery method accumulates sent emails in the
+# ActionMailer::Base.deliveries array.
+config.action_mailer.delivery_method = :test
+
+config.gem "cucumber",    :lib => false,        :version => ">=0.3.11" unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
+config.gem "webrat",      :lib => false,        :version => ">=0.4.4" unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
+config.gem "rspec",       :lib => false,        :version => ">=1.2.6" unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
+config.gem "rspec-rails", :lib => 'spec/rails', :version => ">=1.2.6" unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))

data/generators/test_surveyor/test_surveyor_generator.rb

@@ -0,0 +1,15 @@
+class TestSurveyorGenerator < Rails::Generator::Base
+  def manifest
+    record do |m|
+      
+      m.directory "surveys"
+      
+      # Copy README to your app
+      m.file "TESTING_SURVEYOR", "surveys/TESTING_SURVEYOR"
+        
+      m.file "environments/cucumber.rb", "config/environments/cucumber.rb"
+      m.readme "TESTING_SURVEYOR"
+      
+    end
+  end
+end

data/surveyor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{surveyor}
-  s.version = "0.6.7"
+  s.version = "0.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Chamberlain", "Mark Yoon"]
-  s.date = %q{2009-10-13}
+  s.date = %q{2009-10-15}
   s.email = %q{yoon@northwestern.edu}
   s.extra_rdoc_files = [
     "README.md"
@@ -40,9 +40,18 @@ Gem::Specification.new do |s|
      "app/views/surveyor/new.html.haml",
      "app/views/surveyor/show.html.haml",
      "config/routes.rb",
-     "generators/surveyor/extend_surveyor_generator.rb",
+     "features/step_definitions/surveyor_steps.rb",
+     "features/step_definitions/webrat_steps.rb",
+     "features/support/env.rb",
+     "features/support/paths.rb",
+     "features/surveyor.feature",
+     "generators/extend_surveyor/extend_surveyor_generator.rb",
+     "generators/extend_surveyor/templates/EXTENDING_SURVEYOR",
+     "generators/extend_surveyor/templates/extensions/survey_extensions.rb",
+     "generators/extend_surveyor/templates/extensions/surveyor_controller_extensions.rb",
+     "generators/extend_surveyor/templates/extensions/surveyor_custom.html.erb",
+     "generators/extend_surveyor/templates/extensions/surveyor_helper_extensions.rb",
      "generators/surveyor/surveyor_generator.rb",
-     "generators/surveyor/templates/EXTENDING_SURVEYOR",
      "generators/surveyor/templates/README",
      "generators/surveyor/templates/assets/images/222222_11x11_icon_arrows_leftright.gif",
      "generators/surveyor/templates/assets/images/222222_11x11_icon_arrows_updown.gif",
@@ -96,10 +105,6 @@ Gem::Specification.new do |s|
      "generators/surveyor/templates/assets/stylesheets/sass/surveyor.sass",
      "generators/surveyor/templates/assets/stylesheets/surveyor.css",
      "generators/surveyor/templates/assets/stylesheets/ui.theme.css",
-     "generators/surveyor/templates/extensions/survey_extensions.rb",
-     "generators/surveyor/templates/extensions/surveyor_controller_extensions.rb",
-     "generators/surveyor/templates/extensions/surveyor_custom.html.erb",
-     "generators/surveyor/templates/extensions/surveyor_helper_extensions.rb",
      "generators/surveyor/templates/initializers/haml.rb",
      "generators/surveyor/templates/initializers/surveyor.rb",
      "generators/surveyor/templates/migrate/create_answers.rb",
@@ -113,6 +118,9 @@ Gem::Specification.new do |s|
      "generators/surveyor/templates/migrate/create_surveys.rb",
      "generators/surveyor/templates/surveys/kitchen_sink_survey.rb",
      "generators/surveyor/templates/tasks/surveyor.rb",
+     "generators/test_surveyor/templates/TESTING_SURVEYOR",
+     "generators/test_surveyor/templates/environments/cucumber.rb",
+     "generators/test_surveyor/test_surveyor_generator.rb",
      "init.rb",
      "install.rb",
      "lib/surveyor.rb",
@@ -155,7 +163,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/breakpointer/surveyor}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{A rails (gem) plugin to enable surveys in your application}
   s.test_files = [
     "spec/controllers/surveyor_controller_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: surveyor
 version: !ruby/object:Gem::Version 
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors: 
 - Brian Chamberlain
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-13 00:00:00 -05:00
+date: 2009-10-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,9 +57,18 @@ files:
 - app/views/surveyor/new.html.haml
 - app/views/surveyor/show.html.haml
 - config/routes.rb
-- generators/surveyor/extend_surveyor_generator.rb
+- features/step_definitions/surveyor_steps.rb
+- features/step_definitions/webrat_steps.rb
+- features/support/env.rb
+- features/support/paths.rb
+- features/surveyor.feature
+- generators/extend_surveyor/extend_surveyor_generator.rb
+- generators/extend_surveyor/templates/EXTENDING_SURVEYOR
+- generators/extend_surveyor/templates/extensions/survey_extensions.rb
+- generators/extend_surveyor/templates/extensions/surveyor_controller_extensions.rb
+- generators/extend_surveyor/templates/extensions/surveyor_custom.html.erb
+- generators/extend_surveyor/templates/extensions/surveyor_helper_extensions.rb
 - generators/surveyor/surveyor_generator.rb
-- generators/surveyor/templates/EXTENDING_SURVEYOR
 - generators/surveyor/templates/README
 - generators/surveyor/templates/assets/images/222222_11x11_icon_arrows_leftright.gif
 - generators/surveyor/templates/assets/images/222222_11x11_icon_arrows_updown.gif
@@ -113,10 +122,6 @@ files:
 - generators/surveyor/templates/assets/stylesheets/sass/surveyor.sass
 - generators/surveyor/templates/assets/stylesheets/surveyor.css
 - generators/surveyor/templates/assets/stylesheets/ui.theme.css
-- generators/surveyor/templates/extensions/survey_extensions.rb
-- generators/surveyor/templates/extensions/surveyor_controller_extensions.rb
-- generators/surveyor/templates/extensions/surveyor_custom.html.erb
-- generators/surveyor/templates/extensions/surveyor_helper_extensions.rb
 - generators/surveyor/templates/initializers/haml.rb
 - generators/surveyor/templates/initializers/surveyor.rb
 - generators/surveyor/templates/migrate/create_answers.rb
@@ -130,6 +135,9 @@ files:
 - generators/surveyor/templates/migrate/create_surveys.rb
 - generators/surveyor/templates/surveys/kitchen_sink_survey.rb
 - generators/surveyor/templates/tasks/surveyor.rb
+- generators/test_surveyor/templates/TESTING_SURVEYOR
+- generators/test_surveyor/templates/environments/cucumber.rb
+- generators/test_surveyor/test_surveyor_generator.rb
 - init.rb
 - install.rb
 - lib/surveyor.rb
@@ -192,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A rails (gem) plugin to enable surveys in your application