evernote_oauth 0.1.0 → 0.1.1

data/README.md

@@ -1,6 +1,6 @@
 Evernote OAuth / Thrift API client library for Ruby
 ===================================================
-- Evernote OAuth version 0.1.0
+- Evernote OAuth version 0.1.1
 
 Install the gem
 ---------------
@@ -34,6 +34,7 @@ client = EvernoteOAuth::Client.new(
 
 Usage
 -----
+### OAuth ###
 ```ruby
 client = EvernoteOAuth::Client.new
 request_token = client.request_token(:oauth_callback => 'YOUR CALLBACK URL')
@@ -46,9 +47,47 @@ access_token = request_token.get_access_token(oauth_verifier: params[:oauth_veri
 ```
 Now you can make other API calls
 ```ruby
-client = EvernoteOAuth::Client.new(token: access_token.token)
+token = access_token.token
+client = EvernoteOAuth::Client.new(token: token)
 note_store = client.note_store
-notebooks = note_store.listNotebooks(access_token.token)
+notebooks = note_store.listNotebooks(token)
+```
+
+### UserStore ###
+Once you acquire token, you can use UserStore. For example, if you want to call UserStore.getUser:
+```ruby
+user_store = EvernoteOAuth::Client.new(token: token).user_store
+user_store.getUser(token)
+```
+You can also omit authenticationToken in the arguments of UserStore functions:
+```ruby
+user_store.getUser
+```
+
+### NoteStore ###
+If you want to call NoteStore.listNotebooks:
+```ruby
+note_store = EvernoteOAuth::Client.new(token: token).note_store
+note_store.listNotebooks(token)
+```
+You can also omit authenticationToken in the arguments of NoteStore functions:
+```ruby
+note_store.listNotebooks
+```
+
+### NoteStore for linked notebooks ###
+If you want to get tags for linked notebooks:
+```ruby
+linked_notebook = note_store.listLinkedNotebooks.first # any notebook
+shared_note_store = client.shared_note_store(linked_notebook)
+stoken = shared_note_store.token
+shared_notebook = shared_note_store.getSharedNotebookByAuth(stoken)
+shared_note_store.listTagsByNotebook(stoken, shared_notebook.notebookGuid)
+```
+You can also omit authenticationToken in the arguments of NoteStore functions:
+```ruby
+shared_notebook = shared_note_store.getSharedNotebookByAuth
+shared_note_store.listTagsByNotebook(shared_notebook.notebookGuid)
 ```
 
 References

data/lib/evernote_oauth.rb

@@ -4,7 +4,9 @@ require 'yaml'
 
 require 'evernote-thrift'
 
+require 'evernote_oauth/thrift_client_delegation'
 require 'evernote_oauth/client'
 require 'evernote_oauth/user_store'
 require 'evernote_oauth/note_store'
+require 'evernote_oauth/shared_note_store'
 require 'evernote_oauth/version'

data/lib/evernote_oauth/note_store.rb

@@ -3,20 +3,20 @@ module EvernoteOAuth
   class Client
     def note_store(options={})
       @note_store = EvernoteOAuth::NoteStore.new(
+	token: options[:token] || @token,
 	client: thrift_client(::Evernote::EDAM::NoteStore::NoteStore::Client,
-			      options[:note_store_url] || user_store.getNoteStoreUrl(@token))
+			      options[:note_store_url] || user_store.getNoteStoreUrl)
       )
     end
   end
 
   class NoteStore
+    include ::EvernoteOAuth::ThriftClientDelegation
+
     def initialize(options={})
+      @token = options[:token]
       @client = options[:client]
     end
-
-    def method_missing(name, *args, &block)
-      @client.send(name, *args, &block)
-    end
   end
 
 end

data/lib/evernote_oauth/shared_note_store.rb

@@ -0,0 +1,26 @@
+module EvernoteOAuth
+
+  class Client
+    def shared_note_store(shared_notebook, options={})
+      EvernoteOAuth::SharedNoteStore.new(
+        shared_notebook: shared_notebook,
+        token: options[:token] || @token,
+        client: thrift_client(::Evernote::EDAM::NoteStore::NoteStore::Client,
+                              shared_notebook.noteStoreUrl)
+      )
+    end
+  end
+
+  class SharedNoteStore
+    include ::EvernoteOAuth::ThriftClientDelegation
+    attr_reader :token
+
+    def initialize(options={})
+      @shared_notebook = options[:shared_notebook]
+      @client = options[:client]
+      @token = authenticateToSharedNotebook(@shared_notebook.shareKey,
+                                            options[:token]).authenticationToken
+    end
+  end
+
+end

data/lib/evernote_oauth/thrift_client_delegation.rb

@@ -0,0 +1,22 @@
+module EvernoteOAuth
+
+  module ThriftClientDelegation
+    def method_missing(name, *args, &block)
+      method = @client.class.instance_method(name)
+      parameters = method.parameters
+      if parameters.size != args.size &&
+	idx_token = parameters.index{|e| e.last == :authenticationToken}
+	new_args = args.dup.insert(idx_token, @token)
+	begin
+	  @client.send(name, *new_args, &block)
+	rescue ArgumentError => e
+	  puts e.inspect
+	  @client.send(name, *args, &block)
+	end
+      else
+	@client.send(name, *args, &block)
+      end
+    end
+  end
+
+end

