evertils 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c46a2159d62b6e856e8dff4c06524f6e34098b556a6fa2db6732c3b90158e9c
-  data.tar.gz: c33e3ee54a15c187f95e82a759c428bd5452e6ccf68e967b86d2760015e44a19
+  metadata.gz: 68a35d3e301fe99661e1de9a629f967c806aada550e5b56ad779edce73705086
+  data.tar.gz: c43e863a87f630189d7589906b0bbdb9f8e7bf2c0f7dc0d78da77678abbe866c
 SHA512:
-  metadata.gz: 2ab525b278952924e836d3c10cacb497ef8a2ded543c0e3e839f559119c42dad49c7959442c728ed976c5bab56561e84d470c65e60d10755f5e135df2440d26d
-  data.tar.gz: 6d7b58fdbfd3827d83820ec6a790a07f1967a161e4e3ffee496157bd13414c1ad5f50c8b236c41789a12dc113bcca8a106177d72e2b23fc5b00deedc00797600
+  metadata.gz: 700050701d54012695a4ecea2506a56fc16a4f52f07c93c14ef08e3aa873be813713a24496f9b3e2b05cb4df780e4e4e73bf8e2c3cb134fc250653ebd9997139
+  data.tar.gz: 6a196a2186d41d3525d8a3aaf13fe5517096772f38166f0522446444468b1835b56610a534914f5990ab2c82733a706760c7760e75ccb52b3f5eb6117c5c56a3

data/README.md

