pagemaster 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27df4bed4b0e582657fc8a230c85eccfa46374437c0d985e6b8bb6a22b7caeb4
-  data.tar.gz: c78b9cab7ddd6cbe15f767454b099a17bedf02854606e70a3bfb1800c520e263
+  metadata.gz: f6cdf1de48e215acc4bc5333aaa696a5f780f60fee31215692c0a1f056086db5
+  data.tar.gz: 77311ef8a70474d8d9fdf0af0a6a03a2c78c8e4102bc77e3af4c58c6bf8954c3
 SHA512:
-  metadata.gz: 7718f1fe806f588f726ef289144fc33e34810dff0fd80fcc4f127fd5aca7df8cc479916dcc67c29314cffd11e271d0ed4dcc712040ab4d6e068d5f43ebc633d3
-  data.tar.gz: b954ed10efd104d6ed3643f4f7844033fd1f6d7f133c2798ed6b697405362635228bd79a31ed0ebfeba97be66c93b95ecd5f9b46363418adbe24b2609422e11d
+  metadata.gz: 68c63dc08c8246dea2a055e0c97e4be920d7547e3fbee31cae6fe25cf2086f5f50264eef2d76375b660e0a60625e64755dbcc7b7ceb27df31d7b05650b29f9ac
+  data.tar.gz: 3506b331595c280a8f3a3fafedf14c7c6b9d98b0c13e611b7b7cf2ee22e653bfc41264fa5420e1826a72c7df9c6c1c15eb94e1eeafb5f2993c6d781f4034297d

data/lib/pagemaster.rb

@@ -11,70 +11,76 @@ class Pagemaster < Jekyll::Command
       prog.command(:pagemaster) do |c|
         c.syntax 'pagemaster [options] [args]'
         c.description 'Generate md pages from collection data.'
-        c.option 'no-perma', '--no-permalink', 'Skips adding hard-coded permalink'
+        c.option :no_perma, '--no-permalink', 'Skips adding hard-coded permalink.'
+        c.option :force, '--force', 'Erases pre-existing collection before regenerating.'
         c.action { |args, options| execute(args, options) }
       end
     end
 
-    def execute(args, options)
+    def execute(args, opts = {})
       config = YAML.load_file('_config.yml')
       abort 'Cannot find collections in config' unless config.key?('collections')
-      perma = false
-      perma = config['permalink'] == 'pretty' ? '/' : '.html' unless options.key? 'no-perma'
       args.each do |name|
         abort "Cannot find #{name} in collection config" unless config['collections'].key? name
         meta = {
-          'id_key'  => config['collections'][name].fetch('id_key'),
-          'layout'  => config['collections'][name].fetch('layout'),
-          'source'  => config['collections'][name].fetch('source')
+          id_key: config['collections'][name].fetch('id_key'),
+          layout: config['collections'][name].fetch('layout'),
+          source: config['collections'][name].fetch('source'),
+          ext:    config.fetch('permalink', '') == 'pretty' ? '/' : '.html'
         }
         data = ingest(meta)
-        generate_pages(name, meta, data, perma)
+        generate_pages(name, meta, data, opts)
       end
     end
 
     def ingest(meta)
-      src = '_data/' + meta['source']
+      src = "_data/#{meta[:source]}"
       puts "Processing #{src}...."
-      case File.extname(src)
-      when '.csv' then data = CSV.read(src, headers: true, encoding: 'utf-8').map(&:to_hash)
-      when '.json' then data = JSON.parse(File.read(src).encode('UTF-8'))
-      when '.yml' then data = YAML.load_file(src)
-      else abort 'Collection source must have a valid extension (.csv, .yml, or .json)'
-      end
+      data = case File.extname(src)
+             when '.csv'
+               CSV.read(src, headers: true).map(&:to_hash)
+             when '.json'
+               JSON.parse(File.read(src).encode('UTF-8'))
+             when '.yml'
+               YAML.load_file(src)
+             else
+               raise 'Collection source must have a valid extension (.csv, .yml, or .json)'
+             end
       detect_duplicates(meta, data)
       data
     rescue StandardError
-      abort "Cannot load #{src}. check for typos and rebuild."
+      raise "Cannot load #{src}. check for typos and rebuild."
     end
 
     def detect_duplicates(meta, data)
-      ids = []
-      data.each { |d| ids << d[meta['id_key']] }
+      ids = data.map { |d| d[meta[:data]] }
       duplicates = ids.detect { |i| ids.count(i) > 1 } || []
-      abort "Your collection duplicate ids: \n#{duplicates}" unless duplicates.empty?
+      raise "Your collection duplicate ids: \n#{duplicates}" unless duplicates.empty?
     end
 
-    def generate_pages(name, meta, data, perma)
-      completed = 0
-      skipped = 0
-      dir = '_' + name
+    def generate_pages(name, meta, data, opts)
+      dir       = "_#{name}"
+      perma     = opts.fetch(:no_perma, meta[:ext])
+
+      if opts.fetch(:force, false)
+        FileUtils.rm_rf(dir)
+        puts "Overwriting #{dir} directory with --force."
+      end
+
       mkdir_p(dir)
       data.each do |item|
-        pagename = slug(item.fetch(meta['id_key']))
-        pagepath = dir + '/' + pagename + '.md'
-        item['permalink'] = '/' + name + '/' + pagename + perma if perma
-        item['layout'] = meta['layout']
+        pagename = slug(item.fetch(meta[:id_key]))
+        pagepath = "#{dir}/#{pagename}.md"
+        item['permalink'] = "/#{name}/#{pagename}#{perma}" if perma
+        item['layout']    = meta[:layout]
         if File.exist?(pagepath)
           puts "#{pagename}.md already exits. Skipping."
-          skipped += 1
         else
-          File.open(pagepath, 'w') { |file| file.write(item.to_yaml.to_s + '---') }
-          completed += 1
+          File.open(pagepath, 'w') { |f| f.write("#{item.to_yaml}---") }
         end
       end
     rescue StandardError
-      abort 'Pagemaster exited for some reason, most likely a missing or invalid id_key.'
+      raise 'Pagemaster exited for some reason, most likely a missing or invalid id_key.'
     end
 
     def slug(str)

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: pagemaster
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
-- Marii Nyröp
+- Marii Nyrop
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement