sitepress-core 3.2.2 → 4.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50ca4e44a7c1383550c83bb286a68f8232319d35da955324fdfd64e04e47979c
-  data.tar.gz: 1f9fb14a2bcee3766f5ad2e7d7e7a37034e8fc6731866db61c33020f17261fe0
+  metadata.gz: 28ce680cdd4f344d39f26ae0697f10fd24122c8e3bea5c3206da25fd0565f88e
+  data.tar.gz: 4526b2a2968248ce14ba65e2a09ae33764debb4001d85c1e0507f176bf18c257
 SHA512:
-  metadata.gz: 89a792c19463316b3e56b47a66158b974b05640419a767d8496ca96defa28e63151d63050c6fabc24a5ed96a2ff367c0f0b34522c4b02cef0fedf02e391ff3ff
-  data.tar.gz: 024ac0f23d3df04fd80ee8a9d141ee12610394b635a6e3ee661f313b5ee1ae7ab65b8bec6c9fdaf191c5c36f42fb6f059e515b5d2d380b8d136a0c53adbd1a54
+  metadata.gz: 14fbfe33e54f23887d1d3c14b5edcfb263f50277a2e4f596c059baa04ac35d41ae70bd542564e198e17453862202cec785d6debea3a6a89269946674f4cd6455
+  data.tar.gz: 1ae6cc0347519f583c693fffea97c1f702c6dd1fedf7146cc7dead11012c7c73d7426f086cdf16fe07542a998135dee8dabe52ae49078129cab8d60e614be89a

data/lib/sitepress/asset.rb

@@ -18,6 +18,7 @@ module Sitepress
     DEFAULT_PARSER = Parsers::Frontmatter
 
     attr_reader :path
+    attr_writer :body
 
     extend Forwardable
     def_delegators :renderer, :render
@@ -32,7 +33,11 @@ module Sitepress
     end
 
     def data
-      @data ||= exists? ? parse_error { parser.data } : {}
+      @data ||= Data.manage(exists? ? parse_error { parser.data } : {})
+    end
+
+    def data=(data)
+      @data = Data.manage(data)
     end
 
     def body
@@ -55,7 +60,7 @@ module Sitepress
       !!handler
     end
 
-    # Set the parser equal to a thing.
+    # Mmm.... that's the smell of cache busting, which means the hiearchy of this is wrong.
     def parser=(parser_klass)
       @parser = nil
       @parser_klass = parser_klass
@@ -70,7 +75,7 @@ module Sitepress
     end
 
     def destroy
-      FIleUtils.rm path
+      FileUtils.rm path
     end
 
     def save

data/lib/sitepress/asset_node_mapper.rb

@@ -28,12 +28,12 @@ module Sitepress
 
     def process_directory(path)
       node_name = File.basename path
-      node_mapper path: path, node: node.add_child(node_name)
+      node_mapper path: path, node: node.child(node_name)
     end
 
     def process_asset(path)
       asset = Asset.new(path: path)
-      node.add_child(asset.node_name).formats.add(format: asset.format, asset: asset)
+      node.child(asset.node_name).resources.add_asset(asset, format: asset.format)
     end
 
     private

data/lib/sitepress/asset_paths.rb

@@ -6,13 +6,13 @@ module Sitepress
   class AssetPaths
     include Enumerable
 
-    # Exclude swap files created by Textmate and vim from being added
-    # to the sitemap.
-    IGNORE_FILE_PATTERNS = [
-      "*~",         # Created by many editors when things crash
-      "*.swp",      # Created by vim
-      ".DS_Store",  # Created by our friends at Apple
-      "*.orig"      # Created when there's a git conflict
+    # Exclude swap files created by Textmate and vim from being added to the sitemap.
+    IGNORE_PATTERNS = [
+      "**/*~",        # Created by many editors when things crash
+      "**/*.swp",     # Created by vim
+      "**/.DS_Store", # Created by our friends at Apple
+      "**/*.orig",    # Created when there's a git conflict
+      "**/.git*"      # This is a problem when a git repo is nested in a project's `./pages` folder.
     ]
 
     # Template files that start with `_user.html.erb` are partials that we want
@@ -43,7 +43,7 @@ module Sitepress
     end
 
     def matches_ignore_file_pattern?(path)
-      IGNORE_FILE_PATTERNS.any? { |pattern| path.basename.fnmatch? pattern }
+      IGNORE_PATTERNS.any? { |pattern| path.fnmatch? pattern }
     end
   end
 end

data/lib/sitepress/data.rb

@@ -1,47 +1,94 @@
 module Sitepress
-  class Data
-    def initialize(data)
-      @data = data
+  module Data
+    def self.manage(value)
+      case value
+      when Hash
+        Record.new value
+      when Array
+        Collection.new value
+      else
+        value
+      end
     end
 
-    def fetch(key, *args, &block)
-      wrap_value { @data.fetch(key.to_s, *args, &block) }
+    def self.unmanage(data)
+      case data
+      when Record, Collection
+        data.unmanage
+      else
+        data
+      end
     end
 
-    def [](key)
-      wrap_value { @data[key.to_s] }
+    # Wraps an array and returns managed elements
+    class Collection
+      include Enumerable
+      extend Forwardable
+
+      def_delegators :@array, :each, :[]
+
+      def initialize(array)
+        @array = array.map { |element| Data.manage(element) }
+      end
+
+      def unmanage
+        @array.map { |value| Data.unmanage(value) }
+      end
     end
 
-    def method_missing(name, *args, **kwargs, &block)
-      if respond_to? name
-        self.send name, *args, **kwargs, &block
-      else
-        key, modifier, _ = name.to_s.partition("!")
-        wrap_value do
+    # Wraps a hash and returns managed elements
+    class Record
+      include Enumerable
+      extend Forwardable
+
+      def_delegators :@hash, :keys, :values, :key?
+
+      def initialize(hash)
+        @hash = hash
+      end
+
+      def fetch(key, *args, &block)
+        Data.manage(@hash.fetch(key.to_s, *args, &block))
+      end
+
+      def [](key)
+        Data.manage(@hash[key.to_s])
+      end
+
+      def []=(key, value)
+        Data.manage(@hash[key.to_s] = value)
+      end
+
+      def each
+        @hash.each do |key, value|
+          yield key, Data.manage(value)
+        end
+      end
+
+      def unmanage
+        @hash.transform_values { |value| Data.unmanage(value) }
+      end
+
+      def method_missing(name, *args, **kwargs, &block)
+        if respond_to? name
+          self.send name, *args, **kwargs, &block
+        else
+          key, modifier, _ = name.to_s.partition(/[!?]/)
+
           case modifier
           when ""
-            @data[key]
+            self[key]
           when "!"
-            @data.fetch(key)
+            self.fetch(key, *args, &block)
+          when "?"
+            !!self[key]
           end
         end
       end
-    end
-
-    def dig(*args, **kwargs, &block)
-      wrap_value { @data.dig(*args, **kwargs, &block) }
-    end
 
-    private
-      def wrap_value(&block)
-        case value = block.call
-        when Hash
-          self.class.new value
-        when Array
-          value.map { |v| wrap_value { v } }
-        else
-          value
-        end
+      def dig(*args, **kwargs, &block)
+        Data.manage @hash.dig(*args, **kwargs, &block)
       end
+    end
   end
 end

data/lib/sitepress/extensions/layouts.rb

@@ -14,7 +14,7 @@ module Sitepress
       end
 
       def process_resources(node)
-        node.flatten.each do |resource|
+        node.resources.flatten.each do |resource|
           @rules.each do |rule|
             if rule.processor.call(resource)
               resource.data["layout"] ||= rule.layout

data/lib/sitepress/extensions/proc_manipulator.rb

@@ -6,13 +6,7 @@ module Sitepress
       end
 
       def process_resources(node)
-        node.flatten.each do |resource|
-          if @block.arity == 1
-            @block.call resource
-          else # This will blow up if 0 or greater than 2.
-            @block.call resource, node
-          end
-        end
+        @block.call node
       end
     end
   end

data/lib/sitepress/node.rb

@@ -5,28 +5,28 @@ module Sitepress
   # a leaf node. The actual `buz.html` asset is then stored on the leaf node as a resource. This tree structure
   # makes it possible to reason through path relationships from code to build out elements in a website like tree navigation.
   class Node
-    attr_reader :parent, :name, :default_format, :default_name
+    extend Forwardable
+    def_delegators :resources, :formats
 
-    # Default extension
-    DEFAULT_EXTENSION = :html
+    attr_reader :parent, :name, :default_format, :default_name, :resources
+
+    DEFAULT_FORMAT = :html
 
     DEFAULT_NAME = "index".freeze
 
-    def initialize(parent: nil, name: nil, default_format: DEFAULT_EXTENSION, default_name: DEFAULT_NAME)
-      @parent = parent
+    def initialize(parent: nil, name: nil, default_format: DEFAULT_FORMAT, default_name: DEFAULT_NAME)
       @name = name.freeze
+      @parent = parent
+      @children = Hash.new
+      @resources = Resources.new(node: self)
       @default_format = default_format
       @default_name = default_name
       yield self if block_given?
     end
 
-    def formats
-      @formats ||= Formats.new(node: self)
-    end
-
     # Returns the immediate children nodes.
     def children
-      child_nodes.values
+      @children.values
     end
 
     # Returns sibling nodes and self.
@@ -36,13 +36,7 @@ module Sitepress
 
     # Returns all parents up to the root node.
     def parents
-      parents = []
-      node = parent
-      while node do
-        parents << node
-        node = node.parent
-      end
-      parents
+      Enumerator.produce(parent, &:parent).take_while(&:itself)
     end
 
     def root?
@@ -50,45 +44,64 @@ module Sitepress
     end
 
     def leaf?
-      child_nodes.empty?
-    end
-
-    def flatten(resources: [])
-      formats.each{ |resource| resources << resource }
-      children.each do |child|
-        child.flatten.each{ |resource| resources << resource }
+      @children.empty?
+    end
+
+    def parent=(parent)
+      child = self
+
+      if parent == @parent
+        return
+      elsif parent.nil?
+        remove
+        return
+      # Make sure we don't change the parent of this node to one if its children; otherwise
+      # we'd have to jump into a time machine and do some really weird stuff with Doc Whatever-his-name-is.
+      elsif child.children.include? parent
+        raise Sitepress::Error, "Parent node can't be changed to one of its children"
+      # Check if the name of this node exists as a child on the new parent.
+      elsif parent.child? child.name
+        raise Sitepress::Error, "Node exists with the name #{child.name.inspect} in #{parent.inspect}. Remove existing node."
+      else
+        @parent = parent
+        parent.overwrite_child child
       end
-      resources
     end
 
     def remove
-      formats.clear
-      parent.remove_child(name) if leaf?
+      return if @parent.nil?
+      @parent.remove_child name
+      @parent = nil
     end
 
     def get(path)
       path = Path.new(path)
       node = dig(*path.node_names)
-      node.formats.get(path.format) if node
+      node.resources.format(path.format) if node
     end
 
-    def add_child(name)
+    def child(name)
       return self if name == default_name
-      child_nodes[name].tap do |node|
-        yield node if block_given?
+
+      @children.fetch(name){ @children[name] = build_child(name: name) }.tap do |child|
+        yield child if block_given?
       end
     end
 
+    def child?(name)
+      @children.key? name
+    end
+
     def inspect
-      "<#{self.class}: name=#{name.inspect}, formats=#{formats.extensions.inspect}, children=#{children.map(&:name).inspect}, resource_request_paths=#{formats.map(&:request_path)}>"
+      "<#{self.class}: name=#{name.inspect}, formats=#{formats.inspect}, children=#{children.map(&:name).inspect}, resource_request_paths=#{resources.map(&:request_path)}>"
     end
 
     def dig(*args)
       head, *tail = args
       if (head.nil? or head.empty? or head == default_name) and tail.empty?
         self
-      elsif child_nodes.has_key?(head)
-        child_nodes[head].dig(*tail)
+      elsif child?(head)
+        @children[head].dig(*tail)
       else
         nil
       end
@@ -96,16 +109,16 @@ module Sitepress
 
     protected
     def remove_child(name)
-      child_nodes.delete(name)
+      @children.delete(name)
     end
 
-    private
-    def build_child(name)
-      Node.new(parent: self, name: name, default_format: default_format, default_name: default_name)
+    def overwrite_child(node)
+      @children[node.name] = node
     end
 
-    def child_nodes
-      @child_nodes ||= Hash.new { |hash, key| hash[key] = build_child(key) }
+    private
+    def build_child(**kwargs)
+      Node.new(parent: self, default_format: default_format, default_name: default_name, **kwargs)
     end
   end
 end

data/lib/sitepress/parsers/frontmatter.rb

@@ -24,7 +24,7 @@ module Sitepress
 
         def render
           [
-            dump_yaml(data),
+            dump_yaml(Data.unmanage(data)),
             Frontmatter::DELIMITER,
             $/,
             $/,

data/lib/sitepress/path.rb

@@ -60,6 +60,10 @@ module Sitepress
       (handler_is_format? ? handler : @format)&.to_sym
     end
 
+    def relative_path_from(target)
+      Pathname.new(@path).relative_path_from(target).to_s
+    end
+
     private
       # TODO: I don't want to look this up everytime I try to figure out the
       # extension. I'll have to create an extension registry .

data/lib/sitepress/resource.rb

@@ -6,9 +6,8 @@ module Sitepress
   # and may be altered by the resource proxy.
   class Resource
     extend Forwardable
-    def_delegators :asset, :renderable?
+    def_delegators :asset, :body, :data, :renderable?
 
-    attr_writer :body, :data
     attr_reader :node, :asset
 
     attr_accessor :format, :mime_type, :handler
@@ -28,12 +27,51 @@ module Sitepress
       File.join("/", *lineage, request_filename)
     end
 
-    def data
-      @data ||= asset.data
+    # Eugh, I really don't like this because it's not a full URL. To get a full URL though this thing
+    # needs to be put into `url_for(request_path)` in Rails to get the hostname. I don't want to inject
+    # that dependency into this thing, so here it is.
+    alias :url :request_path
+
+    def node=(destination)
+      if destination.resources.format? format
+        raise Sitepress::Error, "#{destination.inspect} already has a resource with a #{format} format"
+      end
+      remove
+      destination.resources.add self
+      @node = destination
+    end
+
+    # Moves the resource to a destination node. Moving a resource to a Sitepress::Node
+    # is a little weird for people who are accustomed to working with files, which is pretty
+    # much everybody (including myself). A child node has to be created on the destination node
+    # with the name of the resource node.
+    #
+    # Or just ignore all of that and use the `move_to` method so you can feel like you're
+    # moving files around.
+    def move_to(destination)
+      raise Sitepress::Error, "#{destination.inspect} is not a Sitepress::Node" unless destination.is_a? Sitepress::Node
+      self.tap do |resource|
+        resource.node = destination.child(node.name)
+      end
+    end
+
+    # Creates a duplicate of the resource and moves it to the destination.
+    def copy_to(destination)
+      raise Sitepress::Error, "#{destination.inspect} is not a Sitepress::Node" unless destination.is_a? Sitepress::Node
+      self.clone.tap do |resource|
+        resource.node = destination.child(node.name)
+      end
+    end
+
+    # Clones should be initialized with a nil node. Initializing with a node would mean that multiple resources
+    # are pointing to the same node, which shouldn't be possible.
+    def clone
+      self.class.new(asset: @asset, node: nil, format: @format, mime_type: @mime_type, handler: @handler)
     end
 
-    def body
-      @body ||= asset.body
+    # Removes the resource from the node's resources list.
+    def remove
+      node.resources.remove format if node
     end
 
     def inspect
@@ -62,9 +100,16 @@ module Sitepress
 
     # Used internally to construct paths from the current node up to the root node.
     def lineage
-      @lineage ||= node.parents.reject(&:root?).reverse.map(&:name)
+      node.parents.reject(&:root?).reverse.map(&:name)
     end
 
+    class << self
+      attr_accessor :path_suffix_hack_that_you_should_not_use
+
+      def path_suffix_hack_that_you_should_not_use
+        @path_suffix_hack_that_you_should_not_use ||= ""
+      end
+    end
 
     private
     # Filters parent/child/sibling resources by a type. The default behavior is to only return
@@ -83,13 +128,13 @@ module Sitepress
 
       case type
       when :all
-        nodes.map{ |node| node.formats }
+        nodes.map{ |node| node.resources }
       when :same
-        nodes.map{ |n| n.formats.get(format) }.flatten
+        nodes.map{ |n| n.resources.format(format) }.flatten
       when String, Symbol, NilClass
-        nodes.map{ |n| n.formats.get(type) }.flatten
+        nodes.map{ |n| n.resources.format(type) }.flatten
       when MIME::Type
-        nodes.map{ |n| n.formats.mime_type(type) }.flatten
+        nodes.map{ |n| n.resources.mime_type(type) }.flatten
       else
         raise ArgumentError, "Invalid type argument #{type}. Must be either :same, :all, an extension string, or a Mime::Type"
       end
@@ -102,9 +147,9 @@ module Sitepress
       elsif node.root? and format
         "#{node.default_name}.#{format}"
       elsif node.root?
-        node.default_name
+        "#{node.default_name}#{self.class.path_suffix_hack_that_you_should_not_use}"
       elsif format.nil? or node.default_format == format
-        node.name
+        "#{node.name}#{self.class.path_suffix_hack_that_you_should_not_use}"
       else
         "#{node.name}.#{format}"
       end

data/lib/sitepress/{resource_collection.rb → resource_indexer.rb}

@@ -1,7 +1,7 @@
 module Sitepress
-  # Represents a collection of resources. Provides interfaces to query
-  # resource via globbing, paths, etc.
-  class ResourceCollection
+  # Flattens a tree of Sitepress::Node and Sitepress:Resource classes into a collection of
+  # resources that can be quickly globbed, queried, or accessed.
+  class ResourceIndexer
     extend Forwardable
     def_delegators :resources, :each, :size, :index, :[], :last, :length, :fetch, :count, :at
 
@@ -27,7 +27,7 @@ module Sitepress
 
     private
     def resources
-      @node.flatten
+      @node.resources.flatten
     end
   end
 end

data/lib/sitepress/resources.rb

@@ -0,0 +1,73 @@
+require "forwardable"
+
+module Sitepress
+  # Manages collections of resources that share the same Node. Given the files `/a.html` and `/a.gif`,
+  # both of these assets would be stored in the `Node#name = "a"` under `Node#formats` with
+  # the formats `.gif`, and `.html`.
+  class Resources
+    include Enumerable
+
+    extend Forwardable
+    def_delegators :@registry, :size, :clear, :empty?
+    def_delegators :@node, :default_format
+
+    def initialize(node:)
+      @node = node
+      @registry = Hash.new
+    end
+
+    def each(&block)
+      @registry.values.each(&block)
+    end
+
+    def remove(extension)
+      @registry.delete symbolize(extension)
+    end
+
+    def format(extension)
+      @registry[symbolize(extension || default_format)]
+    end
+
+    def formats
+      @registry.keys
+    end
+
+    def format?(key)
+      @registry.key? key
+    end
+
+    def mime_type(mime_type)
+      find { |f| f.mime_type == mime_type }
+    end
+
+    def add(resource)
+      if @registry.key? resource.format
+        raise Sitepress::ExistingRequestPathError, "Resource at #{resource.request_path} already set with format #{resource.format.inspect}"
+      else
+        @registry[resource.format] = resource
+      end
+    end
+
+    def flatten(resources: [])
+      each { |resource| resources << resource }
+      @node.children.each do |child|
+        child.resources.flatten.each { |resource| resources << resource }
+      end
+      resources
+    end
+
+    def add_asset(asset, format: nil)
+      format = symbolize(format || default_format)
+      add Resource.new(asset: asset, node: @node, format: format)
+    end
+
+    def inspect
+      "<#{self.class}: resources=#{map(&:request_path)}>"
+    end
+
+    private
+    def symbolize(format)
+      format&.to_sym
+    end
+  end
+end

data/lib/sitepress/site.rb

@@ -5,17 +5,10 @@ require "forwardable"
 module Sitepress
   # A collection of pages from a directory.
   class Site
-    # Default file pattern to pick up in site
-    DEFAULT_GLOB = "**/**".freeze
-
     # Default root_path for site.
     DEFAULT_ROOT_PATH = Pathname.new(".").freeze
 
-    # Maps Rail-ish template files & structures into the site's node tree.
-    DEFAULT_NODE_MAPPER = AssetNodeMapper
-
     attr_reader :root_path
-    attr_accessor :node_mapper
     attr_writer :resources_pipeline
 
     # TODO: Get rid of these so that folks have ot call site.resources.get ...
@@ -24,21 +17,25 @@ module Sitepress
 
     def initialize(root_path: DEFAULT_ROOT_PATH)
       self.root_path = root_path
-      self.node_mapper = DEFAULT_NODE_MAPPER
     end
 
     # A tree representation of the resourecs wthin the site. The root is a node that's
     # processed by the `resources_pipeline`.
     def root
-      @root ||= Node.new.tap do |node|
-        node_mapper.new(path: pages_path, node: node).map
-        resources_pipeline.process node
+      @root ||= Node.new.tap do |root|
+        asset_node_mapper(root).map
+        resources_pipeline.process root
       end
     end
 
+    # Maps a path of directories and files into the root node.
+    def asset_node_mapper(root_node)
+      AssetNodeMapper.new(path: pages_path, node: root_node)
+    end
+
     # Returns a list of all the resources within #root.
     def resources
-      @resources ||= ResourceCollection.new(node: root, root_path: pages_path)
+      @resources ||= ResourceIndexer.new(node: root, root_path: pages_path)
     end
 
     def reload!
@@ -94,8 +91,8 @@ module Sitepress
     # certain path:
     #
     # ```ruby
-    # Sitepress.site.manipulate do |resource, root|
-    #   if resource.request_path.start_with? "/videos/"
+    # Sitepress.site.manipulate do |root|
+    #   root.get("videos").each do |resource|
     #     resource.data["layout"] = "video"
     #   end
     # end
@@ -105,7 +102,11 @@ module Sitepress
     # in the site:
     #
     # ```ruby
-    # Sitepress.site.manipulate do |resource, root|
+    # Sitepress.site.manipulate do |root|
+    #   root.get("blog").each do |post|
+    #     post.move_to root
+    #   end
+    #
     #   if resource.request_path == "/index"
     #     # Remove the HTML format of index from the current resource level
     #     # so we can level it up.

data/lib/sitepress/version.rb

@@ -1,3 +1,3 @@
 module Sitepress
-  VERSION = "3.2.2".freeze
+  VERSION = "4.0.0.beta1".freeze
 end

data/lib/sitepress-core.rb

@@ -1,6 +1,9 @@
 require "sitepress/version"
 
 module Sitepress
+  # Errors raised by Sitepress
+  Error = Class.new(StandardError)
+
   # Raised by Resources if a path is added that's not a valid path.
   InvalidRequestPathError = Class.new(RuntimeError)
 
@@ -10,12 +13,13 @@ module Sitepress
   autoload :Asset,                "sitepress/asset"
   autoload :AssetNodeMapper,      "sitepress/asset_node_mapper"
   autoload :AssetPaths,           "sitepress/asset_paths"
-  autoload :Formats,              "sitepress/formats"
+  autoload :Data,                 "sitepress/data"
   autoload :Node,                 "sitepress/node"
   autoload :Path,                 "sitepress/path"
   autoload :Parsers,              "sitepress/parsers"
   autoload :Resource,             "sitepress/resource"
-  autoload :ResourceCollection,   "sitepress/resource_collection"
+  autoload :Resources,            "sitepress/resources"
+  autoload :ResourceIndexer,      "sitepress/resource_indexer"
   autoload :ResourcesPipeline,    "sitepress/resources_pipeline"
   autoload :Site,                 "sitepress/site"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitepress-core
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 4.0.0.beta1
 platform: ruby
 authors:
 - Brad Gessler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-11 00:00:00.000000000 Z
+date: 2023-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,7 +80,6 @@ files:
 - lib/sitepress/data.rb
 - lib/sitepress/extensions/layouts.rb
 - lib/sitepress/extensions/proc_manipulator.rb
-- lib/sitepress/formats.rb
 - lib/sitepress/node.rb
 - lib/sitepress/parsers.rb
 - lib/sitepress/parsers/base.rb
@@ -88,7 +87,8 @@ files:
 - lib/sitepress/parsers/notion.rb
 - lib/sitepress/path.rb
 - lib/sitepress/resource.rb
-- lib/sitepress/resource_collection.rb
+- lib/sitepress/resource_indexer.rb
+- lib/sitepress/resources.rb
 - lib/sitepress/resources_pipeline.rb
 - lib/sitepress/site.rb
 - lib/sitepress/version.rb
@@ -111,11 +111,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: An embeddable file-backed content management system.

data/lib/sitepress/formats.rb

@@ -1,59 +0,0 @@
-require "forwardable"
-
-module Sitepress
-  # Manages collections of resources that share the same Node. Given the files `/a.html` and `/a.gif`,
-  # both of these assets would be stored in the `Node#name = "a"` under `Node#formats` with
-  # the extensions `.gif`, and `.html`.
-  class Formats
-    include Enumerable
-
-    extend Forwardable
-    def_delegators :@formats, :size, :clear
-    def_delegators :@node, :default_format
-
-    def initialize(node: )
-      @node = node
-      @formats = Hash.new
-    end
-
-    def each(&block)
-      @formats.values.each(&block)
-    end
-
-    def remove(extension)
-      @formats.delete symbolize(extension)
-    end
-
-    def get(extension)
-      @formats[symbolize(extension || default_format)]
-    end
-
-    def extensions
-      @formats.keys
-    end
-
-    def mime_type(mime_type)
-      find { |f| f.mime_type == mime_type }
-    end
-
-    def add(asset:, format: nil)
-      format = symbolize(format || default_format)
-
-      resource = Resource.new(asset: asset, node: @node, format: format)
-      if @formats.has_key? format
-        raise Sitepress::ExistingRequestPathError, "Resource at #{resource.request_path} already set with format #{format.inspect}"
-      else
-        @formats[format] = resource
-      end
-    end
-
-    def inspect
-      "<#{self.class}: resources=#{map(&:request_path)}>"
-    end
-
-    private
-    def symbolize(format)
-      format&.to_sym
-    end
-  end
-end