contentfs 0.0.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dd7fc4b06ab77f27e8998c275cb3d4659dc450d013ebf2df47fd5609d9fe322
-  data.tar.gz: d289facaae4ca3c791054b632397efb2e2286c964602885888215b5584e06d4d
+  metadata.gz: 5386e4d1a1ef23527ec457ecb544d4d36d02e44811fe81f87db93f4188d82145
+  data.tar.gz: f44614daf6d97aabd4d83a0e2339dd8d20e19d742b8b8403c37fc2967dd40925
 SHA512:
-  metadata.gz: dedfb6034eb79b0b09bbbb9645c8de6f04b9a8e6ff78a31186c11798317ca02807e00eed644bd980f57cb5407d13843d7cec1d0c6a3ec5efa8a0a755865c752a
-  data.tar.gz: 8a9010f2faf608345653e321310208dc2b85afafbc2985a6c9392ddccbfe548e6f500b146a66525aa3adda88320913544e9605ac4f5348de9598f276c6f7f8b1
+  metadata.gz: 39ee593b9c158d2093d5a8bc59a8d8510adb8a206d4b786a0465347e79f12323806765be999be8ad7fd14bccb4e32134696c1f851fa466a1a515d3b44d7ecc63
+  data.tar.gz: f1ab2b7a9cc994b5d91cef392fa8d4a4c1bedaac69428ceb9552143b7f969391ec32a16ae1240c66da616a80440945bfae9f8a30e010bcd47f2f36f7aa89e3ef

data/CHANGELOG.md