@@ -18,7 +18,7 @@ See [this document](https://github.com/aapis/evertils/wiki/Logging-Specification
 |Command|Description|Usage|
 |:--------------|:-----------|:-------------|
 |generate|Create notes from templates|`evertils generate daily`, `evertils generate morning`, `evertils generate monthly`|
-|log|Write a line to a note|`evertils log message "I am a message"`|
+|log|Interact with a note's content|`evertils log message "I am a message"`, `evertils log grep 2223`, `evertils log group`|
 
 ## Automation
 

data/lib/evertils/action_runner.rb

@@ -6,15 +6,16 @@ module Evertils
 
     def execute
       case params.action
-      when nil
-        Notify.info 'Action not provided, creating new note...'
-        Action::Create.new(params)
       when 'create'
         Action::Create.new(params)
       when 'create_multiple'
         Action::CreateMultiple.new(params.notes)
       when 'duplicate_previous'
         Action::DuplicatePrevious.new(params)
+      when 'search'
+        Action::Search.new(params)
+      when 'group'
+        Action::Group.new(params)
       else
         Action::Default.new(action: action)
       end

data/lib/evertils/actions/group.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module Evertils
+  module Action
+    class Group < Action::Base
+      Formatting = Evertils::Helper::Formatting
+
+      #
+      # @since 2.2.2
+      def initialize(args)
+        @note_helper = Evertils::Helper::Note.instance
+        @args = args
+        @note = @note_helper.find_note_by_grammar(grammar.to_s)
+        @api_helper = Evertils::Helper::ApiEnmlHandler.new(@config)
+
+        execute
+      end
+
+      private
+
+      #
+      # @since 2.2.2
+      def execute
+        return Notify.error('Note not found') if @note.entity.nil?
+
+        group_by
+      end
+
+      #
+      # @since 2.2.2
+      def grammar
+        terms = Grammar.new
+        terms.tags = {
+          day: Date.today.yday,
+          week: Date.today.cweek
+        }
+        terms.notebook = @args.notebook
+        terms.created = Date.new(Date.today.year, 1, 1).strftime('%Y%m%d')
+        terms
+      end
+
+      #
+      # @since 2.2.2
+      def group_by
+        grouped_results.each_pair do |job_id, rows|
+          Notify.note("#{Formatting.clean(job_id)} - #{rows.size} occurrences") unless job_id.nil?
+
+          rows.each { |row| Notify.info(Formatting.clean(row)) }
+        end
+      end
+
+      #
+      # @since 2.2.2
+      def search_nodes
+        xml = @api_helper.from_str(@note.entity.content)
+        target = xml.search('en-note').first
+        nodes = []
+
+        target.children.each do |child|
+          node = child.children.first.to_s
+          nodes.push(Formatting.clean(node)) unless node.empty? || node == '<br/>'
+        end
+
+        nodes
+      end
+
+      #
+      # @since 2.2.2
+      def grouped_results
+        search_nodes.group_by do |node|
+          match = /- (.*)? -/.match(node)
+          match[1] unless match.nil?
+        end
+      end
+    end
+  end
+end

data/lib/evertils/actions/search.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module Evertils
+  module Action
+    class Search < Action::Base
+      Formatting = Evertils::Helper::Formatting
+
+      #
+      # @since 2.2.2
+      def initialize(args)
+        @note_helper = Evertils::Helper::Note.instance
+        @args = args
+        @note = @note_helper.find_note_by_grammar(grammar.to_s)
+        @api_helper = Evertils::Helper::ApiEnmlHandler.new(@config)
+
+        execute
+      end
+
+      private
+
+      #
+      # @since 2.2.2
+      def execute
+        return Notify.error('Note not found') if @note.entity.nil?
+
+        search_for(@args.term)
+      end
+
+      #
+      # @since 2.2.2
+      def grammar
+        terms = Grammar.new
+        terms.tags = {
+          day: Date.today.yday,
+          week: Date.today.cweek
+        }
+        terms.notebook = @args.notebook
+        terms.created = Date.new(Date.today.year, 1, 1).strftime('%Y%m%d')
+        terms
+      end
+
+      #
+      # @since 2.2.2
+      def search_for(text)
+        results = grep_results_for(text)
+
+        return Notify.error("No rows matched search query {#{text}}") if results.empty?
+
+        Notify.success("#{results.size} rows matched query {#{text}}")
+        results.each { |res| Notify.info(Formatting.clean(res)) }
+      end
+
+      #
+      # @since 2.2.2
+      def search_nodes
+        xml = @api_helper.from_str(@note.entity.content)
+        target = xml.search('en-note').first
+        nodes = []
+
+        target.children.each do |child|
+          node = child.children.first.to_s
+          nodes.push(Formatting.clean(node)) unless node.empty? || node == '<br/>'
+        end
+
+        nodes
+      end
+
+      #
+      # @since 2.2.2
+      def grep_results_for(text)
+        return search_nodes.select { |line| line.scan(text) } if text.is_a? Regexp
+
+        search_nodes.select { |line| line.include? text }
+      end
+    end
+  end
+end

data/lib/evertils/controllers/log.rb

@@ -1,5 +1,7 @@
 module Evertils
   module Controller
+    Formatting = Evertils::Helper::Formatting
+
     class Log < Controller::Base
       WORDS_PER_LINE = 20
 
@@ -28,23 +30,21 @@ module Evertils
       #
       # @since 2.2.0
       def grep(text = nil)
-        return Notify.error('A search term is required') if text.nil?
-
-        @note = @note_helper.find_note_by_grammar(grammar.to_s)
+        params = OpenStruct.new(term: text, action: 'search', notebook: 'Daily')
 
-        return Notify.error('Note not found') if @note.entity.nil?
-
-        search_for(text)
+        runner = ActionRunner.new
+        runner.params = params
+        runner.execute
       end
 
       #
       # @since 2.2.0
-      def group(text = nil)
-        @note = @note_helper.find_note_by_grammar(grammar.to_s)
+      def group
+        params = OpenStruct.new(action: 'group', notebook: 'Daily')
 
-        return Notify.error('Note not found') if @note.entity.nil?
-
-        group_by
+        runner = ActionRunner.new
+        runner.params = params
+        runner.execute
       end
 
       private
@@ -71,7 +71,7 @@ module Evertils
 
         @note.entity.content = xml.to_s
 
-        Notify.success("Item logged at #{current_time}") if @note.update
+        Notify.success("Item logged at #{Formatting.current_time}") if @note.update
       end
 
       #
@@ -81,72 +81,11 @@ module Evertils
         target = xml.search('en-note').first
 
         text.each do |line|
-          target.add_child("<div>* #{current_time} - #{clean(line)}</div>")
+          target.add_child("<div>* #{Formatting.current_time} - #{Formatting.clean(line)}</div>")
         end
 
         xml
       end
-
-      #
-      # @since 2.2.0
-      def search_for(text)
-        results = grep_results_for(text)
-
-        return Notify.error("No rows matched search query {#{text}}") if results.empty?
-
-        Notify.success("#{results.size} rows matched query {#{text}}")
-        results.each { |res| Notify.info(clean(res)) }
-      end
-
-      #
-      # @since 2.2.0
-      def group_by
-        grouped_results.each_pair do |job_id, rows|
-          Notify.note("#{clean(job_id)} - #{rows.size} occurrences") unless job_id.nil?
-
-          rows.each { |row| Notify.info(clean(row)) }
-        end
-      end
-
-      #
-      # @since 2.2.0
-      def search_nodes
-        xml = @api_helper.from_str(@note.entity.content)
-        target = xml.search('en-note').first
-        nodes = []
-
-        target.children.each do |child|
-          node = child.children.first.to_s
-          nodes.push(clean(node)) unless node.empty? || node == '<br/>'
-        end
-
-        nodes
-      end
-
-      #
-      # @since 2.2.0
-      def grouped_results
-        search_nodes.group_by do |node|
-          match = /- (.*)? -/.match(node)
-          match[1] unless match.nil?
-        end
-      end
-
-      #
-      # @since 2.2.0
-      def grep_results_for(text)
-        search_nodes.select { |line| line.include? text }
-      end
-
-      #
-      # @since 2.2.0
-      def clean(text)
-        text.delete("\n").gsub('&#xA0;', ' ')
-      end
-
-      def current_time
-        Time.now.strftime('%I:%M')
-      end
     end
   end
 end

data/lib/evertils/helpers/formatting.rb

@@ -33,6 +33,18 @@ module Evertils
           result
         }
       end
