surveyor 1.2.0 → 1.3.0

data/lib/assets/stylesheets/surveyor/jquery-ui-timepicker-addon.css

@@ -1,6 +1,11 @@
+/* css for timepicker */
 .ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
 .ui-timepicker-div dl { text-align: left; }
-.ui-timepicker-div dl dt { height: 25px; }
-.ui-timepicker-div dl dd { margin: -25px 10px 10px 65px; }
+.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
 .ui-timepicker-div td { font-size: 90%; }
 .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+
+.ui-timepicker-rtl{ direction: rtl; }
+.ui-timepicker-rtl dl { text-align: right; }
+.ui-timepicker-rtl dl dd { margin: 0 65px 10px 10px; }

data/lib/assets/stylesheets/surveyor/reset.css

@@ -1,50 +1,48 @@
+/* http://meyerweb.com/eric/tools/css/reset/
+   v2.0 | 20110126
+   License: none (public domain)
+*/
+
 html, body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 a, abbr, acronym, address, big, cite, code,
-del, dfn, em, font, img, ins, kbd, q, s, samp,
+del, dfn, em, img, ins, kbd, q, s, samp,
 small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td {
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
 	margin: 0;
 	padding: 0;
 	border: 0;
-	outline: 0;
-	font-weight: inherit;
-	font-style: inherit;
 	font-size: 100%;
-	font-family: inherit;
+	font: inherit;
 	vertical-align: baseline;
 }
-/* remember to define focus styles! */
-:focus {
-	outline: 0;
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+	display: block;
 }
 body {
 	line-height: 1;
-	color: black;
-	background: white;
 }
 ol, ul {
 	list-style: none;
 }
-/* tables still need 'cellspacing="0"' in the markup */
-table {
-	border-collapse: separate;
-	border-spacing: 0;
-}
-caption, th, td {
-	text-align: left;
-	font-weight: normal;
+blockquote, q {
+	quotes: none;
 }
 blockquote:before, blockquote:after,
 q:before, q:after {
-	content: "";
+	content: '';
+	content: none;
 }
-blockquote, q {
-	quotes: "" "";
-}
-pre {
-  background: #333333;
-  color: #EFEFEF;
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
 }

data/lib/generators/surveyor/install_generator.rb

@@ -38,6 +38,8 @@ module Surveyor
       add_unique_index_on_access_code_and_version_in_surveys
       update_blank_versions_on_surveys
       api_ids_must_be_unique
+      create_survey_translations
+      add_input_mask_attributes_to_answer
     )
 
     def readme
@@ -84,6 +86,8 @@ module Surveyor
       copy_file "surveys/kitchen_sink_survey.rb"
       copy_file "surveys/quiz.rb"
       copy_file "surveys/date_survey.rb"
+      copy_file "surveys/languages.rb"
+      directory "surveys/translations"
     end
 
     def locales

data/lib/generators/surveyor/templates/app/assets/javascripts/surveyor_all.js

@@ -1,5 +1,6 @@
-//= require surveyor/jquery.tools.min
-//= require surveyor/jquery-ui
+//= require surveyor/jquery-1.9.0
+//= require surveyor/jquery-ui-1.10.0.custom
 //= require surveyor/jquery-ui-timepicker-addon
-//= require surveyor/jquery.surveyor
 //= require surveyor/jquery.selectToUISlider
+//= require surveyor/jquery.surveyor
+//= require surveyor/jquery.maskedinput

data/lib/generators/surveyor/templates/app/assets/stylesheets/surveyor_all.css

@@ -1,9 +1,9 @@
 /*
 *= require surveyor/reset
-*= require surveyor/dateinput
-*= require surveyor/jquery-ui.custom
+*= require surveyor/jquery-ui-1.10.0.custom
 *= require surveyor/jquery-ui-timepicker-addon
 *= require surveyor/ui.slider.extras
+*= require surveyor/results
 *= require surveyor
 *= require custom
 */

data/lib/generators/surveyor/templates/config/locales/surveyor_en.yml

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # Sample localization file for English. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 

data/lib/generators/surveyor/templates/config/locales/surveyor_he.yml