@@ -0,0 +1,40 @@
+## v0.3.0
+
+*unreleased*
+
+  * `chg` [#8](https://github.com/metabahn/contentfs/pull/8) Load database content from _content to avoid collisions ([bryanp](https://github.com/bryanp))
+
+## v0.2.1
+
+*unreleased*
+
+  * `fix` [#7](https://github.com/metabahn/contentfs/pull/7) Order content and databases by prefix or slug ([bryanp](https://github.com/bryanp))
+
+## [v0.2.0](https://github.com/metabahn/contentfs/releases/tag/v0.2.0)
+
+*released on 2020-11-14*
+
+  * `add` [#6](https://github.com/metabahn/contentfs/pull/6) Expose database metadata ([bryanp](https://github.com/bryanp))
+
+## [v0.1.1](https://github.com/metabahn/contentfs/releases/tag/v0.1.1)
+
+*released on 2020-11-13*
+
+  * `fix` [#5](https://github.com/metabahn/contentfs/pull/5) Remove front-matter from content ([bryanp](https://github.com/bryanp))
+
+## [v0.1.0](https://github.com/metabahn/contentfs/releases/tag/v0.1.0)
+
+*released on 2020-11-12*
+
+  * `add` [#4](https://github.com/metabahn/contentfs/pull/4) Expose namespaces for databases and content ([bryanp](https://github.com/bryanp))
+  * `add` [#3](https://github.com/metabahn/contentfs/pull/3) Introduce `Database#nested` for iterating over databases ([bryanp](https://github.com/bryanp))
+  * `chg` [#2](https://github.com/metabahn/contentfs/pull/2) Rename `Database#all` to `Database#content` ([bryanp](https://github.com/bryanp))
+  * `add` [#1](https://github.com/metabahn/contentfs/pull/1) Introduce `Database#find` for safer traversal ([bryanp](https://github.com/bryanp))
+
+## [v0.0.0](https://github.com/metabahn/contentfs/releases/tag/v0.0.0)
+
+*released on 2020-11-11*
+
+  * Initial release.
+
+

data/lib/contentfs/content.rb

@@ -12,16 +12,16 @@ module ContentFS
   #
   class Content
     class << self
-      def load(path, metadata: {})
-        new(path: path, metadata: metadata)
+      def load(path, metadata: {}, namespace: [])
+        new(path: path, metadata: metadata, namespace: namespace)
       end
     end
 
     FRONT_MATTER_REGEXP = /\A---\s*\n(.*?\n?)^---\s*$\n?/m
 
-    attr_reader :format, :prefix, :slug, :metadata
+    attr_reader :format, :prefix, :slug, :metadata, :namespace
 
-    def initialize(path:, metadata: {})
+    def initialize(path:, metadata: {}, namespace: [])
       path = Pathname.new(path)
       extname = path.extname
       name = path.basename(extname)
@@ -29,8 +29,11 @@ module ContentFS
       @prefix = prefix
       @format = extname.to_s[1..-1]&.to_sym
       @slug = Slug.build(remainder)
-      @content = path.read
-      @metadata = metadata.merge(parse_metadata(@content))
+      @namespace = namespace.dup << @slug
+
+      content = path.read
+      @metadata = metadata.merge(parse_metadata(content))
+      @content = content.gsub(FRONT_MATTER_REGEXP, "")
     end
 
     def to_s

data/lib/contentfs/database.rb

@@ -11,58 +11,84 @@ module ContentFS
   #
   class Database
     class << self
-      def load(path)
-        new(path: path)
+      def load(path, namespace: [], root: true)
+        new(path: path, namespace: namespace, root: root)
       end
     end
 
     METADATA_FILE = "_metadata.yml"
 
-    attr_reader :prefix, :slug
+    attr_reader :prefix, :slug, :namespace, :metadata
 
-    def initialize(path:)
+    def initialize(path:, namespace: [], root: false)
       path = Pathname.new(path)
       name = path.basename(path.extname)
       prefix, remainder = Prefix.build(name)
       @prefix = prefix
-      @slug = Slug.build(remainder)
-      @children = {}
-      @nested = {}
+      @namespace = namespace.dup
+
+      unless root
+        @slug = Slug.build(remainder)
+        @namespace << @slug
+      end
 
       metadata_path = path.join(METADATA_FILE)
 
-      metadata = if metadata_path.exist?
+      @metadata = if metadata_path.exist?
         YAML.safe_load(metadata_path.read).to_h
       else
         {}
       end
 
+      content_path = path.join.glob("_content.*")[0]
+
+      @content = if content_path&.exist?
+        Content.load(content_path, metadata: @metadata, namespace: @namespace)
+      end
+
+      children, nested = {}, {}
       Pathname.new(path).glob("*") do |path|
         next if path.basename.to_s.start_with?("_")
 
         if path.directory?
-          database = Database.load(path)
-          @nested[database.slug] = database
+          database = Database.load(path, namespace: @namespace, root: false)
+          nested[database.slug] = database
         else
-          content = Content.load(path, metadata: metadata)
+          content = Content.load(path, metadata: @metadata, namespace: @namespace)
 
-          if content.slug == :content
-            @content = content
-          else
-            @children[content.slug] = content
-          end
+          children[content.slug] = content
         end
       end
+
+      @children = Hash[
+        children.sort_by { |key, content|
+          (content.prefix || content.slug).to_s
+        }
+      ]
+
+      @nested = Hash[
+        nested.sort_by { |key, database|
+          (database.prefix || database.slug).to_s
+        }
+      ]
     end
 
-    def all
-      return to_enum(:all) unless block_given?
+    def content
+      return to_enum(:content) unless block_given?
 
       @children.each_value do |value|
         yield value
       end
     end
 
+    def nested
+      return to_enum(:nested) unless block_given?
+
+      @nested.each_value do |value|
+        yield value
+      end
+    end
+
     def filter(**filters)
       return to_enum(:filter, **filters) unless block_given?
 
@@ -77,6 +103,16 @@ module ContentFS
       }
     end
 
+    def find(name, *nested)
+      if @children.key?(name)
+        @children[name]
+      elsif @nested.key?(name)
+        nested.inject(@nested[name]) { |database, next_nested|
+          database.find(next_nested.to_sym)
+        }
+      end
+    end
+
     def to_s
       @content&.to_s.to_s
     end
@@ -86,15 +122,7 @@ module ContentFS
     end
 
     def method_missing(name, *nested, **)
-      if @children.key?(name)
-        @children[name]
-      elsif @nested.key?(name)
-        nested.inject(@nested[name]) { |database, next_nested|
-          database.public_send(next_nested.to_sym)
-        }
-      else
-        super
-      end
+      find(name, *nested) || super
     end
 
     def respond_to_missing?(name, *)

data/lib/contentfs/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ContentFS
-  VERSION = "0.0.0"
+  VERSION = "0.3.0"
 
   def self.version
     VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentfs
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Bryan Powell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies: []
 description: A structured content file system.
 email: bryan@metabahn.com
@@ -16,6 +16,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE
 - README.md
 - lib/contentfs.rb