+
+      #
+      # @since 2.2.0
+      def self.clean(text)
+        text.delete("\n").gsub(' ', ' ')
+      end
+
+      #
+      # @since 2.2.1
+      def self.current_time
+        Time.now.strftime('%I:%M')
+      end
     end
   end
 end

data/lib/evertils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Evertils
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
 end

data/lib/evertils.rb

@@ -21,10 +21,13 @@ require 'evertils/kernel'
 require 'evertils/version'
 require 'evertils/base'
 require 'evertils/type'
+require 'evertils/helpers/formatting'
 require 'evertils/action'
 require 'evertils/action_runner'
 require 'evertils/actions/default'
 require 'evertils/actions/create'
+require 'evertils/actions/search'
+require 'evertils/actions/group'
 require 'evertils/actions/create_multiple'
 require 'evertils/actions/duplicate_previous'
 require 'evertils/helpers/results'
@@ -37,7 +40,6 @@ require 'evertils/request'
 require 'evertils/controller'
 require 'evertils/controllers/render'
 require 'evertils/router'
-require 'evertils/helpers/formatting'
 require 'evertils/helpers/evernote-enml'
 require 'evertils/helpers/note'
 require 'evertils/helpers/xml'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Ryan Priebe
@@ -116,6 +116,8 @@ files:
 - lib/evertils/actions/create_multiple.rb
 - lib/evertils/actions/default.rb
 - lib/evertils/actions/duplicate_previous.rb
+- lib/evertils/actions/group.rb
+- lib/evertils/actions/search.rb
 - lib/evertils/base.rb
 - lib/evertils/config.rb
 - lib/evertils/controller.rb