daigaku 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8b67152f8cdc2685c5b2edfa2cf611f1f81eb61
-  data.tar.gz: e969647bd2749977c6f6a4967afbf826b46c291e
+  metadata.gz: 3ce9d43dc806807d9613ddac880f1aaafedc6f2f
+  data.tar.gz: f1abac8e7d72762851395bfdd5dc397f6b1d7833
 SHA512:
-  metadata.gz: 431903dc0fb3e12805b76b94950d47a794180617dd21b25c6dc7c486734f750fadb27cfc4059d6f6a507a72a7995f15e5b2e0e0f356f266f25955624d05986a2
-  data.tar.gz: fb34667ddd6b7c30af0a22aa86d1bc5a2b6090fc2f0e22d9726fd5b2beb8b1b77592edb5e1241204a4d3a80f955d5050876f4f8633bed70864e3bfdd8d74cc9d
+  metadata.gz: 385ee9c126906aa38936e02a74217f22f25b527d879ee882446b6cfbd890b6bf5433d6a4d5d34395b13d0d3c96fc317201c509aaad3247ab31dcca22e70aa3b1
+  data.tar.gz: f4bfe1ebffd9570f41ef05082addd694666c2400ec21cdfd362d54ed73cd8fe80c2bfd4e67f101eb5cc3f4fe003f61515e17d9ff2f3aafec9b955e9ff9eadb24

data/README.md

@@ -1,5 +1,7 @@
 # ![Daigaku](http://res.cloudinary.com/daigaku-ruby/image/upload/c_scale,h_100/v1426946323/rect5481_si3rjr.png)
 
+[![Gem Version](https://badge.fury.io/rb/daigaku.svg)](http://badge.fury.io/rb/daigaku)
+
 Daigaku (大学) is the Japanese word for **university**.
 
 With Daigaku you can master your way of learning the Ruby programming

data/lib/daigaku/test_result.rb

@@ -8,7 +8,11 @@ module Daigaku
     TEST_PASSED_MESSAGE = "Your code passed all tests. Congratulations!"
 
     def initialize(result_json)
-      @result = JSON.parse(result_json, symbolize_names: true)
+      @result = begin
+        JSON.parse(result_json, symbolize_names: true)
+      rescue
+        syntax_error_json
+      end
 
       @example_count = @result[:summary][:example_count]
       @failure_count = @result[:summary][:failure_count]
@@ -47,6 +51,17 @@ module Daigaku
       summary = message.map(&:strip).join("\n" * 3)
     end
 
+    def syntax_error_json
+      {
+        summary: {},
+        examples: [
+          {
+            status: 'failed',
+            exception: { message: ":( You got a syntax error in your code!" }
+          }
+        ]
+      }
+    end
   end
 
   class TestExample

data/lib/daigaku/version.rb

@@ -1,3 +1,3 @@
 module Daigaku
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/daigaku/views/task_view.rb

@@ -102,7 +102,7 @@ module Daigaku
           if @unit.mastered?
             window.green(line, A_STANDOUT, full_line: true)
           else
-            example_index = ((index + 1) / 4.0).ceil - 1
+            example_index = example_index(@example_heights, index)
 
             if @examples[example_index].passed?
               window.green(line, A_STANDOUT, full_line: true)
@@ -186,7 +186,15 @@ module Daigaku
         @lines = [''] + @test_result_lines + ['', ''] + @unit.task.markdown.lines
         @examples = result.examples
 
-        initialize_window(@lines.count + @top_bar_height + @head_height)
+        @example_heights = @examples.reduce({}) do |hash, example|
+          start = hash.values.reduce(0) { |sum, r| sum += r.count }
+          range = (start..(start + example.message.split("\n").count) + 2)
+          hash[hash.keys.count] = range
+          hash
+        end
+
+        height = [@lines.count + @top_bar_height + @head_height, Curses.lines].max
+        initialize_window(height)
       end
 
       def reset_screen(window)
@@ -200,6 +208,10 @@ module Daigaku
         @window = default_window(height)
         main_panel(@window) { |window| show sub_window_below_top_bar(window) }
       end
+
+      def example_index(heights, index)
+        heights.values.index { |range| range.include?(index) }
+      end
     end
 
   end

data/lib/daigaku/window.rb

@@ -115,7 +115,7 @@ module Daigaku
         when h2
           text_decoration = Curses::A_UNDERLINE | Curses::A_NORMAL
           emphasize(text.gsub(/^##\s?/, ''), text_decoration)
-        when bold || code
+        when (code || bold)
           emphasized = false
           highlighted = false
 
@@ -130,14 +130,23 @@ module Daigaku
               next
             end
 
-            if emphasized
-              emphasize(char)
-            elsif highlighted
+            if highlighted
               red(char)
+            elsif emphasized
+              emphasize(char)
             else
               write(char)
             end
           end
+        when bold
+          text.chars.each do |char|
+            if char == '*'
+              emphasized = !emphasized
+              next
+            end
+
+            emphasized ? emphasize(char) : write(char)
+          end
         when line
           write('-' * (Curses.cols - 2))
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daigaku
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Paul Götze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses