evertils-common 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b70b024e3851efb6d76aed24af44ffc8c3327369
-  data.tar.gz: 2e0c3360da532242d17099b7c6cdaf987bb55814
+  metadata.gz: dd6cb83a9efd15fbcc5e8ee17814b043e0ce2ff7
+  data.tar.gz: 48a892fd2bac2c342dcd7383b1c485265d36ab63
 SHA512:
-  metadata.gz: c8e2ddbc9c861da1ae85f6b68c48a7d3edf3ad4766db91df045bbd19375d8f5db71ff93a3474f415c2ede1ec0c448915ca950c0eb1363e230a1f6a3ed77e171f
-  data.tar.gz: 623c1cf08c20ea33bb832e7a15cc833f49e637ef6ef541cb422ef8fce2daec1596b36e90f038fd5054bc2d7527272ef7b877ee5c8b28c82b5d9dd3702506538a
+  metadata.gz: 15c8e4737dffe59ab83704ae21fc2f25ea75e2a7e706e322e699ee27e40faca7215c65375ef282a668e4c909fb796d496afa87351bdb9fd6e416cf2e8093309e
+  data.tar.gz: c4b22fbfc554cb0b38c8a2a6fddad891c5e99694b60b08fc06fdd66acd835e1947754637a12d9e1f724fc576c164508c4e23d7dd128f17f0390cfaad916e5e6e

data/evertils-common.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
 
+  spec.add_runtime_dependency 'mime-types'
   spec.add_runtime_dependency "evernote-thrift"
   spec.add_runtime_dependency "notifaction"
 end

data/lib/evertils/common/authentication.rb

@@ -1,35 +1,46 @@
 module Evertils
   module Common
     class Authentication
+
       attr_accessor :store, :shardId, :version
 
       def initialize
-        if Evertils::Common::EVERNOTE_DEVELOPER_TOKEN.nil?
-          Notify.error("Evernote developer token is not configured properly!\n$EVERTILS_TOKEN == nil")
-        end
+        begin
+          if Evertils::Common::EVERNOTE_DEVELOPER_TOKEN.nil?
+            Notify.error("Evernote developer token is not configured properly!\n$EVERTILS_TOKEN == nil")
+          end
 
-        userStoreUrl = "https://#{Evertils::Common::EVERNOTE_HOST}/edam/user"
+          userStoreUrl = "https://#{Evertils::Common::EVERNOTE_HOST}/edam/user"
 
-        userStoreTransport = Thrift::HTTPClientTransport.new(userStoreUrl)
-        userStoreProtocol = Thrift::BinaryProtocol.new(userStoreTransport)
-        @@user = ::Evernote::EDAM::UserStore::UserStore::Client.new(userStoreProtocol)
+          userStoreTransport = Thrift::HTTPClientTransport.new(userStoreUrl)
+          userStoreProtocol = Thrift::BinaryProtocol.new(userStoreTransport)
+          @@user = ::Evernote::EDAM::UserStore::UserStore::Client.new(userStoreProtocol)
 
-        versionOK = @@user.checkVersion("evernote-data",
-                   ::Evernote::EDAM::UserStore::EDAM_VERSION_MAJOR,
-                   ::Evernote::EDAM::UserStore::EDAM_VERSION_MINOR)
+          versionOK = @@user.checkVersion("evernote-data",
+                     ::Evernote::EDAM::UserStore::EDAM_VERSION_MAJOR,
+                     ::Evernote::EDAM::UserStore::EDAM_VERSION_MINOR)
 
-        @version = "#{::Evernote::EDAM::UserStore::EDAM_VERSION_MAJOR}.#{::Evernote::EDAM::UserStore::EDAM_VERSION_MINOR}"
-        @shardId = user.shardId
+          @version = "#{::Evernote::EDAM::UserStore::EDAM_VERSION_MAJOR}.#{::Evernote::EDAM::UserStore::EDAM_VERSION_MINOR}"
+          @shardId = user.shardId
 
-        if !versionOK
-          Notify.error("Evernote API requires an update.  Latest version is #{@version}")
-        end
+          if !versionOK
+            Notify.error("Evernote API requires an update.  Latest version is #{@version}")
+          end
 
-        noteStoreUrl = @@user.getNoteStoreUrl(Evertils::Common::EVERNOTE_DEVELOPER_TOKEN)
+          noteStoreUrl = @@user.getNoteStoreUrl(Evertils::Common::EVERNOTE_DEVELOPER_TOKEN)
 
-        noteStoreTransport = Thrift::HTTPClientTransport.new(noteStoreUrl)
-        noteStoreProtocol = Thrift::BinaryProtocol.new(noteStoreTransport)
-        @store = ::Evernote::EDAM::NoteStore::NoteStore::Client.new(noteStoreProtocol)
+          noteStoreTransport = Thrift::HTTPClientTransport.new(noteStoreUrl)
+          noteStoreProtocol = Thrift::BinaryProtocol.new(noteStoreTransport)
+          @store = ::Evernote::EDAM::NoteStore::NoteStore::Client.new(noteStoreProtocol)
+        rescue Evernote::EDAM::Error::EDAMSystemException => e
+          Notify.warning("Problem authenticating, EDAM code #{e.errorCode}")
+
+          case e.errorCode
+          when 19
+            minutes = (e.rateLimitDuration/60).to_i
+            Notify.warning("You are rate limited!  Wait #{minutes} minutes")
+          end
+        end
       end
 
       def info

data/lib/evertils/common/converter/yaml_to_enml.rb

@@ -0,0 +1,9 @@
+module Evertils
+  module Common
+    module Converter
+      class YamlToEnml < Converter::Base
+        
+      end
+    end
+  end
+end

data/lib/evertils/common/converter.rb

@@ -0,0 +1,21 @@
+module Evertils
+  module Common
+    module Converter
+      class Base
+        
+        #
+        # @since 0.2.8
+        def deprecation_notice(version)
+          puts "Deprecated as of #{version}"
+        end
+
+        #
+        # @since 0.2.8
+        def deprecation_notice(version)
+          puts "Deprecated as of #{version}"
+        end
+
+      end
+    end
+  end
+end

data/lib/evertils/common/enml.rb

@@ -1,6 +1,7 @@
 module Evertils
   module Common
     class ENML
+
       attr_reader :element, :embeddable_element
 
       def initialize(file = nil)

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

@@ -22,7 +22,7 @@ module Evertils
           end
         end
 
-        def create(title, body = template_contents, p_notebook_name = nil, file = nil, share_note = false, created_on = nil)
+        def create(title, body, p_notebook_name = nil, file = nil, share_note = false, created_on = nil)
           # final output
           output = {}
 
@@ -31,16 +31,24 @@ module Evertils
           our_note.resources = []
           our_note.tagNames = []
 
-          # only join when required
-          body = body.join if body.is_a? Array
-
           # a file was requested, lets prepare it for storage
-          if !file.nil?
-            media_resource = ENML.new(file)
-            body.concat(media_resource.embeddable_element)
-            our_note.resources << media_resource.element
+          if file
+            if file.is_a? Array
+              file.each do |f|
+                media_resource = ENML.new(f)
+                body.concat(media_resource.embeddable_element)
+                our_note.resources << media_resource.element
+              end
+            else
+              media_resource = ENML.new(file)
+              body.concat(media_resource.embeddable_element)
+              our_note.resources << media_resource.element
+            end
           end
 
+          # only join when required
+          body = body.join if body.is_a? Array
+
           n_body = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
           n_body += "<!DOCTYPE en-note SYSTEM \"http://xml.evernote.com/pub/enml2.dtd\">"
           n_body += "<en-note>#{body}</en-note>"
@@ -50,12 +58,14 @@ module Evertils
           our_note.content = n_body
           our_note.created = created_on if !created_on.nil?
 
