surveyor_gui 0.0.3 → 0.1.0

data/app/views/surveyor_gui/surveyforms/edit.html.erb

@@ -0,0 +1,5 @@
+<%= render 'form' %>
+  <p class="floatdown">
+    <%= link_to "Show", surveyor_gui.surveyform_path(@surveyform) %> |
+    <%= link_to "View All", surveyor_gui.surveyforms_path %>
+  </p>

data/app/views/{surveyforms → surveyor_gui/surveyforms}/index.html.erb

@@ -24,8 +24,8 @@
       <%= link_to "Edit", edit_surveyform_path(survey) %>&nbsp
       <%= link_to "Clone", clone_survey_surveyform_path(survey) %>&nbsp
       <%= link_to "Destroy", survey, data: { confirm: 'Are you sure?' }, :method => :delete %>&nbsp; 
-      <%= link_to "Run Report", surveyor_gui_report_path(survey) %> &nbsp;
-      <%= link_to "View Responses" , surveyor_gui_responses_path(id: survey) %></td>
+      <%= link_to "Run Report", report_path(survey) %> &nbsp;
+      <%= link_to "View Responses" , responses_path(id: survey) %></td>
     </tr>
   <% end %>
 </table>

data/config/routes.rb

@@ -1,4 +1,4 @@
-Rails.application.routes.draw do
+SurveyorGui::Engine.routes.draw do
 
   resources :surveyforms do
     member do
@@ -28,16 +28,17 @@ Rails.application.routes.draw do
     member do
       get 'cut'
     end
+    collection do
+      get 'render_answer_fields_partial'
+      get 'render_grid_partial'
+      get 'render_group_inline_partial'
+      get 'render_no_picks_partial'
+    end
   end
 
   resources :question_groups do
   end
 
-  get '/question/render_answer_fields_partial', :to => 'questions#render_answer_fields_partial'
-  get '/question/render_grid_partial', :to => 'questions#render_grid_partial'
-  get '/question_group/render_group_inline_partial', :to => 'question_groups#render_group_inline_partial'
-  get '/question/render_no_picks_partial', :to => 'questions#render_no_picks_partial'
-
   resources :dependencys do
     collection do
       get 'get_answers'
@@ -47,25 +48,22 @@ Rails.application.routes.draw do
   end
   get '/dependency/render_dependency_conditions_partial', :to => 'dependencys#render_dependency_conditions_partial'
 
-  namespace :surveyor_gui do
-    resources :reports,
-      :only=>[
-              'show',
-              'preview',
-              'show_pdf'] do
-        member do
-          get 'show'
-          get 'preview'
-          get 'show_pdf'
-        end
-      end
-    resources :survey, only: ['show'] do
-    end
-    resources :responses, only: ['show', 'index', 'preview'] do
+  resources :reports,
+    :only=>[
+            'show',
+            'preview',
+            'show_pdf'] do
       member do
+        get 'show'
         get 'preview'
+        get 'show_pdf'
       end
     end
+  resources :survey, only: ['show'] do
+  end
+  resources :responses, only: ['show', 'index', 'preview'] do
+    member do
+      get 'preview'
+    end
   end
-
 end

data/lib/assets/javascripts/surveyor_gui/surveyor_gui.js

