evertils-common 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5370c3c9e5231a1b60d8cfb9a2a10d78a8ef0dc2
-  data.tar.gz: 3ffce08e43c708fa4e6c75057c28025a4e514521
+SHA256:
+  metadata.gz: 22dd994d7ac10f3862a2d5ebea103ea136864a3e8b9f58c4696a24df4c3fd6b3
+  data.tar.gz: 513b9d7f97fa5bea2796267734dc5ff759fc1d3c204a5f01d69c189998f5ddd9
 SHA512:
-  metadata.gz: e073b9dacb1c9e4502f83233b3e7c2cc58a985acddba78ac1df77623433458ee2f036fdfc4d3ffde876d69babe79a82930a799603053818207199fe2d417f8e9
-  data.tar.gz: bfa43f4f59dfb7ec21d0d89ca4367e0bb15ffa38142690e753613fdc12918d52c599d1c9d57d8c3534917e9c6c58fdaf15ba2385b7cd4c29dc9eef561dee9359
+  metadata.gz: 9f958b628108cba980269b5a9cfe58ed721523f6104045b2378eabe34a95b4b6fc190dde97e01d3b070565896342b93359acb718284432c763552d497d143a6c
+  data.tar.gz: 21b87e63f9412b83fcc12039bfe44e9f678d098e479ecbc2944dacd2efbbdbeacd657e2768270190c28489d07452bb6c7155454afdec15cf91bb61d7c1c61f64

data/lib/evertils/common/entity.rb

@@ -4,12 +4,51 @@ module Evertils
       class Base < Common::Generic
         attr_accessor :entity
 
+        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)
+        }
+
         def initialize
           @evernote = Authentication.instance
 
           super
         end
 
+        def placeholders_for(items)
+          items.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(items)
+        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
+
         #
         # @since 0.2.8
         def start_of_day(date = ::Time.now)

data/lib/evertils/common/entity/note.rb

@@ -8,16 +8,14 @@ module Evertils
           raise "File not found: #{full_path}" unless File.exist? full_path
 
           begin
-            conf = YAML::load(File.open(full_path))
-            required = %w(title body)
+            conf = placeholders_for(YAML.safe_load(File.read(full_path)))
+            required = %w[title sections]
 
-            if has_required_fields(conf, required)
-              create(conf['title'], conf['body'], conf['parent'])
-            else
-              raise ArgumentError, 'Configuration file is missing some required fields'
-            end
+            return create(conf) if has_required_fields(conf, required) && !exists?
+
+            raise ArgumentError, 'Configuration file is missing some required fields'
           rescue ArgumentError => e
-            puts e.message
+            Notify.error e.message
           end
         end
 

data/lib/evertils/common/model/note.rb

@@ -11,21 +11,26 @@ module Evertils
         # @since 0.3.3
         def initialize(conf = {})
           raise "Title (title) is a required field" unless conf[:title]
-          raise "Body (body) is a required field" unless conf[:body]
+          raise "Body (body) is a required field" unless conf[:sections][:body]
 
           @note = ::Evernote::EDAM::Type::Note.new
 
           # data which maps directly to the Type::Note object
           self.colour = conf[:colour] || 0xffffff
-          self.body = conf[:body]
           self.created = conf[:created_on] || DateTime.now
 
+          note_content = ''
+          note_content += conf[:sections][:header] unless conf[:sections][:header] == 'nil'
+          conf[:sections][:body]&.map { |el| note_content += "<h2>#{el}</h2>" }
+          note_content += conf[:sections][:footer] unless conf[:sections][:footer] == 'nil'
+          self.body = note_content
+
           @note.title = conf[:title]
           @note.tagNames = conf[:tags] || []
           @note.resources = []
 
           # data that must be processed first
-          @notebook = conf[:parent_notebook] || Entity::Notebook.new.default.to_s
+          @notebook = conf[:notebook] || Entity::Notebook.new.default.to_s
           @resources = conf[:file] || []
           @shareable = conf[:share_note] || false
           @updated = conf[:updated_on] || nil

data/lib/evertils/common/version.rb

@@ -1,5 +1,5 @@
 module Evertils
   module Common
-    VERSION = '0.3.9'.freeze
+    VERSION = '0.3.10'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evertils-common
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Ryan Priebe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2019-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -154,8 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: EN (heart) CLI