-          nb = Entity::Notebook.new
-          parent_notebook = nb.find(p_notebook_name)
-          parent_notebook = @evernote.call(:getDefaultNotebook) if parent_notebook.nil?
+          if !p_notebook_name.is_a? ::Evernote::EDAM::Type::Notebook
+            nb = Entity::Notebook.new
+            parent_notebook = nb.find(p_notebook_name)
+            parent_notebook = @evernote.call(:getDefaultNotebook) if parent_notebook.nil?
+          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
+          our_note.notebookGuid = parent_notebook.guid
 
           # Attempt to create note in Evernote account
           begin
@@ -97,21 +107,91 @@ module Evertils
           @evernote.call(:expungeNote, note)
         end
 
+        #
+        # @since 0.2.8
+        def share(name)
+          note = find(name).guid
+
+          @evernote.call(:shareNote, note)
+        end
+
+        #
+        # @since 0.2.8
+        def unshare(name)
+          note = find(name).guid
+
+          @evernote.call(:stopSharingNote, note)
+        end
+
         def find(name)
           filter = ::Evernote::EDAM::NoteStore::NoteFilter.new
           filter.words = name
 
           spec = ::Evernote::EDAM::NoteStore::NotesMetadataResultSpec.new
           spec.includeTitle = true
-          spec.includeUpdated = true
-          spec.includeTagGuids = true
 
           result = @evernote.call(:findNotesMetadata, filter, 0, 1, spec)
 
           if result.totalNotes > 0
-            result.notes[0]
+            return result.notes[0]
           end
         end
+        alias_method :find_by_name, :find
+        
+        def find_by_date_range(start, finish = DateTime.now, period = :created)
+          filter = ::Evernote::EDAM::NoteStore::NoteFilter.new
+          filter.words = "#{period}:year-#{year_diff(start.year)}"
+          filter.order = 1
+
+          spec = ::Evernote::EDAM::NoteStore::NotesMetadataResultSpec.new
+          spec.includeTitle = true
+          spec.includeUpdated = true
+          spec.includeCreated = true
+
+          pool = @evernote.call(:findNotesMetadata, filter, 0, 300, spec)
+          notes_by_date = []
+
+          pool.notes.each do |note|
+            note_datetime = DateTime.strptime(note.send(period).to_s[0...-3], '%s')
+
+            notes_by_date << note if note_datetime.strftime('%m-%d-%Y') < finish.strftime('%m-%d-%Y') && note_datetime.strftime('%m-%d-%Y') > start.strftime('%m-%d-%Y')
+          end
+
+          notes_by_date
+        end
+
+        def find_by_date(date, period = :created)
+          filter = ::Evernote::EDAM::NoteStore::NoteFilter.new
+          filter.words = "#{period}:year-#{year_diff(date.year)}"
+          filter.order = 1
+
+          spec = ::Evernote::EDAM::NoteStore::NotesMetadataResultSpec.new
+          spec.includeTitle = true
+          spec.includeUpdated = true
+          spec.includeCreated = true
+
+          pool = @evernote.call(:findNotesMetadata, filter, 0, 300, spec)
+          notes_by_date = []
+          
+          pool.notes.each do |note|
+            note_datetime = DateTime.strptime(note.send(period).to_s[0...-3], '%s')
+
+            notes_by_date << note if note_datetime.strftime('%m-%d-%Y') == date.strftime('%m-%d-%Y')
+          end
+
+          notes_by_date
+        end
+
+        private
+
+        def year_diff(start_year)
+          curr_year = DateTime.now.year
+          diff = curr_year - start_year
+
+          return 1 if diff == 0 || start_year > curr_year
+
+          diff
+        end
 
       end
     end

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

@@ -3,20 +3,28 @@ module Evertils
     module Entity
       class Notes < Entity::Base
 
-        def findAll(title, notebook = nil)
+        def find_all(title, notebook = nil)
           filter = ::Evernote::EDAM::NoteStore::NoteFilter.new
           filter.words = "intitle:#{title}" if title
           filter.notebookGuid = notebook if notebook
 
-          @evernote.call(:findNotes, filter, nil, 300)
+          spec = ::Evernote::EDAM::NoteStore::NotesMetadataResultSpec.new
+          spec.includeTitle = true
+
+          response = @evernote.call(:findNotesMetadata, filter, nil, 300, spec)
+          response.notes
         end
 
-        def findOne(title, notebook = nil)
+        def find_one(title, notebook = nil)
           filter = ::Evernote::EDAM::NoteStore::NoteFilter.new
           filter.words = "intitle:#{title}" if title
           filter.notebookGuid = notebook if notebook
 
-          @evernote.call(:findNotes, filter, nil, 1)
+          spec = ::Evernote::EDAM::NoteStore::NotesMetadataResultSpec.new
+          spec.includeTitle = true
+
+          response = @evernote.call(:findNotesMetadata, filter, nil, 1, spec)
+          response.notes
         end
 
       end

data/lib/evertils/common/entity.rb

@@ -16,6 +16,28 @@ module Evertils
           end
         end
 
+        #
+        # @since 0.2.8
+        def deprecation_notice(version)
+          puts "Deprecated as of #{version}"
+        end
+
+        #
+        # @since 0.2.8
+        def start_of_day(date = nil)
+          date = ::Time.now unless date
+
+          ::Time.mktime(date.year, date.month, date.day, 12, 0, 0, 0, 0).to_datetime
+        end
+
+        #
+        # @since 0.2.8
+        def end_of_day(date = nil)
+          date = ::Time.now unless date
+
+          ::Time.mktime(date.year, date.month, date.day, 23, 59, 59, 0).to_datetime
+        end
+
       end
     end
   end

data/lib/evertils/common/{queries → query}/backup.rb

@@ -8,11 +8,18 @@ require 'evertils/common/entity/sync'
 
 module Evertils
   module Common
-    module Queries
-      class Backup
+    module Query
+      class Backup < Query::Base
 
+        attr_accessor :note
+
+        #
+        # @since 0.2.8
         def files(*files)
+          date = DateTime.now
+          note = Entity::Note.new
 
+          note.create("Backup: #{date.to_s}", '', 'Backup', files)
         end
 
       end

data/lib/evertils/common/{queries → query}/simple.rb

@@ -8,8 +8,8 @@ require 'evertils/common/entity/sync'
 
 module Evertils
   module Common
-    module Queries
-      class Simple
+    module Query
+      class Simple < Query::Base
 
         def notebooks
           Entity::Notebooks.new.all
@@ -60,7 +60,7 @@ module Evertils
           note.exists? name
         end
 
-        def create_note(title, body = template_contents, p_notebook_name = nil, file = nil, share_note = false, created_on = nil)
+        def create_note(title, body, p_notebook_name = nil, file = nil, share_note = false, created_on = nil)
           note = Entity::Note.new
           note.create(title, body, p_notebook_name, file, share_note, created_on)
         end

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

