evertils 0.3.14 → 0.3.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df5675280a5a000058729c6e54421e27450cc331
-  data.tar.gz: 3a4429dff8c505fc6a634933d26df86a1eb356c1
+  metadata.gz: 718d7296f7fb64fe1e53c51150e94d5dbfca5771
+  data.tar.gz: 1f4a1ff05f39f7e2dfd49a7d525cce45157b5075
 SHA512:
-  metadata.gz: 9a224f419cc2fbd8d2c78165518358c249260d2e8c073a23fa658c64ac724c6ba372b11e1db97a0be370908a8e44013edb73eef8e2e82b522e943c68bba2eb7f
-  data.tar.gz: 59ad4ecbc60745e79cc01b6ff22b02764f686fb0bc8bb1cb4124b4086fe7d4bd6b1c0abd1fa653b5fe89e387c1101e14e1e6be31344d0093164575bd066fa320
+  metadata.gz: d7ac052ae463845c104993eb40e4735629c5094cc438bc9ae4c6c50f1ddc11f36a1909e48601b7003ef33848bf853be929ab4f6f4ff762d75ca56cfd1500153a
+  data.tar.gz: 7e54c227677a05a14621fcc4b20314e2a06c3ac60ed2f57c55b0ffaa7090b5f51cb83ed255a0d299f9e3b1ae86cb4af18e34afb3d80fbdbdb424a1d0cc3d69f3

data/lib/evertils/types/daily.rb

@@ -3,6 +3,7 @@ module Evertils
     class Daily < Type::Base
       NOTEBOOK = :Daily
       COLOUR = 0xffe8b7
+      MAX_SEARCH_SIZE = 21
 
       #
       # @since 0.3.7
@@ -36,15 +37,16 @@ module Evertils
         @api = Evertils::Helper.load('ApiEnmlHandler', @config)
         enml = @api.from_str(@format.template_contents(NOTEBOOK))
 
+        Notify.info('Waiting for...')
         pq = find_priority_queue
 
         # didn't find the note the first time?  wait and try again
         if pq.entity.nil?
-          iter = 0
+          iter = 1
           loop do
             iter += 1
             pq = find_priority_queue(true)
-            break unless pq.entity.nil?
+            break unless pq.entity.nil? || iter == MAX_SEARCH_SIZE
           end
 
           Notify.info("#{iter} attempts to find the pq note") unless iter.zero?
@@ -65,6 +67,7 @@ module Evertils
       def find_priority_queue(sleep = false)
         sleep(5) if sleep
         title = @format.date_templates[:'Priority Queue']
+        Notify.info(title)
         @model.find_note_contents(title)
       end
     end

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

@@ -3,6 +3,7 @@ module Evertils
     class PriorityQueue < Type::Base
       NOTEBOOK = :'Priority Queue'
       COLOUR = 0xffe8b7
+      MAX_SEARCH_SIZE = 21
 
       #
       # @since 0.3.7
@@ -10,13 +11,14 @@ module Evertils
         super(config, *args)
 
         @handler = Evertils::Helper.load('ApiEnmlHandler', @config)
+        @title = @format.date_templates[NOTEBOOK]
 
         if Date.today.monday?
-          @title, @content = condition_monday
+          @content = condition_monday
         elsif Date.today.tuesday?
-          @title, @content = condition_tuesday
+          @content = condition_tuesday
         else
-          @title, @content = condition_default
+          @content = condition_default
         end
       end
 
@@ -38,15 +40,14 @@ module Evertils
 
         raise "Queue was not found - #{friday.strftime('%B %-d')}" unless found
 
-        [
-          @format.date_templates[NOTEBOOK],
-          @handler.convert_to_xml(found.entity.content).prepare
-        ]
+        @handler.convert_to_xml(found.entity.content).prepare
       end
 
       # Find monday's note
+      # TODO: refactor
       # @since 0.3.7
       def condition_tuesday
+        # get monday note
         monday = (Date.today - 1)
         dow = @format.day_of_week(monday.strftime('%a'))
         monday_note_title = "Queue For [#{monday.strftime('%B %-d')} - #{dow}]"
@@ -54,21 +55,38 @@ module Evertils
 
         if !monday_note.entity.nil?
           note = monday_note.entity
-          note.title = @format.date_templates[NOTEBOOK]
         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)
+          fri_note_title = "Queue For [#{friday.strftime('%B %-d')} - #{dow}]"
+          fri_note = @model.find_note_contents(fri_note_title)
+
+          if fri_note.entity.nil?
+            # if it does not exist, get $day - 1 note until we find one
+            day = friday
+            iter = 0
+
+            Notify.info('Searching for...')
+
+            loop do
+              iter += 1
+              day -= 1
+              dow = @format.day_of_week(day.strftime('%a'))
+              note_title = "Queue For [#{day.strftime('%B %-d')} - #{dow}]"
+              query = @model.find_note_contents(note_title)
+              note = query.entity
+
+              Notify.info(" (#{iter}) #{note_title}")
+
+              break unless note.nil? || iter == MAX_SEARCH_SIZE
+            end
+          end
         end
 
         raise 'Queue was not found' unless note
 
-        [
-          note.title,
-          @handler.convert_to_xml(note.content).prepare
-        ]
+        @handler.convert_to_xml(note.content).prepare
       end
 
       # Default action for not-Monday/Tuesday
@@ -81,10 +99,7 @@ module Evertils
 
         raise "Queue was not found - #{yest.strftime('%B %-d')}" unless found
 
-        [
-          @format.date_templates[NOTEBOOK],
-          @handler.convert_to_xml(found.content).prepare
-        ]
+        @handler.convert_to_xml(found.content).prepare
       end
     end
   end

data/lib/evertils/types/weekly.rb

@@ -18,20 +18,6 @@ module Evertils
       def tags
         ["week-#{Date.today.cweek}"]
       end
-
-      #
-      # @since 0.3.7
-      def should_create?
-        is_monday = Date.today.monday?
-
-        weekly_note_title = @format.date_templates[NOTEBOOK]
-        found = @model.find_note_contents(weekly_note_title)
-        result = found.entity.nil? && is_monday
-
-        Notify.warning "#{self.class.name} skipped, note already exists" unless result
-
-        result
-      end
     end
   end
 end

data/lib/evertils/version.rb

@@ -1,3 +1,3 @@
 module Evertils
-  VERSION = '0.3.14'.freeze
+  VERSION = '0.3.14.1'.freeze
 end

metadata

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