evertils 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4ffe43d82d5401de2e7e132b9ca9328c0713ed7
-  data.tar.gz: dcd8f113b8cd4443a3d08a35faaf3ed3518a9fb2
+  metadata.gz: 613756ce620cb2f255b005b86da5e14357c2851c
+  data.tar.gz: 4e1ced19ef5f23579fec39be7d0e939792c00195
 SHA512:
-  metadata.gz: 1f1469fbc3cf5b6a523116e3566c4a8c9f528d934c8652c4c02390750a4ce64480b8dfa88adf68dbca31e416a423a690948da116ab0b820d52087d90c8feac41
-  data.tar.gz: 660a9653dfcacca6892e3ea90a0f66a170f77513246d126094f332c2db00fadc19c7f5e73b0f0ff4ba240c2f43d71fff8674b295cb725ec388ccb743ac155b69
+  metadata.gz: 16c384c2f9baa1580f9142126be48529e386afb0cb955bb6661876535b3bfb0c24eadbc50adf8ab8afe9d4e84118de56e9ee7d622559f9766467d648898f8bc1
+  data.tar.gz: 0712a55cab72c0d843d9d69808aaaee89de92960814a1a73d798320941bbc47f1abd0b2a4a48b3102b7d56a6c7a836d8bd806cb3399f4c54891e6be4247c0efe

data/README.md

@@ -16,8 +16,8 @@ See [this document](https://github.com/aapis/evertils/wiki/Logging-Specification
 
 |Command|Description|Usage|
 |:--------------|:-----------|:-------------|
-|generate|Create notes based on templates|`evertils generate daily|weekly|monthly`|
-|new|Manually create notes|`evertils new note "STUFF"`, `evertils new share_note "STUFF"`, `other task | evertils new share_note --title="Piped data note"`|
-|get|Get data from Evernote|`evertils get notebook`|
+|generate|Create notes from templates|`evertils generate daily`, `evertils generate morning`, `evertils generate monthly`|
+|new|Manually create notes|`evertils new note "STUFF"`, `evertils new share_note "STUFF"`, `other task $PIPE_CHAR$ evertils new share_note --title="Piped data note"`|
+|get|Get data from Evernote|`evertils get notebook` (coming soon)|
 |convert|Convert your notes to Markdown, then back to ENML|(coming soon)|
 |status|View script information and other data|`evertils status`|

data/bin/evertils

@@ -15,6 +15,7 @@ require 'digest/md5'
 require 'mime/types'
 require 'evertils/common'
 require 'yaml'
+require 'nokogiri'
 
 # include required files
 require_relative '../lib/kernel.rb'

data/evertils.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'notifaction'
   s.add_runtime_dependency 'mime-types'
-  s.add_runtime_dependency 'evertils-common', '~> 0.3.1'
+  s.add_runtime_dependency 'evertils-common', '~> 0.3.5'
+  s.add_runtime_dependency 'nokogiri'
 
   s.add_development_dependency "bundler", "~> 1.10"
   s.add_development_dependency "rake", "~> 10.0"
-end
+end

data/lib/controllers/generate.rb

@@ -95,12 +95,56 @@ module Evertils
 
       # generate priority queue notes
       def pq
-        title = @format.date_templates[NOTEBOOK_PRIORITY_QUEUE]
-        body = @format.template_contents(NOTEBOOK_PRIORITY_QUEUE)
-        body += to_enml($config.custom_sections[NOTEBOOK_PRIORITY_QUEUE]) unless $config.custom_sections.nil?
-        parent_notebook = NOTEBOOK_PRIORITY_QUEUE
+        if Date.today.monday?
+          # get friday's note
+          friday = (Date.today - 3)
+          dow = @format.day_of_week(friday.strftime('%a'))
+          note_title = "Queue For [#{friday.strftime('%B %-d')} - #{dow}]"
+          found = @model.find_note_contents(note_title)
+
+          raise "Queue was not found - #{friday.strftime('%B %-d')}" unless found
+
+          title = @format.date_templates[NOTEBOOK_PRIORITY_QUEUE]
+          content = prepare_enml(found.entity.content)
+
+          @model.create_note(title: title, body: content, parent_notebook: NOTEBOOK_PRIORITY_QUEUE)
+        elsif Date.today.tuesday?
+          # find monday's note
+          monday = (Date.today - 1)
+          dow = @format.day_of_week(monday.strftime('%a'))
+          monday_note_title = "Queue For [#{monday.strftime('%B %-d')} - #{dow}]"
+          monday_note = @model.find_note_contents(monday_note_title)
+
+          if !monday_note.entity.nil?
+            note = monday_note.entity
+            note.title = @format.date_templates[NOTEBOOK_PRIORITY_QUEUE]
+          else
+            # if it does not exist, get friday's note
+            friday = (Date.today - 4)
+            dow = @format.day_of_week(friday.strftime('%a'))
+            note_title = "Queue For [#{friday.strftime('%B %-d')} - #{dow}]"
+            note = @model.find_note_contents(note_title)
+          end
 
-        @model.create_note(title: title, body: body, parent_notebook: parent_notebook)
+          raise 'Queue was not found' unless note
+
+          content = prepare_enml(note.content)
+
+          @model.create_note(title: note.title, body: content, parent_notebook: NOTEBOOK_PRIORITY_QUEUE)
+        else
+          yest = (Date.today - 1)
+          dow = @format.day_of_week(yest.strftime('%a'))
+          yest_note_title = "Queue For [#{yest.strftime('%B %-d')} - #{dow}]"
+          found = @model.find_note_contents(yest_note_title).entity
+
+          raise "Queue was not found - #{yest.strftime('%B %-d')}" unless found
+
+          title = @format.date_templates[NOTEBOOK_PRIORITY_QUEUE]
+          content = prepare_enml(found.content)
+          content += to_enml($config.custom_sections[NOTEBOOK_PRIORITY_QUEUE]) unless $config.custom_sections.nil?
+
+          @model.create_note(title: title, body: content, parent_notebook: NOTEBOOK_PRIORITY_QUEUE)
+        end
       end
 
       # creates the notes required to start the day
@@ -120,6 +164,24 @@ module Evertils
       def to_enml(hash)
         Evertils::Helper::EvernoteENML.with_list(hash)
       end
+
+      #
+      # @since 0.3.5
+      def prepare_enml(content)
+        # remove the xml declaration and DTD
+        content = content.split("\n")
+        content.shift(2)
+
+        xml = Nokogiri::XML::DocumentFragment.parse(content.join)
+        note_xml = xml.search('en-note')
+
+        # remove <br> tags
+        note_xml.search('br').each do |br|
+          br.remove
+        end
+
+        note_xml.inner_html().to_s
+      end
     end
   end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Evertils
-  VERSION = '0.3.5'.freeze
+  VERSION = '0.3.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Ryan Priebe
@@ -44,14 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.5
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  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: bundler
   requirement: !ruby/object:Gem::Requirement