evertils 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 206974c6d6d876faed379c1f8d174c8e02f1af89410960b5a0759a2ba988c0ee
-  data.tar.gz: 2a56984a7e1757992e811652c9ba989060943a2d99bf943dd318dfdfcf58a628
+  metadata.gz: 99e8ad314c474633e6107fb99dd66364cab9d8a2f38ae36e461c07cae6a2a842
+  data.tar.gz: 94cff8759a0cac2568fc06f59205870225d7b9f9e76c8f5c37ad3bccfa299f62
 SHA512:
-  metadata.gz: 1cb7bf54cf9a60deb6959c37a053a031f4d406950a619fd784d987d5866a2208827ffdc451f1191d2c043734ce9847255786940754a1abfbcfc6d2df33647982
-  data.tar.gz: c85ea5dab302bbdd7c0f6abd3d6c7eccbaccb9360cea96e517b7190a9fe052ace959a0ebbd2ceb9714668110221ca5009dd3b098ddd0b652d0c29f9728c2a12e
+  metadata.gz: d0a4d0c5ccb9461475e0c975515c0cdaddd13250ba10631504ac861f3729acf218361a86e5d6daeb037f779cd53a3bf8bd6d131a41a6dec4bc9ce503f882dcd0
+  data.tar.gz: 29e50ce9b59a4be5a41fe9288b4d465d13abb20422094487e7df9bdecccbd6f25fb22a8dda22cef551ec1c40239b53177b464ec3104d4b134ad184aacedd08ee

data/lib/evertils/controllers/log.rb

@@ -5,7 +5,6 @@ module Evertils
         super
 
         @note_helper = Evertils::Helper.load('Note')
-        @search_grammar = Evertils::Helper.load('SearchGrammar')
         @api_helper = Evertils::Helper.load('ApiEnmlHandler', @config)
       end
 
@@ -13,16 +12,7 @@ module Evertils
       def message(text = nil)
         return Notify.error('A message is required') if text.nil?
 
-        # TODO: should be an object instead of arbitrary hash
-        criteria = {
-          notebook: :Daily,
-          tags: {
-            day: Date.today.yday
-          },
-          created: Date.new(Date.today.year, 1, 1).strftime('%Y%m%d')
-        }
-
-        note = @note_helper.wait_for_with_grammar(criteria)
+        note = @note_helper.find_note_by_grammar(grammar.to_s)
 
         return Notify.error('Note not found') if note.entity.nil?
 
@@ -31,6 +21,17 @@ module Evertils
 
       private
 
+      def grammar
+        terms = Grammar.new
+        terms.tags = {
+          day: Date.today.yday,
+          week: Date.today.cweek
+        }
+        terms.notebook = :Daily
+        terms.created = Date.new(Date.today.year, 1, 1).strftime('%Y%m%d')
+        terms
+      end
+
       # Update a note with content
       def modify(note, text)
         xml = @api_helper.from_str(note.entity.content)

data/lib/evertils/grammar.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Evertils
+  class Grammar
+    attr_accessor :tags, :notebook, :created
+
+    # Available grammars
+    # https://dev.evernote.com/doc/articles/search_grammar.php
+    # @since 1.0.12
+    def initialize
+      @tags = []
+      @grammar = []
+      @notebook = nil
+      @created = Date.today.strftime('%Y%m%d')
+    end
+
+    #
+    # @since 1.0.12
+    def to_s
+      stringify_properties
+      stringify_tags unless @tags.empty?
+
+      @grammar.join(' ')
+    end
+
+    private
+
+    #
+    # @since 1.0.12
+    def stringify_tags
+      @tags.each_pair do |k, v|
+        @grammar.push("tag:#{k}-#{v}")
+      end
+    end
+
+    #
+    # @since 1.0.12
+    def stringify_properties
+      # automatically convert the non-hash properties to EN grammar key/value
+      # pairs
+      grammars_used = methods - Object.instance_methods
+      grammars_used.reject! { |k, _| k.to_s.end_with?('=') || k == :tags }
+
+      grammars_used.each do |grammar|
+        @grammar.push("#{grammar}:#{send(grammar)}")
+      end
+    end
+  end
+end

