lowload 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0a6b7db4c15bb23eea273eb0a2d63bfed6d182b03a9964eb4c8adabc947fe93
-  data.tar.gz: 4ae8e96140a5f5560204aa7aac365167dd500068e7cef9415ef4b919b8271239
+  metadata.gz: 6e6ef1c86c15e9d8f7318a024bfbfac163defc88e21b01269f8f1f32167b70ec
+  data.tar.gz: 0d30281fef9813da99ddd0326724af9399bb4c9a68aaf181469599bdf174eefb
 SHA512:
-  metadata.gz: 1aee43560dc727fd1093d933805dee8f6fb8f9d466a60c594cd4c6635f007f77830c143d05827efe412b48430705636d556ee8ab554d8973e73e19f04a944df4
-  data.tar.gz: 88c59f0e36586302d1457b00926afe013fbdef453815a38b56ef1cf0b15c74edd38d081e6d263403d5f062d0a9b47b44af635da504bebf63709f040f6f0d9570
+  metadata.gz: 12ba3c16d52fdcc5f9a8edea188891456367f9e9d4c7fa73b223dff4130732944edae68339b30fc8361c787293ca6baed0ff7afb439c7b1936756867dcd62768
+  data.tar.gz: a1ad316c6b3581df9db76b0281c26da17342847473e819dca73ba8f63ff2a73a7c59edeec6cf8eca00b4b68e9f5606577b3b172ef90fe197325345d304c15c8e

data/lib/adapters/adapter.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
+# rubocop:disable Lint/UnusedMethodArgument
+
 module LowLoad
   class Adapter
-    EXTENSIONS = []
+    EXTENSIONS = [].freeze
 
-    def metadata(file_path:) = nil
+    def mapload(file_path:) = nil
 
     def preload(file_path:) = nil
 
     def evaluate(file_path:, top_level_binding: nil) = nil
-
-    def url_path(file_path:) = nil
   end
 end
+
+# rubocop:enable Lint/UnusedMethodArgument

data/lib/adapters/markdown_adapter.rb

@@ -6,39 +6,6 @@ require_relative 'adapter'
 
 module LowLoad
   class MarkdownAdapter < Adapter
-    EXTENSIONS = ['md', 'rd', 'markdown', 'raindown']
-
-    def metadata(file_path:)
-      line_numbers = []
-      yaml_lines = []
-
-      File.foreach(file_path).with_index do |line, index|
-        if line.strip == '---'
-          line_numbers << index + 1
-          break if line_numbers.count > 1
-        elsif line_numbers.count > 0
-          yaml_lines << line
-        end
-      end
-
-      # TODO: Test that this returns an empty hash when no yaml lines found.
-      YAML.safe_load(yaml_lines.join, symbolize_names: true)
-    end
-
-    def url_path(file_path:)
-      # Remove "_number-" and segments beginning with "_".
-      url_path = file_path.split('/').map do |segment|
-        next segment.sub(/^_\d\W/, '') if segment.sub(/^_\d\W/, '') != segment
-        next nil if segment.sub(/^_/, '') != segment
-
-        segment
-      end.compact.join('/')
-      
-      EXTENSIONS.each do |extension|
-        url_path.delete_suffix!(".#{extension}")
-      end
-
-      url_path
-    end
+    EXTENSIONS = %w[md rd markdown raindown].freeze
   end
 end

data/lib/adapters/rbx_adapter.rb

@@ -10,13 +10,11 @@ end
 
 module LowLoad
   class RBXAdapter < Adapter
-    EXTENSIONS = ['rbx']
+    EXTENSIONS = ['rbx'].freeze
 
     # Map all definitions and dependencies.
-    def metadata(file_path:)
+    def mapload(file_path:)
       Lowkey.load(file_path)
-
-      { file_path: }
     end
 
     # Then autoload all dependencies for those files.
@@ -35,7 +33,7 @@ module LowLoad
       eval(file_proxy.export, top_level_binding, file_proxy.file_path, 0) # rubocop:disable Security/Eval
 
       # 3. "Runtime" phase (before low nodes are rendered).
-      # Templates only exist if antlers gem has been required by another gem (such as LowNode) and the template contains antlers syntax.
+      # Templates only exist if antlers gem has been required by another gem (like LowNode) and the template contains antlers syntax.
       templates.each do |namespace, method_template|
         klass = Object.const_get(namespace)
         method, template = method_template

data/lib/adapters/ruby_adapter.rb

@@ -6,13 +6,11 @@ require_relative '../loader'
 
 module LowLoad
   class RubyAdapter < Adapter
-    EXTENSIONS = ['rb']
+    EXTENSIONS = ['rb'].freeze
 
     # Map all definitions and dependencies.
-    def metadata(file_path:)
+    def mapload(file_path:)
       Lowkey.load(file_path)
-
-      { file_path: }
     end
 
     # Then autoload all dependencies for those files.

data/lib/lowload.rb

@@ -11,22 +11,32 @@ module LowLoad
   class UnsupportedTemplate < StandardError; end
 
   class << self
-    ADAPTERS = [MarkdownAdapter.new, RBXAdapter.new, RubyAdapter.new]
+    ADAPTERS = [MarkdownAdapter.new, RBXAdapter.new, RubyAdapter.new].freeze
 
-    def dirload(path, pwd = Dir.pwd)
+    def dirload(path, pwd = Dir.pwd) # rubocop:disable Metrics/AbcSize
       absolute_path = File.expand_path(path, pwd)
       file_paths = Dir["#{absolute_path}/**/*"].filter { !File.directory?(it) }
 
-      file_path_adapters = file_paths.each_with_object({}) do |file_path, hash|
-        hash[file_path] = find_adapter(file_path:)
+      loaded_paths = {}
+      missed_paths = []
+      file_types = {}
+
+      file_paths.each do |file_path|
+        if (adapter = find_adapter(file_path:))
+          loaded_paths[file_path] = adapter
+        else
+          missed_paths << adapter
+        end
+
+        file_types[extension(file_path:)] ||= []
+        file_types[extension(file_path:)] << file_path
       end
 
-      metadata = Metadata.new
-      metadata.process(file_path_adapters:)
-      step(:preload, file_path_adapters:)
-      step(:evaluate, file_path_adapters:)
+      step(:mapload, loaded_paths:)
+      step(:preload, loaded_paths:)
+      step(:evaluate, loaded_paths:)
 
-      metadata
+      Metadata.new(loaded_paths:, missed_paths:, file_types:)
     end
 
     def lowload(file_path)
@@ -37,15 +47,20 @@ module LowLoad
       adapter.evaluate(file_path:)
     end
 
-    def step(step, file_path_adapters:)
-      file_path_adapters.each do |file_path, adapter|
+    private
+
+    def step(step, loaded_paths:)
+      loaded_paths.each do |file_path, adapter|
         adapter&.send(step, file_path:)
       end
     end
 
     def find_adapter(file_path:)
-      extension = File.extname(file_path).delete_prefix('.')
-      ADAPTERS.find { |adapter| adapter.class::EXTENSIONS.include?(extension) }
+      ADAPTERS.find { |adapter| adapter.class::EXTENSIONS.include?(extension(file_path:)) }
+    end
+
+    def extension(file_path:)
+      File.extname(file_path).delete_prefix('.')
     end
   end
 end

data/lib/metadata.rb

@@ -7,39 +7,15 @@ module LowLoad
     EXTENSIONS = [
       *::LowLoad::MarkdownAdapter::EXTENSIONS,
       *::LowLoad::RBXAdapter::EXTENSIONS,
-      *::LowLoad::RubyAdapter::EXTENSIONS,
-    ]
+      *::LowLoad::RubyAdapter::EXTENSIONS
+    ].freeze
 
-    attr_accessor :loaded_paths, :missed_paths, :file_types, :url_paths, :tags
+    attr_accessor :loaded_paths, :missed_paths, :file_types
 
-    def initialize
-      @loaded_paths = []
-      @missed_paths = []
-
-      @file_types = EXTENSIONS.each_with_object({}) { |extension, hash| hash[extension] = [] }
-      @url_paths = {}
-      @tags = {}
-    end
-
-    def process(file_path_adapters:)
-      file_path_adapters.each do |file_path, adapter|
-        if (metadata = adapter&.metadata(file_path:))
-          append(file_path:, adapter:, metadata:)
-        else
-          @missed_paths << file_path
-        end
-      end
-    end
-
-    def append(file_path:, adapter:, metadata:)
-      @loaded_paths << file_path
-      @file_types[File.extname(file_path).delete_prefix('.')] << file_path
-      @url_paths[adapter.url_path(file_path:)] = file_path
-
-      metadata[:tags]&.each do |tag|
-        @tags[tag] ||= []
-        @tags[tag] = file_path
-      end
+    def initialize(loaded_paths:, missed_paths:, file_types:)
+      @loaded_paths = loaded_paths
+      @missed_paths = missed_paths
+      @file_types = file_types
     end
   end
 end

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LowLoad
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lowload
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - maedi