active_record_survey_api 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c173af6cea094f14c55fe9932d84b8caa4afc74
-  data.tar.gz: 05d509216bbd05a2d3beb8abe1c182aeef6b8885
+  metadata.gz: 2e462167630331aaa6e6676953e57ea5002c556e
+  data.tar.gz: 4cd8e981aeff4966e3c441cbb8b540947e6c65ab
 SHA512:
-  metadata.gz: a3fb3a5ffe1db338b18c24c2b212ed259cce9bb08a646359e1fee3a94dd6cc825bdef06df93ea694b986193e7a366eb0e49fa7fbfb3f80ca62e26fd181c30773
-  data.tar.gz: 0b9b54ac7a32c1b4552d7b03b10a2bf6f193e7daba9b12936a3bc71576ee982ab14f9ee2a2a1bd3fc6b7748817d1cd831233dcebe9456b18291f5c9b51af2d14
+  metadata.gz: ee0605613c6950668fd6c98e43ad410a0ef5615a8ba72c887dfeb7dbdc05150bf743abb3c4c53549006d45869e07dd5f7dfca0a85dfd1db27b3feee5c03d6083
+  data.tar.gz: a7e639e26887d4f5376236f4570494ef236f4ad35038c73f0bef339917bf72a400cc0f9e2fb061103d06e6f0bd4de0ba00bb1adfcaf985022cf1099a98ca3d9a

data/app/controllers/active_record_survey_api/node_map_groups_controller.rb

@@ -0,0 +1,15 @@
+require_dependency "active_record_survey_api/application_controller"
+
+module Concerns
+	module Controllers
+		module NodeMapGroups
+			extend ActiveRecordSurveyApi::Concerns::Controllers::NodeMapGroups
+		end
+	end
+end
+
+module ActiveRecordSurveyApi
+	class NodeMapGroupsController < ApplicationController
+		include Concerns::Controllers::NodeMapGroups
+	end
+end

data/config/routes.rb

@@ -7,7 +7,9 @@ ActiveRecordSurveyApi::Engine.routes.draw do
 		resources :questions do
 			resources :answers
 		end
+		resources :node_map_groups, as: "pages"
 	end
+	resources :node_map_groups, as: "pages"
 	resources :questions do
 		resources :answers
 

data/db/migrate/20160408032133_add_active_record_survey_node_map_group.rb

@@ -0,0 +1,11 @@
+class AddActiveRecordSurveyNodeMapGroup < ActiveRecord::Migration
+	def up
+		require "generators/active_record_survey/node_map_group/templates/migration_0.0.1"
+		AddActiveRecordSurveyNodeMapGroup.up
+	end
+	
+	def down
+		require "generators/active_record_survey/node_map_group/templates/migration_0.0.1"
+		AddActiveRecordSurveyNodeMapGroup.down
+	end
+end

data/db/migrate/20160408032206_add_active_record_survey_node_map_group_globalize.rb

@@ -0,0 +1,15 @@
+class AddActiveRecordSurveyNodeMapGroupGlobalize < ActiveRecord::Migration
+	def up
+		::ActiveRecordSurvey::NodeMapGroup.create_translation_table!(
+			:text => {
+				:type => :string,
+				:null => false,
+				:default => '',
+			}
+		)
+	end
+	
+	def down
+		::ActiveRecordSurvey::NodeMapGroup.drop_translation_table!
+	end
+end

data/lib/active_record_survey_api/concerns/controllers/node_map_groups.rb

@@ -0,0 +1,54 @@
+module ActiveRecordSurveyApi
+	module Concerns
+		module Controllers
+			module NodeMapGroups
+				extend ActiveSupport::Concern
+
+				def create
+					@node_map_group = new_node_map_group
+					@node_map_group.survey = @survey
+					@node_map_group.attributes = node_map_group_params
+					@node_map_group.save
+
+					if !@node_map_group.save
+						render json: JSONAPI::Serializer.serialize_errors(@node_map_group.errors), :status => 409
+					else
+						render json: serialize_model(@node_map_group, serializer: ActiveRecordSurveyApi::NodeMapGroupSerializer)
+					end
+				end
+
+				def all_node_map_groups
+					@survey.node_map_groups
+				end
+
+				def node_map_group_by_id(id)
+					ActiveRecordSurvey::NodeMapGroup.find(id)
+				end
+
+				def new_node_map_group(p = nil)
+					ActiveRecordSurvey::NodeMapGroup.new(p)
+				end
+
+				def json_params
+					ActionController::Parameters.new(JSON.parse(request.body.read))
+				end
+
+				def node_map_group_params
+					json_params.require(:node_map_group).permit(:text, questions: []).tap { |whitelisted|
+						whitelisted[:build_from_questions] = whitelisted[:questions] unless whitelisted[:questions].nil?
+
+						whitelisted.delete(:questions)
+					}
+				end
+
+				included do
+					before_filter :find_survey, :if => proc { |c| params[:survey_id].to_i > 0 }
+				end
+
+				def find_survey
+					self.instance_variable_set "@survey", ActiveRecordSurvey::Survey.find(params[:survey_id])
+				end
+			end
+		end
+	end
+end

data/lib/active_record_survey_api/models/node_map_group.rb

@@ -0,0 +1,15 @@
+module ActiveRecordSurveyApi
+	module Models
+		module NodeMapGroup
+			def self.included(base)
+				base.class_eval do
+					translates :text
+				end
+				
+				def build_from_questions=questions
+					self.build_questions(questions)
+				end
+			end
+		end
+	end
+end

data/lib/active_record_survey_api/serializers/node_map_group_serializer.rb

@@ -0,0 +1,5 @@
+module ActiveRecordSurveyApi
+	class NodeMapGroupSerializer < BaseSerializer
+
+	end
+end

data/lib/active_record_survey_api/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordSurveyApi
-	VERSION = "0.0.11"
+	VERSION = "0.0.12"
 end

data/lib/active_record_survey_api.rb

@@ -1,5 +1,6 @@
 require "http_accept_language"
 require "active_record_survey"
+require "active_record_survey/node_map_group"
 require "globalize"
 
 require "active_record_survey_api/engine"
@@ -8,6 +9,7 @@ require "active_record_survey_api/concerns/controllers/surveys"
 require "active_record_survey_api/concerns/controllers/questions"
 require "active_record_survey_api/concerns/controllers/answers"
 require "active_record_survey_api/concerns/controllers/node_maps"
+require "active_record_survey_api/concerns/controllers/node_map_groups"
 require "active_record_survey_api/concerns/controllers/nodes"
 require "active_record_survey_api/concerns/controllers/instances"
 require "active_record_survey_api/concerns/controllers/instance_nodes"
@@ -17,12 +19,14 @@ require "active_record_survey_api/models/node_map"
 require "active_record_survey_api/models/node/question"
 require "active_record_survey_api/models/node/answer"
 require "active_record_survey_api/models/instance"
+require "active_record_survey_api/models/node_map_group"
 
 require "active_record_survey_api/serializers/base_serializer"
 require "active_record_survey_api/serializers/answer_serializer"
 require "active_record_survey_api/serializers/instance_serializer"
 require "active_record_survey_api/serializers/instance_node_serializer"
 require "active_record_survey_api/serializers/node_map_serializer"
+require "active_record_survey_api/serializers/node_map_group_serializer"
 require "active_record_survey_api/serializers/node_serializer"
 require "active_record_survey_api/serializers/question_serializer"
 require "active_record_survey_api/serializers/survey_serializer"
