evertils-common 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e57d1a952e6919cb2e454985c29c01786127dd8
-  data.tar.gz: acb73cef67dcb5b2614b26d631824a00f72bf304
+  metadata.gz: b70b024e3851efb6d76aed24af44ffc8c3327369
+  data.tar.gz: 2e0c3360da532242d17099b7c6cdaf987bb55814
 SHA512:
-  metadata.gz: ca62fed087792f4fb6b11b3cad3e73db0431a5153c0442c8eb4f167fcf93ab99d2221df0ef819b51708aba08845936b5930e14393c753177fa39fced5807c5ca
-  data.tar.gz: 5ef8ceb6814ad67cba541375284b7787e517467122f3f848d383707bb7ad496d9c849fa19f6e5a8a4f82b7d74bb4c1519f9b97476c5bdf679e24df1adf31fd2d
+  metadata.gz: c8e2ddbc9c861da1ae85f6b68c48a7d3edf3ad4766db91df045bbd19375d8f5db71ff93a3474f415c2ede1ec0c448915ca950c0eb1363e230a1f6a3ed77e171f
+  data.tar.gz: 623c1cf08c20ea33bb832e7a15cc833f49e637ef6ef541cb422ef8fce2daec1596b36e90f038fd5054bc2d7527272ef7b877ee5c8b28c82b5d9dd3702506538a

data/README.md

@@ -6,26 +6,27 @@ Evertils::Common is an abstraction library for interacting with the Evernote API
 
 ```ruby
 gem 'evertils-common'
-```
 
