evernote-editor 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e0c7eda0c6c08b8b4e4d1bbc6a2e3c8965a5ceb
-  data.tar.gz: 42b9daf7d67a81bdf93b2e62ecdb60636201027a
+  metadata.gz: 684cdf5f951a2c755dc6f55bd190308e397c0918
+  data.tar.gz: ead114658e2096c7573768888c3d7050766b6e3b
 SHA512:
-  metadata.gz: 091f9574bb001018e1d6738d9f415f7bcc55f4fdfeb364c9c003754004deab16084a495e229f75c8175063a9406c61b1df1ec24839cc28656b995583c0ae0355
-  data.tar.gz: 95d4c1a1c980bab523e65ee59ba691e821faaa6010d423b396c76ac32d8eb433dd0b958461dfa7a92766b9e75add08aefda44516b8e2032f8abe1d6d7158ef07
+  metadata.gz: 86e11fa3a56a732d98df8327ec16451c555fa72f868d427f80e0a6b176575f99cea0a983c52808cf0618edddb29c5cb71f7ef18ab985fd97c3f38a92b573f043
+  data.tar.gz: f0bcf65d5cfa628ba1a99cb5b7e8f9f952f8b7bd4aaa01339914281060f03a43cd94e260e4f14d3f6010b36d4127e2f9853c183de826e142ac5a1bcee79777ae

data/.travis.yml

@@ -1,2 +1,3 @@
 rvm:
-  - 1.9.3
+  - 2.0.0
+  - 2.1.0

data/Gemfile

@@ -1,2 +1,7 @@
 source 'https://rubygems.org'
+
+group :development do
+  gem "fakefs", git: "https://github.com/onehub/fakefs.git", branch: "tempfile-2-1"
+end
+
 gemspec

data/README.md

@@ -7,7 +7,7 @@ Uses your favorite editor and Markdown formatting.
 
 ## Requirements
 
-Only tested on OSX and Ruby 1.9.3 with `vim` and `mvim` editors. YMMV.
+Only tested on OSX and Ruby 2.0, 2.1 with `vim`, `mvim` and `sublime` editors. YMMV.
 
 ## Installation
 

data/evernote-editor.gemspec

@@ -18,13 +18,14 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency "evernote_oauth", "~> 0.2.1"
-  gem.add_runtime_dependency "highline", "~> 1.6.15"
-  gem.add_runtime_dependency "redcarpet", "~> 2.2.2"
-  gem.add_runtime_dependency "reverse_markdown", "~> 0.4.3"
+  gem.add_runtime_dependency "evernote_oauth", "~> 0.2.3"
+  gem.add_runtime_dependency "highline", "~> 1.6.21"
+  gem.add_runtime_dependency "redcarpet", "~> 3.1.1"
+  gem.add_runtime_dependency "reverse_markdown", "0.5.1"
+  gem.add_runtime_dependency "sanitize", "2.1.0"
 
-  gem.add_development_dependency "fakefs", "~> 0.4.2"
-  gem.add_development_dependency "rake", "~> 10.0.3"
-  gem.add_development_dependency "rspec", "~> 2.12.0"
+  # gem.add_development_dependency "fakefs" # See Gemfile, using branch to support Ruby 2.1
+  gem.add_development_dependency "rake", "~> 10.2.2"
+  gem.add_development_dependency "rspec", "~> 2.14.1"
 
 end

data/lib/evernote_editor/editor.rb

@@ -5,6 +5,7 @@ require "highline/import"
 require "json"
 require "redcarpet"
 require "reverse_markdown"
+require "sanitize"
 
 module EvernoteEditor
 
@@ -20,6 +21,7 @@ module EvernoteEditor
       @sandbox = opts[:sandbox]
       @mkdout  = Redcarpet::Markdown.new(Redcarpet::Render::XHTML,
         autolink: true, space_after_headers: true, no_intra_emphasis: true)
+      @notebooks = []
     end
 
     def run
@@ -76,7 +78,7 @@ module EvernoteEditor
       choice = choose do |menu|
         menu.prompt = "Which note would you like to edit:"
         found_notes.each do |n|
-          menu.choice("#{Time.at(n.updated/1000).strftime('%Y-%m-%d %H:%M')} #{n.title}") do
+          menu.choice("#{Time.at(n.updated/1000).strftime('%Y %b %d %H:%M')} [#{lookup_notebook_name(n.notebookGuid)}] #{n.title}") do
             n.guid
           end
         end
@@ -132,7 +134,8 @@ module EvernoteEditor
     end
 
     def note_markdown(markup)
-      ReverseMarkdown.parse markup
+      markup = Sanitize.clean(markup, Sanitize::Config::RELAXED)
+      ReverseMarkdown.convert markup.strip
     end
 
     def invoke_editor(initial_content = "")
@@ -184,6 +187,21 @@ module EvernoteEditor
       end
     end
 
