evertils 0.3.20 → 0.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17268acd8544f52a11006ff8c4b3c81044ed091d
-  data.tar.gz: 8fb9e15b270e5f536131dab79d28e88653d4692a
+  metadata.gz: 20c36a98c336c394c744d795875d052e68bef5bd
+  data.tar.gz: 87d09f3440aa416fc002952ea0097ff1ec485dbc
 SHA512:
-  metadata.gz: 7749e738efbed98948dc90d75617294b58de883470887efafe180e9c5cb02b1509bf9b1f203f440d499e4897cfa61e7348351a2e6aac8cfa1459eb094a3d6e08
-  data.tar.gz: 26c3644bd2cde2f72a0d07b9a51704f1d2c80d3dd13ecced6bde5158070e623170fb466792e8c7e09359c6ab01ad5682ad091198dbe61df80a97628f75ca66e8
+  metadata.gz: 8cd8e239d03e74d3c511f79442bf04da0b787e38fc25214232a8601d215459e7f6b3f851f738c769268208ec322e4b13672cc4b816b5768cf51699f2c6367545
+  data.tar.gz: 0f3df2fea341aac93f150e6facf06e9057f68083672c3974f62ddbe0ba02c5759f619e7f03ca54434380d5bd0ee55f502e437a6ec6b8f2213a6bcfe3c91d6752

data/lib/evertils/controllers/log.rb

@@ -12,7 +12,7 @@ module Evertils
       def message(text)
         Notify.error('Text argument is required', {}) if text.nil?
 
-        note = @note_helper.find_note(:Daily)
+        note = @note_helper.wait_for(:Daily)
         edit_conf = {
           search: 'Triage',
           append: text

data/lib/evertils/helpers/api-enml-handler.rb

@@ -25,11 +25,7 @@ module Evertils
       #
       # @since 0.3.7
       def convert_to_xml(enml)
-        # remove the xml declaration and DTD
-        enml = enml.split("\n")
-        enml.shift(2)
-
-        @xml = from_str(enml.join)
+        @xml = from_str(enml)
         self
       end
       alias to_xml convert_to_xml
@@ -62,9 +58,9 @@ module Evertils
       # lets replace it with a new DTD if that is the case
       # @since 0.3.15
       def fix_dtd
-        if @xml.children.first.is_a?(Text)
+        if @xml.children[0].is_a?(Text)
           # remove the existing broken DTD
-          @xml.children.first.remove
+          @xml.children[0].remove
           # create a new one (note: output is overridden in DTD class defined
           # below ApiEnmlHandler)
           dtd = DTD.new('DOCTYPE', @xml)

data/lib/evertils/helpers/note.rb

@@ -15,7 +15,7 @@ module Evertils
 
       # Wait for a note to exist
       def wait_for(notebook)
-        Notify.info('Waiting for...')
+        Notify.info("Waiting for #{notebook}...")
         note = find_note(notebook)
 
         # didn't find it the first time?  wait and try again

data/lib/evertils/types/monthly.rb

@@ -36,22 +36,23 @@ module Evertils
       #
       # @since 0.3.15
       def add_weekly_note_link
+        wk_entity = @note_helper.wait_for(:Weekly).entity
         # parse the ENML note data into something we can work with
         xml = @api.from_str(@entity.content)
         # include the XML element builder
         xml_helper = Evertils::Helper.load('Xml', xml)
-        # find the note entity we want to link
-        linked_note = @note_helper.wait_for(:Weekly).entity
+        # internal URL for the linked note
+        note_url = @note_helper.internal_url_for(wk_entity)
 
         # don't add the note link if it is already there
-        unless xml.search("a[href='#{@note_helper.internal_url_for(linked_note)}']").size.zero?
+        unless xml.search("a[href='#{note_url}']").size.zero?
           return Notify.warning('Weekly note link already exists here, exiting to avoid duplicate content')
         end
 
         a = xml_helper.a(
-          @note_helper.internal_url_for(linked_note),
+          note_url,
           @format.date_templates[:Weekly]
-          )
+        )
         li = xml_helper.li(a)
         br = xml_helper.br
 

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

@@ -28,7 +28,7 @@ module Evertils
         day = Date.today
         note = nil
 
-        Notify.info('Searching for...')
+        Notify.info('Searching for last PQ...')
 
         (1..MAX_SEARCH_SIZE).each do |iter|
           day -= 1
@@ -45,8 +45,6 @@ module Evertils
           break unless note.nil?
         end
 
-        raise 'Queue was not found' unless note
-
         @handler.convert_to_xml(note.content).prepare
       end
     end

data/lib/evertils/types/weekly.rb

@@ -22,22 +22,23 @@ module Evertils
       #
       # @since 0.3.15
       def add_daily_note_link
+        da_entity = @note_helper.wait_for(:Daily).entity
         # parse the ENML note data into something we can work with
         xml = @api.from_str(@entity.content)
         # include the XML element builder
         xml_helper = Evertils::Helper.load('Xml', xml)
-        # find the note entity we want to link
-        linked_note = @note_helper.wait_for(:Daily).entity
+        # internal URL for the linked note
+        note_url = @note_helper.internal_url_for(da_entity)
 
         # don't add the note link if it is already there
-        unless xml.search("a[href='#{@note_helper.internal_url_for(linked_note)}']").size.zero?
+        unless xml.search("a[href='#{note_url}']").size.zero?
           return Notify.warning('Daily note link already exists here, exiting to avoid duplicate content')
         end
 
         a = xml_helper.a(
-          @note_helper.internal_url_for(linked_note),
+          note_url,
           @format.date_templates[:Daily]
-          )
+        )
         li = xml_helper.li(a)
         br = xml_helper.br
 

data/lib/evertils/version.rb

@@ -1,3 +1,3 @@
 module Evertils
-  VERSION = '0.3.20'.freeze
+  VERSION = '0.3.21'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 0.3.20
+  version: 0.3.21
 platform: ruby
 authors:
 - Ryan Priebe