-And then execute:
+# or...
+gem install evertils-common
+```
 
-    $ bundle
+Then add the following to your ~/.bash_profile
 
-Or install it yourself as:
+```shell
+export EVERTILS_TOKEN="token_goes_here"
+```
 
-    $ gem install evertils-common
+Get your Evernote Developer Tokens [here](https://www.evernote.com/Login.action?targetUrl=%2Fapi%2FDeveloperToken.action).
 
 ## Usage
 
-TODO: Write usage instructions here
+Please see the code samples in the [wiki](https://github.com/aapis/evertils-common/wiki).
 
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/aapis/evertils-common.

data/lib/evertils/common/authentication.rb

@@ -43,6 +43,14 @@ module Evertils
       def user
         @@user.getUser(Evertils::Common::EVERNOTE_DEVELOPER_TOKEN)
       end
+
+      def call(func, *args)
+        if args.size > 0
+          @store.method(func.to_s).call(Evertils::Common::EVERNOTE_DEVELOPER_TOKEN, *args)
+        else
+          @store.method(func.to_s).call(Evertils::Common::EVERNOTE_DEVELOPER_TOKEN)
+        end
+      end
     end
   end
 end

data/lib/evertils/common/entity/note.rb

@@ -1,13 +1,7 @@
-require 'evertils/common/authentication'
-
 module Evertils
   module Common
     module Entity
-      class Note
-
-        def initialize
-          @evernote = Authentication.new.store
-        end
+      class Note < Entity::Base
 
         def create_from_yml(full_path)
           begin
@@ -38,9 +32,7 @@ module Evertils
           our_note.tagNames = []
 
           # only join when required
-          if body.is_a? Array
-            body = body.join
-          end
+          body = body.join if body.is_a? Array
 
           # a file was requested, lets prepare it for storage
           if !file.nil?
@@ -60,22 +52,17 @@ module Evertils
 
           nb = Entity::Notebook.new
           parent_notebook = nb.find(p_notebook_name)
-
-          if parent_notebook.nil?
-            parent_notebook = @evernote.getDefaultNotebook(Evertils::Common::EVERNOTE_DEVELOPER_TOKEN)
-          end
+          parent_notebook = @evernote.call(:getDefaultNotebook) if parent_notebook.nil?
           
-          ## parent_notebook is optional; if omitted, default notebook is used
-          if parent_notebook.is_a? ::Evernote::EDAM::Type::Notebook
-            our_note.notebookGuid = parent_notebook.guid
-          end
+          # parent_notebook is optional; if omitted, default notebook is used
+          our_note.notebookGuid = parent_notebook.guid if parent_notebook.is_a? ::Evernote::EDAM::Type::Notebook
 
-          ## Attempt to create note in Evernote account
+          # Attempt to create note in Evernote account
           begin
-            output[:note] = @evernote.createNote(Evertils::Common::EVERNOTE_DEVELOPER_TOKEN, our_note)
+            output[:note] = @evernote.call(:createNote, our_note)
             
             if share_note
-              shareKey = @evernote.shareNote(Evertils::Common::EVERNOTE_DEVELOPER_TOKEN, output[:note].guid)
+              shareKey = @evernote.call(:shareNote, output[:note].guid)
               output[:share_url] = "https://#{Evertils::Common::EVERNOTE_HOST}/shard/#{@model.shardId}/sh/#{output[:note].guid}/#{shareKey}"
             end
           rescue ::Evernote::EDAM::Error::EDAMUserException => edue
@@ -88,13 +75,7 @@ module Evertils
             Notify.error "EDAMNotFoundException: Invalid parent notebook GUID"
           end
 
-          # A parent notebook object exists, otherwise it was saved to the default
-          # notebook
-          if parent_notebook.is_a? ::Evernote::EDAM::Type::Notebook
-            Notify.success("#{parent_notebook.stack}/#{parent_notebook.name}/#{our_note.title} created")
-          else
-            Notify.success("DEFAULT_NOTEBOOK/#{our_note.title} created")
-          end
+          Notify.success("#{parent_notebook.stack}/#{parent_notebook.name}/#{our_note.title} created")
 
           output
         end
@@ -107,39 +88,31 @@ module Evertils
         def destroy(name)
           note = find(name).guid
 
-          @evernote.deleteNote(Evertils::Common::EVERNOTE_DEVELOPER_TOKEN, note)
+          @evernote.call(:deleteNote, note)
         end
 
         def expunge(name)
           note = find(name).guid
 
-          @evernote.expungeNote(Evertils::Common::EVERNOTE_DEVELOPER_TOKEN, note)
+          @evernote.call(:expungeNote, note)
         end
 
         def find(name)
           filter = ::Evernote::EDAM::NoteStore::NoteFilter.new
           filter.words = name
 
-          result = ::Evernote::EDAM::NoteStore::NotesMetadataResultSpec.new
-          result.includeTitle = true
-          result.includeUpdated = true
-          result.includeTagGuids = true
+          spec = ::Evernote::EDAM::NoteStore::NotesMetadataResultSpec.new
+          spec.includeTitle = true
+          spec.includeUpdated = true
+          spec.includeTagGuids = true
 
-          result = @evernote.findNotesMetadata(Evertils::Common::EVERNOTE_DEVELOPER_TOKEN, filter, 0, 1, result)
+          result = @evernote.call(:findNotesMetadata, filter, 0, 1, spec)
 
           if result.totalNotes > 0
             result.notes[0]
           end
         end
 
-        private
-
-        def has_required_fields(hash, required)
-          hash.keys.each do |key|
-            required.include? key
-          end
-        end
-
       end
     end
   end

data/lib/evertils/common/entity/notebook.rb

@@ -1,16 +1,9 @@
-require 'evertils/common/authentication'
 require 'evertils/common/entity/notebooks'
 
 module Evertils
   module Common
     module Entity
-      class Notebook
-
-        def initialize
-          @evernote = Authentication.new.store
-
-          self
-        end
+      class Notebook < Entity::Base
 
         def find(name)
           @notebook = nil
@@ -34,13 +27,13 @@ module Evertils
             notebook.name = "#{stack}/#{name}"
           end
           
-          @evernote.createNotebook(Evertils::Common::EVERNOTE_DEVELOPER_TOKEN, notebook)
+          @evernote.call(:createNotebook, notebook)
         end
 
         def expunge(name)
           nb = find(name)
 
-          @evernote.expungeNotebook(Evertils::Common::EVERNOTE_DEVELOPER_TOKEN, nb.guid)
+          @evernote.call(:expungeNotebook, nb.guid)
         end
 
         def notes(guid = nil)
@@ -51,14 +44,6 @@ module Evertils
           notes.find(nil, @notebook.guid)
         end
 
-        private
-
-        def has_required_fields(hash, required)
-          hash.keys.each do |key|
-            required.include? key
-          end
-        end
-
       end
     end
   end

data/lib/evertils/common/entity/notebooks.rb

@@ -1,18 +1,10 @@
-require 'evertils/common/authentication'
-
 module Evertils
   module Common
     module Entity
-      class Notebooks
-        
-        def initialize
-          @evernote = Authentication.new.store
-
-          self
-        end
+      class Notebooks < Entity::Base
 
         def all
-          @evernote.listNotebooks(Evertils::Common::EVERNOTE_DEVELOPER_TOKEN)
+          @evernote.call(:listNotebooks)
         end
 
         def create_from_yml(full_path)
@@ -40,14 +32,6 @@ module Evertils
           end
         end
 
-        private
-
-        def has_required_fields(hash, required)
-          hash.keys.each do |key|
-            required.include? key
-          end
-        end
-
       end
     end
   end

data/lib/evertils/common/entity/notes.rb

@@ -1,22 +1,14 @@
-require 'evertils/common/authentication'
-
 module Evertils
   module Common
     module Entity
-      class Notes
-        
-        def initialize
-          @evernote = Authentication.new.store
-
-          self
-        end
+      class Notes < Entity::Base
 
         def findAll(title, notebook = nil)
           filter = ::Evernote::EDAM::NoteStore::NoteFilter.new
           filter.words = "intitle:#{title}" if title
           filter.notebookGuid = notebook if notebook
 
-          @evernote.findNotes(Evertils::Common::EVERNOTE_DEVELOPER_TOKEN, filter, nil, 300)
+          @evernote.call(:findNotes, filter, nil, 300)
         end
 
         def findOne(title, notebook = nil)
@@ -24,7 +16,7 @@ module Evertils
           filter.words = "intitle:#{title}" if title
           filter.notebookGuid = notebook if notebook
 
-          @evernote.findNotes(Evertils::Common::EVERNOTE_DEVELOPER_TOKEN, filter, nil, 1)
+          @evernote.call(:findNotes, filter, nil, 1)
         end
 
       end

data/lib/evertils/common/entity/stack.rb

@@ -1,15 +1,7 @@
-require 'evertils/common/authentication'
-
 module Evertils
   module Common
     module Entity
-      class Stack
-        
-        def initialize
-          @evernote = Authentication.new.store
-
-          self
-        end
+      class Stack < Entity::Base
 
         def create_from_yml(full_path)
           begin
@@ -36,14 +28,6 @@ module Evertils
           end
         end
 
-        private
-
-        def has_required_fields(hash, required)
-          hash.keys.each do |key|
-            required.include? key
-          end
-        end
-
       end
     end
   end

data/lib/evertils/common/entity/sync.rb

@@ -1,18 +1,10 @@
-require 'evertils/common/authentication'
-
 module Evertils
   module Common
     module Entity
-      class Sync
-        
-        def initialize
-          @evernote = Authentication.new.store
-
-          self
-        end
+      class Sync < Entity::Base
 
         def state
-          @evernote.getSyncState()
+          @evernote.call(:getSyncState)
         end
 
       end

data/lib/evertils/common/entity/tag.rb

@@ -1,15 +1,7 @@
-require 'evertils/common/authentication'
-
 module Evertils
   module Common
     module Entity
-      class Tag
-        
-        def initialize
-          @evernote = Authentication.new.store
-
-          self
-        end
+      class Tag < Entity::Base
 
         def find(name)
           @tag = nil
@@ -28,13 +20,13 @@ module Evertils
           tag = ::Evernote::EDAM::Type::Tag.new
           tag.name = name
 
-          @evernote.createTag(Evertils::Common::EVERNOTE_DEVELOPER_TOKEN, tag)
+          @evernote.call(:createTag, tag)
         end
 
         def expunge(name)
           tag = find(name)
 
-          @evernote.expungeTag(Evertils::Common::EVERNOTE_DEVELOPER_TOKEN, tag.guid)
+          @evernote.call(:expungeTag, tag.guid)
         end
 
       end

data/lib/evertils/common/entity/tags.rb

@@ -1,18 +1,10 @@
-require 'evertils/common/authentication'
-
 module Evertils
   module Common
     module Entity
-      class Tags
-        
-        def initialize
-          @evernote = Authentication.new.store
-
-          self
-        end
+      class Tags < Entity::Base
 
         def all
-          @evernote.listTags(Evertils::Common::EVERNOTE_DEVELOPER_TOKEN)
+          @evernote.call(:listTags)
         end
 
       end

data/lib/evertils/common/entity.rb

@@ -0,0 +1,22 @@
+require 'evertils/common/authentication'
+
+module Evertils
+  module Common
+    module Entity
+      class Base
+
+        def initialize
+          @evernote = Authentication.new
+          self
+        end
+
+        def has_required_fields(hash, required)
+          hash.keys.each do |key|
+            required.include? key
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/evertils/common/queries/backup.rb

@@ -0,0 +1,21 @@
+require 'evertils/common/entity/notebook'
+require 'evertils/common/entity/notebooks'
+require 'evertils/common/entity/notes'
+require 'evertils/common/entity/note'
+require 'evertils/common/entity/tag'
+require 'evertils/common/entity/tags'
+require 'evertils/common/entity/sync'
+
+module Evertils
+  module Common
+    module Queries
+      class Backup
+
+        def files(*files)
+
+        end
+
+      end
+    end
+  end
+end

data/lib/evertils/common/queries/time.rb

@@ -0,0 +1,37 @@
+require 'evertils/common/entity/notebook'
+require 'evertils/common/entity/notebooks'
+require 'evertils/common/entity/notes'
+require 'evertils/common/entity/note'
+require 'evertils/common/entity/tag'
+require 'evertils/common/entity/tags'
+require 'evertils/common/entity/sync'
+
+module Evertils
+  module Common
+    module Queries
+      class Time
+
+        def notes_created_in_range(start, finish)
+
+        end
+
+        def notes_updated_in_range(start, finish)
+
+        end
+
+        def notebooks_created_in_range(start, finish)
+
+        end
+
+        def notebooks_updated_in_range(start, finish)
+
+        end
+
+        def last_sync
+
+        end
+
+      end
+    end
+  end
+end

data/lib/evertils/common/version.rb

@@ -1,5 +1,5 @@
 module Evertils
   module Common
-    VERSION = "0.2.6"
+    VERSION = "0.2.7"
   end
 end

data/lib/evertils/common.rb

@@ -2,8 +2,11 @@ require 'evernote-thrift'
 require 'notifaction'
 require 'yaml'
 require 'evertils/common/enml'
+require 'evertils/common/entity'
 require 'evertils/common/version'
+require 'evertils/common/queries/backup'
 require 'evertils/common/queries/simple'
+require 'evertils/common/queries/time'
 
 module Evertils
   module Common

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evertils-common
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Ryan Priebe
@@ -14,56 +14,56 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: evernote-thrift
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: notifaction
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Evernote utilities for your CLI workflow
@@ -75,7 +75,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -86,6 +86,7 @@ files:
 - lib/evertils/common.rb
 - lib/evertils/common/authentication.rb
 - lib/evertils/common/enml.rb
+- lib/evertils/common/entity.rb
 - lib/evertils/common/entity/note.rb
 - lib/evertils/common/entity/notebook.rb
 - lib/evertils/common/entity/notebooks.rb
@@ -94,7 +95,9 @@ files:
 - lib/evertils/common/entity/sync.rb
 - lib/evertils/common/entity/tag.rb
 - lib/evertils/common/entity/tags.rb
+- lib/evertils/common/queries/backup.rb
 - lib/evertils/common/queries/simple.rb
+- lib/evertils/common/queries/time.rb
 - lib/evertils/common/version.rb
 homepage: http://rubygems.org/gems/evertils-common
 licenses:
@@ -106,12 +109,12 @@ 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: []