From 38785ce06a484cae08efbdf9d7c7c980c87eb9db Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Wed, 30 Dec 2015 18:51:52 -0800
Subject: Use updated 'kipcole9/evernote' gem

Updated the gem to fix the `LoadError` I ran into
(https://github.com/teddywing/evernote/commit/f10ec2efe2e2984109545e496f36067cb3707dd6).

Change our `NotesController` code to use the updated gem now instead of
the code we copied over directly into `services/evernote.rb`.
---
 Gemfile                             |  1 +
 Gemfile.lock                        | 12 ++++++++++++
 app/controllers/notes_controller.rb |  4 ++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index f218f0c..bb13b45 100644
--- a/Gemfile
+++ b/Gemfile
@@ -40,6 +40,7 @@ gem 'omniauth-evernote'
 gem 'evernote-thrift'
 
 # gem 'evernote', '1.3.0', :github => 'kipcole9/evernote'
+gem 'evernote', '1.3.1', :github => 'teddywing/evernote'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
diff --git a/Gemfile.lock b/Gemfile.lock
index 5d9f4fe..592cc2c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,11 @@
+GIT
+  remote: git://github.com/teddywing/evernote.git
+  revision: 5d781dee5698073b311acf385d60144d5434a9a8
+  specs:
+    evernote (1.3.1)
+      activesupport
+      thrift_client (>= 0.9.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -137,6 +145,9 @@ GEM
     sqlite3 (1.3.11)
     thor (0.19.1)
     thread_safe (0.3.5)
+    thrift (0.9.3.0)
+    thrift_client (0.9.3)
+      thrift (~> 0.9.0)
     tilt (2.0.1)
     turbolinks (2.5.3)
       coffee-rails
@@ -157,6 +168,7 @@ PLATFORMS
 DEPENDENCIES
   byebug
   coffee-rails (~> 4.1.0)
+  evernote (= 1.3.1)!
   evernote-thrift
   jbuilder (~> 2.0)
   jquery-rails
diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index e9b7e7d..918d7d1 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -1,4 +1,4 @@
-require_relative '../services/evernote'
+# require_relative '../services/evernote'
 
 class NotesController < ApplicationController
   def index
@@ -10,7 +10,7 @@ class NotesController < ApplicationController
 
     # @notes = @notebooks.collect { |b| e.notes_from_notebook(b) }
 
-    note_store = EvernoteService::NoteStore.new(notestore_url, access_token)
+    note_store = Evernote::NoteStore.new(notestore_url, access_token)
 
     @notebooks = note_store.notebooks
     # @notes = @notebooks.collect { |b| b.notes }
-- 
cgit v1.2.3