@@ -14,5 +14,5 @@ he:
     click_here_to_finish: "לסיום"
     previous_section: "חזרה »"
     next_section: "« המשך"
-    Select_one: "בחר/י"
+    select_one: "בחר/י"
     sections: "סעיפים"

data/lib/generators/surveyor/templates/config/locales/surveyor_ko.yml

@@ -0,0 +1,18 @@
+# encoding: UTF-8
+# Sample localization file for Korean. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+ko:
+  surveyor:
+    take_these_surveys: "설문에 답을 하셔도 좋습니다"
+    take_it: "답을 하십시요"
+    completed_survey: "완료된 설문"
+    unable_to_find_your_responses: "설문에 대한 답을 찾을 수 없습니다"
+    unable_to_update_survey: "설문을 업데이트 할 수 없습니다"
+    unable_to_find_that_survey: "이 설문을 찾을 수 없습니다"
+    survey_started_success: "설문 조사가 성공적으로 시작되었습니다"
+    click_here_to_finish: "종료 하려면 여기를 누르십시요"
+    previous_section: "« 이전 항목으로"
+    next_section: "다음 항목으로 »"
+    select_one: "하나를 선택하십시요"
+    sections: "항목"

data/lib/generators/surveyor/templates/db/migrate/add_input_mask_attributes_to_answer.rb

@@ -0,0 +1,12 @@
+# encoding: UTF-8
+class AddInputMaskAttributesToAnswer < ActiveRecord::Migration
+  def self.up
+    add_column :answers, :input_mask, :string
+    add_column :answers, :input_mask_placeholder, :string
+  end
+
+  def self.down
+    remove_column :answers, :input_mask
+    remove_column :answers, :input_mask_placeholder
+  end
+end

data/lib/generators/surveyor/templates/db/migrate/create_survey_translations.rb

@@ -0,0 +1,19 @@
+# encoding: UTF-8
+class CreateSurveyTranslations < ActiveRecord::Migration
+  def self.up
+    create_table :survey_translations do |t|
+      # Content
+      t.integer :survey_id
+
+      # Reference
+      t.string :locale
+      t.text :translation
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :surveys
+  end
+end

data/lib/generators/surveyor/templates/surveys/kitchen_sink_survey.rb

@@ -175,6 +175,11 @@ survey "Kitchen Sink survey", :default_mandatory => false do
     a "maybe"
     a "no"
     a "I don't know"
+
+    # Questions may also have input masks with fancy placeholders
+    q "What is your phone number?"
+    a :string, :input_mask => '(999)999-9999', :input_mask_placeholder => '#'
+    
   end
 
   section "Complicated questions" do

data/lib/generators/surveyor/templates/surveys/languages.rb

@@ -0,0 +1,10 @@
+# encoding: UTF-8
+survey "One language is never enough" do
+  translations :es => "translations/languages.es.yml", :he => "translations/languages.he.yml", :ko => "translations/languages.ko.yml"
+  section_one "One" do
+    g_hello "Hello" do
+	    q_name "What is your name?"
+	    a_name :string, :help_text => "My name is..."
+	  end
+  end
+end

data/lib/generators/surveyor/templates/surveys/translations/languages.es.yml

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+title: "Un idioma nunca es suficiente"
+survey_sections:
+  one:
+    title: "Uno"
+question_groups:
+  hello:
+    text: "¡Hola!"
+questions:
+  name:
+    text: "¿Cómo se llama Usted?"
+    answers:
+      name:
+        help_text: "Mi nombre es..."

data/lib/generators/surveyor/templates/surveys/translations/languages.he.yml

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+title: "ידיעת שפה אחת אינה מספיקה"
+survey_sections:
+  one:
+    title: "אחת"
+question_groups:
+  hello:
+    text: "שלום"
+questions:
+  name:
+    text: "מה שמך?"
+    answers:
+      name:
+        help_text: "שמי..."

data/lib/generators/surveyor/templates/surveys/translations/languages.ko.yml

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+title: "한가지 언어로는 충분치 않습니다."
+survey_sections:
+  one:
+    title: "하나"
+question_groups:
+  hello:
+    text: "안녕하십니까"
+questions:
+  name:
+    text: "성함이 어떻게 되십니까?"
+    answers:
+      name:
+        help_text: "제 이름은 ... 입니다"

