evertils 0.3.17 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 561c28824de0f475fed905f3ad995a484f363533
-  data.tar.gz: e8ffe5ac1387992629396c333bb9c0096e41fe46
+  metadata.gz: 886b1ca6799ab8f5f90720db8e70cc28be5fd36a
+  data.tar.gz: 787b8c3b1bb253717851bfeb2cd73bab45995fd2
 SHA512:
-  metadata.gz: f096438ac57c7500fb97c5c0ec24f4cebd33d7a0cb5ee394edd6c7b42efed535ded0c1d9021161d80dee4b3a98da0e22ae7d72bcbe3a02f1384984d75b3b9151
-  data.tar.gz: 9bf09c2ded96a58e8fc60636ae5cada0604edfc88213bc7c991bb92cd992bfe484b64be398972eb256acc54cd1a1287c2bb3b85586465edc73b77712277d80a9
+  metadata.gz: 19b830abed45c29fb384631991e3b33d8eede5fa1c54f2643b687e531df8d86c5bf3fb745c1fae117982afb295956f1c834d4b3b197f7638aa3a3a06a99d5797
+  data.tar.gz: 32a4b7052b018627e1512395cafd4af0b27ba97f3003158db2a6a8b4df9fafdd1bedc5c669f7c4167401532a7218f785511405a32c901dc4f18a543e02ef8474

data/lib/evertils.rb

@@ -31,6 +31,8 @@ require 'evertils/router'
 require 'evertils/helper'
 require 'evertils/helpers/formatting'
 require 'evertils/helpers/evernote-enml'
+require 'evertils/helpers/note'
+require 'evertils/helpers/xml'
 
 module Evertils
   # Flag to determine if module is running in test mode

data/lib/evertils/controller.rb

@@ -37,7 +37,7 @@ module Evertils
         if @request.param.nil?
           send(@method.to_sym)
         else
-          send(@method.to_sym, @request.flags.first)
+          send(@method.to_sym, (@request.flags.first || @request.param))
         end
       end
 

data/lib/evertils/controllers/log.rb

@@ -0,0 +1,49 @@
+module Evertils
+  module Controller
+    class Log < Controller::Base
+      def pre_exec
+        super
+
+        @note_helper = Evertils::Helper.load('Note')
+        @api_helper = Evertils::Helper.load('ApiEnmlHandler', {})
+      end
+
+      # Send arbitrary text to the daily log
+      def message(text)
+        Notify.error('Text argument is required', {}) if text.nil?
+
+        note = @note_helper.find_note(:Daily)
+        edit_conf = {
+          search: 'Triage',
+          append: text
+        }
+
+        modify(note, edit_conf)
+      end
+
+      private
+
+      # Update a note with content
+      def modify(note, conf)
+        xml = @api_helper.from_str(note.entity.content)
+        xml_helper = Evertils::Helper.load('Xml', xml)
+
+        time = Time.now.strftime('%I:%M')
+        target = xml.search("div:contains('#{conf[:search]}')").first.next_element
+        nearest_ul = target.search('ul')
+        span = xml_helper.span("#{time} - #{conf[:append]}")
+        li = xml_helper.li(span)
+
+        if nearest_ul.empty?
+          node = xml_helper.ul(li)
+          target.children.before(node)
+        else
+          nearest_ul.children.after(li)
+        end
+
+        note.entity.content = xml.to_s
+        Notify.success("Item logged at #{time}") if note.update
+      end
+    end
+  end
+end

data/lib/evertils/helpers/note.rb

@@ -0,0 +1,54 @@
+module Evertils
+  module Helper
+    class Note
+      attr_reader :model
+
+      MAX_SEARCH_SIZE = 21
+
+      # Create the Note object
+      def initialize
+        @model = Evertils::Common::Query::Simple.new
+        @format = Evertils::Helper.load('Formatting')
+        @user = @model.user_info[:user]
+        @shard = @model.user_info[:shard]
+      end
+
+      # Wait for a note to exist
+      def wait_for(notebook)
+        Notify.info('Waiting for...')
+        note = find_note(notebook)
+
+        # didn't find it the first time?  wait and try again
+        if note.entity.nil?
+          (1..MAX_SEARCH_SIZE).each do |iter|
+            Notify.info(" (#{iter}) #{notebook}")
+            note = find_note(notebook, true)
+            break unless note.entity.nil? || iter == MAX_SEARCH_SIZE
+          end
+        end
+
+        note
+      end
+
+      # Find a note
+      def find_note(notebook, sleep = false)
+        sleep(5) if sleep
+        title = @format.date_templates[notebook]
+        @model.find_note_contents(title)
+      end
+      alias find_by_notebook find_note
+
+      #
+      # @since 0.3.15
+      def internal_url_for(note)
+        "evernote:///view/#{@user[:id]}/#{@shard}/#{note.guid}/#{note.guid}/"
+      end
+
+      # Create a note
+      def create(data)
+        @model.create_note(data)
+      end
+      alias create_note create
+    end
+  end
+end

data/lib/evertils/helpers/xml.rb

@@ -22,6 +22,16 @@ module Evertils
         create(:a, conf)
       end
 
+      #
+      # @since 0.3.18
+      def span(content)
+        conf = {
+          content: content
+        }
+
+        create(:span, conf)
+      end
+
       #
       # @since 0.3.15
       def br
@@ -44,6 +54,14 @@ module Evertils
         el
       end
 
+      #
+      # @since 0.3.18
+      def ul(*children)
+        el = create(:ul)
+        children.each { |child| el.add_child(child) }
+        el
+      end
+
       #
       # @since 0.3.15
       def create(element, conf = {})

data/lib/evertils/type.rb

@@ -9,10 +9,10 @@ module Evertils
       #
       # @since 0.3.7
       def initialize(config, *args)
-        @model = Evertils::Common::Query::Simple.new
-        @user = @model.user_info[:user]
-        @shard = @model.user_info[:shard]
+        # helpers
+        @note_helper = Evertils::Helper.load('Note')
         @format = Evertils::Helper.load('Formatting')
+
         @config = config if config
         @api = Evertils::Helper.load('ApiEnmlHandler', @config)
         @args = args unless args.size.zero?
@@ -33,13 +33,13 @@ module Evertils
         raise 'Invalid note content' if @content.nil?
         raise 'Invalid notebook' if self.class::NOTEBOOK.nil?
 
-        @model.create_note(data)
+        @note_helper.create_note(data)
       end
 
       #
       # @since 0.3.7
       def should_create?
-        @note = find_note(self.class::NOTEBOOK)
+        @note = @note_helper.find_note(self.class::NOTEBOOK)
         @entity = @note.entity
         result = @entity.nil?
 
@@ -53,38 +53,6 @@ module Evertils
       def morning_note?
         !caller.grep(/morning/).nil?
       end
-
-      #
-      # @since 0.3.15
-      def wait_for(notebook)
-        Notify.info('Waiting for...')
-        note = find_note(notebook)
-
-        # didn't find it the first time?  wait and try again
-        if note.entity.nil?
-          (1..MAX_SEARCH_SIZE).each do |iter|
-            Notify.info(" (#{iter}) #{notebook}")
-            note = find_note(notebook, true)
-            break unless note.entity.nil? || iter == MAX_SEARCH_SIZE
-          end
-        end
-
-        note
-      end
-
-      #
-      # @since 0.3.15
-      def find_note(notebook, sleep = false)
-        sleep(5) if sleep
-        title = @format.date_templates[notebook]
-        @model.find_note_contents(title)
-      end
-
-      #
-      # @since 0.3.15
-      def internal_url_for(note)
-        "evernote:///view/#{@user[:id]}/#{@shard}/#{note.guid}/#{note.guid}/"
-      end
     end
   end
 end

data/lib/evertils/types/daily.rb

@@ -1,5 +1,3 @@
-require 'evertils/helpers/xml'
-
 module Evertils
   module Type
     class Daily < Type::Base
@@ -32,12 +30,10 @@ module Evertils
         @api = Evertils::Helper.load('ApiEnmlHandler', @config)
         enml = @api.from_str(@format.template_contents(NOTEBOOK))
 
-        pq = wait_for(:'Priority Queue')
-
-        guid = pq.entity.guid
+        pq = @note_helper.wait_for(:'Priority Queue')
 
         xml_conf = {
-          href: "evernote:///view/#{@user[:id]}/#{@shard}/#{guid}/#{guid}/",
+          href: @note_helper.internal_url_for(pq.entity),
           content: @format.date_templates[:'Priority Queue']
         }
 

data/lib/evertils/types/monthly.rb

@@ -24,7 +24,7 @@ module Evertils
       def should_create?
         today_is_first_of_month = Date.today.day == 1
 
-        @note = find_note(NOTEBOOK)
+        @note = @note_helper.find_note(NOTEBOOK)
         @entity = @note.entity
         result = @entity.nil? && today_is_first_of_month
 
@@ -41,15 +41,15 @@ module Evertils
         # include the XML element builder
         xml_helper = Evertils::Helper.load('Xml', xml)
         # find the note entity we want to link
-        linked_note = wait_for(:Weekly).entity
+        linked_note = @note_helper.wait_for(:Weekly).entity
 
         # don't add the note link if it is already there
-        unless xml.search("a[href='#{internal_url_for(linked_note)}']").size.zero?
+        unless xml.search("a[href='#{@note_helper.internal_url_for(linked_note)}']").size.zero?
           return Notify.warning('Weekly note link already exists here, exiting to avoid duplicate content')
         end
 
         a = xml_helper.a(
-          internal_url_for(linked_note),
+          @note_helper.internal_url_for(linked_note),
           @format.date_templates[:Weekly]
           )
         li = xml_helper.li(a)

data/lib/evertils/types/priority-queue.rb

@@ -38,7 +38,7 @@ module Evertils
           next if %i[Sa Su].include?(dow)
 
           note_title = "Queue For [#{day.strftime('%B %-d')} - #{dow}]"
-          note = @model.find_note_contents(note_title).entity
+          note = @note_helper.model.find_note_contents(note_title).entity
 
           Notify.info(" (#{iter}) #{note_title}")
 

data/lib/evertils/types/weekly.rb

@@ -27,15 +27,15 @@ module Evertils
         # include the XML element builder
         xml_helper = Evertils::Helper.load('Xml', xml)
         # find the note entity we want to link
-        linked_note = wait_for(:Daily).entity
+        linked_note = @note_helper.wait_for(:Daily).entity
 
         # don't add the note link if it is already there
-        unless xml.search("a[href='#{internal_url_for(linked_note)}']").size.zero?
+        unless xml.search("a[href='#{@note_helper.internal_url_for(linked_note)}']").size.zero?
           return Notify.warning('Daily note link already exists here, exiting to avoid duplicate content')
         end
 
         a = xml_helper.a(
-          internal_url_for(linked_note),
+          @note_helper.internal_url_for(linked_note),
           @format.date_templates[:Daily]
           )
         li = xml_helper.li(a)

data/lib/evertils/version.rb

@@ -1,3 +1,3 @@
 module Evertils
-  VERSION = '0.3.17'.freeze
+  VERSION = '0.3.18'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.18
 platform: ruby
 authors:
 - Ryan Priebe
@@ -122,6 +122,7 @@ files:
 - lib/evertils/controllers/firstrun.rb
 - lib/evertils/controllers/generate.rb
 - lib/evertils/controllers/get.rb
+- lib/evertils/controllers/log.rb
 - lib/evertils/controllers/new.rb
 - lib/evertils/controllers/status.rb
 - lib/evertils/helper.rb
@@ -129,6 +130,7 @@ files:
 - lib/evertils/helpers/evernote-enml.rb
 - lib/evertils/helpers/evernote-markdown.rb
 - lib/evertils/helpers/formatting.rb
+- lib/evertils/helpers/note.rb
 - lib/evertils/helpers/results.rb
 - lib/evertils/helpers/time.rb
 - lib/evertils/helpers/xml.rb