lib/mill/resource.rb in mill-0.11 vs lib/mill/resource.rb in mill-0.16

@@ -4,14 +4,16 @@
 
     FileTypes = []
 
     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,
                    date: nil,
                    public: false,
@@ -21,11 +23,14 @@
         @input_file = Path.new(input_file)
         @date = input_file.mtime.to_datetime
       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
       @site = site
     end
@@ -55,45 +60,53 @@
         raise Error, "Can't assign 'public' attribute: #{public.inspect}"
       end
     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
       @site.site_uri + uri
     end
 
     def tag_uri
@@ -117,17 +130,17 @@
     end
 
     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
 
   end
 
\ No newline at end of file