data/lib/surveyor/helpers/formtastic_custom_input.rb

@@ -4,14 +4,10 @@ module Surveyor
       def input_html_options_with(choice, response_class)
         input_html_options.merge(choice_html_options(choice)).merge({:id => (input_html_options[:id] || "answer_id").gsub("answer_id", response_class_to_method(response_class).to_s), :class => [input_html_options[:class], response_class].join(" ")})
       end
-      def response_class_to_method(response_class)
+      def response_class_to_method(type_sym)
         # doesn't handle response_class == answer, and doesn't have to
-        case response_class.to_s
-        when /^other_and_string$/ then :string_value
-        when /^date|time$/ then :datetime_value
-        else "#{response_class}_value".to_sym
-        end
-      end      
+        "#{type_sym.to_s}_value".to_sym
+      end
     end
   end
-end
+end

data/lib/surveyor/helpers/surveyor_helper_methods.rb

@@ -10,7 +10,19 @@ module Surveyor
         if asset_pipeline_enabled?
           stylesheet_link_tag('surveyor_all') + javascript_include_tag('surveyor_all')
         else
-          stylesheet_link_tag('surveyor/reset', 'surveyor/dateinput', 'surveyor/jquery-ui.custom', 'surveyor/jquery-ui-timepicker-addon', 'surveyor', 'custom') + javascript_include_tag('surveyor/jquery.tools.min', 'surveyor/jquery-ui', 'surveyor/jquery-ui-timepicker-addon', 'surveyor/jquery.surveyor')
+          stylesheet_link_tag('surveyor/reset',
+                              'surveyor/jquery-ui-1.10.0.custom',
+                              'surveyor/jquery-ui-timepicker-addon',
+                              'surveyor/ui.slider.extras',
+                              'surveyor/results',
+                              'surveyor',
+                              'custom') +
+          javascript_include_tag('surveyor/jquery-1.9.0',
+                                  'surveyor/jquery-ui-1.10.0.custom',
+                                  'surveyor/jquery-ui-timepicker-addon',
+                                  'surveyor/jquery.selectToUISlider',
+                                  'surveyor/jquery.surveyor',
+                                  'surveyor/jquery.maskedinput')
         end
       end
       # Helper for displaying warning/notice/error flash messages
@@ -28,7 +40,7 @@ module Surveyor
         "  You answered "#{trigger_responses.join("" and "")}" to the question "#{dependent_questions.map(&:text).join("","")}""
       end
       def menu_button_for(section)
-        submit_tag(section.title, :name => "section[#{section.id}]")
+        submit_tag(section.translation(I18n.locale)[:title], :name => "section[#{section.id}]")
       end
       def previous_section
         # use copy in memory instead of making extra db calls
@@ -40,11 +52,8 @@ module Surveyor
       end
 
       # Questions
-      def q_text(obj, context=nil)
-
-        return image_tag(obj.text) if obj.is_a?(Question) and obj.display_type == "image"
-        return obj.render_question_text(context) if obj.is_a?(Question) and (obj.dependent? or obj.display_type == "label" or obj.part_of_group?)
-        "#{next_question_number(obj)}#{obj.render_question_text(context)}"
+      def q_text(q, context=nil, locale=nil)
+        "#{next_question_number(q) unless (q.dependent? or q.display_type == "label" or q.display_type == "image" or q.part_of_group?)}#{q.text_for(nil, context, locale)}"
       end
 
       def next_question_number(question)
@@ -52,24 +61,7 @@ module Surveyor
         "<span class='qnum'>#{@n += 1}) </span>"
       end
 
-      # def split_text(text = "") # Split text into with "|" delimiter - parts to go before/after input element
-      #   {:prefix => text.split("|")[0].blank? ? "&nbsp;" : text.split("|")[0], :postfix => text.split("|")[1] || "&nbsp;"}
-      # end
-      # def question_help_helper(question)
-      #   question.help_text.blank? ? "" : %Q(<span class="question-help">#{question.help_text}</span>)
-      # end
-
-      # Help_text
-      def render_help_text(obj, context=nil)
-        obj.render_help_text(context)
-      end
-
-      # Answers
-      def a_text(obj, pos=nil, context = nil)
-        return image_tag(obj.text) if obj.is_a?(Answer) and obj.display_type == "image"
-        obj.split_or_hidden_text(pos, context)
-      end
-
+      # Responses
       def rc_to_attr(type_sym)
         case type_sym.to_s
         when /^answer$/ then :answer_id
