Pickaxe 0.6.3 → 0.7.0

data/lib/pickaxe.rb

@@ -18,7 +18,7 @@ end
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
 
 module Pickaxe
-	VERSION = "0.6.3"
+	VERSION = "0.7.0"
 	
 	class PickaxeError < StandardError; end
   

data/lib/pickaxe/cli.rb

@@ -26,6 +26,10 @@ END_OF_BANNER
 		Pickaxe::Main.options[:select] = Integer(v)
 	end
 	  
+	opts.on("--single", "Generated test will have only 1 correct answer") do |v|
+		Pickaxe::Main.options[:one_choice] = true
+	end
+	
 	opts.on("--full-test", "Checks test after all questions are answered") do |v|
 		Pickaxe::Main.options[:full_test] = true
 	end
@@ -82,6 +86,12 @@ END_OF_MESSAGE
 		$stderr.puts(("! --full-test disables the --repeat-incorrect option" ).color(:yellow))
 		Pickaxe::Main.options[:repeat_incorrect] = false
 	end
+	
+	if Pickaxe::Main.options[:one_choice] and Pickaxe::Main.options[:repeat_incorrect]
+		$stderr.puts(("! --one-choice disables the --repeat-incorrect option" ).color(:yellow))
+		Pickaxe::Main.options[:repeat_incorrect] = false
+	end
+	
 	Pickaxe::Main.new(ARGV)
 rescue Pickaxe::PickaxeError, OptionParser::InvalidOption => e
 	$stderr.puts(("! " + e.to_s).color(:red))

data/lib/pickaxe/errors.rb

@@ -49,12 +49,5 @@ module Pickaxe
 					BadQuestion.message(question.content.first, "has no correct answers"))
 			end
 		end
-	
-		class NotUniqueAnswerIndices < TestSyntaxError
-			def initialize(question)
-				super(question.content.first.index,
-					BadQuestion.message(question.content.first, "answer indices are not unique"))
-			end
-		end
 	end
 end

data/lib/pickaxe/test.rb

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 module Pickaxe
 	class TestLine < String
 		attr_accessor :index
@@ -11,7 +13,7 @@ module Pickaxe
 		end
 	end
 		
-	class Test
+	class Test		
 		include Pickaxe::Errors
 		
 		attr_reader :questions
@@ -106,6 +108,11 @@ module Pickaxe
 		
 		RE = /^\s*(\d+)\.?\s*(.+)$/u	
 		
+		def initialize(*args)
+			super(*args)
+			reindex_answers(self.answers)
+		end
+		
 		def self.parse(file, answers)
 			content = []
 			until answers.first.nil? or Answer::RE.match(answers.first)
@@ -128,8 +135,7 @@ module Pickaxe
 			
 			answers = answers.collect {|answer| Answer.parse(answer) }
 			Question.new(file, m[1], content, answers).tap do |q|
-				raise NoCorrectAnswer.new(q) if q.correct_answers.blank?				
-				raise NotUniqueAnswerIndices.new(q) unless q.answer_indices.uniq!.nil?
+				raise NoCorrectAnswer.new(q) if q.correct_answers.blank?
 				q.content = q.content.join(" ").gsub("\\n", "\n")
 			end
 		end
@@ -142,17 +148,57 @@ module Pickaxe
 			if @shuffled_answers.nil?
 				unless Main.options[:sorted_answers]
 					@shuffled_answers = self.answers.shuffle
-					answer_indices.sort.each_with_index do |index, order|
-						@shuffled_answers[order].index = index
-					end
+					reindex_answers(@shuffled_answers)
 				else
 					@shuffled_answers = self.answers
 				end
+				
+				if Main.options[:one_choice]
+					# NOTE:
+					# This hack line removes possible answers that states that non of
+					# other answers are correct (in Polish), because this invalidates
+					# the algorithm fot generating fourth answer from given 3
+					#
+					# NOTE: Other languages will remain untouched.
+					#
+					@shuffled_answers.reject! { |a| a.content =~ /(\s+|^)żadne(\s+|$)/u }
+					reindex_answers(@shuffled_answers)
+					# END OF HACK
+			
+					@shuffled_answers = generate_fourth_answer(@shuffled_answers[0...3])
+				end
 			end
 			
 			@shuffled_answers
 		end
 		
+		def reindex_answers(answers)
+			letters = ('a'...'z').to_a
+			answers.each_with_index do |index, order|
+				answers[order].index = letters[order]
+			end
+		end
+		
+		def generate_fourth_answer(answers)			
+			correct = correct_answers(answers)
+			answers + case correct.length
+			when 0 then
+				[Answer.new(Answer::EMPTY, "d", true)]
+			when 1
+				left = answer_indices(answers) - correct
+				fourth = (0...([3, left.length].min)).collect {|i| left.combination(i).to_a.flatten }.shuffle.first
+				fourth = if fourth.empty?
+					Answer::EMPTY
+				else
+					Answer::CORRECT_ARE % fourth.map(&:upcase).join(", ")
+				end
+				[Answer.new(fourth, "d", false)]
+			else
+				answers.each {|a| a.correctness = false }
+				[Answer.new(Answer::CORRECT_ARE % correct.map(&:upcase).join(", "), "d", true)]
+			end
+		end
+		
 		def answered(indices)
 			content = self.content.word_wrap(:indent => index.to_s.length+2)
 			content + "\n\n" + self.shuffled_answers.collect do |answer|
@@ -176,12 +222,12 @@ module Pickaxe
 			given.sort == correct_answers
 		end
 		
-		def correct_answers
-			answers.select(&:correctness).collect(&:index).sort
+		def correct_answers(a = shuffled_answers)
+			a.select(&:correctness).collect(&:index).sort
 		end
 		
-		def answer_indices
-			shuffled_answers.collect(&:index)
+		def answer_indices(a = shuffled_answers)
+			a.collect(&:index)
 		end
 		
 		def check?(given)
@@ -206,6 +252,9 @@ module Pickaxe
 	end
 	
 	class Answer < Struct.new(:content, :index, :correctness)
+		EMPTY = "None of answers above is correct"
+		CORRECT_ARE = "Correct answers: %s"
+		
 		RE = /^\s*(>+)?\s*(\?+)?\s*\(?(\w)\)\s*(.+)$/u
 		LINE_RE = /^\s*\\?\s*([[:alpha:]]|\w+)/u
 		

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: Pickaxe
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 3
-  version: 0.6.3
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Dawid Fatyga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-12 00:00:00 +01:00
+date: 2010-12-13 00:00:00 +01:00
 default_executable: bin/pickaxe
 dependencies: 
 - !ruby/object:Gem::Dependency