mill 0.8.4 → 0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8b00dde07ebc45e2b31e617fbd4172cc2466acf9530543e3b9411bfdc7befee
-  data.tar.gz: 132eb25e65ad17e7cc79e4b97f7c5f4f9bd6599d55e7579672ea568fdc9aa361
+  metadata.gz: 5accfe1e5067386b3de4898faceb6ea201c6bc30097da779c38ef343e0aad18c
+  data.tar.gz: 5861a090880607573153929c75f0475fb258467676b2a4084514e8b368028bb6
 SHA512:
-  metadata.gz: b4a8c81b1c31e4931e1b0008a615f0b34369ca4158a2eb7fbefc6e1413c2f087f8fa04e504eea72bb772b869c1baae091b378df8bdb65b6c91d9bcb51ab5b014
-  data.tar.gz: 735816537e112036967833b72fab301211138e471d5bb326855acf93bee7ce6016880e4bbc403206ac832b85de92def7737e22e58093cdb844d0d110e7a09098
+  metadata.gz: 1c1e0a63042509e67a028e2e50b2f61fa92560ee16bb77370ca1ca82d1f75ebbd7054b9ba8b2408aff32e83a44c3e5f9cc2600316e5dd22c8a47ef7d26cee932
+  data.tar.gz: 7dc21c2b4181768be5150d1e51ef6ea9b16aba0a33c8536dd9609e72b458913e2fa79ee460d9c50c204dc6a0da733587bd4807005a16ca2acc4e5806b33d168d

data/.gitignore

@@ -1 +1,11 @@
-*.gem
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
+/test/output

data/Gemfile

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

data/Rakefile

@@ -1,2 +1,9 @@
-require 'rubygems/tasks'
-Gem::Tasks.new
+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

data/TODO.txt

@@ -1,6 +1,10 @@
+- 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
@@ -41,8 +45,6 @@
         - 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)
@@ -56,6 +58,4 @@
 
 - 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
+    - serve compressed versions if asked by client

data/bin/mill

@@ -20,8 +20,8 @@ begin
     $site.snapshot
   when 'upload'
     $site.upload
-  when 'output-dir'
-    puts $site.output_dir
+  when 'show'
+    puts $site.send(ARGV.shift)
   else
     raise "Unknown command: #{command.inspect}"
   end

data/lib/mill.rb

@@ -5,16 +5,19 @@ require 'mime/types'
 require 'nokogiri'
 require 'path'
 require 'pp'
+# require 'pry' rescue nil
 require 'RedCloth'
 require 'rubypants'
-require 'sass'
+require 'sassc'
 require 'time'
+require 'tree'
 require 'web-checker'
 
 require 'mill/error'
 require 'mill/html_helpers'
 require 'mill/navigator'
 require 'mill/resource'
+require 'mill/resources/blob'
 require 'mill/resources/feed'
 require 'mill/resources/google_site_verification'
 require 'mill/resources/image'

data/lib/mill/html_helpers.rb

@@ -104,13 +104,19 @@ module HTMLHelpers
       nil => RubyPants,
       smart_quotes: RubyPants,
       markdown: Kramdown::Document,
-      textile: RedCloth,
+      textile: [RedCloth, :no_span_caps],
       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)
+      converter_class = Converters[options[:mode]] or raise "Unknown to_html mode: #{options[:mode].inspect}"
+      if converter_class.kind_of?(Array)
+        converter_class, *converter_options = *converter_class
+        converter = converter_class.new(self, converter_options)
+      else
+        converter = converter_class.new(self)
+      end
+      html = Nokogiri::HTML::DocumentFragment.parse(converter.to_html)
       if !options[:multiline] && (p_elem = html.at_xpath('p'))
         html = p_elem.children.to_html
       end

data/lib/mill/resource.rb

@@ -6,10 +6,12 @@ module Mill
 
     attr_accessor :input_file
     attr_accessor :output_file
+    attr_accessor :path
     attr_accessor :date
     attr_accessor :public
     attr_accessor :content
     attr_accessor :site
+    attr_accessor :node
 
     def initialize(input_file: nil,
                    output_file: nil,
@@ -23,7 +25,10 @@ module Mill
       else
         @date = DateTime.now
       end
-      @output_file = Path.new(output_file) if output_file
+      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
@@ -57,39 +62,47 @@ module Mill
     end
 
     def public?
-      @public
+      @public == true
+    end
+
+    def text?
+      kind_of?(Resource::Text) && public?
+    end
+
+    def redirect?
+      kind_of?(Resource::Redirect)
     end
 
     def inspect
-      "<%p> input_file: %p, output_file: %p, date: %s, public: %p, content: <%p>" % [
+      "<%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 && @content.class,
+        @content&.class,
+        parent&.path,
+        siblings.map(&:path),
+        children.map(&:path),
       ]
     end
 
-    def find_sibling_resources(klass=nil)
-      # parent_uri = parent_uri
-      @site.resources.select do |resource|
-        resource != self &&
-          (klass.nil? || resource.kind_of?(klass)) &&
-          resource.parent_uri == parent_uri
-      end
+    def parent
+      @node.parent&.content
     end
 
-    def uri
-      raise Error, "#{@input_file}: No output file defined for #{self.class}" unless @output_file
-      path = '/' + @output_file.relative_to(@site.output_dir).to_s
-      path.sub!(%r{/index\.html$}, '/')
-      path.sub!(%r{\.html$}, '') if @site.shorten_uris
-      Addressable::URI.encode(path, Addressable::URI)
+    def siblings
+      @node.siblings.map(&:content).compact
     end
 
-    def parent_uri
-      uri + '.'
+    def children
+      @node.children.map(&:content).compact
+    end
+
+    def uri
+      raise Error, "#{@input_file}: No path defined for #{self.class}" unless @path
+      Addressable::URI.encode(@path, Addressable::URI)
     end
 
     def absolute_uri
@@ -119,14 +132,14 @@ module Mill
     def save
       @output_file.dirname.mkpath
       if (content = final_content)
-        # ;;warn "#{uri}: writing #{@input_file} to #{@output_file}"
+        # ;;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 "#{uri}: copying #{@input_file} to #{@output_file}"
+        # ;;warn "#{path}: copying #{@input_file} to #{@output_file}"
         @input_file.copy(@output_file)
       else
-        raise Error, "Can't build resource without content or input file: #{uri}"
+        raise Error, "Can't build resource without content or input file: #{path}"
       end
     end
 

data/lib/mill/resources/blob.rb

@@ -0,0 +1,42 @@
+module Mill
+
+  class Resource
+
+    class Blob < Resource
+
+      FileTypes = %w{
+        application/pdf
+
+        application/zip
+
+        application/ecmascript
+        application/javascript
+        text/ecmascript
+        text/javascript
+        application/x-javascript
+
+        font/otf
+        application/font-sfnt
+        application/x-font-opentype
+        application/x-font-otf
+
+        application/mp4
+        audio/mpeg
+        audio/mp4
+        video/mp4
+        video/vnd.objectvideo
+        video/quicktime
+
+        application/msword
+        application/word
+        application/x-msword
+        application/x-word
+        application/vnd.ms-powerpoint
+        application/powerpoint
+      }
+
+    end
+
+  end
+
+end

data/lib/mill/resources/stylesheet.rb

@@ -11,10 +11,9 @@ module Mill
       def load
         super
         unless @input_file.basename.to_s.end_with?('.min.css')
-          engine = Sass::Engine.for_file(@input_file.to_s, syntax: :scss, style: :compressed)
           begin
-            @content = engine.render
-          rescue Sass::SyntaxError => e
+            @content = SassC::Engine.new(@input_file.read, syntax: :scss, style: :compressed).render
+          rescue SassC::SyntaxError => e
             raise "#{input_file}: error parsing CSS: #{e}"
           end
         end

data/lib/mill/resources/text.rb

@@ -1,3 +1,4 @@
+
 module Mill
 
   class Resource
@@ -15,19 +16,29 @@ module Mill
       attr_accessor :title
       attr_accessor :summary
       attr_accessor :author
+      attr_accessor :type
 
-      def initialize(title: nil, summary: nil, author: nil, public: true, **args)
+      def initialize(title: nil, summary: nil, author: nil, public: true, output_file: nil, **args)
         @title = title
         @summary = summary
         @author = author
-        super(public: public, **args)
+        @type = nil
+        super(
+          public: public,
+          output_file: output_file&.replace_extension('.html'),
+          **args)
+        if @path
+          @path.sub!(%r{\.html$}, '') if @site&.shorten_uris
+          @path.sub!(%r{(.*)index$}, '\1')
+        end
       end
 
       def inspect
-        super + ", title: %p, summary: %p, author: %p" % [
+        super + ", title: %p, summary: %p, author: %p, type: %p" % [
           @title,
           @summary,
           @author,
+          @type,
         ]
       end
 
@@ -35,7 +46,7 @@ module Mill
         super
         if @input_file
           @content = @input_file.read
-          mode = case @input_file.extname.downcase
+          @type = case @input_file.extname.downcase
           when '.md', '.mdown', '.markdown'
             :markdown
           when '.textile'
@@ -47,10 +58,10 @@ module Mill
           else
             raise "Unknown text type: #{@input_file}"
           end
-          if mode != :html
+          if @type != :html
             parse_text_header
-            @content = (@content || '').to_html(mode: mode, multiline: true)
-            @output_file = @output_file.replace_extension('.html')
+            @content = (@content || '').to_html(mode: @type, multiline: true)
+            @type = :html
           end
           begin
             @content = parse_html(@content)
@@ -66,7 +77,7 @@ module Mill
           if (title_elem = @content.at_xpath('/html/head/title'))
             @title = title_elem.text
           else
-            @title = uri.to_s
+            @title = @path
           end
         end
         @content.xpath('/html/head/meta[@name]').each do |meta|
@@ -78,7 +89,7 @@ module Mill
         if @content.split(/\n/, 2).first =~ /^\w+:\s+/
           header, @content = @content.split(/\n\n/, 2)
           header.split(/\n/).map do |line|
-            key, value = line.strip.split(/:\s+/, 2)
+            key, value = line.strip.split(/:\s*/, 2)
             key = key.gsub('-', '_').downcase.to_sym
             send("#{key}=", value)
           end
@@ -86,7 +97,7 @@ module Mill
       end
 
       def final_content
-        html_document(@site.html_version) do |doc|
+        html_document(@site&.html_version || :html5) do |doc|
           doc.html(lang: 'en') do |html|
             html.parent << head
             html.parent << body
@@ -168,7 +179,7 @@ module Mill
             self_uri.scheme = 'http'
             link_uri.scheme = 'http'
             attribute.value = self_uri.route_to(link_uri)
-            # ;;warn "[#{uri}] shortened link #{elem.name}/@#{attribute.name}: #{link_uri} => #{attribute.value}"
+            # ;;warn "[#{path}] shortened link #{elem.name}/@#{attribute.name}: #{link_uri} => #{attribute.value}"
           end
         end
       end
@@ -195,7 +206,7 @@ module Mill
             body_elem.children
           end
         else
-          warn "Warning: Resource #{uri} (#{self.class}) has no content"
+          warn "Warning: Resource #{path} (#{self.class}) has no content"
           nil
         end
       end

data/lib/mill/site.rb

@@ -64,8 +64,8 @@ module Mill
       @google_site_verification = google_site_verification
       @redirects = redirects
 
-      @resources = []
-      @resources_by_uri = {}
+      @resources = {}
+      @resources_tree = Tree::TreeNode.new('')
       build_file_types
     end
 
@@ -79,35 +79,20 @@ module Mill
     end
 
     def add_resource(resource)
-      resource.site = self
-      @resources << resource
-      @resources_by_uri[resource.uri] = resource
-      # ;;warn "added #{resource} as #{resource.uri}"
-    end
-
-    def delete_resource(resource)
-      @resources.delete(resource)
-      @resources_by_uri.delete(resource.uri)
-    end
-
-    def find_resource(uri)
-      uri = Addressable::URI.parse(uri.to_s) unless uri.kind_of?(Addressable::URI)
-      resource = @resources_by_uri[uri]
-      if resource.nil? && @shorten_uris
-        uri.path = uri.path.sub(%r{\.html$}, '')
-        resource = @resources_by_uri[uri]
+      raise "Must assign resource to site" unless resource.site
+      @resources[resource.path] = resource
+      node = @resources_tree
+      resource.path.split('/').reject(&:empty?).each do |component|
+        node = node[component] || (node << Tree::TreeNode.new(component))
       end
-      resource
+      resource.node = node
+      node.content = resource
+      # ;;warn "added #{resource} as #{resource.path}"
     end
 
-    def resource_for_file(path)
-      find_resource(
-        URI.parse(
-          '/' + URI.encode(
-            path.relative_to(@output_dir).to_s
-          )
-        )
-      )
+    def find_resource(path)
+      path = path.path if path.kind_of?(Addressable::URI)
+      @resources[path] || @resources[path + '/']
     end
 
     def home_resource
@@ -135,20 +120,30 @@ module Mill
       @site_email
     end
 
+    def select_resources(selector=nil, &block)
+      if block_given?
+        @resources.values.select(&block)
+      elsif selector.kind_of?(Class)
+        @resources.values.select { |r| r.kind_of?(selector) }
+      else
+        @resources.values.select(selector)
+      end
+    end
+
     def feed_resources
       public_resources.sort_by(&:date)
     end
 
     def public_resources
-      @resources.select(&:public)
+      select_resources(&:public?)
     end
 
-    def private_resources
-      @resources.select { |r| r.kind_of?(Resource::Text) && !r.public }
+    def redirect_resources
+      select_resources(&:redirect?)
     end
 
-    def redirect_resources
-      @resources.select { |r| r.kind_of?(Resource::Redirect) }
+    def text_resources
+      select_resources(&:text?)
     end
 
     def make
@@ -156,11 +151,67 @@ module Mill
       save
     end
 
+    def print_tree(node=nil, level=0)
+      node ||= @resources_tree
+      if node.is_root?
+        print '*'
+      else
+        print "\t" * level
+      end
+      print " #{node.name.inspect}"
+      print " <#{node.content&.path}>"
+      print " (#{node.children.length} children)" if node.has_children?
+      puts
+      node.children { |child| print_tree(child, level + 1) }
+    end
+
+    ListKeys = {
+      path:         :to_s,
+      input_file:   :to_s,
+      output_file:  :to_s,
+      date:         :to_s,
+      public:       :to_s,
+      class:        :to_s,
+      content:      proc { |r| r.content ? ('%s (%dKB)' % [r.content.class, (r.content.to_s.length / 1024.0).ceil]) : nil },
+      parent:       proc { |r| r.parent&.path },
+      siblings:     proc { |r| r.siblings.map(&:path) },
+      children:     proc { |r| r.children.map(&:path) },
+    }
+
     def list
       build
-      on_each_resource do |resource|
-        puts resource.inspect
+      width = ListKeys.keys.map(&:length).max
+      select_resources.each do |resource|
+        ListKeys.each do |key, converter|
+          value = resource.send(key)
+          value = case converter
+          when nil
+            value
+          when Symbol
+            value.send(converter)
+          when Proc
+            converter.call(resource)
+          else
+            raise
+          end
+          print '%*s: ' % [width, key]
+          case value
+          when Array
+            if value.empty?
+              puts '-'
+            else
+              value.each_with_index do |v, i|
+                print '%*s  ' % [width, ''] if i > 0
+                puts (v.nil? ? '-' : v)
+              end
+            end
+          else
+            puts (value.nil? ? '-' : value)
+          end
+        end
+        puts
       end
+      puts
     end
 
     def build
@@ -181,14 +232,14 @@ module Mill
 
     def load_resources
       on_each_resource do |resource|
-        # ;;warn "#{resource.uri}: loading"
+        # ;;warn "#{resource.path}: loading"
         resource.load
       end
     end
 
     def build_resources
       on_each_resource do |resource|
-        # ;;warn "#{resource.uri}: building"
+        # ;;warn "#{resource.path}: building"
         resource.build
       end
     end
@@ -197,7 +248,7 @@ module Mill
       clean
       @output_dir.mkpath
       on_each_resource do |resource|
-        # ;;warn "#{resource.uri}: saving"
+        # ;;warn "#{resource.path}: saving"
         resource.save
       end
     end
@@ -211,11 +262,14 @@ module Mill
     end
 
     def check
+      build
       checker = WebChecker.new(site_uri: @site_uri, site_dir: @output_dir)
     end
 
     def snapshot
       @output_dir.chdir do
+        system('git',
+          'init') unless Path.new('.git').exist?
         system('git',
           'add',
           '.')
@@ -240,6 +294,7 @@ module Mill
         '--progress',
         '--verbose',
         '--archive',
+        # '--append-verify',
         '--exclude=.git',
         '--delete-after',
         @output_dir.to_s,
@@ -247,17 +302,11 @@ module Mill
     end
 
     def on_each_resource(&block)
-      @resources.each do |resource|
-        old_uri = resource.uri.dup
+      @resources.values.each do |resource|
         begin
           yield(resource)
         rescue Error => e
-          raise e, "#{resource.input_file || '-'} (#{old_uri}): #{e}"
-        end
-        if resource.uri != old_uri
-          # ;;warn "URI changed: #{old_uri} => #{resource.uri}"
-          @resources_by_uri.delete(old_uri)
-          @resources_by_uri[resource.uri] = resource
+          raise e, "#{resource.input_file || '-'} (#{resource.path}): #{e}"
         end
       end
     end
@@ -269,12 +318,12 @@ module Mill
       if type && (klass = @file_types[type.content_type])
         klass
       else
-        Resource
+        raise Error, "Unknown file type: #{file.to_s.inspect} (#{MIME::Types.of(file.to_s).join(', ')})"
       end
     end
 
     def add_files
-      raise Error, "Input path not found: #{@input_dir}" unless @input_dir.exist?
+      raise Error, "Input directory not found: #{@input_dir}" unless @input_dir.exist?
       @input_dir.find do |input_file|
         if input_file.basename.to_s[0] == '.'
           Find.prune
@@ -283,7 +332,8 @@ module Mill
         else (klass = resource_class_for_file(input_file))
           resource = klass.new(
             input_file: input_file,
-            output_file: @output_dir / input_file.relative_to(@input_dir))
+            output_file: @output_dir / input_file.relative_to(@input_dir),
+            site: self)
           add_resource(resource)
         end
       end
@@ -291,19 +341,22 @@ module Mill
 
     def add_feed
       @feed_resource = Resource::Feed.new(
-        output_file: @output_dir / 'feed.xml')
+        output_file: @output_dir / 'feed.xml',
+        site: self)
       add_resource(@feed_resource)
     end
 
     def add_sitemap
       @sitemap_resource = Resource::Sitemap.new(
-        output_file: @output_dir / 'sitemap.xml')
+        output_file: @output_dir / 'sitemap.xml',
+        site: self)
       add_resource(@sitemap_resource)
     end
 
     def add_robots
       @robots_resource = Resource::Robots.new(
-        output_file: @output_dir / 'robots.txt')
+        output_file: @output_dir / 'robots.txt',
+        site: self)
       add_resource(@robots_resource)
     end
 
@@ -313,7 +366,8 @@ module Mill
           output_file = @output_dir / Path.new(from).relative_to('/')
           resource = Resource::Redirect.new(
             output_file: output_file,
-            redirect_uri: to)
+            redirect_uri: to,
+            site: self)
           add_resource(resource)
         end
       end
@@ -322,14 +376,16 @@ module Mill
     def add_google_site_verification
       resource = Resource::GoogleSiteVerification.new(
         output_file: (@output_dir / @google_site_verification).add_extension('.html'),
-        key: @google_site_verification)
+        key: @google_site_verification,
+        site: self)
       add_resource(resource)
     end
 
     def add_htpasswd
       resource = Resource.new(
         input_file: @htpasswd_file,
-        output_file: @output_dir / '.htpasswd')
+        output_file: @output_dir / '.htpasswd',
+        site: self)
       add_resource(resource)
     end
 

data/lib/mill/version.rb

@@ -1,5 +1,5 @@
 module Mill
 
-  VERSION = '0.8.4'
+  VERSION = '0.16'
 
 end

data/mill.gemspec

@@ -18,17 +18,22 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_path  = 'lib'
 
-  s.add_dependency 'addressable', '~> 2.5'
-  s.add_dependency 'image_size', '~> 1.5'
-  s.add_dependency 'kramdown', '~> 1.16'
-  s.add_dependency 'mime-types', '~> 3.1'
-  s.add_dependency 'nokogiri', '~> 1.8'
+  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 'RedCloth', '~> 4.3'
-  s.add_dependency 'rubypants', '~> 0.6'
-  s.add_dependency 'sass', '~> 3.5'
-  s.add_dependency 'web-checker', '~> 0'
+  s.add_dependency 'rubypants', '~> 0.7'
+  s.add_dependency 'rubytree', '~> 1.0'
+  s.add_dependency 'sassc', '~> 2.4'
+  s.add_dependency 'web-checker', '~> 0.4'
 
-  s.add_development_dependency 'rake', '~> 0'
-  s.add_development_dependency 'rubygems-tasks', '~> 0.0'
+  s.add_development_dependency 'bundler', '~> 2.2'
+  s.add_development_dependency 'minitest', '~> 5.14'
+  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'
 end

data/test/content/a.md

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

data/test/content/b/ba.md

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

data/test/content/b/bb.md

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

data/test/content/b/index.md

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

data/test/content/index.md

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

data/test/test.rb

@@ -0,0 +1,56 @@
+$VERBOSE = false
+
+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.new(
+        input_dir: 'test/content',
+        output_dir: 'test/output',
+        site_title: 'Test',
+        site_uri: 'http://test.test',
+        html_version: :html5,
+      )
+      @site.make
+# ;;@site.print_tree
+# ;;@site.list
+# ;;binding.pry
+      @root = @site.find_resource('/') or raise
+      @a = @site.find_resource('/a') or raise
+      @b = @site.find_resource('/b') or raise
+      @ba = @site.find_resource('/b/ba') or raise
+      @bb = @site.find_resource('/b/bb') or raise
+    end
+
+    def test_has_index
+      assert { @root }
+    end
+
+    def test_children
+      assert { @root.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
+      assert { @root.siblings.empty? }
+      assert { @a.siblings == [@b] }
+      assert { @ba.siblings == [@bb] }
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mill
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: '0.16'
 platform: ruby
 authors:
 - John Labovitz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-18 00:00:00.000000000 Z
+date: 2020-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: image_size
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: path
   requirement: !ruby/object:Gem::Requirement
@@ -114,70 +114,140 @@ 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: sass
+  name: rubytree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        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: web-checker
   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: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.14'
+- !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: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.2'
 description: "\n    Mill provides a simple but useful static site generator.\n  "
 email: johnl@johnlabovitz.com
 executables:
@@ -186,6 +256,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -196,6 +267,7 @@ files:
 - lib/mill/html_helpers.rb
 - lib/mill/navigator.rb
 - lib/mill/resource.rb
+- lib/mill/resources/blob.rb
 - lib/mill/resources/dir.rb
 - lib/mill/resources/feed.rb
 - lib/mill/resources/google_site_verification.rb
@@ -208,11 +280,17 @@ files:
 - 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/index.md
+- test/test.rb
 homepage: http://github.com/jslabovitz/mill
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -227,9 +305,14 @@ 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.2.3
+signing_key:
 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/index.md
+- test/test.rb