mill 0.16 → 0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5accfe1e5067386b3de4898faceb6ea201c6bc30097da779c38ef343e0aad18c
-  data.tar.gz: 5861a090880607573153929c75f0475fb258467676b2a4084514e8b368028bb6
+  metadata.gz: 72216a7795be9cfd8a2039e3eac35f73f4c129a30e951074c638d6c77088c869
+  data.tar.gz: aead637972f953d1d01aaee384554766361cfb4d9efa1ae95a6aaa2e2e5e6d11
 SHA512:
-  metadata.gz: 1c1e0a63042509e67a028e2e50b2f61fa92560ee16bb77370ca1ca82d1f75ebbd7054b9ba8b2408aff32e83a44c3e5f9cc2600316e5dd22c8a47ef7d26cee932
-  data.tar.gz: 7dc21c2b4181768be5150d1e51ef6ea9b16aba0a33c8536dd9609e72b458913e2fa79ee460d9c50c204dc6a0da733587bd4807005a16ca2acc4e5806b33d168d
+  metadata.gz: 34d154f5a9cfa6e0a10d4abc57c7d3d99e18e857b1457e5ab9fbf82b50d426f469ed8cd79dc8821cdcddcf9e7fc95920d868b2025a0a328fdab9624e7d83d115
+  data.tar.gz: 8c433c5295ad53229ac23473eddd21b12995f225beb542e9c4d64ecafbec63d215fa343630e3380b5b162b62fd63c29eeba9b58f0404cf281aa89c36ef666bd2

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 jslabovitz
+Copyright (c) 2023 John S. Labovitz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Rakefile

@@ -1,9 +1 @@
-require 'bundler/gem_tasks'
-Bundler.require
-require 'rake/testtask'
-
-Rake::TestTask.new do |t|
-  t.test_files = FileList['test/*test.rb']
-end
-
-task :default => :test
+require 'simple-rake-tasks'

data/TODO.md

@@ -0,0 +1,4 @@
+# TODO
+
+- make Resources use tree for lookup instead of dictionary
+  - keep simple array of resources for quick access/iterators

data/bin/mill

@@ -2,30 +2,4 @@
 
 require 'mill'
 
-load Path.pwd / 'code' / 'site.rb'
-
-begin
-  case (command = ARGV.shift)
-  when nil, 'make'
-    $site.make
-  when 'clean'
-    $site.clean
-  when 'check'
-    $site.check
-  when 'list'
-    $site.list
-  when 'diff'
-    $site.diff
-  when 'snapshot'
-    $site.snapshot
-  when 'upload'
-    $site.upload
-  when 'show'
-    puts $site.send(ARGV.shift)
-  else
-    raise "Unknown command: #{command.inspect}"
-  end
-rescue Mill::Error => e
-  warn e
-  exit(1)
-end
+Simple::CommandParser.run(ARGV)

data/lib/mill/command.rb

@@ -0,0 +1,13 @@
+module Mill
+
+  class Command < Simple::CommandParser::Command
+
+    attr_accessor :dir
+
+    def run(args)
+      @site = Mill::Site.load(@dir || '.')
+    end
+
+  end
+
+end

data/lib/mill/commands/build.rb

@@ -0,0 +1,17 @@
+module Mill
+
+  module Commands
+
+    class Build < Command
+
+      def run(args)
+        super
+        @site.build
+        @site.save
+      end
+
+    end
+
+  end
+
+end

data/lib/mill/commands/check.rb

@@ -0,0 +1,16 @@
+module Mill
+
+  module Commands
+
+    class Check < Command
+
+      def run(args)
+        super
+        @site.check
+      end
+
+    end
+
+  end
+
+end

data/lib/mill/commands/diff.rb

@@ -0,0 +1,18 @@
+module Mill
+
+  module Commands
+
+    class Diff < Command
+
+      def run(args)
+        super
+        @site.output_dir.chdir do
+          run_command(%w[git diff])
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/mill/commands/list.rb

@@ -0,0 +1,20 @@
+module Mill
+
+  module Commands
+
+    class List < Command
+
+      def run(args)
+        super
+        @site.build
+        @site.resources.each do |resource|
+          resource.print
+          puts
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/mill/commands/snapshot.rb

