active_record_survey 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96acfdcb3022af01ad493de3970ded02d82e76ec
-  data.tar.gz: 77836f5cceb9598c7df0910446d72f022fac5b5d
+  metadata.gz: 3e0bf7b98d33a965f69f24d715c45718ca9b6071
+  data.tar.gz: 380afa7927dea7f05097dddc47405553487719c2
 SHA512:
-  metadata.gz: 61c26bc02c582db78f54379b961de73b3d91db7b8250c0e608c66734d00bdd32c7e3dd45a10b81dbd1eb47ed975472f38cad3e7321d7a76995c268f2d20bd4f4
-  data.tar.gz: f1a6e73f168e89abc61e0850a1f37f266a172907f1e044e0cc3adf642131b6137126f31194c5630e97bec448b56fee961dc0d8359b6c85b49521151edff512b9
+  metadata.gz: 8232d4ab5cf39eaa900fd0e286f973c796b77df8eb8a1fe8c1116e4ee3fe0af7746073888cb9d96a7aa19b5fb7a9b1b335a51b471118a8c1de5f52a799d8af2a
+  data.tar.gz: 41e2702dc82b5e057f2da5ab18d9b2905dbf3b1d5fcb9fdf0846d3ca2217da333da0dab6fa4d9f573ad1148f7ebbb450a5e648dc959c477dc77f28c520d75e71

data/README.md

@@ -12,6 +12,9 @@ The goal is to give a simple interface for creating surveys and validating the a
 Release Notes
 ============
 
+**0.1.22**
+ - answer#remove_link cleaned up so it can be understood
+
 **0.1.20**
  - answer#build_link now detects and throws an error when a infinite loop is added
 
@@ -54,7 +57,7 @@ rails generate active_record_survey:active_record
 
 See the spec file for more detailed usage.
 