@@ -84,11 +76,15 @@ module Surveyor
         end
       end
 
-      def generate_pick_none_input_html(value, default_value, css_class, response_class, disabled)
+      def generate_pick_none_input_html(value, default_value, css_class, response_class, disabled, input_mask, input_mask_placeholder)
         html = {}
         html[:class] = [response_class,css_class].reject{ |c| c.blank? }
         html[:value] = default_value if value.blank?
         html[:disabled] = disabled unless disabled.blank?
+        if input_mask
+          html[:'data-input-mask'] = input_mask
+          html[:'data-input-mask-placeholder'] = input_mask_placeholder unless input_mask_placeholder.blank?
+        end
         html
       end
 

data/lib/surveyor/models/answer_methods.rb

@@ -8,10 +8,13 @@ module Surveyor
         base.send :belongs_to, :question
         base.send :has_many, :responses
         base.send :has_many, :validations, :dependent => :destroy
-        
+
         # Scopes
         base.send :default_scope, :order => "display_order ASC"
-        
+
+        # Mustache
+        base.send :include, MustacheContext
+
         @@validations_already_included ||= nil
         unless @@validations_already_included
           # Validations
@@ -20,12 +23,10 @@ module Surveyor
           # base.send :validates_numericality_of, :question_id, :allow_nil => false, :only_integer => true
           @@validations_already_included = true
         end
-        
+
         # Whitelisting attributes
-        base.send :attr_accessible, :question, :question_id, :text, :short_text, :help_text, :weight, :response_class, :reference_identifier, :data_export_identifier, :common_namespace, :common_identifier, :display_order, :is_exclusive, :display_length, :custom_class, :custom_renderer, :default_value, :display_type
+        base.send :attr_accessible, :question, :question_id, :text, :short_text, :help_text, :weight, :response_class, :reference_identifier, :data_export_identifier, :common_namespace, :common_identifier, :display_order, :is_exclusive, :display_length, :custom_class, :custom_renderer, :default_value, :display_type, :input_mask, :input_mask_placeholder
       end
-      
-      include RenderText      
 
       # Instance Methods
       def initialize(*args)
@@ -41,14 +42,44 @@ module Surveyor
         self.data_export_identifier ||= Surveyor::Common.normalize(text)
         self.api_id ||= Surveyor::Common.generate_api_id
       end
-      
+      def display_type=(val)
+        write_attribute(:display_type, val.nil? ? nil : val.to_s)
+      end
+
       def css_class
         [(is_exclusive ? "exclusive" : nil), custom_class].compact.join(" ")
       end
-      
-      def split_or_hidden_text(part = nil, context = nil)
+
+      def text_for(position = nil, context = nil, locale = nil)
         return "" if display_type == "hidden_label"
-        part == :pre ? self.render_answer_text(text.split("|",2)[0], context) : (part == :post ? self.render_answer_text(text.split("|",2)[1], context) : self.render_answer_text(text, context))
+        imaged(split(in_context(translation(locale)[:text], context), position))
+      end
+      def help_text_for(context = nil, locale = nil)
+        in_context(translation(locale)[:help_text], context)
+      end
+      def default_value_for(context = nil, locale = nil)
+        in_context(translation(locale)[:default_value], context)
+      end
+      def split(text, position=nil)
+        case position
+        when :pre
+          text.split("|",2)[0]
+        when :post
+          text.split("|",2)[1]
+        else
+          text
+        end.to_s
+      end
+      def translation(locale)
+        {:text => self.text, :help_text => self.help_text, :default_value => self.default_value}.with_indifferent_access.merge(
+          (self.question.translation(locale)[:answers] || {})[self.reference_identifier] || {}
+        )
+      end
+
+      private
+
+      def imaged(text)
+        self.display_type == "image" && !text.blank? ? ActionController::Base.helpers.image_tag(text) : text
       end
     end
   end