surveyor 0.6.8 → 0.6.9

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

data/VERSION

@@ -1 +1 @@
-0.6.8
+0.6.9

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

@@ -9,31 +9,23 @@ class CreateAnswers < ActiveRecord::Migration
       t.text :short_text #Used for presenting responses to experts (ie non-survey takers). Just a shorted version of the string
       t.text :help_text
       t.integer :weight # Used to assign a weight to an answer object (used for computing surveys that have numerical results) (I added this to support the Urology questionnaire -BLC)
+      t.string :response_class # What kind of additional data does this answer accept?
       
+      # Reference
+      t.string :reference_identifier # from paper
+      t.string :data_export_identifier # data export
+      t.string :common_namespace # maping to a common vocab
+      t.string :common_identitier # maping to a common vocab
+    
       # Display
-      t.string :response_class # What kind of additional data does this answer accept?
       t.integer :display_order
       t.boolean :is_exclusive # If set it causes some UI trigger to remove (and disable) all the other answer choices selected for a question (needed for the WHR)
-      t.boolean :hide_label 
-      
-      # Reference
-      t.string :reference_identifier # Used to relate this question object to questions imported from a paper questionnaire 
-      t.string :data_export_identifier # Used when referencing this quesiton in data export. Usually a shortend/cryptic version of the question text
-      t.string :common_data_identitier # Used to share data across surveys (or perhaps map to a common vocab.)
-      
-      # Validations
-      # the response_class attr also has validation implications (int, string, float,etc..) but these attrs below give fine grain control over responses
-      t.integer :max_value
-      t.integer :min_value
-      t.integer :length # number of chars/ints accepted
-      t.integer :decimal_precision # only for floats
-      t.boolean :allow_negative # only for numeric values
-      t.boolean :allow_blank
-      t.string :unit # a string representation of the unit (lbs. USD, oz.) - Context is from the survey domain and question
-      
-      # Display property
+      t.boolean :hide_label
       t.integer :display_length # if smaller than answer.length the html input length will be this value
       
+      t.string :custom_class
+      t.string :custom_renderer
+      
       t.timestamps
       
     end

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

@@ -5,9 +5,18 @@ class CreateQuestionGroups < ActiveRecord::Migration
       t.text :text
       t.text :help_text
       
+      # Reference
+      t.string :reference_identifier # from paper
+      t.string :data_export_identifier # data export
+      t.string :common_namespace # maping to a common vocab
+      t.string :common_identitier # maping to a common vocab
+            
       # Display
       t.string :display_type
-
+      
+      t.string :custom_class
+      t.string :custom_renderer
+      
       t.timestamps
     end
   end

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

@@ -3,26 +3,29 @@ class CreateQuestions < ActiveRecord::Migration
     create_table :questions do |t|
       # Context
       t.integer :survey_section_id
+      t.integer :question_group_id
 
       # Content
       t.text :text
       t.text :short_text # For experts (ie non-survey takers). Short version of text
       t.text :help_text
-      
-      # Display
       t.string :pick
-      t.string :display_type
-      t.integer :display_order
-      t.integer :question_group_id
-      t.boolean :is_mandatory
 
       # Reference
-      t.string :reference_identifier # For questions imported from a paper questionnaire 
-      t.string :data_export_identifier # For data export. Usually a short/cryptic version of text
+      t.string :reference_identifier # from paper
+      t.string :data_export_identifier # data export
+      t.string :common_namespace # maping to a common vocab
+      t.string :common_identitier # maping to a common vocab
       
-      # styling
+      # Display
+      t.integer :display_order
+      t.string :display_type
+      t.boolean :is_mandatory
       t.integer :display_width # used only for slider component (if needed)
       
+      t.string :custom_class
+      t.string :custom_renderer
+      
       t.timestamps
     end
   end

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

@@ -7,13 +7,17 @@ class CreateSurveySections < ActiveRecord::Migration
       # Content
       t.string :title
       t.text :description
-
+      
+      # Reference
+      t.string :reference_identifier # from paper
+      t.string :data_export_identifier # data export
+      t.string :common_namespace # maping to a common vocab
+      t.string :common_identitier # maping to a common vocab
+      
       # Display
       t.integer :display_order
-
-      # Reference
-      t.string :reference_identifier # Used to relate this question object to questions imported from a paper questionnaire 
-      t.string :data_export_identifier # Used when referencing this quesiton in data export. Usually a shortend/cryptic version of the question text
+      
+      t.string :custom_class
 
       t.timestamps
     end

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

@@ -7,14 +7,20 @@ class CreateSurveys < ActiveRecord::Migration
 
       # Reference
       t.string :access_code
+      t.string :reference_identifier # from paper
+      t.string :data_export_identifier # data export
+      t.string :common_namespace # maping to a common vocab
+      t.string :common_identitier # maping to a common vocab
 
       # Expiry
       t.datetime :active_at
       t.datetime :inactive_at
       
