mkmatter 3.1.19 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7304c83014128ff9532cd76f7a3b9806b782e0735d47831c98a41b3324f883db
-  data.tar.gz: 41f7f6dee52f1a6dfd3ee4250cf6d96c58d6d99419a7009a91ea0666d3e4191b
+  metadata.gz: 985cf93b9ef0d39c5e217e52fa84bfd67eb7c147fb16e44bd42af61e6b6ba523
+  data.tar.gz: 648d7ae5a84fdbe29093f1b2f1645944720e6dc5f65e40b0ee2ecb58704e9327
 SHA512:
-  metadata.gz: d5baebb4810de5240b2e2558e9244a235a8a9d9496ce1e4d6a2fc53185f06d3219455d5c3140317e60b267e0067251d36e70d190ac4821afe69f0cd99d69e044
-  data.tar.gz: 0d74b60662ed5d4aa4364ac81c7e7870195b1732a5e028a9dcdc969005d1a42a26ff7832d69dd5abff9a71f488cd45feff73a4ba21156670651d869f62ed3036
+  metadata.gz: d124c6644cee5b680dbb9ceb3638882544ef723df471112bb47cec198bd0b85b4bcf3ad7b5c90b80140c4076ce3e6a82f85de3bc7e9c66eded08fa41ad590539
+  data.tar.gz: 0c96a0be07c0fd565d4e9ea5fa390049aae54f1d7f4357b8808fbce1797cb917ecb71b45884023bdfdf836321780bb6fe0d8547911c001616096baec8136b13a

data/lib/mkmatter/answers.rb

@@ -2,7 +2,7 @@ require 'yaml'
 require 'time'
 require 'mkmatter/helpers'
 module Mkmatter
-  class Answers
+  class Answers < Object
     attr_accessor :title, :tags, :categories, :date, :draft, :slug_date, \
                   :answer_hash, :published, :file_format, :matter, :extra_fields, :summary
 
@@ -14,9 +14,11 @@ module Mkmatter
       end
       @tags         = question_hash[:tags] if question_hash[:tags].nil? == false
       @categories   = question_hash[:categories] if question_hash[:categories].nil? == false
-      Time.zone     =  get_time_zone_full(Time.now.getlocal) || 'Eastern Time (US & Canada)' if (include_post_fields == true || @layout == 'post')
+      if include_post_fields == true || @layout == 'post'
+        Time.zone =  get_time_zone_full(Time.now.getlocal) || 'Eastern Time (US & Canada)'
+      end
       # Time.zone     = question_hash[:time_zone] || Time.now.zone
-      @now           = Time.zone.now || Time.now.getlocal
+      @now = Time.zone.now || Time.now.getlocal
       @date         = @now.to_s if include_post_fields == true
       @slug_date    = @now.strftime('%Y-%m-%d') if include_post_fields == true
       @published    = publish
@@ -26,15 +28,15 @@ module Mkmatter
         @summary = question_hash[:summary] unless question_hash[:summary].empty?
       end
 
-      @matter      = {
-          layout:     @layout,
-          title:      @title,
+      @matter = {
+        layout: @layout,
+        title: @title
       }
-      if @layout == 'post' or include_post_fields
-        @matter[:tags] =       @tags if @tags
+      if @layout == 'post' || include_post_fields
+        @matter[:tags] = @tags if @tags
         @matter[:categories] = @categories if @categories
-        @matter[:summary] =    @summary if @summary
-        @matter[:date] =       @date 
+        @matter[:summary] = @summary if @summary
+        @matter[:date] = @date
 
       end
       if @draft
@@ -46,19 +48,22 @@ module Mkmatter
       @matter[:published] = @published if publish
     end
 
-        # @return [Hash] returns attribute `.matter`
+    # @return [Hash] returns attribute `.matter`
     def to_h
       @matter
     end
 
+    def [](arg)
+      self.instance_variable_get("@#{arg}")
+    end
     # @param [Hash] hash other hash
     # @return [nil] merges hash into attribute `.matter`
     def to_h=(hash)
       @matter.merge!(hash)
     end
+
     def to_yaml(*args, **kwargs)
       @matter.stringify_keys.to_yaml(*args, **kwargs)
     end
-
   end
 end

data/lib/mkmatter/cli/app.rb

@@ -1,14 +1,14 @@
-require "thor"
-require "highline"
-require "slugity/extend_string"
-require "yaml"
 require "active_support/all"
-require "terminal-table"
-require "os"
-require "rbconfig"
+require "highline"
 require "mkmatter/version"
 require "mkmatter/cli/subs"
 require 'mkmatter/cli/descriptions'
+require "os"
+require "rbconfig"
+require "slugity"
+require "terminal-table"
+require "thor"
+require "yaml"
 
 module Mkmatter
   module App
@@ -96,15 +96,16 @@ module Mkmatter
         @questions = Mkmatter::Questions.new.ask(options[:type], options[:include_post_qs])
         answers = Mkmatter::Answers.new(@questions, options[:publish], options[:include_post_qs])
         draft_folder = "_drafts"
-        filename = [].concat([answers.slug_date, "-", answers.title.to_slug, ".", answers.file_format.downcase]).join
+        filename = [].concat([answers['slug_date'], '-', Slugity::Convert.slug(answers['title']), '.', answers['file_format'].downcase]).join
 
         path = Pathname("./#{filename}").realdirpath
-        if HILINE.agree("Would you like to put this page into a subdirectory? ", true)
-          HILINE.say(<<~FOLDERDOC)
+        hl = HighLine.new
+        if hl.agree("Would you like to put this page into a subdirectory? ", true)
+          hl.say(<<~FOLDERDOC)
             What path? (directories will be created if they don't exist, relative to Jekyll root)
-            
+
           FOLDERDOC
-          folder = HILINE.ask("? ") do |q|
+          folder = hl.ask("? ") do |q|
             q.confirm = true
             q.default = "."
             q.validate = /^[^\/].*$/
@@ -113,12 +114,12 @@ module Mkmatter
           end
           folder = Pathname(folder)
           if options[:'dry-run']
-            HILINE.say("Would create #{File.join(Pathname("."), folder)}")
+            hl.say("Would create #{File.join(Pathname("."), folder)}")
           else
             begin
               FileUtils.mkdir_p(File.join(Mkmatter::Methods.get_jekyll_root, folder))
             rescue Errno::EEXIST
-              HILINE.say("<%= color('Error', :red, :bold) %>:Insufficient Permissions")
+              hl.say("<%= color('Error', :red, :bold) %>:Insufficient Permissions")
               exit 1
             end
           end
@@ -132,8 +133,8 @@ module Mkmatter
           end
         end
         if options[:'dry-run']
-          HILINE.say("Would create '#{path}'")
-          HILINE.say("Would output \n#{answers.to_yaml(indentation: 2)}\n---\n\n")
+          hl.say("Would create '#{path}'")
+          hl.say("Would output \n#{answers.to_yaml(indentation: 2)}\n---\n\n")
         else
           File.open(path.to_path, "a") do |fd|
             fd.puts answers.to_yaml(indentation: 2)

data/lib/mkmatter/questions.rb

@@ -30,12 +30,11 @@ module Mkmatter
       end
       known_questions.each do |m|
         @answers[:layout] = type
-        @answers[m.to_s.gsub(/^get_[0-9]{3}_/, '')] = method(m).call
+        @answers[m.to_s.gsub(/^get_[0-9]{3}_/, '').to_sym] = method(m).call
       end
       @answers
     end
 
-    # @!visibility private
     def initialize
       @answers = {}
     end
@@ -47,13 +46,15 @@ module Mkmatter
       else
         title
       end
+      title # =>
     end
 
     # @return [Array]
     def get_002_tags
-      @@hl.ask("Tags? (write one on each line, then press '.' then press 'Enter')") do |q|
+      tags = @@hl.ask("Tags? (write one on each line, then press '.' then press 'Enter') ") do |q|
         q.gather = '.'
       end
+      tags
     end
 
     # @return [Array]
@@ -80,7 +81,7 @@ module Mkmatter
     # @return [String]
     def get_005_extra_fields
       fields = {}
-      custom_fields = nil
+      custom_fields = []
       cfh = nil
       if @@hl.agree("Do you want to add custom fields? ", true)
         @@hl.say(<<~EXTRA_FIELDS)
@@ -93,7 +94,7 @@ module Mkmatter
           q.gather = '.'
         end
       end
-      if !custom_fields.empty?
+      unless custom_fields.empty?
         custom_fields.each do |field|
           fields.store(field.to_sym, 'nil')
         end
@@ -102,7 +103,7 @@ module Mkmatter
         @@hl.say('No extra fields were added.')
         return
       else
-        @@hl.say("#{fields} #{fields.class}")
+        # @@hl.say("#{fields} #{fields.class}")
         cfh = @@hl.ask("Value of field '<%= key %>'?") do |q|
           q.gather = fields
         end
@@ -123,7 +124,7 @@ module Mkmatter
           q.gather = '.'
         end
       end
-      summary.join("\n")
+      summary.join("\n") if summary
     end
   end
 end

data/lib/mkmatter/version.rb

@@ -1,5 +1,5 @@
 module Mkmatter
-  VERSION = '3.1.19'
+  VERSION = '3.2.0'
 
   # Return gem information for certain commands and options
   class GemInfo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mkmatter
 version: !ruby/object:Gem::Version
-  version: 3.1.19
+  version: 3.2.0
 platform: ruby
 authors:
 - Ken Spencer