@@ -0,0 +1,20 @@
+module Mill
+
+  module Commands
+
+    class Snapshot < Command
+
+      def run(args)
+        super
+        @site.output_dir.chdir do
+          run_command(%w[git init]) unless Path.new('.git').exist?
+          run_command(%w[git add .])
+          run_command(%w[git commit -a -m Update.])
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/mill/commands/tree.rb

@@ -0,0 +1,17 @@
+module Mill
+
+  module Commands
+
+    class Tree < Command
+
+      def run(args)
+        super
+        @site.build
+        @site.resources.print_tree
+      end
+
+    end
+
+  end
+
+end

data/lib/mill/commands/types.rb

@@ -0,0 +1,18 @@
+module Mill
+
+  module Commands
+
+    class Types < Command
+
+      def run(args)
+        super
+        @site.file_types.sort.each do |type, klass|
+          puts '%-40s %s' % [type, klass]
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/mill/commands/upload.rb

@@ -0,0 +1,24 @@
+module Mill
+
+  module Commands
+
+    class Upload < Command
+
+      def run(args)
+        super
+        raise "site_rsync not defined" unless @site.site_rsync
+        options = %w[
+          --progress
+          --verbose
+          --archive
+          --exclude=.git
+          --delete-after
+        ]
+        run_command('rsync', *options, @site.output_dir, @site.site_rsync, verbose: true)
+      end
+
+    end
+
+  end
+
+end

data/lib/mill/config.rb

@@ -0,0 +1,27 @@
+module Mill
+
+  ConfigFileName = 'mill.yaml'
+
+  BaseConfig = Simple::Configurator.define(
+    dir: { default: '.', converter: :path },
+    input_dir: { default: 'content', converter: :path },
+    output_dir: { default: 'public_html', converter: :path },
+    code_dir: { default: 'code', converter: :path },
+    site_uri: { default: 'http://localhost', converter: :uri },
+    site_rsync: nil,
+    site_title: nil,
+    site_email: nil,
+    site_twitter: { converter: :uri },
+    site_instagram: { converter: :uri },
+    site_postal: nil,
+    site_phone: nil,
+    site_control_date: { converter: :date },
+    html_version: { default: :html5, converter: :symbol },
+    make_error: true,
+    make_feed: true,
+    make_sitemap: true,
+    make_robots: true,
+    allow_robots: true,
+  )
+
+end

data/lib/mill/resource.rb

@@ -4,123 +4,105 @@ module Mill
 
     FileTypes = []
 
-    attr_accessor :input_file
-    attr_accessor :output_file
     attr_accessor :path
+    attr_accessor :uri
+    attr_accessor :primary
+    attr_accessor :input
     attr_accessor :date
-    attr_accessor :public
-    attr_accessor :content
+    attr_reader   :output
     attr_accessor :site
     attr_accessor :node
 
-    def initialize(input_file: nil,
-                   output_file: nil,
-                   date: nil,
-                   public: false,
-                   content: nil,
-                   site: nil)
-      if input_file
-        @input_file = Path.new(input_file)
-        @date = input_file.mtime.to_datetime
-      else
-        @date = DateTime.now
-      end
-      if output_file
-        @output_file = Path.new(output_file)
-        @path = '/' + @output_file.relative_to(site.output_dir).to_s
-      end
-      self.date = date if date
-      self.public = public
-      @content = content
-      @site = site
-    end
-
-    def date=(date)
-      @date = case date
-      when String, Time
-        begin
-          DateTime.parse(date.to_s)
-        rescue ArgumentError => e
-          raise Error, "Can't parse date: #{date.inspect}"
-        end
-      when Date, DateTime, nil
-        date
-      else
-        raise Error, "Can't assign 'date' attribute: #{date.inspect}"
+    include SetParams
+    include Simple::Printer::Printable
+
+    def initialize(params={})
+      super({ primary: false }.merge(params))
+      unless defined?(@date)
+        @date = @input&.kind_of?(Path) ? @input.mtime.to_datetime : DateTime.now
       end
+      @uri = Addressable::URI.encode(@path, Addressable::URI)
     end
 
-    def public=(public)
-      @public = case public
-      when 'false', FalseClass
-        false
-      when 'true', TrueClass
-        true
-      else
-        raise Error, "Can't assign 'public' attribute: #{public.inspect}"
-      end
+    def inspect
+      "<#{self.class}>"
     end
 
-    def public?
-      @public == true
+    def primary?
+      @primary
     end
 
-    def text?
-      kind_of?(Resource::Text) && public?
+    def root?
+      self == @site.root_resource
     end
 
-    def redirect?
-      kind_of?(Resource::Redirect)
+    def output_file
+      if @site && @path
+        @site.output_dir / Path.new(@path).relative_to('/')
+      else
+        nil
+      end
     end
 
-    def inspect
-      "<%p> input_file: %p, output_file: %p, path: %s, date: %s, public: %p, content: <%p>, parent: %p, siblings: %p, children: %p" % [
-        self.class,
-        @input_file ? @input_file.relative_to(@site.input_dir).to_s : nil,
-        @output_file ? @output_file.relative_to(@site.output_dir).to_s : nil,
-        @path,
-        @date.to_s,
-        @public,
-        @content&.class,
-        parent&.path,
-        siblings.map(&:path),
-        children.map(&:path),
+    def printable
+      [
+        :path,
+        { key: :input, value: input_description },
+        { key: :output_file, value: (o = output_file) ? o.relative_to(@site.output_dir).to_s : nil },
+        :date,
+        :primary?,
+        :class,
+        { label: 'Parent', value: parent&.path || '-' },
+        { label: 'Siblings', value: siblings&.map(&:path)&.join(', ') || '-' },
+        { label: 'Children', value: children&.map(&:path)&.join(', ') || '-' },
       ]
     end
 
+    def input_description
+      case @input
+      when Path
+        @input.relative_to(@site.input_dir).to_s
+      when String
+        (@input[0...100] + '...').inspect
+      when nil
+        '-'
+      else
+        "<#{@input.class}>"
+      end
+    end
+
     def parent
-      @node.parent&.content
+      @node&.parent&.content
     end
 
     def siblings
-      @node.siblings.map(&:content).compact
+      @node ? @node.siblings.map(&:content).compact : []
     end
 
-    def children
-      @node.children.map(&:content).compact
+    def previous_sibling
+      @node&.previous_sibling&.content
     end
 
-    def uri
-      raise Error, "#{@input_file}: No path defined for #{self.class}" unless @path
-      Addressable::URI.encode(@path, Addressable::URI)
+    def next_sibling
+      @node&.next_sibling&.content
+    end
+
+    def children
+      @node ? @node.children.map(&:content).compact : []
     end
 
     def absolute_uri
-      @site.site_uri + uri
+      @site.site_uri + @uri
     end
 
     def tag_uri
-      @site.tag_uri + uri
+      @site.tag_uri + @uri
     end
 
     def change_frequency
       :weekly
     end
 
-    def final_content
-      @content
-    end
-
     def load
       # implemented in subclass
     end
@@ -130,16 +112,21 @@ module Mill
     end
 
     def save
-      @output_file.dirname.mkpath
-      if (content = final_content)
-        # ;;warn "#{path}: writing #{@input_file} to #{@output_file}"
-        @output_file.write(content.to_s)
-        @output_file.utime(@date.to_time, @date.to_time)
-      elsif @input_file
-        # ;;warn "#{path}: copying #{@input_file} to #{@output_file}"
-        @input_file.copy(@output_file)
+      file = output_file
+      file.dirname.mkpath
+      if @output
+        # ;;warn "#{@path}: writing output to #{file}"
+        file.write(@output)
+        file.utime(@date.to_time, @date.to_time)
+      elsif @input.kind_of?(Path)
+        # ;;warn "#{@path}: copying #{@input} to #{file}"
+        @input.copy(file)
+      elsif @input
+        # ;;warn "#{@path}: writing input to #{file}"
+        file.write(@input)
+        file.utime(@date.to_time, @date.to_time)
       else
-        raise Error, "Can't build resource without content or input file: #{path}"
+        raise Error, "#{@path}: Can't build resource without output or input file"
       end
     end
 

data/lib/mill/resources/blob.rb

@@ -5,6 +5,8 @@ module Mill
     class Blob < Resource
 
       FileTypes = %w{
+        text/plain
+
         application/pdf
 
         application/zip
@@ -16,9 +18,11 @@ module Mill
         application/x-javascript
 
         font/otf
+        font/woff2
         application/font-sfnt
         application/x-font-opentype
         application/x-font-otf
+        application/font-woff
 
         application/mp4
         audio/mpeg

data/lib/mill/resources/feed.rb

@@ -1,20 +1,16 @@
-# see http://www.sitemaps.org/protocol.php
-
 module Mill
 
   class Resource
 
     class Feed < Resource
 
-      include HTMLHelpers
-
       def build
         resources = @site.feed_resources
-        builder = Nokogiri::XML::Builder.new do |xml|
+        @output = Nokogiri::XML::Builder.new do |xml|
           xml.feed(xmlns: 'http://www.w3.org/2005/Atom') do
             xml.id(@site.tag_uri)
             xml.title(@site.site_title) if @site.site_title
-            xml.link(rel: 'alternate', type: 'text/html',             href: @site.home_resource.absolute_uri) if @site.home_resource
+            xml.link(rel: 'alternate', type: 'text/html',             href: @site.root_resource.absolute_uri) if @site.root_resource
             xml.link(rel: 'self',      type: 'application/atom+xml',  href: absolute_uri)
             xml.author do
               xml.name(@site.feed_author_name) if @site.feed_author_name
@@ -35,15 +31,11 @@ module Mill
               end
             end
           end
-        end
-        @content = builder.doc
-        super
+        end.doc
       end
 
-      def link_html
-        html_fragment do |html|
-          html.link(href: uri, rel: 'alternate', type: 'application/atom+xml')
-        end
+      def build_link(html)
+        html.link(href: uri, rel: 'alternate', type: 'application/atom+xml')
       end
 
     end

data/lib/mill/resources/image.rb

@@ -4,8 +4,6 @@ module Mill
 
     class Image < Resource
 
-      include HTMLHelpers
-
       FileTypes = %w{
         image/gif
         image/jpeg
@@ -18,27 +16,21 @@ module Mill
       attr_accessor :width
       attr_accessor :height
 
-      def inspect
-        super + ", width: %p, height: %p" % [
-          @width,
-          @height,
+      def printable
+        super + [
+          :width,
+          :height,
         ]
       end
 
       def load
-        info = ImageSize.path(@input_file.to_s)
-        @width, @height = *info.size
-        super
-      end
-
-      def img_html
-        html_fragment do |html|
-          html.img(
-            src: uri,
-            alt: @title,
-            height: @height,
-            width: @width)
+        raise Error, "Input must be file" unless @input.kind_of?(Path)
+        begin
+          info = ImageSize.path(@input.to_s)
+        rescue => e
+          raise Error, "Can't load image file #{@input.to_s.inspect}: #{e}"
         end
+        @width, @height = *info.size
       end
 
     end

data/lib/mill/resources/markdown.rb

@@ -0,0 +1,20 @@
+module Mill
+
+  class Resource
+
+    class Markdown < Markup
+
+      FileTypes = %w{
+        text/markdown
+        text/x-web-markdown
+      }
+
+      def parse_text(text)
+        Kramdown::Document.new((text || '').strip).to_html
+      end
+
+    end
+
+  end
+
+end

data/lib/mill/resources/markup.rb

@@ -0,0 +1,62 @@
+module Mill
+
+  class Resource
+
+    class Markup < Resource
+
+      def printable
+        super + [
+          :header,
+          { label: 'Text', value: @text[0...100] + '...' },
+        ]
+      end
+
+      def load
+        @text = case @input
+        when Path
+          @input.read
+        when String
+          @input.dup
+        else
+          raise Error, "Unknown markup input: #{@input.class}"
+        end
+        @header = HashStruct.new
+        if @text.split(/\n/, 2).first =~ /^\w+:\s+/
+          fields = {}
+          lines, @text = @text.split(/\n\n/, 2)
+          lines.split(/\n/).each do |line|
+            if line.start_with?(/\s+/)
+              key = fields.keys.last
+              fields[key] += line
+            else
+              key, value = line.strip.split(/:\s*/, 2)
+              fields[key] = value
+            end
+          end
+          @header = HashStruct.new(fields)
+        end
+      end
+
+      def parse_text(text)
+        # implemented in subclass
+      end
+
+      def convert_class
+        @site.resource_class_for_type('text/html')
+      end
+
+      def convert
+        return nil if @header[:draft]
+        convert_class.new(
+          path: @path.sub(%r{\.\w+$}, '.html'),
+          input: parse_text(@text),
+          date: @date,
+          **@header,
+        )
+      end
+
+    end
+
+  end
+
+end