core-loader 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5a9a91c437fb1cf4033d6fc70b98d4f9ab1784360838ce84e83ad6b10ad62ee
-  data.tar.gz: 28995fde28e2505ca1072b26e5bbeb8333c55fd7f9a32cd176b78ac198166e79
+  metadata.gz: 1484ad0d5e2736ca252c0ec67308556dd0b45bffdfb8cd51756f1a4007d87bc6
+  data.tar.gz: beb2f418301e05f53bed4dec557126cd37fd4633b6769987718e1243e06296a2
 SHA512:
-  metadata.gz: b3f580e3494670b72240c3be121bc9cb82da7e9d51a729d8c5c788e20d8a8adc5cfa96fd15dc2b93604d0db3cb40b6b4dce8231c2775060ad4df8d4d8b1a7463
-  data.tar.gz: 8968a6d6a4622db48d41008f1df346fe9fb1cd2780ecfd56a883a0bed3a15474080a8c6ceb74cac000cd9e66d17e59ec69d1150a87cbbbb688ecb1bdfa3c7d26
+  metadata.gz: 9f5746e5b02cd234aa4a3b741505fb284d1c21cc8f803e59fe23e5294da1530d6d1e0679550e07cabda01a6047e348d65c6dc2f62959792a73f71cf239bdc3d3
+  data.tar.gz: 629be77c6e72453a2ecd2c811324fcc162e387883d582f27ff3c61fa6d2dccbe9956b985bc5a1b1ef9ac77d7edbaea6c37e6f94f664a1e27e21f3e5866d6e564

data/CHANGELOG.md

