evertils 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '090e7c596124e90b0ef20118f78f1609906eac814fc70f5c68b8c10f8509d867'
-  data.tar.gz: fdeda657569494c3fba6a650820f15dae663be3624d7f6650549bc3e240f4847
+  metadata.gz: da72e4388eada49ffce7a77efb8cc712c4a97ecd153561ac37e42111af92c6b1
+  data.tar.gz: e8835575faee6e0ffa12d7a9a8ba39865722181ac9038c14900b446f383ef2d9
 SHA512:
-  metadata.gz: 0c98eedc392dfac24e4e23f28a59cbac12667df4aeb250c4db768bc0ad19890446788329021a19fdb2578ed26338076b0c7f1a3d8caff0aeebde3189dbf7baa5
-  data.tar.gz: 12dea2af67a4415d7deaa52d7ccb23e6b96ea0cb047100a4fec638cdf76c11c0a57e9278fa3c47ca0e91e83e99c5cc2275531d393c56bbd3443cb5b8925271d9
+  metadata.gz: 6c578630beddc02d38369f2f2c81b2b388ca807eb6be62174e4843742d9c0c01bcc116ff8cdb0a0e902615d3142959f5886033245913430757ede602d4308066
+  data.tar.gz: 03fc086116fa06f436b109d8e2c3845c867c8683ffc8ea0e9841ea523dcebdde1b2de59a574d3044c2492b346a6ef0c28260320e206248fe63ab015d83e0cd9b

data/lib/evertils/config.rb

@@ -1,5 +1,19 @@
+# frozen_string_literal: true
+
 module Evertils
   class Cfg
+    REPLACEMENTS = {
+      '%DOY%': Date.today.yday,
+      '%MONTH_NAME%': Date.today.strftime('%B'),
+      '%MONTH%': Date.today.month,
+      '%DAY%': Date.today.day,
+      '%DOW%': Date.today.wday,
+      '%DOW_NAME%': Date.today.strftime('%a'),
+      '%YEAR%': Date.today.year,
+      '%WEEK%': Date.today.cweek,
+      '%WEEK_START%': Date.commercial(Date.today.year, Date.today.cweek, 1),
+      '%WEEK_END%': Date.commercial(Date.today.year, Date.today.cweek, 5)
+    }
 
     # default values for initialization
     def initialize
@@ -66,11 +80,40 @@ module Evertils
     end
 
     def symbolize!
-      @yml = @yml.inject({}) { |h, (k, v)| h[k.to_sym] = v; h}
+      @yml = @yml.inject({}) { |h, (k, v)| h[k.to_sym] = v; h }
     end
 
     def pluck(*args)
-      @yml.slice(*args)
+      @yml.select do |key, _|
+        args.include? key
+      end
+    end
+
+    def translate_placeholders
+      @yml.map do |item|
+        REPLACEMENTS.each_pair do |k, v|
+          item.last.gsub!(k.to_s, v.to_s) if item.last.is_a? String
+          item.last.map { |i| i.gsub!(k.to_s, v.to_s) } if item.last.is_a? Array
+        end
+      end
+
+      symbolize_keys(@yml)
+      self
+    end
+
+    def symbolize_keys(hash)
+      hash.inject({}){ |result, (key, value)|
+        new_key = case key
+                  when String then key.to_sym
+                  else key
+                  end
+        new_value = case value
+                    when Hash then symbolize_keys(value)
+                    else value
+                    end
+        result[new_key] = new_value
+        result
+      }
     end
 
     private

data/lib/evertils/controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Evertils
   module Controller
     class Base
@@ -58,7 +60,7 @@ module Evertils
           @method = command
         elsif is_a? Evertils::Controller::Render
           @method = :from_file
-          @request.param = config.pluck(:path, :notebook)
+          @request.param = config
         else
           raise NoMethodError, "Invalid method: #{command}"
         end

data/lib/evertils/controllers/log.rb

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

data/lib/evertils/controllers/render.rb

@@ -1,10 +1,13 @@
+# frozen_string_literal: true
+
 require 'evertils/common/query/simple'
 
 module Evertils
   module Controller
     class Render < Controller::Base
       def from_file(config)
-        @config = config
+        @config = config.translate_placeholders.pluck(:title, :notebook)
+
         return Notify.warning("Note already exists\n- #{@link}") if note_exists?
 
         Notify.info 'Note not found, creating a new one'
@@ -15,7 +18,7 @@ module Evertils
 
       def note_exists?
         helper = Evertils::Helper.load('Note')
-        note = helper.wait_for(@config[:notebook].to_sym, 3)
+        note = helper.wait_for_by_title(@config[:title], @config[:notebook], 3)
         @link = helper.external_url_for(note.entity) unless note.entity.nil?
 
         note.exists?

data/lib/evertils/helpers/formatting.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Evertils
   module Helper
     class Formatting

data/lib/evertils/helpers/note.rb

@@ -12,16 +12,16 @@ module Evertils
       end
 
       # Wait for a note to exist
-      def wait_for(notebook, iterations = Evertils::Type::Base::MAX_SEARCH_SIZE)
+      def wait_for_by_notebook(notebook, iterations = Evertils::Type::Base::MAX_SEARCH_SIZE)
         Notify.info("Waiting for #{notebook}...")
-        note = find_note(notebook)
+        note = find_note_by_notebook(notebook)
 
         begin
           # didn't find it the first time?  wait and try again
           if note.entity.nil?
             (1..iterations).each do |iter|
               Notify.info(" (#{iter}) Looking for #{notebook.downcase}")
-              note = find_note(notebook, true)
+              note = find_note_by_notebook(notebook, true)
               break unless note.entity.nil? || iter == Evertils::Type::Base::MAX_SEARCH_SIZE
             end
           end
@@ -32,13 +32,41 @@ module Evertils
         note
       end
 
-      # Find a note
-      def find_note(notebook, sleep = false)
+      # Wait for a note to exist
+      def wait_for_by_title(title, notebook, iterations = Evertils::Type::Base::MAX_SEARCH_SIZE)
+        Notify.info("Waiting for #{notebook}...")
+        note = find_note_by_title(title)
+
+        begin
+          # didn't find it the first time?  wait and try again
+          if note.entity.nil?
+            (1..iterations).each do |iter|
+              Notify.info(" (#{iter}) Looking for #{notebook.downcase}")
+              note = find_note_by_title(notebook, true)
+              break unless note.entity.nil? || iter == Evertils::Type::Base::MAX_SEARCH_SIZE
+            end
+          end
+        rescue Interrupt
+          Notify.warning('Cancelled wait')
+        end
+
+        note
+      end
+
+      # Find a note by note
+      def find_note_by_title(title, sleep = false)
+        sleep(5) if sleep
+        @model.find_note_contents(title)
+      end
+
+      # Find a note by notebook
+      def find_note_by_notebook(notebook, sleep = false)
         sleep(5) if sleep
         title = @format.date_templates[notebook]
+
         @model.find_note_contents(title)
       end
-      alias find_by_notebook find_note
+      # alias find_by_notebook
 
       #
       # @since 0.3.15

data/lib/evertils/types/daily.rb

@@ -32,7 +32,7 @@ module Evertils
       # @since 0.3.13
       def attach_pq_note
         enml = @api.from_str(@format.template_contents(NOTEBOOK))
-        pq = @note_helper.wait_for(:'Priority Queue')
+        pq = @note_helper.wait_for_by_notebook(:'Priority Queue')
         xml_conf = {
           href: @note_helper.internal_url_for(pq.entity),
           content: @format.date_templates[:'Priority Queue']

data/lib/evertils/types/monthly.rb

@@ -22,7 +22,7 @@ module Evertils
       #
       # @since 0.3.15
       def add_weekly_note_link
-        wk_entity = @note_helper.wait_for(:Weekly).entity
+        wk_entity = @note_helper.wait_for_by_notebook(:Weekly).entity
         # parse the ENML note data into something we can work with
         xml = @api.from_str(@entity.content)
         # include the XML element builder

data/lib/evertils/types/weekly.rb

@@ -25,7 +25,7 @@ module Evertils
       #
       # @since 0.3.15
       def add_daily_note_link
-        da_entity = @note_helper.wait_for(:Daily).entity
+        da_entity = @note_helper.wait_for_by_notebook(:Daily).entity
         # parse the ENML note data into something we can work with
         xml = @api.from_str(@entity.content)
         # include the XML element builder

data/lib/evertils/version.rb

@@ -1,3 +1,3 @@
 module Evertils
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

metadata

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