rnote 0.0.4 → 0.0.5

data/lib/rnote/noun/note/converter.rb

@@ -21,6 +21,14 @@ require 'evernote-thrift'
 # the note attributes get its own class and thats where we stick the conversion routines.
 
 class Evernote::EDAM::Type::Note
+  
+  NON_BREAKING_SPACE = "\xc2\xa0".force_encoding("UTF-8")
+  
+  ENML_PREAMBLE = <<EOF
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd">
+<en-note style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">
+EOF
 
   # simple xhtml to txt converter
   # just tries to convert evernotes simple xhtml. 
@@ -131,20 +139,24 @@ class Evernote::EDAM::Type::Note
     # TODO create a proper DOM, with proper xml entity escapes and tag structure
     
     # escape any entities
-    txt.gsub!('<','&lt;')
-    txt.gsub!('>','&gt;')
+    txt = txt.gsub('<','&lt;')
+    txt = txt.gsub('>','&gt;')
     
     # replace todo items 
-    txt.gsub!('[ ] ','<en-todo/>')
-    txt.gsub!('[X] ','<en-todo checked="true"/>')
+    txt = txt.gsub('[ ] ','<en-todo/>')
+    txt = txt.gsub('[X] ','<en-todo checked="true"/>')
     
     # every newline becomes a <div></div>
     # an empty line becomes a <div><br/></div>
+    txt = txt.gsub('  ',NON_BREAKING_SPACE + ' ')
     
     lines = txt.split("\n",-1)
     lines = [''] if txt == ''
     raise if lines.length == 0
     
+    # every pair of spaces must be swaped to a nbsp
+    # don't have to use the identity though. the utf-8 char is fine
+    
     xhtml = lines.map { |string|
       if string == ''
         "<div><br/></div>\n"
@@ -153,12 +165,7 @@ class Evernote::EDAM::Type::Note
       end
     }.join('')
       
-    <<EOF
-<?xml version='1.0' encoding='utf-8'?>
-<!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd">
-<en-note>
-#{xhtml}</en-note>
-EOF
+    "#{Evernote::EDAM::Type::Note::ENML_PREAMBLE}#{xhtml}</en-note>\n"
   end
   
   def self.enml_to_format(format,enml)
@@ -187,6 +194,10 @@ EOF
     self.class.enml_to_format('txt',self.content)
   end
   
+  def txt_content=(txt)
+    self.content = self.class.format_to_enml('txt', txt)
+  end
+  
   # The yaml stream is what we give to the user to edit in their editor
   # 
   # Its just a string, but its composed of 2 parts. the note attributes and the note content.

data/lib/rnote/noun/note/edit.rb

@@ -225,7 +225,7 @@ module Rnote
           when 'exit'
             raise "User cancelled due to lost content."
           when 'diff'
-            show_diff(@note.content,converted_content)
+            show_diff(@note.content,unconverted_content)
           else
             raise
         end

data/lib/rnote/version.rb

@@ -1,3 +1,3 @@
 module Rnote
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rnote
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake