evertils 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f61daa7a1057463617eae0fd57e4fdf99157dd5e4665ff6870ed9a2ddb6b9b7c
-  data.tar.gz: 51a484f7c0657572b0bce55e3910e29aa46969e8d46180a0e1af8c1d3bb5e505
+  metadata.gz: 21365e228004a470654bca7506cdcbb1b650de3f533a9a9526378b886512feb6
+  data.tar.gz: 88d857222088fc6614df75c79f598fb5f478ba6a42b29bc7ab2eb4a0d1681463
 SHA512:
-  metadata.gz: 85f6cded362a7cbff82f283c603a2eafc82727c606d4b5a9c1a19baff597f3dd8dbec50f7b6a41a1e73656c0e0a12e51c337077d9b8a3351c7dab4b58cef834f
-  data.tar.gz: 65d3aa2ad8d01361ebc6c1791004c239bf3c35c682a835b97a6c74af792797b8e7f6993e10530bcaedacd472d398a5dcbf9b30e573f70960c867df6dd03180d6
+  metadata.gz: 4d51d610da5f984f3451d4ea3318f94921a05ec14b0560ecdbf8399bcb8ef1f9b1d39be2a6b724392b4cefc95cc1aeb8b2acd153039436eba964d811686af1c9
+  data.tar.gz: 6eb94bfa2dff49d231eae40b2fe1d70e2e006706194a2532babb3b5f8c1c1745e373d396a9c23dc1ec3b63ba2741979bab9131c4bcc6f689effa31dbff8897a2

data/README.md

@@ -5,7 +5,8 @@ Evertils is a command line utility for interacting with your Evernote account.
 ## Installation
 
 1. `gem install evertils`
-2. Add `export EVERTILS_TOKEN="token_goes_here"` to your ~/.profile
+2. `git clone git@github.com:aapis/evertils-config.git ~/.evertils`
+3. `mv ~/.evertils/config.dist.yml ~/.evertils/config.yml && nano ~/.config.yml`
 
 Get your Evernote Developer Tokens [here](https://www.evernote.com/Login.action?targetUrl=%2Fapi%2FDeveloperToken.action).
 

data/evertils.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'notifaction', '~> 0.4.4'
   s.add_runtime_dependency 'mime-types', '~> 3.3.1'
   s.add_runtime_dependency 'evertils-common', '~> 0.3.7'
-  s.add_runtime_dependency 'nokogiri'
+  s.add_runtime_dependency 'nokogiri', '~> 1.10.9'
 
   s.add_development_dependency "bundler", "~> 1.10"
   s.add_development_dependency "rake", "~> 12.3.3"

data/lib/evertils/action.rb

@@ -10,4 +10,4 @@ module Evertils
       end
     end
   end
-end
+end

data/lib/evertils/action_runner.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Evertils
+  class ActionRunner
+    attr_accessor :params
+
+    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)
+      else
+        Action::Default.new(action: action)
+      end
+    end
+  end
+end

data/lib/evertils/actions/create.rb

@@ -6,8 +6,16 @@ module Evertils
   module Action
     class Create < Action::Base
       def initialize(args)
+        @args = args
         query = Evertils::Common::Query::Simple.new
-        query.create_note_from_yml(args[:path])
+
+        query.create_note_from_hash(allowed_args)
+      end
+
+      private
+
+      def allowed_args
+        @args.to_h.reject { |key, _| key == :action }
       end
     end
   end

data/lib/evertils/actions/create_multiple.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Evertils
+  module Action
+    class CreateMultiple < Action::Base
+      def initialize(notes)
+        return unless notes.is_a? Array
+
+        notes.each do |child|
+          Notify.info("Creating #{child['label']}")
+
+          # avoid infinite recursion
+          next if ['create_multiple'].include?(child['action'])
+
+          child['path'].gsub!('%EVERTILS_CONF_TYPE_PATH%', '~/.evertils/templates/type')
+
+          runner = ActionRunner.new
+          runner.params = Evertils::Type.new(child['path']).params
+          runner.execute
+        end
+      end
+    end
+  end
+end

data/lib/evertils/actions/duplicate_previous.rb

@@ -6,10 +6,10 @@ module Evertils
       def initialize(args)
         super(args)
 
-        @args[:content] = find_previous
+        @args.content = find_previous
 
         query = Evertils::Common::Query::Simple.new
-        query.create_note_from_hash(@args)
+        query.create_note_from_hash(@args.to_h)
       end
 
       private

data/lib/evertils/config.rb

@@ -47,7 +47,7 @@ module Evertils
     # Populates the internal hash which stores any values set in the config file
     def populate_config
       file = File.expand_path("~/.evertils/config.yml")
-      @yml = symbolize_keys(::YAML.load_file(file))
+      @yml = Evertils::Helper::Formatting.symbolize_keys(::YAML.load_file(file))
 
       set_evertils_token
 
@@ -94,6 +94,8 @@ module Evertils
       title_format = @yml[:title].dup
 
       @yml.map do |item|
+        break if item.last.is_a? Hash
+
         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
@@ -102,25 +104,10 @@ module Evertils
 
       @yml[:title_format] = title_format unless @yml.key? :title_format
 
-      symbolize_keys(@yml)
+      Evertils::Helper::Formatting.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
 
     def set_evertils_token

data/lib/evertils/controllers/render.rb

@@ -4,28 +4,14 @@ module Evertils
   module Controller
     class Render < Controller::Base
       def from_file
-        set_allowed_fields
+        configure_allowed_fields
 
-        execute_action(@allowed_fields[:action])
+        runner = ActionRunner.new
+        runner.params = Evertils::Type.new(@allowed_fields[:path]).params
+        runner.execute
       end
 
-      def execute_action(action)
-        case action
-        when nil
-          Notify.info 'Action not provided, creating new note...'
-          Action::Create.new(@allowed_fields)
-        when 'create'
-          Action::Create.new(@allowed_fields)
-        when 'duplicate_previous'
-          Action::DuplicatePrevious.new(@allowed_fields)
-        else
-          Action::Default.new(action: action)
-        end
-      end
-
-      private
-
-      def set_allowed_fields
+      def configure_allowed_fields
         @allowed_fields = config.translate_placeholders.pluck(
           :title,
           :title_format,
@@ -35,17 +21,6 @@ module Evertils
           :tags
         )
       end
-
-      def grammar
-        terms = Grammar.new
-        terms.notebook = @allowed_fields[:notebook]
-        terms.tags = {
-          day: Date.today.yday,
-          week: Date.today.cweek
-        }
-        terms.created = Date.new(Date.today.year, 1, 1).strftime('%Y%m%d')
-        terms
-      end
     end
   end
 end

data/lib/evertils/helpers/formatting.rb

@@ -18,6 +18,21 @@ module Evertils
           :'Priority Queue' => "Queue For [#{current_date.strftime('%B %-d')} - #{week_stub}]"
         }
       end
+
+      def self.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
     end
   end
 end

data/lib/evertils/type.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'ostruct'
+
+module Evertils
+  class Type
+    attr_reader :params
+
+    def initialize(path)
+      begin
+        type_path = File.expand_path(path)
+        contents = YAML.load_file(type_path)
+
+        return if contents.empty?
+
+        translate_variables(contents)
+
+        @params = OpenStruct.new(contents)
+      rescue Errno::ENOENT
+        Notify.error("File doesn't exist - #{type_path}")
+      end
+    end
+
+    private
+
+    def translate_variables(hash)
+      title_format = hash[:title].dup
+
+      hash.map do |item|
+        break if item.last.is_a? Hash
+
+        Evertils::Cfg::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| break if i.is_a? Hash; i.gsub!(k.to_s, v.to_s) } if item.last.is_a? Array
+        end
+      end
+
+      hash[:title_format] = title_format unless hash.key? :title_format
+
+      Evertils::Helper::Formatting.symbolize_keys(hash)
+    end
+  end
+end

data/lib/evertils/version.rb

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

data/lib/evertils.rb

@@ -20,9 +20,12 @@ require 'nokogiri'
 require 'evertils/kernel'
 require 'evertils/version'
 require 'evertils/base'
+require 'evertils/type'
 require 'evertils/action'
+require 'evertils/action_runner'
 require 'evertils/actions/default'
 require 'evertils/actions/create'
+require 'evertils/actions/create_multiple'
 require 'evertils/actions/duplicate_previous'
 require 'evertils/helpers/results'
 require 'evertils/helpers/api-enml-handler'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Ryan Priebe
@@ -56,16 +56,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.9
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +111,9 @@ files:
 - evertils.gemspec
 - lib/evertils.rb
 - lib/evertils/action.rb
+- lib/evertils/action_runner.rb
 - lib/evertils/actions/create.rb
+- lib/evertils/actions/create_multiple.rb
 - lib/evertils/actions/default.rb
 - lib/evertils/actions/duplicate_previous.rb
 - lib/evertils/base.rb
@@ -135,6 +137,7 @@ files:
 - lib/evertils/kernel.rb
 - lib/evertils/request.rb
 - lib/evertils/router.rb
+- lib/evertils/type.rb
 - lib/evertils/vendor/enml.dtd
 - lib/evertils/version.rb
 homepage: http://rubygems.org/gems/evertils