archival 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c29406fcec39c52b6876b805dba5509d6f43da5805944a344b2c771214cd8ed
-  data.tar.gz: 7319f9d6dace6b20c57e318d4df1c4dc80c1bd67673cee1b37d9a17ba35f823b
+  metadata.gz: 823433cd1bdae7bc4e3a6179451a875e7fbe5de17c4ceaa8a0b246cdd9fa3b61
+  data.tar.gz: 778ef490bf23365d6e1fa1207d0f959ead5a59edbaebebeebe16837981a6c230
 SHA512:
-  metadata.gz: e05e6573f3e580d3a364826b7fd604559f2513e609a5436ba4170d606112d913e91d3cc0ec5498f4e0c418212b85068d7d859829030ee8b113a8909b04020e64
-  data.tar.gz: 8c227320c6d961595b5ce545559df4cdddf42e1d27819c1e5013b1e8189932bb50b4047e47bc5f85c8af1b0109a9b582063e487fb926132248d766b19fc98498
+  metadata.gz: cbbbd3c0ef92fabfcc08608adc376ce1272c36e30aa6f3b6d9e12d0ce5b9dd781b1fac4663262b144a85fe42ad951df396004f08518059820f6fc0c45d8a082c
+  data.tar.gz: fee79490a8d086eee8779e985483f0b80e75b1ec0df657eb19ed8c74a3a2e5590a8c2e4f74f20ce529e1536e204c3f62574cc5c6ac777bc38c07ebcd1723f3b4

data/archival.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'archival'
-  s.version     = '0.0.5'
+  s.version     = '0.0.6'
   s.summary     = 'An incredibly simple CMS for durable websites'
   s.description = 'https://jesseditson.com/the-simplest-cms-part-1'
   s.authors     = ['Jesse Ditson']

data/lib/archival/builder.rb

@@ -9,6 +9,9 @@ Liquid::Template.error_mode = :strict
 Liquid::Template.register_tag('layout', Layout)
 
 module Archival
+  class DuplicateKeyError < StandardError
+  end
+
   class Builder
     attr_reader :page_templates
 
@@ -110,14 +113,16 @@ module Archival
     end
 
     def sort_objects(objects)
-      # Since objects are hashes but we'd like them to be iterable based on
-      # arbitrary "order" keys, and in ruby hashes enumerate in insert order,
-      # we just need to re-insert in the correct order.
-      sorted_keys = objects.sort_by do |name, obj|
-        obj['order'].to_s || name
+      # Sort by either 'order' key or object name, depending on what is
+      # available.
+      sorted_by_keys = objects.sort_by do |name, obj|
+        obj.key?('order') ? obj['order'].to_s : name
       end
-      sorted_objects = {}
-      sorted_keys.each do |d|
+      sorted_objects = Archival::TemplateArray.new
+      sorted_by_keys.each do |d|
+        raise DuplicateKeyError if sorted_objects.key?(d[0])
+
+        sorted_objects.push(d[1])
         sorted_objects[d[0]] = d[1]
       end
       sorted_objects

data/lib/archival/template_array.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Archival
+  class TemplateArray < Array
+    alias subscript_access []
+    alias subscript_write []=
+
+    def initialize(*args)
+      super(*args)
+      @data = {}
+    end
+
+    def [](*args)
+      key = args[0]
+      return @data[key] if key.is_a? String
+      return @data[key] if key.is_a? Symbol
+
+      subscript_access(*args)
+    end
+
+    def []=(*args)
+      key = args[0]
+      if key.is_a?(String) || key.is_a?(Symbol)
+        @data[key] = args[1]
+        return
+      end
+      subscript_write(*args)
+    end
+
+    def key?(key)
+      @data.key?(key)
+    end
+  end
+end

data/lib/archival/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Archival
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/archival.rb

@@ -5,6 +5,7 @@ module Archival
 end
 
 require 'archival/version'
+require 'archival/template_array'
 require 'archival/logger'
 require 'archival/config'
 require 'archival/helper_server'

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "archival",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "An incredibly simple CMS for durable websites",
   "bin": "build.rb",
   "directories": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: archival
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Jesse Ditson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-07 00:00:00.000000000 Z
+date: 2021-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -105,6 +105,7 @@ files:
 - lib/archival/listen.rb
 - lib/archival/logger.rb
 - lib/archival/rake_tasks.rb
+- lib/archival/template_array.rb
 - lib/archival/version.rb
 - lib/tags/layout.rb
 - package.json