-      # Styling
+      # Display
       t.string :css_url
-            
+      
+      t.string :custom_class
+      
       t.timestamps
     end
   end

data/script/surveyor/answer.rb

@@ -3,11 +3,11 @@ require File.dirname(__FILE__) + '/columnizer'
 class Answer  
   include Columnizer
 
-  # Context, Content, Display, Reference
-  attr_accessor :id, :question_id, :parser
-  attr_accessor :text, :short_text, :help_text, :numerical_value
-  attr_accessor :response_class, :display_order, :is_exclusive, :is_a_disabler, :hide_label
-  attr_accessor :reference_identifier, :data_export_identifier
+  # Context, Content, Reference, Display
+  attr_accessor :id, :parser, :question_id
+  attr_accessor :text, :short_text, :help_text, :weight, :response_class
+  attr_accessor :reference_identifier, :data_export_identifier, :common_namespace, :common_identitier
+  attr_accessor :display_order, :is_exclusive, :hide_label, :display_length, :custom_class, :custom_renderer
   
   def initialize(question, args, options)
     self.parser = question ? question.parser : nil
@@ -69,11 +69,16 @@ class Answer
     out << %(  help_text: "#{@help_text}")
     out << %(  weight: #{@weight})
     out << %(  response_class: "#{@response_class}")
-    out << %(  display_order: #{display_order} )
+    out << %(  reference_identifier: "#{@reference_identifier}")
+    out << %(  data_export_identifier: "#{@data_export_identifier}")
+    out << %(  common_namespace: "#{@common_namespace}")
+    out << %(  common_identitier: "#{@common_identitier}")
+    out << %(  display_order: #{@display_order} )
     out << %(  is_exclusive: #{@is_exclusive})
     out << %(  hide_label: #{@hide_label})
-    out << %(  reference_identifier: #{@reference_identifier})
-    out << %(  data_export_identifier: "#{@data_export_identifier}")
+    out << %(  display_length: #{@display_length} )
+    out << %(  custom_class: "#{@custom_class}")
+    out << %(  custom_renderer: "#{@custom_renderer}")
     (out << nil ).join("\r\n")
   end
 

data/script/surveyor/question.rb

@@ -3,11 +3,11 @@ require File.dirname(__FILE__) + '/columnizer'
 class Question
   include Columnizer
   
-  # Context, Content, Display, Reference, Children
-  attr_accessor :id, :survey_section_id, :parser
-  attr_accessor :text, :short_text, :help_text
-  attr_accessor :pick, :display_type, :display_order, :question_group_id, :is_mandatory
-  attr_accessor :reference_identifier, :data_export_identifier
+  # Context, Content, Reference, Display, Children
+  attr_accessor :id, :parser, :survey_section_id, :question_group_id
+  attr_accessor :text, :short_text, :help_text, :pick
+  attr_accessor :reference_identifier, :data_export_identifier, :common_namespace, :common_identitier
+  attr_accessor :display_order, :display_type, :is_mandatory, :display_width, :custom_class, :custom_renderer
   attr_accessor :answers, :dependency
 
   def initialize(section, args, options)
@@ -54,16 +54,21 @@ class Question
     out =[ %(#{@data_export_identifier}_#{@id}:) ]
     out << %(  id: #{@id})
     out << %(  survey_section_id: #{@survey_section_id})
+    out << %(  question_group_id: #{@question_group_id})
     out << %(  text: "#{@text}")
     out << %(  short_text: "#{@short_text}")
     out << %(  help_text: "#{@help_text}")
-    out << %(  pick: #{pick})
-    out << %(  display_type: #{display_type})
-    out << %(  display_order: #{display_order})
-    out << %(  question_group_id: #{question_group_id})
-    out << %(  is_mandatory: #{@is_mandatory})
-    out << %(  reference_identifier: #{@reference_identifier})
+    out << %(  pick: "#{pick}")
+    out << %(  reference_identifier: "#{@reference_identifier}")
     out << %(  data_export_identifier: "#{@data_export_identifier}")
+    out << %(  common_namespace: "#{@common_namespace}")
+    out << %(  common_identitier: "#{@common_identitier}")
+    out << %(  display_order: #{@display_order})
+    out << %(  display_type: "#{@display_type}")
+    out << %(  is_mandatory: #{@is_mandatory})
+    out << %(  display_width: #{@display_width})
+    out << %(  custom_class: "#{@custom_class}")
+    out << %(  custom_renderer: "#{@custom_renderer}")
     (out << nil ).join("\r\n")
   end
   

data/script/surveyor/question_group.rb

@@ -1,9 +1,10 @@
 class QuestionGroup
-  
+
   # Context, Content, Display
   attr_accessor :id, :section_id, :section, :parser
   attr_accessor :text, :help_text
-  attr_accessor :display_type
+  attr_accessor :reference_identifier, :data_export_identifier, :common_namespace, :common_identitier
+  attr_accessor :display_type, :custom_class, :custom_renderer
 
   # id, section and text required
   def initialize(section, args, options)
@@ -16,13 +17,19 @@ class QuestionGroup
   def default_options()
     {:display_type => "default"}
   end
-  
+
   def to_yml
     out =[ %(#{@id}:) ]
     out << %(  id: #{@id})
     out << %(  text: "#{@text}")
     out << %(  help_text: "#{@help_text}")
+    out << %(  reference_identifier: "#{@reference_identifier}")
+    out << %(  data_export_identifier: "#{@data_export_identifier}")
+    out << %(  common_namespace: "#{@common_namespace}")
+    out << %(  common_identitier: "#{@common_identitier}")
     out << %(  display_type: "#{@display_type}")
+    out << %(  custom_class: "#{@custom_class}")
+    out << %(  custom_renderer: "#{@custom_renderer}")    
     (out << nil ).join("\r\n")
   end
 

data/script/surveyor/survey.rb

@@ -1,12 +1,13 @@
 require File.dirname(__FILE__) + '/survey_section'
 
 class Survey
-    include Columnizer
-  # Content, Reference, Expiry, Children
+  include Columnizer
+  # Context, Content, Reference, Expiry, Display, Children
   attr_accessor :id, :parser
   attr_accessor :title, :description
-  attr_accessor :access_code
+  attr_accessor :access_code, :reference_identifier, :data_export_identifier, :common_namespace, :common_identitier
   attr_accessor :active_at, :inactive_at
+  attr_accessor :css_url, :custom_class
   attr_accessor :survey_sections
   
   @@current_survey = nil
@@ -78,24 +79,27 @@ class Survey
   
   
   def reconcile_dependencies
-    
     @survey_sections.each do |section|
       section.questions.each do |question| 
         question.dependency.dependency_conditions.each { |con| con.reconcile_dependencies} unless question.dependency.nil?
-    
       end
-    end
-    
+    end  
   end
-  
+
   def to_yml
     out =[ %(survey_#{@id}:) ]
     out << %(  id: #{@id})
     out << %(  title: "#{@title}")
     out << %(  description: "#{@description}")
-    out << %(  access_code: #{@access_code})
+    out << %(  access_code: "#{@access_code}")
+    out << %(  reference_identifier: "#{@reference_identifier}")
+    out << %(  data_export_identifier: "#{@data_export_identifier}")
+    out << %(  common_namespace: "#{@common_namespace}")
+    out << %(  common_identitier: "#{@common_identitier}")
     out << %(  active_at: #{@active_at})
     out << %(  inactive_at: #{@inactive_at})
+    out << %(  css_url: "#{@css_url}")
+    out << %(  custom_class: "#{@custom_class}")
     (out << nil ).join("\r\n")
   end
 

data/script/surveyor/survey_section.rb

@@ -11,14 +11,13 @@ class SurveySection
   include Columnizer
 
   # Context, Content, Display, Reference, Children, Placeholders
-  attr_accessor :id, :survey_id, :parser
+  attr_accessor :id, :parser, :survey_id
   attr_accessor :title, :description
-  attr_accessor :display_order
-  attr_accessor :reference_identifier, :data_export_identifier
+  attr_accessor :reference_identifier, :data_export_identifier, :common_namespace, :common_identitier
+  attr_accessor :display_order, :custom_class
   attr_accessor :question_groups, :questions, :grid_answers
   attr_accessor :current_question_group, :current_question, :current_dependency
 
-
   # id, survey, and title required
   def initialize(id, survey, title, options = {})
     self.id = id
@@ -131,16 +130,19 @@ class SurveySection
     question
   end
   
-
   def to_yml
     out =[ %(#{@data_export_identifier}_#{@id}:) ]
     out << %(  id: #{@id})
     out << %(  survey_id: #{@survey_id})
     out << %(  title: "#{@title}")
     out << %(  description: "#{@description}")
-    out << %(  display_order: #{display_order})
-    out << %(  reference_identifier: #{@reference_identifier})
+    out << %(  reference_identifier: "#{@reference_identifier}")
     out << %(  data_export_identifier: "#{@data_export_identifier}")
+    out << %(  common_namespace: "#{@common_namespace}")
+    out << %(  common_identitier: "#{@common_identitier}")
+    out << %(  display_order: #{@display_order})
+    out << %(  custom_class: "#{@custom_class}")
+    
     (out << nil ).join("\r\n")
   end
 

data/surveyor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{surveyor}
-  s.version = "0.6.8"
+  s.version = "0.6.9"
 
   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-15}
+  s.date = %q{2009-10-16}
   s.email = %q{yoon@northwestern.edu}
   s.extra_rdoc_files = [
     "README.md"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: surveyor
 version: !ruby/object:Gem::Version 
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors: 
 - Brian Chamberlain
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-15 00:00:00 -05:00
+date: 2009-10-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency