evertils 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04b57db19e88587c1b226d8b457f2366be8abaa9d9ac11167d08c704d828a008
-  data.tar.gz: 2dc9c21a462bdd8404f116bdd45a3ffd32e91e4191133e4ee0d1bc363936a721
+  metadata.gz: a73b52e4baf5b8c14bb0927c7f34ad5d6379c32403a5aa73dd3e4aa6720695fc
+  data.tar.gz: eabd9cd23471a321759a41586f1551561b8508058fddc60069acb452c0e04580
 SHA512:
-  metadata.gz: be6ea98ad31e762358da2188e145f987367e1c2e1e976470e1ec575c2c9ec687c639bf838a90c090a0c426dbff9a4d4783fe9b248bf75ede31bb9ef0619a183f
-  data.tar.gz: 3d7d6aeae4d8676cee6f5619407719ef364bc426f398c4c39fc29178106290daeea7b746c11e4a2b69cd5b3797c973f0a2b9fa3e241efc7f02b9402ba805de2f
+  metadata.gz: 90f8309a45345fa461078aeda4bc4a0b2c58698a958c84101291a3e14950d221ec7ee1425ff07809875f5bff724ea8097b03763e68adcc9e8690c83e03fe0495
+  data.tar.gz: 2f983ff37691cd9969de44a240e1b594216dc52c8397c3266e1c7684569fbe053f451d1d96ae2a22dc4a5105cf9abb05c65a616e46dbc0549719b1b92be61a4c

data/lib/evertils/action.rb

@@ -6,7 +6,7 @@ module Evertils
       def initialize(args)
         @args = args
         @note_helper = Evertils::Helper::Note.instance
-        @api = Evertils::Helper::ApiEnmlHandler.new
+        @api = Evertils::Helper::ApiEnmlHandler.new(@args)
       end
     end
   end

data/lib/evertils/actions/duplicate_previous.rb

@@ -6,7 +6,7 @@ module Evertils
       def initialize(args)
         super(args)
 
-        @args[:content] = find_previous(args)
+        @args[:content] = find_previous
 
         query = Evertils::Common::Query::Simple.new
         query.create_note_from_hash(@args)
@@ -14,50 +14,22 @@ module Evertils
 
       private
 
-      def find_previous(args)
-        day = Date.today
-        note = nil
+      def find_previous
+        helper = Evertils::Helper::Note.instance
+        note = helper.wait_for_with_grammar(grammar)
 
-        Notify.info("Searching for last #{@args[:notebook]}...")
-
-        (1..Evertils::Base::MAX_SEARCH_SIZE).each do |iter|
-          day -= 1
-          dow = day.strftime('%a')
-
-          # always skip weekends, even if there is a note for those days
-          next if %i[Sat Sun].include?(dow)
-
-          note_title = previous_note_title(@args[:title_format], day)
-          note = @note_helper.model.find_note_contents(note_title).entity
-
-          Notify.info(" (#{iter}) #{note_title}")
-
-          break unless note.nil?
-        end
-
-        @api.convert_to_xml(note.content).prepare
+        @api.convert_to_xml(note.entity.content).prepare
       end
 
-      def previous_note_title(fmt, date)
-        # not a good solution but it works
-        # TODO: fix this
-        replacements = {
-          '%DOY%': date.yday,
-          '%MONTH_NAME%': date.strftime('%B'),
-          '%MONTH%': date.month,
-          '%DAY%': date.day,
-          '%DOW%': date.wday,
-          '%DOW_NAME%': date.strftime('%a'),
-          '%YEAR%': date.year,
-          '%WEEK%': date.cweek,
-          '%WEEK_START%': Date.commercial(date.year, date.cweek, 1),
-          '%WEEK_END%': Date.commercial(date.year, date.cweek, 5)
+      def grammar
+        terms = Grammar.new
+        terms.notebook = @args[:notebook]
+        terms.tags = {
+          day: Date.today.yday,
+          week: Date.today.cweek
         }
-
-        title_format = fmt.dup
-
-        replacements.each_pair { |k, v| title_format.gsub!(k.to_s, v.to_s) }
-        title_format
+        terms.created = Date.new(Date.today.year, 1, 1).strftime('%Y%m%d')
+        terms
       end
     end
   end

data/lib/evertils/controllers/render.rb

@@ -6,9 +6,11 @@ module Evertils
       def from_file
         set_allowed_fields
 
-        return Notify.warning("Note already exists\n- #{@link}") if note_exists?
+        if @allowed_fields[:action] == 'create'
+          return Notify.warning("Note already exists\n- #{@link}") if note_exists?
 
-        Notify.info 'Note not found, creating a new one'
+          Notify.info 'Note not found, creating a new one'
+        end
 
         execute_action(@allowed_fields[:action])
       end

data/lib/evertils/grammar.rb

@@ -18,6 +18,7 @@ module Evertils
     #
     # @since 1.0.12
     def to_s
+      @grammar = []
       stringify_properties
       stringify_tags unless @tags.empty?
 

data/lib/evertils/version.rb

@@ -1,3 +1,3 @@
 module Evertils
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.0.1'.freeze
 end

metadata

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