missinglink 0.2.1 → 0.2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e4831b34c8d0eda8eb16a551b660387e36a6a46
-  data.tar.gz: fcc9a4b5fd84fd88979877abe8c7f3abe265e836
+  metadata.gz: 90a8c402694e1bcfd9e36658ed6919150b546aba
+  data.tar.gz: 81f1d658a20f25baa96278ffe605837d93fb6512
 SHA512:
-  metadata.gz: 48717c4b4be1426742ce7e6b18ba29c576ea5cecc19d97fcdfdeb5ee8dd58dcf1c04cfffd79edb5221dd81eec9df97b4bd93c7b7cb33c3b2ed09b5ca44b0ace2
-  data.tar.gz: 461808ece66053ba3d1d614d3c435e3354da7ac3e1bcd3919098409483c99cb8dd53072e109ef598277e267c9bdffb64e3fec7b390380e82ae6e96eadc1810f4
+  metadata.gz: 6b4a3785a7a47173db80fabe9088f3aea5f68d3c5978a4d60b7637deb2900e23432ba599a6aae88bba76b90aa4202034636c6c77e3845be3a11dc16a5e3db14f
+  data.tar.gz: 78315db99f9fddbe128383343678d7aca667eeeab135e2331056b3278f7b451f2f166db4ad3e67a37c8218f508b94c7eea0bcf95641029537b1c70806bf28772

data/app/models/missinglink/survey_question.rb

@@ -44,20 +44,22 @@ module Missinglink
           sa_row = (sra.row_survey_answer_id ? SurveyAnswer.find(sra.row_survey_answer_id) : nil)
           sa_col = (sra.col_survey_answer_id ? SurveyAnswer.find(sra.col_survey_answer_id) : nil)
           sa_col_choice = (sra.col_choice_survey_answer_id ? SurveyAnswer.find(sra.col_choice_survey_answer_id) : nil)
-          other_text = ((!search_other || sra.text.nil?) ? nil : "Other: #{ sra.text }")
 
           case answer_strategy
           when "first_survey_response_answer_text"
             hash[sra.text] = sra.id unless (sra.text.nil? || hash[sra.text])
           when "answer_row_match_for_survey_response_answer_text"
+            other_text = ((!search_other || sra.text.nil?) ? nil : "#{ (sa_row.try(:text) || "Other") }: #{ sra.text }")
             hash[sa_row.text] = sra.id unless (sa_row.nil? || hash[sa_row.text])
             hash[other_text] = sra.id unless (other_text.nil? || hash[other_text])
           when "row_column_survey_response_answers_and_text"
             main_text = "#{ sa_row.try(:text) }: #{ sa_col.try(:text) }"
+            other_text = ((!search_other || sra.text.nil? || !sa_row.nil?) ? nil : "Other: #{ sra.text }")
             hash[main_text] = sra.id unless (sa_row.nil? || sa_col.nil? || hash[main_text])
             hash[other_text] = sra.id unless (other_text.nil? || hash[other_text])
           when "row_column_and_choice_survey_response_answers_and_text"
             main_text = "#{ sa_row.try(:text) }, #{ sa_col.try(:text) }: #{ sa_col_choice.try(:text) }"
+            other_text = ((!search_other || sra.text.nil? || !sa_row.nil?) ? nil : "Other: #{ sra.text }")
             hash[main_text] = sra.id unless (sa_row.nil? || sa_col.nil? || sa_col_choice.nil? || hash[main_text])
             hash[other_text] = sra.id unless (other_text.nil? || hash[other_text])
           end

data/etc/question_types.yml

@@ -0,0 +1,45 @@
+# first_survey_response_answer_text:
+#   pull the first SRA, and use the text
+# answer_row_match_for_survey_response_answer_text:
+#   pull each SRA, use the row answer, and the text if present
+# row_column_survey_response_answers_and_text
+#   pull each SRA, combo row/column search, "other" just has text
+# row_column_and_choice_survey_response_answers_and_text:
+#   pull each SRA, combo row/column/colchoice search, "other" text
+# none:
+#   this is not actually a question, so ignore it
+
+
+open_ended:
+  essay: first_survey_response_answer_text
+  multi: answer_row_match_for_survey_response_answer_text
+  numerical: answer_row_match_for_survey_response_answer_text
+  single: first_survey_response_answer_text
+single_choice:
+  vertical: answer_row_match_for_survey_response_answer_text
+  vertical_two_col: answer_row_match_for_survey_response_answer_text
+  vertical_three_col: answer_row_match_for_survey_response_answer_text
+  horiz: answer_row_match_for_survey_response_answer_text
+  menu: answer_row_match_for_survey_response_answer_text
+multiple_choice:
+  vertical: answer_row_match_for_survey_response_answer_text
+  vertical_two_col: answer_row_match_for_survey_response_answer_text
+  vertical_three_col: answer_row_match_for_survey_response_answer_text
+  horiz: answer_row_match_for_survey_response_answer_text
+matrix:
+  single: row_column_survey_response_answers_and_text
+  multi: row_column_survey_response_answers_and_text
+  menu: row_column_and_choice_survey_response_answers_and_text
+  rating: row_column_survey_response_answers_and_text
+  ranking: row_column_survey_response_answers_and_text
+demographic:
+  us: answer_row_match_for_survey_response_answer_text
+  international: answer_row_match_for_survey_response_answer_text
+datetime:
+  date_only: answer_row_match_for_survey_response_answer_text
+  time_only: answer_row_match_for_survey_response_answer_text
+  both: answer_row_match_for_survey_response_answer_text
+presentation:
+  image: none
+  video: none
+  descriptive_text: none

data/lib/missinglink/version.rb

@@ -1,3 +1,3 @@
 module Missinglink
-  VERSION = "0.2.1"
+  VERSION = "0.2.1.1"
 end

data/lib/missinglink.rb

@@ -32,6 +32,6 @@ module Missinglink
   end
 
   def answer_strategies
-    @@answer_strategies ||= YAML.load_file("etc/question_types.yml")
+    @@answer_strategies ||= YAML.load_file(File.join(File.dirname(File.expand_path(__FILE__)), "../etc/question_types.yml"))
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: missinglink
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.1.1
 platform: ruby
 authors:
 - Trey Springer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -133,6 +133,7 @@ files:
 - app/views/layouts/missinglink/application.html.erb
 - config/routes.rb
 - db/migrate/20140308005724_add_missinglink_survey_schema.rb
+- etc/question_types.yml
 - lib/missinglink.rb
 - lib/missinglink/connection.rb
 - lib/missinglink/engine.rb