active_record_survey 0.1.25 → 0.1.26

data/spec/factories/active_record_survey/survey.rb

@@ -1,8 +1,7 @@
 module FactoryGirlSurveyHelpers
 	extend self
 	def build_simple_survey(survey)
-		q1 = ActiveRecordSurvey::Node::Question.new(:text => "Question #1")
-		survey.build_question(q1)
+		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_a3 = ActiveRecordSurvey::Node::Answer.new(:text => "Q1 Answer #3")
@@ -10,22 +9,19 @@ module FactoryGirlSurveyHelpers
 		q1.build_answer(q1_a2)
 		q1.build_answer(q1_a3)
 
-		q2 = ActiveRecordSurvey::Node::Question.new(:text => "Question #2")
-		survey.build_question(q2)
+		q2 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Question #2", :survey => survey)
 		q2_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q2 Answer #1")
 		q2_a2 = ActiveRecordSurvey::Node::Answer.new(:text => "Q2 Answer #2")
 		q2.build_answer(q2_a1)
 		q2.build_answer(q2_a2)
 
-		q3 = ActiveRecordSurvey::Node::Question.new(:text => "Question #3")
-		survey.build_question(q3)
+		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 = ActiveRecordSurvey::Node::Question.new(:text => "Question #4")
-		survey.build_question(q4)
+		q4 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Question #4", :survey => survey)
 		q4_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q4 Answer #1")
 		q4_a2 = ActiveRecordSurvey::Node::Answer.new(:text => "Q4 Answer #2")
 		q4.build_answer(q4_a1)
@@ -45,8 +41,7 @@ module FactoryGirlSurveyHelpers
 		q3_a2.build_link(q4)
 	end
 	def build_basic_survey(survey)
-		q1 = ActiveRecordSurvey::Node::Question.new(:text => "Q1")
-		survey.build_question(q1)
+		q1 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Q1", :survey => survey)
 		q1_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q1 A1")
 		q1_a2 = ActiveRecordSurvey::Node::Answer.new(:text => "Q1 A2")
 		q1_a3 = ActiveRecordSurvey::Node::Answer.new(:text => "Q1 A3")
@@ -54,36 +49,31 @@ module FactoryGirlSurveyHelpers
 		q1.build_answer(q1_a2)
 		q1.build_answer(q1_a3)
 
-		q2 = ActiveRecordSurvey::Node::Question.new(:text => "Q2")
-		survey.build_question(q2)
+		q2 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Q2", :survey => survey)
 		q2_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q2 A1")
 		q2_a2 = ActiveRecordSurvey::Node::Answer.new(:text => "Q2 A2")
 		q2.build_answer(q2_a1)
 		q2.build_answer(q2_a2)
 
-		q3 = ActiveRecordSurvey::Node::Question.new(:text => "Q3")
-		survey.build_question(q3)
+		q3 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Q3", :survey => survey)
 		q3_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q3 A1")
 		q3_a2 = ActiveRecordSurvey::Node::Answer.new(:text => "Q3 A2")
 		q3.build_answer(q3_a1)
 		q3.build_answer(q3_a2)
 
-		q4 = ActiveRecordSurvey::Node::Question.new(:text => "Q4")
-		survey.build_question(q4)
+		q4 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Q4", :survey => survey)
 		q4_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q4 A1")
 		q4_a2 = ActiveRecordSurvey::Node::Answer.new(:text => "Q4 A2")
 		q4.build_answer(q4_a1)
 		q4.build_answer(q4_a2)
 
-		q5 = ActiveRecordSurvey::Node::Question.new(:text => "Q5 Boolean")
-		survey.build_question(q5)
+		q5 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Q5 Boolean", :survey => survey)
 		q5_a1 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q5 A1")
 		q5_a2 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q5 A2")
 		q5.build_answer(q5_a1)
 		q5.build_answer(q5_a2)
 
-		q6 = ActiveRecordSurvey::Node::Question.new(:text => "Q6")
-		survey.build_question(q6)
+		q6 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Q6", :survey => survey)
 		q6_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q6 A1")
 		q6_a2 = ActiveRecordSurvey::Node::Answer.new(:text => "Q6 A2")
 		q6.build_answer(q6_a1)

data/spec/spec_helper.rb

@@ -11,6 +11,8 @@ require 'database_cleaner'
 # Trigger AR to initialize
 ActiveRecord::Base
 
+#ActiveRecord::Base.logger = Logger.new(STDOUT)
+
 module Rails
   def self.root
     '.'
@@ -30,9 +32,11 @@ end
 ActiveRecord::Migration.verbose = false
 
 require "generators/active_record_survey/templates/migration_0.1.0"
+require "generators/active_record_survey/templates/migration_0.1.26"
 
 ActiveRecord::Schema.define do
 	AddActiveRecordSurvey.up
+	Update_0_1_26_ActiveRecordSurvey.up
 
 	# Make it easier when you can put text on things
 	add_column :active_record_survey_nodes, :text, :string

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_survey
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Butch Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +165,7 @@ files:
 - lib/generators/active_record_survey/active_record_survey_generator.rb
 - lib/generators/active_record_survey/next_migration_version.rb
 - lib/generators/active_record_survey/templates/migration_0.1.0.rb
+- lib/generators/active_record_survey/templates/migration_0.1.26.rb
 - rspec_rvm
 - spec/active_record_survey/node/answer/boolean_spec.rb
 - spec/active_record_survey/node/answer/rank_spec.rb