@@ -0,0 +1,104 @@
+require 'evertils/common/entity/notebook'
+require 'evertils/common/entity/notebooks'
+require 'evertils/common/entity/notes'
+require 'evertils/common/entity/note'
+
+module Evertils
+  module Common
+    module Query
+      class Time < Query::Base
+
+        #
+        # @since 0.2.8
+        def notes_created_in_range(start, finish = nil)
+          finish = DateTime.now if !finish
+          note_manager = Evertils::Common::Entity::Note.new
+
+          note_manager.find_by_date_range(start, finish)
+        end
+
+        #
+        # @since 0.2.8
+        def notes_updated_in_range(start, finish = nil)
+          finish = DateTime.now if !finish
+          note_manager = Evertils::Common::Entity::Note.new
+
+          note_manager.find_by_date_range(start, finish, :updated)
+        end
+
+        #
+        # @since 0.2.8
+        def notes_created_on(date = DateTime.now)
+          note_manager = Evertils::Common::Entity::Note.new
+
+          # start should be used for both start and end here
+          note_manager.find_by_date(date)
+        end
+
+        #
+        # @since 0.2.8
+        def notes_updated_on(date = DateTime.now)
+          note_manager = Evertils::Common::Entity::Note.new
+
+          # start should be used for both start and end here
+          note_manager.find_by_date(date, :updated)
+        end
+
+        #
+        # @since 0.2.8
+        def notebooks_created_in_range(start, finish = nil)
+          finish = DateTime.now if !finish
+          notebook_manager = Evertils::Common::Entity::Notebook.new
+
+          notebook_manager.find_by_date_range(start, finish)
+        end
+
+        #
+        # @since 0.2.8
+        def notebooks_updated_in_range(start, finish = nil)
+          finish = DateTime.now if !finish
+          notebook_manager = Evertils::Common::Entity::Notebook.new
+
+          notebook_manager.find_by_date_range(start, finish, :updated)
+        end
+
+        #
+        # @since 0.2.8
+        def last_year
+          filter = ::Evernote::EDAM::NoteStore::NoteFilter.new
+          filter.words = "created:year-1"
+
+          @evernote.call(:findNotesMetadata, filter, nil, 300)
+        end
+
+        #
+        # @since 0.2.8
+        def last_month
+          filter = ::Evernote::EDAM::NoteStore::NoteFilter.new
+          filter.words = "created:month-1"
+
+          @evernote.call(:findNotesMetadata, filter, nil, 300)
+        end
+
+        #
+        # @since 0.2.8
+        def last_week
+          filter = ::Evernote::EDAM::NoteStore::NoteFilter.new
+          filter.words = "created:week-1"
+
+          @evernote.call(:findNotesMetadata, filter, nil, 300)
+        end
+
+        #
+        # @since 0.2.8
+        def yesterday
+          filter = ::Evernote::EDAM::NoteStore::NoteFilter.new
+          filter.words = "created:day-1"
+
+          @evernote.call(:findNotesMetadata, filter, nil, 300)
+        end
+
+      end
+    end
+  end
+end

data/lib/evertils/common/query.rb

@@ -0,0 +1,31 @@
+module Evertils
+  module Common
+    module Query
+      class Base
+
+        #
+        # @since 0.2.8
+        def deprecation_notice(version)
+          puts "Deprecated as of #{version}"
+        end
+
+        #
+        # @since 0.2.8
+        def start_of_day(date = nil)
+          date = ::Time.now unless date
+
+          ::Time.mktime(date.year, date.month, date.day, 12, 0, 0).to_datetime
+        end
+
+        #
+        # @since 0.2.8
+        def end_of_day(date = nil)
+          date = ::Time.now unless date
+          
+          ::Time.mktime(date.year, date.month, date.day, 23, 59, 59).to_datetime
+        end
+
+      end
+    end
+  end
+end

data/lib/evertils/common/version.rb

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

data/lib/evertils/common.rb

@@ -1,16 +1,23 @@
 require 'evernote-thrift'
 require 'notifaction'
 require 'yaml'
+require 'mime/types'
+require 'date'
+
 require 'evertils/common/enml'
 require 'evertils/common/entity'
+require 'evertils/common/query'
+require 'evertils/common/converter'
 require 'evertils/common/version'
-require 'evertils/common/queries/backup'
-require 'evertils/common/queries/simple'
-require 'evertils/common/queries/time'
+require 'evertils/common/query/backup'
+require 'evertils/common/query/simple'
+require 'evertils/common/query/time'
 
 module Evertils
   module Common
+
     EVERNOTE_HOST = 'www.evernote.com'
     EVERNOTE_DEVELOPER_TOKEN = ENV['EVERTILS_TOKEN']
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evertils-common
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Ryan Priebe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  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: evernote-thrift
   requirement: !ruby/object:Gem::Requirement
@@ -85,6 +99,8 @@ files:
 - evertils-common.gemspec
 - lib/evertils/common.rb
 - lib/evertils/common/authentication.rb
+- lib/evertils/common/converter.rb
+- lib/evertils/common/converter/yaml_to_enml.rb
 - lib/evertils/common/enml.rb
 - lib/evertils/common/entity.rb
 - lib/evertils/common/entity/note.rb
@@ -95,9 +111,10 @@ 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/query.rb
+- lib/evertils/common/query/backup.rb
+- lib/evertils/common/query/simple.rb
+- lib/evertils/common/query/time.rb
 - lib/evertils/common/version.rb
 homepage: http://rubygems.org/gems/evertils-common
 licenses:

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

@@ -1,37 +0,0 @@
-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