mill 0.16 → 0.18

data/lib/mill/resources/page.rb

@@ -0,0 +1,140 @@
+module Mill
+
+  class Resource
+
+    class Page < Resource
+
+      FileTypes = %w{
+        text/html
+      }
+
+      attr_accessor :title
+      attr_reader   :document
+
+      def initialize(params={})
+        super({ primary: true }.merge(params))
+        @path.sub!(%r{\.\w+$}, '')
+        @path.sub!(%r{/index$}, '/')
+        @uri = Addressable::URI.encode(@path, Addressable::URI)
+      end
+
+      def printable
+        super + [
+          :title,
+        ]
+      end
+
+      def output_file
+        if (file = super)
+          file /= 'index' if @path.end_with?('/')
+          file.add_extension('.html')
+        end
+      end
+
+      def load
+        @document = case @input
+        when Path
+          Simple::Builder.parse_html_document(@input.read)
+        when String
+          Simple::Builder.parse_html_document(@input)
+        when Nokogiri::HTML4::Document
+          @input
+        else
+          raise Error, "Unknown HTML input: #{@input.class}"
+        end
+        @title ||= @document.at_xpath('//h1')&.text || Simple::Builder.find_title_element(@document)&.text
+        set(Simple::Builder.find_meta_info(@document))
+      end
+
+      def build
+        raise Error, "No document defined" unless @document
+        builder = case @site.html_version
+        when :html4
+          :build_html4_document
+        when :html5, nil
+          :build_html5_document
+        else
+          raise "Unknown HTML version: #{@site.html_version.inspect}"
+        end
+        @output = Simple::Builder.send(builder) do |html|
+          html.html(lang: 'en') do
+            html.head do
+              build_head(html)
+            end
+            html.body do
+              build_body(html)
+            end
+          end
+        end.to_html
+      end
+
+      def build_head(html)
+        title = @title || Simple::Builder.find_title_element(@document)&.text
+        html.title { html << title.to_html } if title
+        if (head = document_head&.children)
+          head.reject { |e| e.text? || e.name == 'title' }.each do |e|
+            html << e.to_html
+          end
+        end
+      end
+
+      def build_body(html)
+        if (elem = document_body&.children)
+          html << elem.to_html
+        end
+      end
+
+      def document_head
+        Simple::Builder.find_head_element(@document)
+      end
+
+      def document_body
+        Simple::Builder.find_body_element(@document)
+      end
+
+      def add_image_sizes
+        @document.xpath('//img').each do |img|
+          # skip elements that already have width/height defined
+          next if img[:width] || img[:height]
+          img_link = Addressable::URI.parse(img['src'])
+          raise Error, "No link in <img> element: #{img.to_s}" if img_link.nil? || img_link.empty?
+          next if img_link.host
+          img_uri = @uri + img_link
+          img_resource = @site.find_resource(img_uri) or raise Error, "Can't find image for #{img_uri}"
+          img[:width], img[:height] = img_resource.width, img_resource.height
+        end
+      end
+
+      def shorten_links
+        Simple::Builder.find_link_element_attributes(@document).each do |attribute|
+          link_uri = Addressable::URI.parse(attribute.value) or raise Error, "Can't parse attribute value: #{attribute.inspect}"
+          link_uri = @uri + link_uri
+          if link_uri.relative?
+            self_uri = @uri.normalize
+            self_uri.scheme = link_uri.scheme = @site.site_uri.scheme
+            attribute.value = self_uri.route_to(link_uri)
+            # ;;warn "[#{@path}] shortened link #{attribute.parent.name}/@#{attribute.name}: #{link_uri} => #{attribute.value}"
+          end
+        end
+      end
+
+      def feed_content
+        document_body&.children
+      end
+
+      def build_link(html)
+        html.a(href: @uri) { html << (@title || @path).to_html }
+      end
+
+      def links
+        raise "#{@path}: Can't get links for empty document: #{self}" unless @document
+        Simple::Builder.find_link_element_attributes(@document).map do |u|
+          (@uri + u).normalize
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/mill/resources/redirect.rb

@@ -4,30 +4,31 @@ module Mill
 
     class Redirect < Resource
 
-      attr_accessor :redirect_uri
+      attr_reader   :redirect_uri
       attr_accessor :redirect_code
 
-      def initialize(redirect_uri:, redirect_code: 303, **args)
-        @redirect_uri = redirect_uri
-        @redirect_code = redirect_code
-        super(**args)
+      def initialize(redirect_uri:, redirect_code: nil, **params)
+        super(
+          {
+            redirect_uri: redirect_uri,
+            redirect_code: redirect_code || 303,
+          }.merge(params)
+        )
       end
 
-      def inspect
-        super + ", redirect_uri: %p, redirect_code: %p" % [
-          @redirect_uri.to_s,
-          @redirect_code,
-        ]
+      def redirect_uri=(uri)
+        @redirect_uri = Addressable::URI.parse(uri)
       end
 
-      def load
-        @content = "%s %d" % [@redirect_uri, @redirect_code]
-        super
+      def printable
+        super + [
+          :redirect_uri,
+          :redirect_code,
+        ]
       end
 
-      def save
-        @output_file = @output_file.add_extension('.redirect')
-        super
+      def build
+        @output = "%s %d" % [@redirect_uri, @redirect_code]
       end
 
     end

data/lib/mill/resources/robots.rb

@@ -9,10 +9,9 @@ module Mill
       def build
         info = {}
         info['User-Agent'] = '*'
-        info['Disallow'] = '/' unless @site.allow_robots
-        info['Sitemap'] = @site.sitemap_resource.absolute_uri if @site.make_sitemap
-        @content = info.map { |key, value| "#{key}: #{value}" }.join("\n")
-        super
+        info['Disallow'] = '/' unless @site.allow_robots?
+        info['Sitemap'] = @site.sitemap_resource.absolute_uri if @site.make_sitemap?
+        @output = info.map { |key, value| "#{key}: #{value}" }.join("\n")
       end
 
     end

data/lib/mill/resources/sitemap.rb

@@ -7,11 +7,11 @@ module Mill
     class Sitemap < Resource
 
       def build
-        builder = Nokogiri::XML::Builder.new do |xml|
+        @output = Nokogiri::XML::Builder.new do |xml|
           xml.urlset('xmlns' => 'http://www.sitemaps.org/schemas/sitemap/0.9',
                      'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
                      'xsi:schemaLocation' => 'http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd') do
-            @site.public_resources.each do |resource|
+            @site.sitemap_resources.each do |resource|
               xml.url do
                 xml.loc(resource.absolute_uri)
                 xml.lastmod(resource.date.iso8601)
@@ -19,9 +19,7 @@ module Mill
               end
             end
           end
-        end
-        @content = builder.doc
-        super
+        end.doc
       end
 
     end

data/lib/mill/resources/stylesheet.rb

@@ -9,12 +9,12 @@ module Mill
       }
 
       def load
-        super
-        unless @input_file.basename.to_s.end_with?('.min.css')
+        raise Error, "Input must be file" unless @input.kind_of?(Path)
+        unless @input.basename.to_s.end_with?('.min.css')
           begin
-            @content = SassC::Engine.new(@input_file.read, syntax: :scss, style: :compressed).render
+            @output = SassC::Engine.new(@input.read, syntax: :scss, style: :compressed).render
           rescue SassC::SyntaxError => e
-            raise "#{input_file}: error parsing CSS: #{e}"
+            raise "#{@input}: error parsing CSS: #{e}"
           end
         end
       end

data/lib/mill/resources/textile.rb

@@ -0,0 +1,27 @@
+module Mill
+
+  class Resource
+
+    class Textile < Markup
+
+      FileTypes = %w{
+        text/textile
+      }
+
+      if MIME::Types['text/textile'].empty?
+        type = MIME::Type.new(
+          'content-type'        => 'text/textile',
+          'preferred-extension' => 'textile',
+        )
+        MIME::Types.add(type)
+      end
+
+      def parse_text(text)
+        RedCloth.new((text || '').strip, [:no_span_caps]).to_html
+      end
+
+    end
+
+  end
+
+end

data/lib/mill/resources.rb

@@ -0,0 +1,89 @@
+module Mill
+
+  class Resources
+
+    include SetParams
+
+    def initialize(params={})
+      super
+      @dictionary = {}
+      @tree = Tree::TreeNode.new('')
+    end
+
+    def <<(resource)
+      @dictionary[resource.path] = resource
+      if resource.primary?
+        node = find_or_create_node(resource.path)
+        resource.node = node
+        node.content = resource
+      end
+    end
+
+    def empty?
+      @dictionary.empty?
+    end
+
+    def [](path)
+      path = path.path if path.kind_of?(Addressable::URI)
+      @dictionary[path] || @dictionary[path + '/']
+    end
+
+    def each(&block)
+      @dictionary.values.each(&block)
+    end
+
+    def select(&block)
+      @dictionary.values.select(&block)
+    end
+
+    def of_class(klass)
+      @dictionary.values.select { |r| r.kind_of?(klass) }
+    end
+
+    def delete(resource)
+      @dictionary.delete(resource.path) or raise Error, "No resource with path #{resource.path.inspect}"
+      if (node = find_node(resource.path))
+        node.delete
+      end
+    end
+
+    def find_node(path)
+      node = @tree
+      path_components(path).each do |component|
+        node = node[component] or return nil
+      end
+      node
+    end
+
+    def find_or_create_node(path)
+      node = @tree
+      path_components(path).each do |component|
+        node = node[component] || (node << Tree::TreeNode.new(component))
+      end
+      node
+    end
+
+    def path_components(path)
+      path.split('/').reject(&:empty?)
+    end
+
+    def print_tree
+      print_node(@tree)
+    end
+
+    def print_node(node, level=0)
+      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_node(child, level + 1) }
+    end
+
+  end
+
+end