Move data sets into a dedicated directory

I want site and _site to be a similar shape. The leading-underscore YAML
files are not intended to have a 1:1 relationship with a generated file.

I think that's my major mental model. I want there to be a 1:1
relationship between a "source" in `site` and a "target" in `_site`.

We'll see.

.github/workflows/download_pinboard_bookmarks.yml

@@ -16,6 +16,6 @@ jobs:
         run: |
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
-          git add site/_pinboard_bookmarks.yml
-          git commit --only site/_pinboard_bookmarks.yml --message "Ran rake download_pinboard_bookmarks in a GitHub Action" || echo "Nothing to commit"
+          git add data/pinboard_bookmarks.yml
+          git commit --only data/pinboard_bookmarks.yml --message "Ran rake download_pinboard_bookmarks in a GitHub Action" || echo "Nothing to commit"
           git push

lib/build.rb

@@ -17,6 +17,10 @@ def target_dir
     "_site"
   end
 
+  def data_dir
+    "data"
+  end
+
   def dehydrated_sources
     @dehydrated_sources ||= Source.gather(source_dir)
   end
@@ -29,8 +33,12 @@ def hydrated_targets
     @hydrated_targets ||= dehydrated_targets.map(&:hydrate) + [RssTarget.new]
   end
 
+  def data_sets
+    DataSet.gather(data_dir)
+  end
+
   def data
-    @data ||= BuildData.new(dehydrated_targets)
+    @data ||= BuildData.new(dehydrated_targets, data_sets)
   end
 
   def includables

lib/build_data.rb

@@ -1,14 +1,16 @@
 class BuildData
   attr_reader :targets
+  attr_reader :data_sets
   attr_reader :current_page
 
-  def initialize(targets, current_page = nil)
+  def initialize(targets, data_sets, current_page = nil)
     @targets = targets
+    @data_sets = data_sets
     @current_page = current_page
   end
 
   def for_current_page(next_current_page)
-    self.class.new(targets, next_current_page)
+    self.class.new(targets, data_sets, next_current_page)
   end
 
   def all
@@ -42,7 +44,7 @@ def assets
   end
 
   def sets
-    targets.select { |t| t.is_a?(DataSet) }.map { |t| [t.name, t.data] }.to_h
+    data_sets.map { |t| [t.name, t.data] }.to_h
   end
 
   def tags

lib/data_set.rb

@@ -1,26 +1,27 @@
 class DataSet
   attr_reader :path
 
+  def self.gather(dir)
+    Dir
+      .glob("#{dir}/*")
+      .reject { |path| File.directory?(path) }
+      .map { |path| new(path) }
+  end
+
   def initialize(path)
     @path = path
   end
 
   def data
-    YAML.safe_load(
-      File.read(path),
-      permitted_classes: [Date, PinboardBookmark, Symbol]
-    )
+    @data ||=
+      YAML.safe_load(
+        File.read(path),
+        permitted_classes: [Date, PinboardBookmark, Symbol]
+      )
   end
 
   def name
-    path.delete_prefix(Build.source_dir).delete_prefix("/_").delete(".yml")
-  end
-
-  def hydrate
-    self
-  end
-
-  def write
-    self
+    extname = File.extname(path)
+    File.basename(path, extname)
   end
 end

lib/pinboard_bookmark.rb

@@ -1,6 +1,6 @@
 PinboardBookmark =
   Struct.new(:href, :title, :commentary, :date, :tags, keyword_init: true) do
-    PATH = "site/_pinboard_bookmarks.yml".freeze
+    PATH = "data/pinboard_bookmarks.yml".freeze
 
     def self.pull
       auth_token = ENV["DANOTT_DOT_WEBSITE_PINBOARD_AUTH_TOKEN"]

lib/source.rb

@@ -13,8 +13,6 @@ def self.for(path)
       MarkdownSource.new(path: path, content: MagicFile.read(path))
     when ".css", ".jpg", ".js", ".png"
       FileCopier.new(path)
-    when ".yml"
-      DataSet.new(path)
     else
       NoopSource.new(path)
     end