mill 0.11 → 0.18

data/test/content/d.md

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

data/test/content/index.md

@@ -0,0 +1,3 @@
+Title: index
+
+This is index.

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.11'
+  version: '0.18'
 platform: ruby
 authors:
 - John Labovitz
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-28 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.5'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        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: '1.5'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        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
@@ -114,70 +141,168 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: rubytree
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+- !ruby/object:Gem::Dependency
+  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: '2.0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: web-checker
+  name: simple-builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: simple-command-parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: simple-configurator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: simple-printer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        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: '5.26'
+- !ruby/object:Gem::Dependency
+  name: minitest-power_assert
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '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.0'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.1'
 description: "\n    Mill provides a simple but useful static site generator.\n  "
 email: johnl@johnlabovitz.com
 executables:
@@ -189,31 +314,48 @@ files:
 - 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
-homepage: http://github.com/jslabovitz/mill
+- 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/main_test.rb
+- test/mill.yaml
+homepage: https://github.com/jslabovitz/mill
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -228,9 +370,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.7.2
 specification_version: 4
 summary: A simple but useful static site generator.
-test_files: []
+test_files:
+- 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/main_test.rb
+- test/mill.yaml

data/TODO.txt

@@ -1,61 +0,0 @@
-- 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
-
-- 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)
-
-- create bin/mill tool to replace Rake
-
-- 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
-
-- add MailChimp signup form generator to HTMLHelpers

data/lib/mill/html_helpers.rb

@@ -1,122 +0,0 @@
-module HTMLHelpers
-
-  LinkElementsXPath = '//@href | //@src'
-
-  def html_document(type=:html4_transitional, &block)
-    doc = Nokogiri::HTML::Document.new
-    doc.encoding = 'UTF-8'
-    doc.internal_subset.remove
-    case type
-    when :html4_transitional
-      doc.create_internal_subset('html', '-//W3C//DTD HTML 4.01 Transitional//EN', 'http://www.w3.org/TR/html4/loose.dtd')
-    when :html5
-      doc.create_internal_subset('html', nil, nil)
-    else
-      raise "Unknown HTML type: #{type.inspect}"
-    end
-    Nokogiri::HTML::Builder.with(doc) do |doc|
-      yield(doc)
-    end
-    doc
-  end
-
-  def html_fragment(&block)
-    html = Nokogiri::HTML::DocumentFragment.parse('')
-    Nokogiri::HTML::Builder.with(html) do |html|
-      yield(html) if block_given?
-    end
-    html
-  end
-
-  def parse_html(str)
-    if str.strip.empty?
-      html = html_fragment
-    else
-      html = Nokogiri::HTML::Document.parse(str) { |config| config.strict }
-      check_errors(html)
-    end
-    html
-  end
-
-  def parse_html_fragment(str)
-    html = Nokogiri::HTML::DocumentFragment.parse(str) { |config| config.strict }
-    check_errors(html)
-    html
-  end
-
-  def check_errors(html)
-    html.errors.each do |error|
-      raise Mill::Error, "HTML error #{error}" unless error.message =~ /Tag .+? invalid$/
-    end
-  end
-
-  def find_link_elements(html)
-    html.xpath(LinkElementsXPath)
-  end
-
-  def replace_element(html, xpath, &block)
-    html.xpath(xpath).each do |elem|
-      elem.replace(yield(elem))
-    end
-  end
-
-  def google_analytics(tracker_id)
-    html_fragment do |html|
-      html.script(type: 'text/javascript') do
-        html << %Q{
-          var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-          document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-        }
-      end
-      html.script(type: 'text/javascript') do
-        html << %Q{
-          try {
-            var pageTracker = _gat._getTracker("#{tracker_id}");
-            pageTracker._trackPageview();
-          } catch(err) {}
-        }
-      end
-    end
-  end
-
-  def link_if(state, html, &block)
-    elem = html_fragment { |h| yield(h) }
-    if state
-      html.a(href: uri) { html << elem.to_html }
-    else
-      html << elem.to_html
-    end
-  end
-
-  class PreText < String
-
-    def to_html
-      html_fragment do |html|
-        html.pre(self)
-      end
-    end
-
-  end
-
-  class ::String
-
-    Converters = {
-      nil => RubyPants,
-      smart_quotes: RubyPants,
-      markdown: Kramdown::Document,
-      textile: RedCloth,
-      pre: PreText,
-    }
-
-    def to_html(options={})
-      converter = Converters[options[:mode]] or raise "Unknown to_html mode: #{options[:mode].inspect}"
-      html = Nokogiri::HTML::DocumentFragment.parse(converter.new(self).to_html)
-      if !options[:multiline] && (p_elem = html.at_xpath('p'))
-        html = p_elem.children.to_html
-      end
-      html.to_html
-    end
-
-  end
-
-end