evernote_oauth 0.1.5 → 0.1.6

data/README.md

@@ -1,6 +1,8 @@
+[![Gem Version](https://badge.fury.io/rb/evernote_oauth.png)](http://badge.fury.io/rb/evernote_oauth)
+
 Evernote OAuth / Thrift API client library for Ruby
 ===================================================
-- Evernote OAuth version 0.1.4
+- Evernote OAuth version 0.1.6
 
 Install the gem
 ---------------
@@ -57,21 +59,14 @@ notebooks = note_store.listNotebooks(token)
 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
 ```
+You can omit authenticationToken in the arguments of UserStore/NoteStore functions:
 
 ### 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
 ```
 
@@ -80,12 +75,6 @@ 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)
 ```
@@ -93,14 +82,12 @@ shared_note_store.listTagsByNotebook(shared_notebook.notebookGuid)
 ### NoteStore for Business ###
 If you want to get the list of notebooks in your business account:
 ```ruby
+user_store = client.user_store
+user = user_store.getUser
 business_note_store = client.business_note_store
-btoken = business_note_store.token
-business_note_store.listNotebooks(btoken)
-```
-You can also omit authenticationToken in the arguments of NoteStore functions:
-```ruby
-business_note_store = client.business_note_store
-business_note_store.listNotebooks
+if user.belongs_to_business?
+  business_note_store.listNotebooks
+end
 ```
 
 ### Method Chaining ###

data/lib/evernote/edam/type/user.rb

@@ -0,0 +1,14 @@
+module Evernote
+  module EDAM
+    module Type
+      class User
+        def belongs_to_business?
+          self.accounting.businessId != nil
+        end
+        def business_name
+          self.accounting.businessName
+        end
+      end
+    end
+  end
+end

data/lib/evernote_oauth/client.rb

@@ -59,9 +59,15 @@ module EvernoteOAuth
     end
 
     def thrift_client(client_class, url)
+      if m = /:A=(.+):/.match(@token)
+        key_id = m[1]
+      else
+        key_id = @consumer_key || 'nil'
+      end
+
       transport = Thrift::HTTPClientTransport.new(url)
       transport.add_headers(
-        'User-Agent' => "EvernoteOAuth / #{::EvernoteOAuth::VERSION}; Ruby / #{RUBY_VERSION};"
+        'User-Agent' => "#{key_id} / #{::EvernoteOAuth::VERSION}; Ruby / #{RUBY_VERSION};"
       )
       transport.add_headers(@additional_headers) if @additional_headers
       protocol = Thrift::BinaryProtocol.new(transport)

data/lib/evernote_oauth/version.rb

@@ -1,3 +1,3 @@
 module EvernoteOAuth
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/evernote_types.rb

@@ -1,5 +1,6 @@
 require 'evernote_oauth/store_attachable'
 
+require 'evernote/edam/type/user'
 require 'evernote/edam/type/note'
 require 'evernote/edam/type/resource'
 require 'evernote/edam/type/shared_notebook'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evernote_oauth
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -77,6 +77,7 @@ files:
 - lib/evernote/edam/type/resource.rb
 - lib/evernote/edam/type/shared_notebook.rb
 - lib/evernote/edam/type/tag.rb
+- lib/evernote/edam/type/user.rb
 - lib/evernote_oauth/business_note_store.rb
 - lib/evernote_oauth/client.rb
 - lib/evernote_oauth/note_store.rb