mill 0.16 → 0.18

data/mill.gemspec

@@ -1,10 +1,6 @@
-#encoding: utf-8
-
-require_relative 'lib/mill/version'
-
 Gem::Specification.new do |s|
   s.name          = 'mill'
-  s.version       = Mill::VERSION
+  s.version       = '0.18'
   s.summary       = 'A simple but useful static site generator.'
   s.author        = 'John Labovitz'
   s.email         = 'johnl@johnlabovitz.com'
@@ -12,28 +8,32 @@ Gem::Specification.new do |s|
     Mill provides a simple but useful static site generator.
   }
   s.license       = 'MIT'
-  s.homepage      = 'http://github.com/jslabovitz/mill'
+  s.homepage      = 'https://github.com/jslabovitz/mill'
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_path  = 'lib'
 
-  s.add_dependency 'addressable', '~> 2.7'
-  s.add_dependency 'image_size', '~> 2.1'
-  s.add_dependency 'kramdown', '~> 2.3'
-  s.add_dependency 'mime-types', '~> 3.3'
-  s.add_dependency 'nokogiri', '~> 1.10'
-  s.add_dependency 'path', '~> 2.0'
+  s.add_dependency 'addressable', '~> 2.8'
+  s.add_dependency 'hashstruct', '~> 1.6'
+  s.add_dependency 'http', '~> 5.3'
+  s.add_dependency 'image_size', '~> 3.4'
+  s.add_dependency 'kramdown', '~> 2.5'
+  s.add_dependency 'mime-types', '~> 3.7'
+  s.add_dependency 'nokogiri', '~> 1.18'
+  s.add_dependency 'path', '~> 2.1'
   s.add_dependency 'RedCloth', '~> 4.3'
   s.add_dependency 'rubypants', '~> 0.7'
-  s.add_dependency 'rubytree', '~> 1.0'
+  s.add_dependency 'rubytree', '~> 2.1'
   s.add_dependency 'sassc', '~> 2.4'
-  s.add_dependency 'web-checker', '~> 0.4'
+  s.add_dependency 'set_params', '~> 0.3'
+  s.add_dependency 'simple-builder', '~> 0.4'
+  s.add_dependency 'simple-command-parser', '~> 1.2'
+  s.add_dependency 'simple-configurator', '~> 0.2'
+  s.add_dependency 'simple-printer', '~> 0.4'
 
-  s.add_development_dependency 'bundler', '~> 2.2'
-  s.add_development_dependency 'minitest', '~> 5.14'
+  s.add_development_dependency 'minitest', '~> 5.26'
   s.add_development_dependency 'minitest-power_assert', '~> 0.3'
-  s.add_development_dependency 'pry', '~> 0.13'
-  s.add_development_dependency 'rake', '~> 13.0'
-  s.add_development_dependency 'rubygems-tasks', '~> 0.2'
+  s.add_development_dependency 'rake', '~> 13.3'
+  s.add_development_dependency 'simple-rake-tasks', '~> 0.1'
 end

data/test/content/c.md

@@ -0,0 +1,4 @@
+Title: c
+Primary: false
+
+This is c.

data/test/content/d.md

@@ -0,0 +1,4 @@
+Title: d
+Draft: true
+
+This is d.

data/test/main_test.rb

@@ -0,0 +1,68 @@
+require 'minitest/autorun'
+require 'minitest/power_assert'
+
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require 'mill'
+
+module Mill
+
+  class Test < Minitest::Test
+
+    def setup
+      @site = Site.load('test')
+      @site.build
+      @site.save
+# ;;pp @site
+# ;;@site.resources.print_tree
+# ;;@site.list
+      @root = @site.find_resource('/')
+      @a = @site.find_resource('/a')
+      @b = @site.find_resource('/b')
+      @ba = @site.find_resource('/b/ba')
+      @bb = @site.find_resource('/b/bb')
+      @c = @site.find_resource('/c')
+      @d = @site.find_resource('/d')
+    end
+
+    def test_has_index
+      assert { @root }
+    end
+
+    def test_resources
+      assert { @a }
+      assert { @b }
+      assert { @ba }
+      assert { @bb }
+      assert { @c }
+      assert { @d == nil }
+    end
+
+    def test_primary
+      assert { !@c.primary? }
+    end
+
+    def test_children
+      children = @root.children
+      assert { children == [@a, @b] }
+      assert { @a.children.empty? }
+    end
+
+    def test_parent
+      assert { @a.parent == @root }
+      assert { @b.parent == @root }
+      assert { @ba.parent == @b }
+      assert { @bb.parent == @b }
+    end
+
+    def test_siblings
+      root_siblings = @root.siblings
+      a_siblings = @a.siblings
+      ba_siblings = @ba.siblings
+      assert { root_siblings.empty? }
+      assert { a_siblings == [@b] }
+      assert { ba_siblings == [@bb] }
+    end
+
+  end
+
+end

data/test/mill.yaml

@@ -0,0 +1,8 @@
+input_dir: content
+output_dir: output
+site_title: Test
+site_uri: http://test.test
+make_error: false
+make_feed: false
+make_sitemap: false
+make_robots: false

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mill
 version: !ruby/object:Gem::Version