-**Build a basic survey**
+### Build a basic survey
 ```ruby
 
 # New method for building surveys
@@ -111,6 +114,50 @@ The will build a survey with the following node structure.
 
 ![alt tag](https://raw.githubusercontent.com/butchmarshall/active_record_survey/master/bin/Example_1.png)
 
+### Answer Types
+
+A number of different answer types are implemented by default.
+
+ - [Default (a.k.a radio)](#answer_default)
+ - [Boolean (a.k.a. checkbox)](#answer_checkbox)
+ - [Rank](#answer_rank)
+ - [Scale](#answer_scale)
+ - [Text](#answer_text)
+
+#### Default <a id="answer_default"></a>
+
+```ruby
+ActiveRecordSurvey::Node::Answer
+```
+
+#### Boolean <a id="answer_checkbox"></a>
+
+```ruby
+ActiveRecordSurvey::Node::Answer::Boolean
+```
+
+#### Rank <a id="answer_rank"></a>
+
+```ruby
+ActiveRecordSurvey::Node::Answer::Rank
+```
+
+#### Scale <a id="answer_scale"></a>
+
+```ruby
+ActiveRecordSurvey::Node::Answer::Scale
+```
+
+#### Text <a id="answer_text"></a>
+
+```ruby
+ActiveRecordSurvey::Node::Answer::Text
+```
+
+### Answer Validation
+
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/active_record_survey.gemspec

@@ -26,6 +26,8 @@ Gem::Specification.new do |spec|
 	else
 		spec.add_development_dependency "sqlite3", "> 0"
 	end
+
+	spec.add_development_dependency "database_cleaner"
 	spec.add_development_dependency "factory_girl", "> 4.0"
 	spec.add_development_dependency "bundler", "~> 1.7"
 	spec.add_development_dependency "rake", "~> 10.0"

data/lib/active_record_survey/node/answer.rb

@@ -1,18 +1,5 @@
 module ActiveRecordSurvey
 	class Node::Answer < Node
-		attr_accessor :ancestor_marked_for_destruction
-		protected :ancestor_marked_for_destruction
-
-		before_save do |node|
-			# ------------------------ WARNING ------------------------
-			# This code is to support #remove_link which uses mark_for_destruction
-			# This code is necessary to clean everything up.
-			# Calling save on this answer won't automatically go to its next_question -> node_maps and clean everything up
-			(@ancestor_marked_for_destruction || []).each { |i|
-				i.destroy
-			}
-		end
-
 		# Answer nodes are valid if their questions are valid!
 		# Validate this node against an instance
 		def validate_node(instance)
@@ -60,34 +47,18 @@ module ActiveRecordSurvey
 		# Removes the link
 		# TODO - does this work when saved??
 		def remove_link
-			@ancestor_marked_for_destruction ||= []
-
-			# Go through the answers node_maps
-			self.node_maps.each_with_index { |answer_node_map, answer_node_map_index|
-				# Go through all the node_maps this answers node map is linked to
-				# a.k.a all the questions node maps
-				answer_node_map.children = answer_node_map.children.select { |child|
-					node_map_removed = false
-					# TODO - clean up this logic to be easier to follow
-					# The question can be linked to from more than one answer!
-					# If this is the case, we *don'tz* want to leave one last node_map hanging out - we can destroy them all
-					linked_somewhere_else = !child.node.node_maps.select { |nm| nm.parent && nm.parent.node != self }.first.nil?
-
-					child.node.node_maps.select { |nm|
-						nm.parent && nm.parent.node == self
-					}.each_with_index { |nm,ii|
-						# Cleans up all the excess node_maps from the old linkage
-						if linked_somewhere_else || nm.parent && nm.parent.node == self && ii > 0
-							nm.mark_for_destruction 
-							@ancestor_marked_for_destruction << nm
-							node_map_removed = true
-						end
-					}
-
-					# Should not know about parent
-					child.parent = nil if node_map_removed
-
-					!node_map_removed
+			# not linked to a question - nothing to remove!
+			return true if (question = self.next_question).nil?
+
+			self.node_maps.each_with_index { |answer_nm, answer_nm_i|
+				answer_nm.children = answer_nm.children.select { |question_nm|
+					# This node_map links to the question
+					if question_nm.node === question
+						question_nm.parent = nil
+						false
+					else
+						true
+					end
 				}
 			}
 		end
@@ -104,7 +75,7 @@ module ActiveRecordSurvey
 			if self.node_maps.select { |i|
 				i.children.length === 0
 			}.length === 0
-				raise RuntimeError.new "This answer has already been linked"
+				raise RuntimeError.new "This answer has already been linked" 
 			end
 
 			# Attempt to find an unused to_node node_map

data/lib/active_record_survey/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordSurvey
-	VERSION = "0.1.21"
+	VERSION = "0.1.22"
 end

data/spec/active_record_survey/node/answer_spec.rb

@@ -7,7 +7,7 @@ describe ActiveRecordSurvey::Node::Answer, :answer_spec => true do
 			@survey.save
 		end
 
-		describe '#build_link', :focus => true do
+		describe '#build_link' do
 			it 'should throw error when build_link creates an infinite loop' do
 				survey = ActiveRecordSurvey::Survey.new()
 
@@ -30,6 +30,39 @@ describe ActiveRecordSurvey::Node::Answer, :answer_spec => true do
 				q2_a1.build_link(q3)
 				expect{q3_a1.build_link(q1)}.to raise_error(RuntimeError) # This should throw exception
 			end
+
+			it 'should be allowed before saving after calling #remove_link' do
+				survey = ActiveRecordSurvey::Survey.new()
+
+				q1 = ActiveRecordSurvey::Node::Question.new(:text => "Q1")
+				survey.build_question(q1)
+				q1_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q1 A1")
+				q1.build_answer(q1_a1)
+
+				q2 = ActiveRecordSurvey::Node::Question.new(:text => "Q2")
+				survey.build_question(q2)
+				q3 = ActiveRecordSurvey::Node::Question.new(:text => "Q3")
+				survey.build_question(q3)
+
+				expect(survey.as_map).to eq([{"text"=>"Q1", :id=>nil, :node_id=>nil, :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 A1", :id=>nil, :node_id=>nil, :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}, {"text"=>"Q2", :id=>nil, :node_id=>nil, :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}, {"text"=>"Q3", :id=>nil, :node_id=>nil, :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}])
+
+				q1_a1.build_link(q2)
+				expect(q1_a1.next_question).to eq(q2)
+				expect(survey.as_map).to eq([{"text"=>"Q1", :id=>nil, :node_id=>nil, :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 A1", :id=>nil, :node_id=>nil, :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Q2", :id=>nil, :node_id=>nil, :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}]}]}, {"text"=>"Q3", :id=>nil, :node_id=>nil, :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}])
+
+				q1_a1.remove_link
+				expect(q1_a1.next_question).to eq(nil)
+				expect(survey.as_map).to eq([{"text"=>"Q1", :id=>nil, :node_id=>nil, :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 A1", :id=>nil, :node_id=>nil, :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}, {"text"=>"Q2", :id=>nil, :node_id=>nil, :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}, {"text"=>"Q3", :id=>nil, :node_id=>nil, :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}])
+
+				q1_a1.build_link(q3)
+				expect(q1_a1.next_question).to eq(q3)
+				expect(survey.as_map).to eq([{"text"=>"Q1", :id=>nil, :node_id=>nil, :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 A1", :id=>nil, :node_id=>nil, :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Q3", :id=>nil, :node_id=>nil, :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}]}]}, {"text"=>"Q2", :id=>nil, :node_id=>nil, :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}])
+
+				survey.save
+				expect(survey.as_map).to eq([{"text"=>"Q1", :id=>190, :node_id=>58, :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 A1", :id=>191, :node_id=>59, :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Q3", :id=>192, :node_id=>60, :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}]}]}, {"text"=>"Q2", :id=>193, :node_id=>61, :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}])
+				survey.reload
+				expect(survey.as_map).to eq([{"text"=>"Q1", :id=>190, :node_id=>58, :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 A1", :id=>191, :node_id=>59, :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Q3", :id=>192, :node_id=>60, :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}]}]}, {"text"=>"Q2", :id=>193, :node_id=>61, :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}])
+			end
 		end
 
 		describe '#remove_link' do

data/spec/spec_helper.rb

@@ -6,6 +6,8 @@ require 'active_record_survey'
 
 require_relative '../spec/factories/active_record_survey/survey'
 
+require 'database_cleaner'
+
 # Trigger AR to initialize
 ActiveRecord::Base
 
@@ -61,6 +63,12 @@ RSpec.configure do |config|
 	config.include FactoryGirl::Syntax::Methods
 	config.after(:each) do
 	end
+
+	config.before(:suite) do
+		DatabaseCleaner.strategy = :transaction
+		DatabaseCleaner.clean_with(:truncation)
+	end
+
 	config.expect_with :rspec do |c|
 		c.syntax = :expect
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_survey
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - Butch Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -58,6 +58,20 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement