ruql 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4e1dbaefe63c93236938687254c7eb6dcaf0bc3
-  data.tar.gz: 8dfd7eaac4c4f363ed8bf83be5f72d1c428a117e
+  metadata.gz: 1a384710404460b95c945d6a1fb850c88531db8a
+  data.tar.gz: 5c6af8b878133a20c3f7b0e4e38a184b4b0b7400
 SHA512:
-  metadata.gz: d859ea182e95f44111181c4e61c4cdb69320cde8ae30af8bdd446bc7f3c89d797cbdcc9e36628976f2c1d8f5a8f6a6a9aea67a19db2aecc47a01896325d0ce46
-  data.tar.gz: 35f46ed721d7987109cc7f187b3ca531ebe953736576c6dbf9607a793ace9d72d0c8b151bed950ad960415f2fe79c12a51260d24e58c1c8eabd74ee40f348bc8
+  metadata.gz: feb04ca43e5e83c6e6a97f042ab03b3692663a23f835783121edd68bc3ebba1b3ffe728ab682edf053055ef64222625cf8f056a93112ebc287314f475edb0f4a
+  data.tar.gz: 0414a7abbd51a50703b290c2a912575b6fbaead7330cfbcede247950dd67e0e4d84a6f6e6d35120d26e8fdbcb37a6b103c75d512211e16b9db8eb2fcdc2b5736

data/bin/ruql

@@ -98,6 +98,7 @@ def main
   raise "Unknown renderer '#{renderer}'" unless Quiz.get_renderer(renderer)
 
   opts = Getopt::Long.getopts(
+    ['-v', '--version', Getopt::BOOLEAN],
     ['-o', '--list-type', Getopt::REQUIRED],
     ['-r', '--report', Getopt::REQUIRED],
     ['-a', '--start', Getopt::REQUIRED],

data/lib/ruql/answer.rb

@@ -7,11 +7,12 @@ class Answer
 
   def <=>(other) ; self.answer_text <=> other.answer_text ; end
   def correct? ; !!correct ; end
-  def has_explanation? ; !!explanation ; end
-  def initialize(answer_text = '', correct = false, explanation=nil)
+  def has_explanation? ; @explanation.to_s != '' ; end
+  def initialize(answer_text = '', correct = false, explanation=nil, question=nil)
     @answer_text = answer_text
     @correct = !!correct # ensure boolean
     @explanation = explanation
+    @question = question
   end
   
   def to_JSON

data/lib/ruql/question.rb

@@ -1,6 +1,6 @@
 class Question
   attr_accessor :question_text, 
-                :answers, 
+                :answers,
                 :question_image,
                 :randomize, 
                 :points, 
@@ -19,28 +19,35 @@ class Question
     @question_image = options[:image]
     @question_tags = []
     @question_uid = (options.delete(:uid) || SecureRandom.uuid).to_s
+    @explanation = nil
     @question_comment = ''
   end
   def raw? ; !!@raw ; end
   
+  def has_explanation? ; @explanation.to_s != '' ; end
+
+  def explanation(text=nil)
+    if text
+      @explanation = text
+    else
+      @explanation
+    end
+  end
+
   def uid(u) ; @question_uid = u ; end
   
   def text(s) ; @question_text = s ; end
 
-  def explanation(text)
-    @answers.each { |answer| answer.explanation ||= text }
-  end
-
   def image(url)
     @question_image = url
   end
   
   def answer(text, opts={})
-    @answers << Answer.new(text, correct=true, opts[:explanation])
+    @answers << Answer.new(text, correct=true, opts[:explanation], self)
   end
 
   def distractor(text, opts={})
-    @answers << Answer.new(text, correct=false, opts[:explanation])
+    @answers << Answer.new(text, correct=false, opts[:explanation], self)
   end
 
   # these are ignored but legal for now:

data/lib/ruql/renderers/html5_renderer.rb

@@ -62,6 +62,10 @@ class Html5Renderer
             if q.raw? then @h.li { |l| l << answer.answer_text } else @h.li answer.answer_text end
           end
         end
+        if @show_solutions && ((exp = q.explanation.to_s) != '')
+          @h.br
+          if q.raw? then @h.span(:class => 'explanation') { |p| p << exp } else @h.span(exp, :class => 'explanation') end
+        end
       end
     end
     self
@@ -100,10 +104,10 @@ class Html5Renderer
         answer.correct? ? "CORRECT: " : "INCORRECT: ")
     end
     @h.li(args) do
-      if raw then @h.p { |p| p << answer.answer_text } else @h.p answer.answer_text  end
+      if raw then @h.span { |p| p << answer.answer_text } else @h.span answer.answer_text  end
       if answer.has_explanation?
-        if raw then @h.p(:class => 'explanation') { |p| p << answer.explanation }
-        else @h.p(answer.explanation, :class => 'explanation') end
+        @h.br
+        if raw then @h.span(:class => 'explanation') { |p| p << answer.explanation } else @h.span(answer.explanation, :class => 'explanation') end
       end
     end
   end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: ruql
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Armando Fox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-06 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :runtime
   prerelease: false
+  name: builder
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: getopt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
-  type: :runtime
   prerelease: false
+  name: getopt
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :development
   prerelease: false
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.0'
+  type: :development
 - !ruby/object:Gem::Dependency
-  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
-  type: :development
   prerelease: false
+  name: activesupport
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
+  type: :development
 description: Ruby-embedded DSL for creating short-answer quiz questions
 email: fox@cs.berkeley.edu
 executables:
@@ -109,17 +109,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Ruby question language