@@ -11,6 +11,13 @@ function application_js_code(){
 // this function is added to jQuery, it allows access to the readylist
 // it works for jQuery 1.3.2, it might break on future versions
 //      if (!Modernizr.input.required) {
+  surveyor_gui_mount_point = $("#surveyor_gui_mount_point").data("surveyor_gui_mount_point");
+  if (surveyor_gui_mount_point.length==0){
+    surveyor_gui_mount_point="/";
+  } else {
+    surveyor_gui_mount_point= surveyor_gui_mount_point.replace(/surveyforms/i, ""); 
+  }
+
   $.ajaxSetup({
     headers: {
       'X-CSRF-Token': $('meta[name="csrf-token"]').attr('content')
@@ -446,9 +453,10 @@ function application_js_code(){
   };
 
   $.fn.render_no_picks_partial = function (){
+    var render_no_picks_partial_url = $('#no_picks_partial_url').data("render_no_picks_partial_url");
     here = $(this)
     $.get(
-      "/question/render_no_picks_partial?id=" + $(this).closest('.questions').find('input#question_id').val(),
+      render_no_picks_partial_url + "?id="+ $(this).closest('.questions').find('input#question_id').val(),
       function(data){
         here.html(data);
       }
@@ -457,6 +465,7 @@ function application_js_code(){
 
   $.fn.render_answer_fields_partial = function (add_row){
     here = $(this);
+    var answer_fields_partial_url = $("#answer_fields_partial_url").data("answer_fields_partial_url");
     if (add_row === true) {
       var option = "&add_row=true";
     }
@@ -464,7 +473,7 @@ function application_js_code(){
       option = ' ';
     }
     $.get(
-      "/question/render_answer_fields_partial?id=" + $(this).closest('.questions').find('input#question_id').val() + option,
+      answer_fields_partial_url + "?id=" + $(this).closest('.questions').find('input#question_id').val() + option,
       function(data){
         if (add_row == true) {
           data = replace_idx($(".question_answers_text"),"answers", data)
@@ -481,9 +490,10 @@ function application_js_code(){
 
   $.fn.render_grid_fields_partial = function (question_type, index){
     here = $(this);
+    var render_grid_partial_url = $("#render_grid_partial_url").data("render_grid_partial_url");
     index = typeof index !== 'undefined' ? index : null;
     $.get(
-      "/question/render_grid_partial?id="
+      render_grid_partial_url + "?id="
         + $(this).closest('.questions').find('input#question_id').val()
         + "&question_type_id="+question_type
         + "&index=" + parseInt(index)
@@ -510,7 +520,7 @@ function application_js_code(){
     }
     else
       var question_clause = "/new";
-    window.location.href = "/questions"+question_clause +"?survey_section_id="+
+    window.location.href = surveyor_gui_mount_point+"questions"+question_clause +"?survey_section_id="+
         survey_section_id+"&text="+text+
         "&display_order="+display_order +
         "&question_type_id="+question_type_id;
@@ -531,7 +541,7 @@ function application_js_code(){
     else
       var question_group_clause = "/new";
 
-      window.location.href = "/question_groups"+question_group_clause+"?survey_section_id="+
+      window.location.href = surveyor_gui_mount_point+"question_groups"+question_group_clause+"?survey_section_id="+
         survey_section_id+"&text="+text+
         "&display_order="+display_order +
         "&question_id="+question_id +
@@ -541,6 +551,7 @@ function application_js_code(){
 
   $.fn.render_group_inline_fields_partial = function (add_row){
     here = $(this);
+    var render_group_inline_partial_url = $("render_group_inline_partial_url").data("render_group_inline_partial_url");
     var survey_section_id = $('input#question_group_survey_section_id').val();
     if (add_row === true) {
       var option = "&add_row=true";
@@ -552,7 +563,7 @@ function application_js_code(){
     var display_order = (this).closest('.questions').find('input[id$="display_order"]').last().val();
     display_order = parseInt(display_order) + 1;
     $.get(
-      "/question_group/render_group_inline_partial?id="
+      render_group_inline_partial_url + "?id="
         + last_question.val() + 
         "&display_order=" + display_order + 
         option,
@@ -729,7 +740,7 @@ function application_js_code(){
         option = ' ';
       }
       $.get(
-        "/dependency/render_dependency_conditions_partial?id=" + $(this).data('question_id') + 
+        surveyor_gui_mount_point+"dependency/render_dependency_conditions_partial?id=" + $(this).data('question_id') + 
         "&dependency_id=" + $(this).data('dependency_id') + option,
         function(data){
           if (add_row === true) {
@@ -1012,7 +1023,7 @@ function application_js_code(){
   function update_dependency_questions() {
     $('.question_logic_notifier').closest('div.question').each(function(){
       var id = $(this).closest('div.question').attr('id').match(/\d+/)[0]
-      $.get("/surveyforms/0/replace_question?question_id="+id,
+      $.get(surveyor_gui_mount_point+"surveyforms/0/replace_question?question_id="+id,
         {},
         function(response) {
           $("#question_"+id).html(replace_idx($("#question_"+id),"questions", response));
@@ -1050,7 +1061,7 @@ function application_js_code(){
             complete: function(request){
             $('#survey_section').effect('highlight');
           },
-          url: '/survey_sections/sort'})
+          url: surveyor_gui_mount_point+'survey_sections/sort'})
         }
       });
       
@@ -1092,7 +1103,7 @@ function application_js_code(){
               $('#survey_section').effect('highlight');
               update_question_numbers();
             },
-            url: '/questions/sort'
+            url: surveyor_gui_mount_point+'/questions/sort'
           })
         }
       });
@@ -1301,7 +1312,7 @@ function application_js_code(){
       .datepicker({
         duration: 'fast',
         showOn: 'both',
-        buttonImage: '../../assets/datepicker.gif',
+        buttonImage: '/../../assets/datepicker.gif',
         buttonImageOnly: true
     });
     $("input.datetime_picker")
@@ -1322,7 +1333,7 @@ function application_js_code(){
 
   $.fn.determine_dependency_question_type = function () {
     var target = $(this);
-    $.get('/dependencys/get_question_type',
+    $.get(surveyor_gui_mount_point+'dependencys/get_question_type',
       'question_id='+$(this).val(),
       function(data){
         show_dependency_value(data,target);
@@ -1339,7 +1350,7 @@ function application_js_code(){
       $(this).closest("tr").find('[id*="dependency_attributes_dependency_conditions_attributes"][id$="_id"]').val();
     $(this).closest('tr').find('[id*="dependency_attributes_dependency_conditions_attributes"][id$="answer_id"]')
       .load(
-      '/dependencys/get_answers',
+      surveyor_gui_mount_point+'dependencys/get_answers',
       'question_id='+question_id +
       '&dependency_condition_id='+dependency_condition_id +
       '&column_id='+column_id
@@ -1352,7 +1363,7 @@ function application_js_code(){
       $(this).closest("tr").find('[id*="dependency_attributes_dependency_conditions_attributes"][id$="_id"]').val();
     column.closest('.column_id').show()
     $.get(
-      '/dependencys/get_columns',
+      surveyor_gui_mount_point+'dependencys/get_columns',
       'question_id='+question_id +
       '&dependency_condition_id='+dependency_condition_id,
       function(data){

data/lib/assets/stylesheets/surveyor_gui/surveyor_gui.sass

@@ -648,3 +648,5 @@ span.preview_multiple_choice_answer
   :font-style italic 
   :font-weight bold
     
+.q_hidden
+  :display none

data/lib/generators/surveyor_gui/install_generator.rb

@@ -24,7 +24,7 @@ module SurveyorGui
     end
 
     def routes
-      route('mount SurveyorGui::Engine => "/", :as => "surveyor_gui"')
+      route('mount SurveyorGui::Engine => "/surveyor_gui", :as => "surveyor_gui"')
     end
 
     def assets

data/lib/generators/surveyor_gui/templates/app/views/layouts/{surveyor_gui_default.html.erb → surveyor_gui/surveyor_gui_default.html.erb}

@@ -7,6 +7,7 @@
     <%= csrf_meta_tags %>
   </head>
   <body>
+    <div id="surveyor_gui_mount_point" data-surveyor_gui_mount_point="<%= surveyor_gui.surveyforms_path %>"></div>
    <% flash.each do |key, value| %>
      <%= content_tag(:div, value, :class => "flash #{key}") %>
    <% end %>

data/lib/surveyor_gui/engine.rb

@@ -4,6 +4,7 @@ require 'haml' # required for view resolution
 
 module SurveyorGui
   class Engine < Rails::Engine
+    isolate_namespace SurveyorGui
     root = File.expand_path('../../', __FILE__)
     config.autoload_paths << root
 
@@ -17,7 +18,7 @@ module SurveyorGui
       Dir.glob(root + "app/facades/*.rb").each do |c|
         require_dependency(c)
       end
-      c = Dir.glob(File.expand_path('../',root)+'/app/controllers/surveyor_controller.rb').first
+      c = Dir.glob(File.expand_path('../',root)+'/app/controllers/surveyor_gui/surveyor_controller.rb').first
       require_dependency(c)
       Dir.glob(File.expand_path('../',root)+'/app/models/*.rb').each do |c|
         require_dependency(c)

data/lib/surveyor_gui/models/response_set_methods.rb

@@ -35,10 +35,11 @@ module SurveyorGui
 
       def report_user_name
         user_name = nil
+        fake_users = {'0'=>'Bob', '-1'=>'Kishore','-2'=>'Tina','-3'=>'Xiao','-4'=>'Marshal','-5'=>'Lana','-6'=>'Demarius','-7'=>'Taylor','-8'=>'Cameron','-9'=>'Clio'} 
         if class_exists?('ResponseSetUser')
           user_name = ResponseSetUser.new(self.user_id).report_user_name
         end
-        user_name || self.user_id || self.id
+        user_name || fake_users[self.user_id.to_s] || self.id
       end
       
       private

data/lib/surveyor_gui/surveyforms_controller_methods.rb

@@ -2,7 +2,7 @@ module SurveyorGui
   module SurveyformsControllerMethods
 
     def self.included(base)
-      base.send :layout, 'surveyor_gui_default'
+      base.send :layout, 'surveyor_gui/surveyor_gui_default'
     end
 
     def index

data/lib/surveyor_gui/version.rb

@@ -1,3 +1,3 @@
 module SurveyorGui
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/spec/controllers/surveyforms_controller_spec.rb

@@ -1,10 +1,11 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe SurveyformsController do
+describe SurveyorGui::SurveyformsController do
   include Surveyor::Engine.routes.url_helpers
-#  before do
-#    @routes = Surveyor::Engine.routes
-#  end
+  include SurveyorGui::Engine.routes.url_helpers
+  before do
+    self.routes = SurveyorGui::Engine.routes
+  end
 
   let!(:survey) { FactoryGirl.create(:survey, :title => "Alphabet", :access_code => "alpha", :survey_version => 0)}
   let!(:survey_beta) { FactoryGirl.create(:survey, :title => "Alphabet", :access_code => "alpha", :survey_version => 1)}
@@ -106,7 +107,7 @@ describe SurveyformsController do
 
       it "returns to the edit page" do
         do_post(:title=>'New surv')
-        expect(response).to redirect_to(edit_surveyform_url(assigns(:surveyform).id))
+        expect(response).to redirect_to(edit_surveyform_path(assigns(:surveyform).id))
       end
 
       it "resets question_no to 0" do
@@ -133,7 +134,7 @@ describe SurveyformsController do
       context "when sections are valid" do
         it "redirects to the edit page" do
           do_post @survey_with_sections
-          expect(response).to redirect_to(edit_surveyform_url(assigns(:surveyform).id))
+          expect(response).to redirect_to(edit_surveyform_path(assigns(:surveyform).id))
         end
       end
 
@@ -191,7 +192,7 @@ describe SurveyformsController do
 
       it "redirects to index" do
         do_put(:id=>survey.id,:surveyform=>{:id=>survey.id})
-        expect(response).to redirect_to(surveyforms_url)
+        expect(response).to redirect_to(surveyforms_path)
       end
 
     end
@@ -238,7 +239,7 @@ describe SurveyformsController do
 
       it "successfully destroys the survey" do
         do_delete
-        expect(response).to redirect_to(surveyforms_url)
+        expect(response).to redirect_to(surveyforms_path)
         expect(Survey.exists?(survey_with_no_responses.id)).to be_false
       end
     end
@@ -250,7 +251,7 @@ describe SurveyformsController do
 
       it "fails to delete the survey" do
         do_delete
-        expect(response).to redirect_to(surveyforms_url)
+        expect(response).to redirect_to(surveyforms_path)
         expect(Survey.exists?(survey_with_responses.id)).to be_true
       end
 

data/spec/features/create_survey_spec.rb

@@ -8,7 +8,6 @@ feature "User creates a new survey using a browser",  %q{
   As a user
   I want to create a new survey using a browser
   So that I don't have to learn the Surveyor DSL or dive into technical weeds} do
-
   #force a cr/lf to make the output look better
   scenario " " do
   end
@@ -16,7 +15,7 @@ feature "User creates a new survey using a browser",  %q{
   context "User has not yet started a new survey" do
     scenario "User starts a new survey" do
       #Given I'm on the surveyform web page
-      visit surveyforms_path
+      visit surveyor_gui.surveyforms_path
 
       #When I click "New Survey"
       click_link "New Survey"
@@ -27,7 +26,7 @@ feature "User creates a new survey using a browser",  %q{
 
     scenario "User gives the survey a title" do
       #Given I'm on the "Create New Survey" page
-      visit new_surveyform_path
+      visit surveyor_gui.new_surveyform_path
 
       #When I fill in a title
       fill_in "Title", with: "How was Boston?"

data/spec/features/dependencies_spec.rb

@@ -23,7 +23,7 @@ feature "User creates a dependency using browser", %q{
 
   scenario "user creates a dependency", js: true do
     #Given I have a survey with two questions
-    visit surveyforms_path 
+    visit surveyor_gui.surveyforms_path 
     expect(page).to have_content("Hotel ratings")
     within "tr", text: "Hotel ratings" do
       click_link "Edit"

data/spec/support/surveyforms_creation_helpers.rb

@@ -1,7 +1,7 @@
 module SurveyFormsCreationHelpers
   module CreateSurvey
     def start_a_new_survey
-      visit new_surveyform_path
+      visit surveyor_gui.new_surveyform_path
       fill_in "Title", with: "How was Boston?"
       click_button "Save Changes"
     end
@@ -64,7 +64,7 @@ module SurveyFormsCreationHelpers
   module BuildASurvey
     def build_a_survey
       #Given I'm on the "Create New Survey" page
-      visit new_surveyform_path
+      visit surveyor_gui.new_surveyform_path
 
       title_the_survey
       title_the_first_section
@@ -89,14 +89,14 @@ module SurveyFormsCreationHelpers
     end
 
     def build_a_three_question_survey
-      visit new_surveyform_path
+      visit surveyor_gui.new_surveyform_path
       title_the_survey
       question_maker = QuestionsFactory.new
       question_maker.make_question(3){|text| add_a_text_question(text)}
     end
 
     def build_a_three_section_survey
-      visit new_surveyform_path
+      visit surveyor_gui.new_surveyform_path
       title_the_survey
       title_the_first_section ("Unique Section 1")
       add_a_new_section("Unique Section 2")