data/lib/evertils/helpers/note.rb

@@ -7,23 +7,20 @@ module Evertils
       def initialize
         @model = Evertils::Common::Query::Simple.new
         @format = Evertils::Helper.load('Formatting')
-        @search_grammar = Evertils::Helper.load('SearchGrammar')
         @user = @model.user_info[:user]
         @shard = @model.user_info[:shard]
       end
 
-      def wait_for_with_grammar(conf, iterations = Evertils::Type::Base::MAX_SEARCH_SIZE)
-        grammar = @search_grammar.from(conf)
+      def wait_for_with_grammar(grammar, iterations = Evertils::Type::Base::MAX_SEARCH_SIZE)
         Notify.info("Searching with grammar #{grammar}")
-        note = find_note_by_grammar(grammar)
+        note = find_note_by_grammar(grammar.to_s)
 
         begin
           if note.entity.nil?
             (1..iterations).each do |iter|
-              conf[:tags][:day] -= 1
-              grammar = @search_grammar.from(conf)
+              grammar.tags[:day] -= 1
               Notify.info(" (#{iter}) Looking for #{grammar}")
-              note = find_note_by_grammar(grammar, true)
+              note = find_note_by_grammar(grammar.to_s, true)
 
               break unless note.entity.nil? || iter == Evertils::Type::Base::MAX_SEARCH_SIZE
             end

data/lib/evertils/version.rb

@@ -1,3 +1,3 @@
 module Evertils
-  VERSION = '1.0.11'.freeze
+  VERSION = '1.0.12'.freeze
 end

data/lib/evertils.rb

@@ -28,7 +28,6 @@ require 'evertils/actions/duplicate_previous'
 require 'evertils/helpers/time'
 require 'evertils/helpers/results'
 require 'evertils/helpers/api-enml-handler'
-require 'evertils/helpers/search-grammar'
 require 'evertils/gpg_exception'
 require 'evertils/yubikey_exception'
 require 'evertils/required_check_exception'
@@ -42,6 +41,7 @@ require 'evertils/helpers/formatting'
 require 'evertils/helpers/evernote-enml'
 require 'evertils/helpers/note'
 require 'evertils/helpers/xml'
+require 'evertils/grammar'
 
 module Evertils
   # Flag to determine if module is running in test mode

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Ryan Priebe
@@ -131,6 +131,7 @@ files:
 - lib/evertils/controllers/new.rb
 - lib/evertils/controllers/render.rb
 - lib/evertils/gpg_exception.rb
+- lib/evertils/grammar.rb
 - lib/evertils/helper.rb
 - lib/evertils/helpers/api-enml-handler.rb
 - lib/evertils/helpers/evernote-enml.rb
@@ -138,7 +139,6 @@ files:
 - lib/evertils/helpers/formatting.rb
 - lib/evertils/helpers/note.rb
 - lib/evertils/helpers/results.rb
-- lib/evertils/helpers/search-grammar.rb
 - lib/evertils/helpers/time.rb
 - lib/evertils/helpers/xml.rb
 - lib/evertils/kernel.rb

data/lib/evertils/helpers/search-grammar.rb

@@ -1,29 +0,0 @@
-module Evertils
-  module Helper
-    class SearchGrammar
-      def from(conf)
-        @configuration = conf
-        @grammar = []
-
-        fix_standard_grammar
-        fix_tags if @configuration.include?(:tags)
-
-        @grammar.join(' ')
-      end
-
-      private
-
-      def fix_tags
-        @configuration[:tags].each_pair do |k, v|
-          @grammar.push("tag:#{k}-#{v}")
-        end
-      end
-
-      def fix_standard_grammar
-        @configuration.each_pair do |k, v|
-          @grammar.push("#{k}:#{v}") unless k == :tags
-        end
-      end
-    end
-  end
-end