Unescaping *after* parsing JSON.

lib/hacker_term/page_data.rb

@@ -13,13 +13,17 @@ class PageData
     attr_reader :data, :mean_score, :median_score, :mode_score, :sorted_by, :line_pos
 
     def initialize(data)
-      unescaped = CGI.unescapeHTML data
-      @data = JSON.parse(unescaped)['items']
+      begin 
+        @data = JSON.parse(data)['items']
+      rescue JSON::ParserError
+        raise "JSON appears to be malformed: #{unescaped}" # Bomb out for now...
+      end
 
       add_missing_keys!
       format_numbers!
       format_urls!
-
+      unescape_titles!
+
       calculate_mean_score
       calculate_median_score
       calculate_mode_score
@@ -28,6 +32,10 @@ def initialize(data)
       @line_pos = 1
     end
 
+    def unescape_titles!
+      @data.each { |row| row['title'] = CGI.unescapeHTML(row['title']) }
+    end
+
     def sort_on!(mode)
       case mode
       when :score