Pickaxe 0.7.0 → 0.7.1

data/lib/pickaxe.rb

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

data/lib/pickaxe/cli.rb

@@ -34,7 +34,7 @@ END_OF_BANNER
 		Pickaxe::Main.options[:full_test] = true
 	end
 	
-	opts.on("--repeat-incorrect", "Repeat questions answered incorrectly") do |v|
+	opts.on("-r", "--repeat-incorrect", "Repeat questions answered incorrectly") do |v|
 		Pickaxe::Main.options[:repeat_incorrect] = true
 	end
 	

data/lib/pickaxe/main.rb

@@ -137,9 +137,9 @@ END_OF_HELP
 					@last_answer = @question.check?(@answers[@question])
 					if Main.options[:repeat_incorrect] and not @question.correct?(@answers[@question])
 						@answers.delete(@question)
+						@question.reset!
 						@questions.insert(@current_index + 1 + rand(@questions.length - @current_index), @question)
 						@questions.delete_at(@current_index)
-						@question.reset!
 					else
 						@current_index += 1
 					end
@@ -150,13 +150,24 @@ END_OF_HELP
 			end
 		end
 		
-		ANSWER_CONVERTION_HASH = ('a'..'z').to_a[0,10].each_with_index.inject({}) do |m, p| 
+		LETTERS = ('a'..'z').to_a
+		ANSWER_CONVERTION_HASH = LETTERS[0,10].each_with_index.inject({}) do |m, p| 
 			m[((p.last + 1) % 10).to_s] =  p.first
 			m
 		end
-		
-		def convert_answers(line)			
-			line.gsub(/\s+/, "").downcase.each_char.collect do |c|
+				
+		def convert_answers(line)
+			line = line.gsub(/\s+/, "").split("").each_with_index.inject("") do |l, pair|
+				l + if pair.first == "["
+					LETTERS[pair.last]
+				elsif pair.first == "]"
+					""
+				else
+					pair.first
+				end
+			end
+
+			line = line.downcase.each_char.collect do |c|
 				ANSWER_CONVERTION_HASH[c] || c
 			end.to_a.uniq
 		end

data/lib/pickaxe/test.rb

@@ -161,7 +161,7 @@ module Pickaxe
 					#
 					# NOTE: Other languages will remain untouched.
 					#
-					@shuffled_answers.reject! { |a| a.content =~ /(\s+|^)żadne(\s+|$)/u }
+					@shuffled_answers.reject! { |a| a.content =~ /(\s+|^)(ż|Ż)ad(na|ne|en)(\s+|$)/ui }
 					reindex_answers(@shuffled_answers)
 					# END OF HACK
 			
@@ -181,21 +181,25 @@ module Pickaxe
 		
 		def generate_fourth_answer(answers)			
 			correct = correct_answers(answers)
-			answers + case correct.length
+			answers << case correct.length
 			when 0 then
-				[Answer.new(Answer::EMPTY, "d", true)]
+				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
+				indices = answer_indices(answers)
+				fourth = [[]]
+				fourth.push(*indices.combination(2).to_a)
+				fourth.push(*indices.combination(3).to_a)
+				
+				fourth = fourth.shuffle.first
 				fourth = if fourth.empty?
 					Answer::EMPTY
 				else
 					Answer::CORRECT_ARE % fourth.map(&:upcase).join(", ")
 				end
-				[Answer.new(fourth, "d", false)]
+				Answer.new(fourth, "d", false)
 			else
 				answers.each {|a| a.correctness = false }
-				[Answer.new(Answer::CORRECT_ARE % correct.map(&:upcase).join(", "), "d", true)]
+				Answer.new(Answer::CORRECT_ARE % correct.map(&:upcase).join(", "), "d", true)
 			end
 		end
 		

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: Pickaxe
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Dawid Fatyga