fastreader 1.0.2 → 1.0.3

data/lib/display.rb

@@ -84,10 +84,10 @@ class Display
   def display_raw_entry_content(entry)
     out = []
     if entry.description
-      out << divider + "Entry Summary\n\n" + entry.description
+      out << divider + "Entry Summary\n\n" + process_entities_and_utf(entry.description)
     end
     if entry.content
-      out << "Entry Content\n\n" + entry.content
+      out << "Entry Content\n\n" + process_entities_and_utf(entry.content)
     end
     wrap_text(out.join(divider)).strip
   end
@@ -132,10 +132,6 @@ class Display
 
     doc.search('//comment()').remove
 
-    doc.search('p, div') do |p|
-      p.swap( "\n\n" + p.inner_html.gsub("\n", ' ').squeeze(' ').strip + "\n\n" )
-    end
-
     doc.search('blockquote, pre') do |x|
       # compress extra spaces
       text = x.inner_text.squeeze(' ').strip
@@ -163,7 +159,7 @@ class Display
     doc.search('i, b, strong, em') do |p|
       p.swap( "*#{p.inner_text}*" )
     end
-    doc.search('abbr') do |p|
+    doc.search('abbr, code') do |p|
       p.swap( "+#{p.inner_text}+" )
     end
     #
@@ -199,10 +195,20 @@ class Display
     doc.search('ul, ol, dl') do |s|
       s.swap(  s.inner_text.strip  )
     end
+
+    doc.search('p') do |p|
+      p.swap( "\n\n" + p.inner_text.gsub("\n", ' ').squeeze(' ').strip + "\n\n" )
+    end
+
+
+    doc.search('div') do |p|
+      p.swap( "\n\n" + p.inner_text.gsub("\n", ' ').squeeze(' ').strip + "\n\n" )
+    end
+
     doc.to_s
-  end
 
-  def links_to_footnotes(html)
+  end
+def links_to_footnotes(html)
     doc = Hpricot(html)
     footnotes = []
     doc.search('//a[@href]') do |link|

data/lib/entry_window.rb

@@ -77,9 +77,13 @@ class EntryWindow
     @window.setpos(0, 0)
     @window.clear
     if @search_string
-      addstr_with_highlighting(page_content, @search_string)
+      page_content.each do |line|
+        addstr_with_highlighting(line + "\n", @search_string)
+      end
     else
-      @window.addstr(page_content)
+      page_content.each do |line|
+        @window.addstr(line + "\n")
+      end
     end
 
     @window.refresh
@@ -114,7 +118,7 @@ class EntryWindow
 
   def page_content
     line_offset = @page_index * @height
-    @lines[line_offset, @height].join("\n")
+    @lines[line_offset, @height]
   end
 
   def toggle_flag

data/lib/fastreader.rb

@@ -33,7 +33,7 @@ include FileUtils
 include ActionView::Helpers::DateHelper
 
 class Fastreader
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 
   attr_accessor :database_path
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fastreader
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Daniel Choi