@@ -36,6 +40,8 @@ ActiveRecordSurvey::Node::Question.send(:include, ActiveRecordSurveyApi::Models:
 ActiveRecordSurvey::Node::Answer.send(:include, ActiveRecordSurveyApi::Models::Node::Answer)
 ActiveRecordSurvey::Instance.send(:include, ActiveRecordSurveyApi::Models::Instance)
 
+ActiveRecordSurvey::NodeMapGroup.send(:include, ActiveRecordSurveyApi::Models::NodeMapGroup)
+
 # Fallback support
 #require "i18n/backend/fallbacks" 
 #I18n.fallbacks.map('es' => 'en')

data/spec/controllers/active_record_survey_api/surveys/node_map_groups_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+describe ActiveRecordSurveyApi::NodeMapGroupsController, :type => :controller, :node_map_groups_api => true do
+	routes { ActiveRecordSurveyApi::Engine.routes }
+
+	before(:each) do
+		I18n.locale = :en
+		request.headers[:HTTP_ACCEPT_LANGUAGE] = :en
+		@header_params = {
+			:CONTENT_TYPE => 'application/json',
+			:ACCEPT => 'application/json'
+		}
+		@survey = FactoryGirl.build(:pageable_survey)
+		@survey.save
+
+		@q1 = @survey.questions.select { |i| i.text == "Question #1" }.first
+		@q1_a1 = @q1.answers.select { |i| i.text == "Q1 Answer #1" }.first
+		@q1_a2 = @q1.answers.select { |i| i.text == "Q1 Answer #2" }.first
+
+		@q2 = @survey.questions.select { |i| i.text == "Question #2" }.first
+		@q2_a2 = @q2.answers.select { |i| i.text == "Q2 Answer #2" }.first
+
+		@q3 = @survey.questions.select { |i| i.text == "Question #3" }.first
+		@q3_a1 = @q3.answers.select { |i| i.text == "Q3 Answer #1" }.first
+		@q3_a2 = @q3.answers.select { |i| i.text == "Q3 Answer #2" }.first
+
+		@q4 = @survey.questions.select { |i| i.text == "Question #4" }.first
+		@q5 = @survey.questions.select { |i| i.text == "Question #5" }.first
+	end
+
+	describe "CREATE" do
+		describe "success" do
+			it 'should succeed for single questions' do
+				post :create,
+				{
+					:node_map_group => {
+						:questions => [
+							@q1.id,
+						]
+					}
+				}.to_json, @header_params.merge(:survey_id => @survey.id)
+
+				expect(response.status).to eq(200)
+			end
+
+			it 'should succeed for multiple questions' do
+				post :create,
+				{
+					:node_map_group => {
+						:questions => [
+							@q3.id,
+							@q4.id,
+						]
+					}
+				}.to_json, @header_params.merge(:survey_id => @survey.id)
+
+				expect(response.status).to eq(200)
+			end
+		end
+		describe "failure" do
+			it 'should fail when one of the questions branches' do
+				post :create,
+				{
+					:node_map_group => {
+						:questions => [
+							@q1.id,
+							@q2.id,
+						]
+					}
+				}.to_json, @header_params.merge(:survey_id => @survey.id)
+
+				expect(response.status).to eq(409)
+			end
+		end
+	end
+end

data/spec/factories/active_record_survey/survey.rb

@@ -40,6 +40,39 @@ module FactoryGirlSurveyHelpers
 		q3_a1.build_link(q4)
 		q3_a2.build_link(q4)
 	end
+
+	def build_pageable_survey(survey)
+		q1 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Question #1", :survey => survey)
+		q1_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q1 Answer #1")
+		q1_a2 = ActiveRecordSurvey::Node::Answer.new(:text => "Q1 Answer #2")
+		q1.build_answer(q1_a1)
+		q1.build_answer(q1_a2)
+
+		q2 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Question #2", :survey => survey)
+		q2_a1 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q2 Answer #1")
+		q2_a2 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q2 Answer #2")
+		q2.build_answer(q2_a1)
+		q2.build_answer(q2_a2)
+
+		q3 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Question #3", :survey => survey)
+		q3_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q3 Answer #1")
+		q3_a2 = ActiveRecordSurvey::Node::Answer.new(:text => "Q3 Answer #2")
+		q3.build_answer(q3_a1)
+		q3.build_answer(q3_a2)
+
+		q4 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Question #4", :survey => survey)
+
+		q5 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Question #5", :survey => survey)
+
+		q1_a1.build_link(q2)
+		q1_a2.build_link(q3)
+		q2_a2.build_link(q3)
+
+		q3_a1.build_link(q4)
+		q3_a2.build_link(q4)
+
+		q4.build_link(q5)
+	end
 end
 
 FactoryGirl.define do	
@@ -50,4 +83,7 @@ FactoryGirl.define do
 	factory :basic_survey, parent: :survey do |f|
 		after(:build) { |survey| FactoryGirlSurveyHelpers.build_basic_survey(survey) }
 	end
+	factory :pageable_survey, parent: :survey do |f|
+		after(:build) { |survey| FactoryGirlSurveyHelpers.build_pageable_survey(survey) }
+	end
 end

data/spec/test_app/db/schema.rb

@@ -11,7 +11,24 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151002131904) do
+ActiveRecord::Schema.define(version: 20160408032206) do
+
+  create_table "active_record_survey_api_node_map_group_translations", force: :cascade do |t|
+    t.integer  "active_record_survey_api_node_map_group_id",              null: false
+    t.string   "locale",                                                  null: false
+    t.datetime "created_at",                                              null: false
+    t.datetime "updated_at",                                              null: false
+    t.string   "text",                                       default: "", null: false
+  end
+
+  add_index "active_record_survey_api_node_map_group_translations", ["active_record_survey_api_node_map_group_id"], name: "index_b498d8de7f6d8f1068770987d74f791d985628f2"
+  add_index "active_record_survey_api_node_map_group_translations", ["locale"], name: "index_ce3a77b5bc1f5d7186fb8462af6a4ead5150a0f7"
+
+  create_table "active_record_survey_api_node_map_groups", force: :cascade do |t|
+    t.integer  "active_record_survey_id"
+    t.datetime "created_at",              null: false
+    t.datetime "updated_at",              null: false
+  end
 
   create_table "active_record_survey_instance_nodes", force: :cascade do |t|
     t.integer  "active_record_survey_instance_id"
@@ -30,13 +47,14 @@ ActiveRecord::Schema.define(version: 20151002131904) do
   create_table "active_record_survey_node_maps", force: :cascade do |t|
     t.integer  "active_record_survey_node_id"
     t.integer  "parent_id"
-    t.integer  "lft",                                      null: false
-    t.integer  "rgt",                                      null: false
-    t.integer  "depth",                        default: 0, null: false
-    t.integer  "children_count",               default: 0, null: false
+    t.integer  "lft",                                                    null: false
+    t.integer  "rgt",                                                    null: false
+    t.integer  "depth",                                      default: 0, null: false
+    t.integer  "children_count",                             default: 0, null: false
     t.integer  "active_record_survey_id"
-    t.datetime "created_at",                               null: false
-    t.datetime "updated_at",                               null: false
+    t.datetime "created_at",                                             null: false
+    t.datetime "updated_at",                                             null: false
+    t.integer  "active_record_survey_api_node_map_group_id"
   end
 
   add_index "active_record_survey_node_maps", ["lft"], name: "index_active_record_survey_node_maps_on_lft"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_survey_api
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Butch Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,14 +44,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.37
+        version: 0.1.38
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.37
+        version: 0.1.38
+- !ruby/object:Gem::Dependency
+  name: active_record_survey-node_map_group
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: globalize
   requirement: !ruby/object:Gem::Requirement
@@ -192,16 +206,20 @@ files:
 - app/controllers/active_record_survey_api/application_controller.rb
 - app/controllers/active_record_survey_api/instance_nodes_controller.rb
 - app/controllers/active_record_survey_api/instances_controller.rb
+- app/controllers/active_record_survey_api/node_map_groups_controller.rb
 - app/controllers/active_record_survey_api/questions_controller.rb
 - app/controllers/active_record_survey_api/surveys_controller.rb
 - app/helpers/active_record_survey_api/application_helper.rb
 - app/helpers/active_record_survey_api/surveys_helper.rb
 - config/routes.rb
 - db/migrate/20151002131904_add_globalize.rb
+- db/migrate/20160408032133_add_active_record_survey_node_map_group.rb
+- db/migrate/20160408032206_add_active_record_survey_node_map_group_globalize.rb
 - lib/active_record_survey_api.rb
 - lib/active_record_survey_api/concerns/controllers/answers.rb
 - lib/active_record_survey_api/concerns/controllers/instance_nodes.rb
 - lib/active_record_survey_api/concerns/controllers/instances.rb
+- lib/active_record_survey_api/concerns/controllers/node_map_groups.rb
 - lib/active_record_survey_api/concerns/controllers/node_maps.rb
 - lib/active_record_survey_api/concerns/controllers/nodes.rb
 - lib/active_record_survey_api/concerns/controllers/questions.rb
@@ -212,10 +230,12 @@ files:
 - lib/active_record_survey_api/models/node/answer.rb
 - lib/active_record_survey_api/models/node/question.rb
 - lib/active_record_survey_api/models/node_map.rb
+- lib/active_record_survey_api/models/node_map_group.rb
 - lib/active_record_survey_api/serializers/answer_serializer.rb
 - lib/active_record_survey_api/serializers/base_serializer.rb
 - lib/active_record_survey_api/serializers/instance_node_serializer.rb
 - lib/active_record_survey_api/serializers/instance_serializer.rb
+- lib/active_record_survey_api/serializers/node_map_group_serializer.rb
 - lib/active_record_survey_api/serializers/node_map_serializer.rb
 - lib/active_record_survey_api/serializers/node_serializer.rb
 - lib/active_record_survey_api/serializers/question_serializer.rb
@@ -225,6 +245,7 @@ files:
 - spec/active_record_survey_api_spec.rb
 - spec/controllers/active_record_survey_api/surveys/instances/instance_nodes_spec.rb
 - spec/controllers/active_record_survey_api/surveys/instances_spec.rb
+- spec/controllers/active_record_survey_api/surveys/node_map_groups_spec.rb
 - spec/controllers/active_record_survey_api/surveys/questions/answers_spec.rb
 - spec/controllers/active_record_survey_api/surveys/questions_spec.rb
 - spec/controllers/active_record_survey_api/surveys_spec.rb
@@ -4861,6 +4882,7 @@ test_files:
 - spec/controllers/active_record_survey_api/surveys/instances_spec.rb
 - spec/controllers/active_record_survey_api/surveys/instances/instance_nodes_spec.rb
 - spec/controllers/active_record_survey_api/surveys/questions/answers_spec.rb
+- spec/controllers/active_record_survey_api/surveys/node_map_groups_spec.rb
 - spec/controllers/active_record_survey_api/surveys/questions_spec.rb
 - spec/spec_helper.rb
 - spec/factories/active_record_survey/node/answer.rb