-  version: '0.16'
+  version: '0.18'
 platform: ruby
 authors:
 - John Labovitz
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-31 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -16,84 +15,112 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: hashstruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: image_size
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: path
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +155,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: sassc
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +178,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: web-checker
+  name: set_params
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: simple-builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -165,89 +206,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: simple-command-parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :development
+        version: '1.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: simple-configurator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
-  type: :development
+        version: '0.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: minitest-power_assert
+  name: simple-printer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.26'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '5.26'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: minitest-power_assert
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13.3'
 - !ruby/object:Gem::Dependency
-  name: rubygems-tasks
+  name: simple-rake-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.1'
 description: "\n    Mill provides a simple but useful static site generator.\n  "
 email: johnl@johnlabovitz.com
 executables:
@@ -256,41 +311,51 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- TODO.txt
+- TODO.md
 - bin/mill
 - lib/mill.rb
+- lib/mill/command.rb
+- lib/mill/commands/build.rb
+- lib/mill/commands/check.rb
+- lib/mill/commands/diff.rb
+- lib/mill/commands/list.rb
+- lib/mill/commands/snapshot.rb
+- lib/mill/commands/tree.rb
+- lib/mill/commands/types.rb
+- lib/mill/commands/upload.rb
+- lib/mill/config.rb
 - lib/mill/error.rb
-- lib/mill/html_helpers.rb
-- lib/mill/navigator.rb
 - lib/mill/resource.rb
+- lib/mill/resources.rb
 - lib/mill/resources/blob.rb
-- lib/mill/resources/dir.rb
 - lib/mill/resources/feed.rb
-- lib/mill/resources/google_site_verification.rb
 - lib/mill/resources/image.rb
+- lib/mill/resources/markdown.rb
+- lib/mill/resources/markup.rb
+- lib/mill/resources/page.rb
 - lib/mill/resources/redirect.rb
 - lib/mill/resources/robots.rb
 - lib/mill/resources/sitemap.rb
 - lib/mill/resources/stylesheet.rb
-- lib/mill/resources/text.rb
+- lib/mill/resources/textile.rb
 - lib/mill/site.rb
-- lib/mill/version.rb
 - mill.gemspec
 - test/content/a.md
 - test/content/b/ba.md
 - test/content/b/bb.md
 - test/content/b/index.md
+- test/content/c.md
+- test/content/d.md
 - test/content/index.md
-- test/test.rb
-homepage: http://github.com/jslabovitz/mill
+- test/main_test.rb
+- test/mill.yaml
+homepage: https://github.com/jslabovitz/mill
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -305,8 +370,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: A simple but useful static site generator.
 test_files:
@@ -314,5 +378,8 @@ test_files:
 - test/content/b/ba.md
 - test/content/b/bb.md
 - test/content/b/index.md
+- test/content/c.md
+- test/content/d.md
 - test/content/index.md
-- test/test.rb
+- test/main_test.rb
+- test/mill.yaml

data/Gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-gem 'path', github: 'eregon/path'
-gem 'rubytree', github: 'evolve75/RubyTree'

data/TODO.txt

@@ -1,61 +0,0 @@
-- remove textile/pre processors from Resource::Text
-    - streamline to allow domain-specific subclassing if needed
-
-- initialize site by setting ivars directly, not by passing params to super's initialize()
-
-- create alternate sites (beta, final, etc.) by subclassing site, and changing @output or @location
-    - allow CLI option to specify site
-
-- rework resource URI usage
-    - 'uri' attribute should be canonical
-        - 'output_file' should be derived from @site.output_dir + uri
-    - URIs should be fully qualified
-        - start with '/'
-        - have extension according to file type
-    - referencing URIs should follow server rules (e.g., / -> /index.html)
-    - #shorten_uris should only apply to writing final files
-
-- combine @input_file & @content?
-    - if @content.kind_of?(Path): copy
-    - else: write as string
-
-- rename Resource #load to #import
-    - uses path argument instead of @input_file
-    - sets @content to path
-    - sets @date to mtime of path
-    - subclasses should:
-        - call super
-    - subclasses may:
-        - assigned @content
-        - change URI
-
-- rename Resource #build to #process
-
-- formalize widget creation & access
-    - any object that responds to #to_html
-    - doesn't have to be specific class (e.g., Mill::Widget)
-    - object that is used across site
-    - possibly with different states or parameters (eg, navigation)
-    - built from current html_fragment use
-    - eg:
-        - navigation
-        - buy buttons
-        - Google Analytics bug
-        - link to resource (<a ...>)
-        - sidebars
-        - strings (existing String extensions)
-
-- split Resource#date into Resource#published & Resource#updated
-    + add <published> element to feed
-    + #published should be stated date (e.g., from header)
-    + #updated should be mtime of source file
-
-- make Navigator into more generic Collection
-    + include Enumerable
-
-- make Resource::External for external links?
-    + add on import of HTML (by examining href/src/etc attributes)
-
-- save compressed versions of files
-    - write compressed versions along with non-compressed
-    - serve compressed versions if asked by client