mkmatter 3.1.12 → 3.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e51dd62ad3fe54420a842a181a3214e3cd8e24ea3f06ad61f93d43d7cb83667
-  data.tar.gz: 46d59dca27686feb195470b558d7e7b30b25ed5ec7ea809a2b135659363a1539
+  metadata.gz: 90665a1c1eabe3028319ef3fdbde4770ebe1eeb22273bb6aa421a10a37455825
+  data.tar.gz: 7a8806195aee81dcacdc0e06895cf9873fe8b0db37f4fdd4a109b4aadc1369ed
 SHA512:
-  metadata.gz: 447dc522fd22a5251b91de493d784280b3538e9b5efba59edb23caa8d7ea6d9eab1b4ed6660f5326f76c0e0a9cc6efbdc127b32d9d36969bde37b938b6e6a452
-  data.tar.gz: 2298565c0ec52f408054374882a6be678fc5ec365951726f56c31c835a8d68c30504a75b0bd6c3c7d48c79bb36c653ef5929263bdbf1286a16909284baf2ae5d
+  metadata.gz: 0abe5786bea69019220f0b1248729602effcae72161f0b2f2f65f271c7508d396deb1c06b60c37d57ebf6080daa3fb7dfeb30fbba2aa5e697b16f084b9d30168
+  data.tar.gz: b954bf3927f4ce7306c3b9a3e95f2232ccfd0ad639fdf9edb82af65a1b30dc105ee724fdd3f801fe145c736effb1564644c7b331f1b39cfb6c3b2c3910f95ec3

data/lib/mkmatter/answers.rb

@@ -7,7 +7,8 @@ module Mkmatter
     attr_accessor :date, :draft
     attr_accessor :slug_date, :answer_hash
     attr_accessor :published, :file_format
-    attr_reader :matter
+    attr_accessor :matter
+    attr_accessor :extra_fields
 
     def initialize(question_hash, publish)
       @title       = question_hash[:title]
@@ -19,6 +20,8 @@ module Mkmatter
       @slug_date   = now.strftime('%Y-%m-%d')
       @published   = publish
       @file_format = question_hash[:file_format]
+      @extra_fields = question_hash[:extra_fields]
+
       @matter      = {
           layout:     question_hash[:layout],
           title:      @title,
@@ -26,49 +29,11 @@ module Mkmatter
           tags:       @tags,
           date:       @date,
       }
+      if @extra_fields
+        @matter.merge!(@extra_fields)
+      end
       @matter[:published] = @published if publish
     end
 
-    # @return [Hash] returns attribute `.matter`
-    def to_h
-      @matter
-    end
-
-    # @param [Hash] hash other hash
-    # @return [nil] merges hash into attribute `.matter`
-    def to_h=(hash)
-      @matter.merge!(hash)
-    end
-
-    alias_method :inspect, :to_h
-    #
-    # Dumps all file applicable metadata to a provided output.
-    # @return [String] yaml front matter
-    def dump
-      custom_fields = nil
-      hl            = HighLine.new($stdin, $stderr, 80)
-      # Custom matter
-      if hl.agree('Do you want to add custom fields? (usable as {{LAYOUT_TYPE.FIELD}} in templates) ', true)
-        hl.say('Your fields should be inputted as FIELD=>TEXT HERE')
-        hl.say("Type 'EOL' on a new line then press Enter when you are done.")
-        hl.say("<% HighLine.color('NOTE', :bold, :red) %>: Input is <% HighLine.color('NOT', :bold, :red) %> evaluated!")
-        custom_fields = hl.ask('Fields?') do |q|
-          q.gather = /^EOL$/
-        end
-      end
-      if custom_fields
-        fields = Hash.new
-        custom_fields.each do |field|
-          field = field.split(/=>/)
-          fields.store(field[0].to_s, field[1])
-        end
-        self.to_h = fields
-      elsif custom_fields.nil?
-        hl.say('No extra fields were added.')
-      else
-      end
-      self.to_h.stringify_keys.to_yaml(indentation: 2)
-      '---'
-    end
   end
 end

data/lib/mkmatter/questions.rb

@@ -15,6 +15,7 @@ module Mkmatter
     class Post
       attr :answers
       attr :extra_fields
+      @extra_fields = nil
       @hl = HighLine.new
 
       def ask
@@ -130,15 +131,25 @@ module Mkmatter
       end
       # @return [OpenStruct]
     end
-
     class Page
       attr :answers
+      attr :extra_fields
+      @extra_fields = nil
       @hl = HighLine.new
 
+      def ask
+        known_questions = methods.sort.delete_if { |m| m.to_s !~ /^get_.*$/ }
+        known_questions.each do |m|
+          @answers[:layout] = 'page'
+          @answers[m.to_s.gsub(/^get_[0-9]{3}_/, '')] = method(m).call
+        end
+        @answers
+      end
+
       # @!visibility private
       def initialize
         @answers = OpenStruct.new
-
+        @hl = HighLine.new
       end
 
       def get_001_title
@@ -162,7 +173,7 @@ module Mkmatter
       # @return [Array]
       def get_003_categories
         hl = @hl
-        hl.ask("Categories? (write one on each line, then type  '.') ") do |q|
+        hl.ask("Categories? (write one on each line, then type '.') ") do |q|
           q.gather = '.'
         end
       end
@@ -211,7 +222,7 @@ module Mkmatter
           menu.prompt = '? '
         end
       end
-      # @return [Array[Hash]]
+      # @return [String]
       def get_006_extra_fields
         hl = @hl
         custom_fields = nil

data/lib/mkmatter/version.rb

@@ -1,5 +1,5 @@
 module Mkmatter
-  VERSION = '3.1.12'
+  VERSION = '3.1.13'
 
   # 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.12
+  version: 3.1.13
 platform: ruby
 authors:
 - Ken Spencer