+    def lookup_notebook_name(guid)
+      if @notebooks.empty?
+        begin
+          evn_client = EvernoteOAuth::Client.new(token: @configuration['token'], sandbox: @sandbox)
+          note_store = evn_client.note_store
+          @notebooks = note_store.listNotebooks
+        rescue Evernote::EDAM::Error::EDAMSystemException,
+               Evernote::EDAM::Error::EDAMUserException,
+               Evernote::EDAM::Error::EDAMNotFoundException => e
+          return "unknown notebook"
+        end
+      end
+      @notebooks.select {|n| n.guid == guid}.first.name
+    end
+
   end
 
 end

data/lib/evernote_editor/version.rb

@@ -1,3 +1,3 @@
 module EvernoteEditor
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/evernote_editor/editor_spec.rb

@@ -7,6 +7,8 @@ describe EvernoteEditor::Editor do
     FileUtils.mkpath(File.expand_path("~"))
     FileUtils.mkpath(File.expand_path("/tmp"))
     @mock_note_store = double("note_store",
+      getNotebook: double("notebook", guid: "456", name: "Zebra Notebook"),
+      listNotebooks: [double("notebook", guid: "456", name: "Zebra Notebook")],
       createNote: double("note", guid: "123", title: 'Alpha'),
       getNote:    double("note", guid: "123", title: 'Alpha',
         :content= => nil, :updated= => nil,
@@ -114,7 +116,7 @@ describe EvernoteEditor::Editor do
     end
 
     it "saves the document to Evernote" do
-      enved.stub!(:open_editor)
+      enved.stub(:open_editor)
       EvernoteOAuth::Client.should_receive(:new).and_return(
         double("EvernoteOAuth::Client", note_store: @mock_note_store))
       enved.configure
@@ -124,7 +126,7 @@ describe EvernoteEditor::Editor do
     context "when there is an Evernote Cloud API communication error" do
 
       it "prints your note to STDOUT so you don't lose it" do
-        enved.stub!(:open_editor)
+        enved.stub(:open_editor)
         EvernoteOAuth::Client.stub(:new).and_raise(Evernote::EDAM::Error::EDAMSystemException)
         enved.should_receive(:graceful_failure).once
         enved.configure
@@ -286,10 +288,50 @@ describe EvernoteEditor::Editor do
     let(:enved) { EvernoteEditor::Editor.new('a note', {}) }
 
     it "converts ENML/XHTML to markdown" do
-      str = "\n# Interesting!\n\n- Alpha\n- Bravo\n"
+      str = "# Interesting!\n\n- Alpha\n- Bravo\n"
+      markup = enved.note_markup(str)
+      enved.note_markdown(markup).should eq str
+    end
+
+    it "converts nested indentation to markdown" do
+      pending "https://github.com/xijo/reverse_markdown/issues/29"
+      str = "# Interesting!\n\n- Alpha\n  - Zebra\n  - Yankee\n- Bravo\n"
       markup = enved.note_markup(str)
       enved.note_markdown(markup).should eq str
     end
 
   end
+
+  describe "#lookup_notebook_name" do
+
+    before { write_fakefs_config }
+    let(:enved) { EvernoteEditor::Editor.new('a note', {}) }
+
+    it "looks up a notebook name by guid" do
+      enved.configure
+      EvernoteOAuth::Client.stub(:new).and_return(
+        double("EvernoteOAuth::Client", note_store: @mock_note_store))
+      enved.lookup_notebook_name('456').should eq 'Zebra Notebook'
+    end
+
+    it "returns 'unknown notebook' when there is a communication error" do
+      enved.configure
+      EvernoteOAuth::Client.stub(:new).and_return(
+        double("EvernoteOAuth::Client", note_store: @mock_note_store))
+        @mock_note_store.stub(:listNotebooks).and_raise(Evernote::EDAM::Error::EDAMSystemException)
+      enved.lookup_notebook_name('456').should eq 'unknown notebook'
+    end
+
+    it "first looks in locally stored value for the notebook attributes" do
+      enved.configure
+      enved.instance_variable_set(:@notebooks, [
+        double("notebook", guid: "456", name: "Yankee Notebook"),
+        double("notebook", guid: "789", name: "Xray Notebook")])
+      EvernoteOAuth::Client.should_not_receive(:new)
+      enved.lookup_notebook_name('456').should eq 'Yankee Notebook'
+
+    end
+
+  end
+
 end

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: evernote-editor
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - hpoydar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evernote_oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.15
+        version: 1.6.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.15
+        version: 1.6.21
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: reverse_markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
-  type: :development
+        version: 2.1.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.2.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.14.1
 description: Simple command line creation and editing of Evernote notes in Markdown
   format with your favorite editor via a gem installed binary
 email:
@@ -117,8 +117,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -139,17 +139,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.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Command line creation and editing of Evernote notes