@@ -1,20 +1,33 @@
-## [v0.1.0](https://github.com/metabahn/corerb/releases/tag/2022-01-07)
+## [v0.2.0](https://github.com/bryanp/corerb/releases/tag/2023-12-24)
+
+*released on 2023-12-24*
+
+  * `dep` [#143](https://github.com/bryanp/corerb/pull/143) Deprecate `Is::*` and `Refine::*` namespaces ([bryanp](https://github.com/bryanp))
+  * `dep` [#135](https://github.com/bryanp/corerb/pull/135) Remove Ruby 2 support ([bryanp](https://github.com/bryanp))
+
+## [v0.1.1](https://github.com/bryanp/corerb/releases/tag/2022-01-08)
+
+*released on 2022-01-08*
+
+  * `fix` [#117](https://github.com/bryanp/corerb/pull/117) Explicitly define makeables in loader, resolving some context issues ([bryanp](https://github.com/bryanp))
+
+## [v0.1.0](https://github.com/bryanp/corerb/releases/tag/2022-01-07)
 
 *released on 2022-01-07*
 
-  * `chg` [#115](https://github.com/metabahn/corerb/pull/115) Make the loader context configurable ([bryanp](https://github.com/bryanp))
-  * `chg` [#114](https://github.com/metabahn/corerb/pull/114) Add an explicit strict option to loader ([bryanp](https://github.com/bryanp))
+  * `chg` [#115](https://github.com/bryanp/corerb/pull/115) Make the loader context configurable ([bryanp](https://github.com/bryanp))
+  * `chg` [#114](https://github.com/bryanp/corerb/pull/114) Add an explicit strict option to loader ([bryanp](https://github.com/bryanp))
 
-## [v0.0.1](https://github.com/metabahn/corerb/releases/tag/2021-11-23.1)
+## [v0.0.1](https://github.com/bryanp/corerb/releases/tag/2021-11-23.1)
 
 *released on 2021-11-23*
 
-  * `chg` [#109](https://github.com/metabahn/corerb/pull/109) Prefer `__send__` to `send` ([bryanp](https://github.com/bryanp))
+  * `chg` [#109](https://github.com/bryanp/corerb/pull/109) Prefer `__send__` to `send` ([bryanp](https://github.com/bryanp))
 
-## [v0.0.0](https://github.com/metabahn/corerb/releases/tag/2021-11-02)
+## [v0.0.0](https://github.com/bryanp/corerb/releases/tag/2021-11-02)
 
 *released on 2021-11-02*
 
-  * `add` [#94](https://github.com/metabahn/corerb/pull/94) Initial implementation of the core-loader gem ([bryanp](https://github.com/bryanp))
+  * `add` [#94](https://github.com/bryanp/corerb/pull/94) Initial implementation of the core-loader gem ([bryanp](https://github.com/bryanp))
 
 

data/lib/core/loader/context.rb

@@ -8,7 +8,7 @@ module Core
   module Loader
     # [public]
     #
-    class Context < BasicObject
+    class Context
       class << self
         def load(path:, root:, type:, target:, strict:)
           new(path: path, root: root, type: type, target: target, strict: strict).load
@@ -16,75 +16,66 @@ module Core
       end
 
       def initialize(path:, root:, type:, target:, strict:)
-        @path = ::Kernel.Pathname(path)
-        @root = ::Kernel.Pathname(root)
+        @path = Pathname(path)
+        @root = Pathname(root)
         @type = type.to_sym
         @target = target
         @strict = strict
+        prepare_to_load!
       end
 
       # [public]
       #
       def load
-        ::Kernel.eval(@path.read, ::Kernel.binding, @path.to_s)
+        eval(@path.read, binding, @path.to_s)
       end
 
-      def self.const_missing(name)
-        ::Object.const_get(name)
-      end
+      private def prepare_to_load!
+        @target.makeables.each do |makeable|
+          define_singleton_method(makeable) do |*name, **kwargs, &block|
+            if @strict && makeable != @type
+              raise "expected to define an object of type `#{@type}` but was `#{makeable}` (#{@path})"
+            end
 
-      def method_missing(definable, *name, **kwargs, &block)
-        if @target.makes?(definable)
-          if @strict && definable != @type
-            ::Kernel.raise "expected to define an object of type `#{@type}` but was `#{definable}` (#{@path})"
-          end
+            definable_path = Pathname(@path.to_s.gsub(@root.to_s, ""))
+            expected_name = definable_path.dirname.join(
+              definable_path.basename(definable_path.extname)
+            ).to_s.split("/").reject(&:empty?).compact.map(&:to_sym)
 
-          definable_path = ::Kernel.Pathname(@path.to_s.gsub(@root.to_s, ""))
-          expected_name = definable_path.dirname.join(
-            definable_path.basename(definable_path.extname)
-          ).to_s.split("/").reject(&:empty?).compact.map(&:to_sym)
+            if name.empty?
+              name = expected_name
+            elsif @strict && name != expected_name
+              raise "expected to define an object named `#{expected_name.join(", ")}` but was `#{name.join(", ")}` (#{@path})"
+            end
 
-          if name.empty?
-            name = expected_name
-          elsif @strict && name != expected_name
-            ::Kernel.raise "expected to define an object named `#{expected_name.join(", ")}` but was `#{name.join(", ")}` (#{@path})"
-          end
+            path, line = caller(1..1).first.split(":", 3)
+            location = Core::Define::Location.new(path: path, line: line)
+            defined = @target.make(makeable, *name, __location__: location, **kwargs)
 
-          path, line = ::Kernel.caller(1..1).first.split(":", 3)
-          location = ::Core::Define::Location.new(path: path, line: line)
-          defined = @target.make(definable, *name, __location__: location, **kwargs)
+            if block
+              header = @path.read.each_line.take(block.source_location[1] - 1).join
+              source = extract_block_inner_source(block, @path)
 
-          # TODO: Validate that definition name matches the expectation, and that it's the expected type.
+              type = case defined
+              when ::Class
+                "class"
+              when ::Module
+                "module"
+              end
 
-          if block
-            header = @path.read.each_line.take(block.source_location[1] - 1).join
-            source = extract_block_inner_source(block, @path)
+              eval_source = <<~SOURCE
+                #{header}#{type} #{defined}#{source}
+                end
+              SOURCE
 
-            type = case defined
-            when ::Class
-              "class"
-            when ::Module
-              "module"
+              eval(eval_source, TOPLEVEL_BINDING, @path.to_s)
             end
 
-            eval_source = <<~SOURCE
-              #{header}#{type} #{defined}#{source}
-              end
-            SOURCE
-
-            ::Kernel.eval(eval_source, ::Kernel.const_get(:TOPLEVEL_BINDING), @path.to_s)
+            defined
           end
-
-          defined
-        else
-          ::Kernel.public_send(definable, *name, **kwargs, &block)
         end
       end
 
-      def respond_to_missing?(definable, include_private = false)
-        @target.makes?(definable) || ::Kernel.respond_to?(definable, include_private)
-      end
-
       private def extract_block_inner_source(block, path)
         source = extract_block_source(block, path).strip
 
@@ -95,7 +86,7 @@ module Core
         else
           # We should never get here, but raise an error just to be clear.
           #
-          ::Kernel.raise "could not parse inner source of `#{path}`"
+          raise "could not parse inner source of `#{path}`"
         end
       end
 
@@ -113,7 +104,7 @@ module Core
 
         # We should never get here, but raise an error just to be clear.
         #
-        ::Kernel.raise "could not find a complete expression in `#{path}`"
+        raise "could not find a complete expression in `#{path}`"
       end
 
       private def scan_to_complete_expression(source, matcher, ending_offset, path)
@@ -129,7 +120,7 @@ module Core
 
         # We should never get here, but raise an error just to be clear.
         #
-        ::Kernel.raise "could not find a complete expression for `#{matcher}` in `#{path}`"
+        raise "could not find a complete expression for `#{matcher}` in `#{path}`"
       end
 
       # Based on https://github.com/banister/method_source.
@@ -138,8 +129,8 @@ module Core
         original_verbose = $VERBOSE
         $VERBOSE = nil
 
-        ::Kernel.catch :valid do
-          ::Kernel.eval "BEGIN{throw :valid}\n#{string}" # standard:disable Style/EvalWithLocation
+        catch :valid do
+          eval "BEGIN{throw :valid}\n#{string}"
         end
 
         true

data/lib/core/loader/version.rb

@@ -2,7 +2,7 @@
 
 module Core
   module Loader
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
 
     # [public]
     #

data/lib/core/loader.rb

@@ -1,7 +1,90 @@
 # frozen_string_literal: true
 
+require "core/extension"
+require "core/state"
+
 module Core
+  # [public]
+  #
   module Loader
+    require_relative "loader/context"
     require_relative "loader/version"
+
+    extend Core::Extension
+
+    extends dependencies: [Core::State]
+
+    extends :definition do
+      # [public]
+      #
+      def loads(definable, path, pattern: "*.rb", strict: true, context: Core::Loader::Context)
+        unless ancestors.include?(Core::Factory) && makes?(definable)
+          raise "cannot load unknown object `#{definable}`"
+        end
+
+        __loads__[definable.to_sym] = {
+          type: definable,
+          path: Pathname(path),
+          pattern: pattern,
+          strict: strict,
+          context: context
+        }
+      end
+
+      # [public]
+      #
+      def load(reload: false)
+        loadable = []
+
+        __loads__.each_pair do |definable, options|
+          find_loadable_paths(options[:path], options, loadable)
+        end
+
+        while (loadable_path, loadable_options = loadable.shift)
+          if reload || !loaded?(loadable_path)
+            loadable_options[:context].load(
+              path: loadable_path,
+              root: loadable_options[:path],
+              type: loadable_options[:type],
+              strict: loadable_options[:strict],
+              target: self
+            )
+
+            __loaded_paths__ << loadable_path
+          end
+        end
+      end
+
+      # [public]
+      #
+      def reload
+        load(reload: true)
+      end
+
+      # [public]
+      #
+      def reset
+        __loaded_paths__.clear
+      end
+
+      private def loaded?(path)
+        __loaded_paths__.include?(Pathname(path))
+      end
+
+      private def find_loadable_paths(path, options, loadable)
+        path.glob(options[:pattern]).sort.each do |each_path|
+          loadable << [each_path, options]
+        end
+
+        path.glob("*").select(&:directory?).sort.each do |each_path|
+          find_loadable_paths(each_path, options, loadable)
+        end
+      end
+    end
+
+    applies do
+      state :__loads__, :class, default: {}
+      state :__loaded_paths__, :class, default: []
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: core-loader
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Bryan Powell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2023-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: core-extension
@@ -16,44 +16,44 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: core-factory
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: core-state
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 description: Load Ruby objects from the filesystem.
-email: bryan@metabahn.com
+email: bryan@bryanp.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -63,8 +63,7 @@ files:
 - lib/core/loader.rb
 - lib/core/loader/context.rb
 - lib/core/loader/version.rb
-- lib/is/loadable.rb
-homepage: https://github.com/metabahn/corerb/
+homepage: https://github.com/bryanp/corerb/
 licenses:
 - MPL-2.0
 metadata: {}
@@ -76,14 +75,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.5.1
 signing_key:
 specification_version: 4
 summary: Load Ruby objects from the filesystem.

data/lib/is/loadable.rb

@@ -1,89 +0,0 @@
-# frozen_string_literal: true
-
-require "is/extension"
-require "is/stateful"
-
-require_relative "../core/loader/context"
-
-module Is
-  # [public]
-  #
-  module Loadable
-    extend Is::Extension
-
-    extends dependencies: [Is::Stateful]
-
-    extends :definition do
-      # [public]
-      #
-      def loads(definable, path, pattern: "*.rb", strict: true, context: Core::Loader::Context)
-        unless ancestors.include?(Is::Factory) && makes?(definable)
-          raise "cannot load unknown object `#{definable}`"
-        end
-
-        __loads__[definable.to_sym] = {
-          type: definable,
-          path: Pathname(path),
-          pattern: pattern,
-          strict: strict,
-          context: context
-        }
-      end
-
-      # [public]
-      #
-      def load(reload: false)
-        loadable = []
-
-        __loads__.each_pair do |definable, options|
-          find_loadable_paths(options[:path], options, loadable)
-        end
-
-        while (loadable_path, loadable_options = loadable.shift)
-          if reload || !loaded?(loadable_path)
-            loadable_options[:context].load(
-              path: loadable_path,
-              root: loadable_options[:path],
-              type: loadable_options[:type],
-              strict: loadable_options[:strict],
-              target: self
-            )
-
-            __loaded_paths__ << loadable_path
-          end
-        end
-      end
-
-      # [public]
-      #
-      def reload
-        load(reload: true)
-      end
-
-      # [public]
-      #
-      def reset
-        __loaded_paths__.clear
-      end
-
-      private def loaded?(path)
-        __loaded_paths__.include?(Pathname(path))
-      end
-
-      private def find_loadable_paths(path, options, loadable)
-        path.glob(options[:pattern]).sort.each do |each_path|
-          loadable << [each_path, options]
-        end
-
-        path.glob("*").select(&:directory?).sort.each do |each_path|
-          find_loadable_paths(each_path, options, loadable)
-        end
-      end
-    end
-
-    applies do
-      state :__loads__, :class, default: {}
-      state :__loaded_paths__, :class, default: []
-    end
-  end
-end