quiz 0.1.0 → 0.1.1

data/lib/quiz.rb

@@ -15,28 +15,35 @@ class Quiz
   def start(n=3)
 
     nodes = XPath.match(@doc.root, '*[question]')
-    list = (0..nodes.length).to_a.sample(n)
+    list = (0...nodes.length).to_a.sample(n)
     questions = nodes.values_at(*list)
 
-    results = questions.map do |q|
+    @results = questions.map do |q|
       question, answer = q.text('question').strip, q.text('answer').strip
       *options = XPath.match(q,'./options//option/text()').sort{rand}
       a_options = options.length.times.map {|x| (97 + x).chr }.\
         zip(options.map {|x| x.to_s.strip})
       q_options = a_options.map {|x| " " * 2 + "%s) %s" % x}
-      h = Hash[a_options.to_a] # answers are in the hash, keys = a,b,c,d
-      puts question + "\nis it ... \n" + q_options.join("\n")
+      answers = Hash[a_options.to_a] # answers are in the hash, keys = a,b,c,d
       
-      student_answer = gets.chop; redo unless h.keys.include? student_answer
-      
-      result = h[student_answer] == answer
-      reply = result ? '* correct *' : 'the answer was ' + answer
-      puts reply
+      if block_given? then
+        result = yield(question, q_options, answers, answer)
+      else
+        puts question + "\nis it ... \n" + q_options.join("\n")
+        
+        student_answer = gets.chop; redo unless answers.keys.include? student_answer
+        
+        result = answers[student_answer] == answer
+        reply = result ? '* correct *' : 'the answer was ' + answer
+        puts reply
+      end
       result
     end
-
-    tally = (results - [false]).size
-    percent = 100 / (results.size / tally.to_f)
+  end
+  
+  def score()
+    tally = (@results - [false]).size
+    percent = 100 / (@results.size / tally.to_f)
     your_score = "you scored %s%" % percent.to_i
 
   end

metadata

@@ -2,7 +2,7 @@
 name: quiz
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - James Robertson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-09 00:00:00 +00:00
+date: 2012-02-10 00:00:00 +00:00
 default_executable: 
 dependencies: []