data/lib/evernote_oauth/user_store.rb

@@ -3,6 +3,7 @@ module EvernoteOAuth
   class Client
     def user_store
       @user_store = EvernoteOAuth::UserStore.new(
+	token: @token,
 	client: thrift_client(::Evernote::EDAM::UserStore::UserStore::Client,
 			      endpoint('edam/user'))
       )
@@ -10,15 +11,14 @@ module EvernoteOAuth
   end
 
   class UserStore
+    include ::EvernoteOAuth::ThriftClientDelegation
+
     def initialize(options={})
+      @token = options[:token]
       @client = options[:client]
       raise 'API version is not up to date' unless version_valid?
     end
 
-    def method_missing(name, *args, &block)
-      @client.send(name, *args, &block)
-    end
-
     def version_valid?
       checkVersion("EDAMTest",
 		   ::Evernote::EDAM::UserStore::EDAM_VERSION_MAJOR,

data/lib/evernote_oauth/version.rb

@@ -1,3 +1,3 @@
 module EvernoteOAuth
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/evernote_oauth/note_store_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), "/../spec_helper")
 
 describe "EvernoteOAuth::NoteStore" do
   context "#initialize" do
-    it "assigns instance variables and checks version" do
+    it "assigns instance variables" do
       note_store = EvernoteOAuth::NoteStore.new(client: 'client')
       note_store.instance_variable_get(:@client).should == 'client'
     end
@@ -11,6 +11,9 @@ describe "EvernoteOAuth::NoteStore" do
     it "dispatches method" do
       mock_client = mock(Object)
       mock_client.should_receive(:send).with(:call_method, 'args')
+      mock_client.class.should_receive(:instance_method).with(:call_method).and_return{
+	Proc.new {|a| a}
+      }
       note_store = EvernoteOAuth::NoteStore.new(client: mock_client)
       note_store.call_method('args')
     end

data/spec/evernote_oauth/shared_note_store_spec.rb

@@ -0,0 +1,30 @@
+require File.join(File.dirname(__FILE__), "/../spec_helper")
+
+describe "EvernoteOAuth::SharedNoteStore" do
+  context "#initialize" do
+    it "assigns instance variables" do
+      sn = Struct.new(:shareKey).new('shareKey')
+      auth_token = Struct.new(:authenticationToken).new('token')
+      EvernoteOAuth::SharedNoteStore.any_instance.should_receive(
+	:authenticateToSharedNotebook).and_return(auth_token)
+      note_store = EvernoteOAuth::SharedNoteStore.new(client: 'client', shared_notebook: sn)
+      note_store.instance_variable_get(:@client).should == 'client'
+      note_store.token.should == 'token'
+    end
+  end
+  context "#method_missing" do
+    it "dispatches method" do
+      mock_client = mock(Object)
+      mock_client.should_receive(:send).with(:call_method, 'args')
+      mock_client.class.should_receive(:instance_method).with(:call_method).and_return{
+	Proc.new {|a| a}
+      }
+      sn = Struct.new(:shareKey).new('shareKey')
+      auth_token = Struct.new(:authenticationToken).new('token')
+      EvernoteOAuth::SharedNoteStore.any_instance.should_receive(
+	:authenticateToSharedNotebook).and_return(auth_token)
+      note_store = EvernoteOAuth::SharedNoteStore.new(client: mock_client, shared_notebook: sn)
+      note_store.call_method('args')
+    end
+  end
+end

data/spec/evernote_oauth/user_store_spec.rb

@@ -16,6 +16,9 @@ describe "EvernoteOAuth::UserStore" do
     it "dispatches method" do
       mock_client = mock(Object)
       mock_client.should_receive(:send).with(:call_method, 'args')
+      mock_client.class.should_receive(:instance_method).with(:call_method).and_return{
+	Proc.new {|a| a}
+      }
       EvernoteOAuth::UserStore.any_instance.stub(:version_valid?){true}
       user_store = EvernoteOAuth::UserStore.new(client: mock_client)
       user_store.call_method('args')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evernote_oauth
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -71,11 +71,14 @@ files:
 - evernote_oauth.gemspec
 - lib/evernote_oauth/client.rb
 - lib/evernote_oauth/note_store.rb
+- lib/evernote_oauth/shared_note_store.rb
+- lib/evernote_oauth/thrift_client_delegation.rb
 - lib/evernote_oauth/user_store.rb
 - lib/evernote_oauth/version.rb
 - lib/evernote_oauth.rb
 - spec/evernote_oauth/client_spec.rb
 - spec/evernote_oauth/note_store_spec.rb
+- spec/evernote_oauth/shared_note_store_spec.rb
 - spec/evernote_oauth/user_store_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/rekotan/evernote_oauth