stimpack 1.0.0.alpha3 → 1.0.0.alpha4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ea2ffb8a9efd6a3cbfa52d91072a1a1f7d4c853bcd7f0caed17d67565941c3d
-  data.tar.gz: fb9a47e3e6fcf899979d161e1859560dc28d0c9317316e551205cddb08c772fa
+  metadata.gz: 64cf8eebac14e77ccb68d74b80daf0e76184388a2da40a42934322f640b774e2
+  data.tar.gz: 9b48e360e8e8e60f0213c33bcbe192c5267474b9ee6aebc1d223228225d7835f
 SHA512:
-  metadata.gz: 8a69a1f67af1db2eabaab480ad380330f0d0d35e95a1ab552a5303a9dec4c5956547b4c134d5af1b70758f712b3203aa327729b48a6d0d7e54d2db8ee135164a
-  data.tar.gz: 0bf2816d1acd26f852caaa4399bd3feaad5b4c30ab4b15065291dfcf1c00571c7cbb08fae92664e52a6732ad998ec08d1cc375330cd53f7b731bc0b4fef400fb
+  metadata.gz: f3f9a50ff656ff1104daee1f0a5b9c22cb107c7341094a2198eac38262ae46ec685ca83bcbd3b5ce2ab7d0fca4a78aca87e447f0f534483ad3334be659ca7e6e
+  data.tar.gz: 062c344182ceabbe779d1504c9baba9226334df3ce067a0c821e604172c74c55f72e19cdf452fef790f70cfb4476c364ecbf69c1c637c8d9af7589ffdb4ad95a

data/lib/stimpack.rb

@@ -4,14 +4,11 @@ require "rails"
 module Stimpack
   extend ActiveSupport::Autoload
 
-  # autoload :Require
-  autoload :Autoloaders
   autoload :Integrations
   autoload :Packs
   autoload :Railtie
   autoload :Settings
   autoload :Stim
-  autoload :ZeitwerkProxy
 
   class Error < StandardError; end
 
@@ -19,9 +16,6 @@ module Stimpack
     def start!
       @started = @started ? return : true
 
-      # Override Rails' autoloader accessors.
-      # Rails::Autoloaders.singleton_class.prepend(Autoloaders)
-
       Packs.resolve
 
       install_integrations
@@ -29,15 +23,6 @@ module Stimpack
 
     def finalize!
       @finalized = @finalized ? return : true
-
-      # Require.setup
-    end
-
-    def autoloader(original)
-      return original if @finalized
-
-      @autoloader_proxies ||= {}
-      @autoloader_proxies[original] ||= ZeitwerkProxy.new(original)
     end
 
     def [](name)
@@ -54,5 +39,3 @@ module Stimpack
 end
 
 require "stimpack/railtie"
-# require "stimpack/require"
-# require "stimpack/kernel"

data/lib/stimpack/packs.rb

@@ -5,19 +5,21 @@ require "rails"
 module Stimpack
   module Packs
     PATH = Pathname.new("packs").freeze
+    PACK_CLASS = "Pack".freeze
 
     class << self
       def resolve
-        PATH.glob("**/#{Settings::PACKWERK_PACKAGE_CONFIG}").each do |path|
+        PATH.glob("**/#{Settings::PACK_CONFIG}").each do |path|
           path = path.dirname
           create(path.relative_path_from(PATH).to_s, path.expand_path)
         end
       end
 
       def create(name, path)
-        pack_class = ActiveSupport::Inflector.camelize(name).gsub("::", "_")
-        stim = Stim.new(path)
-        @packs[name] = const_set(pack_class, Class.new(Rails::Engine)).include(stim)
+        settings = Settings.new(name, path)
+        namespace = create_namespace(settings.engine? ? Object : self, name)
+        stim = Stim.new(settings, namespace)
+        @packs[name] = namespace.const_set(PACK_CLASS, Class.new(Rails::Engine)).include(stim)
       end
 
       def find(path)
@@ -35,6 +37,19 @@ module Stimpack
       def each(*args, &block)
         @packs.each_value(*args, &block)
       end
+
+      private
+
+      def create_namespace(base, name)
+        namespace = ActiveSupport::Inflector.camelize(name)
+        namespace.split("::").reduce(base) do |current_base, mod|
+          if current_base.const_defined?(mod)
+            current_base.const_get(mod)
+          else
+            current_base.const_set(mod, Module.new)
+          end
+        end
+      end
     end
 
     @packs = {}

data/lib/stimpack/settings.rb

@@ -2,39 +2,32 @@
 
 module Stimpack
   class Settings
-    PACKWERK_PACKAGE_CONFIG = "package.yml"
+    PACK_CONFIG = "package.yml"
 
-    def initialize(pack)
-      @pack = pack
+    attr_reader :name
+    attr_reader :path
 
-      package_config = YAML.load_file(pack.root.join(PACKWERK_PACKAGE_CONFIG)) || {}
-      @config = package_config.fetch("metadata", {}).freeze
-    end
-
-    def path
-      @pack.called_from
+    def initialize(name, path)
+      @name = name
+      @path = path
     end
 
     def relative_path
-      @relative_path ||= path.relative_path_from(Rails.root)
-    end
-
-    def name
-      @name ||= ActiveSupport::Inflector.underscore(namespace.name)
+      Rails.root.relative_path_from(@path)
     end
 
-    def namespace
-      @pack.module_parent
+    def engine
+      config.fetch("engine", false)
     end
+    alias_method :engine?, :engine
 
-    # def implicit_namespace
-    #   @config.fetch("implicit_namespace", true)
-    # end
-    # alias_method :implicit_namespace?, :implicit_namespace
+    private
 
-    def isolate_namespace
-      @config.fetch("isolate_namespace", false)
+    def config
+      @config ||= begin
+        package_config = YAML.load_file(path.join(PACK_CONFIG))
+        package_config.fetch("metadata", {}).freeze
+      end
     end
-    alias_method :isolate_namespace?, :isolate_namespace
   end
 end

data/lib/stimpack/stim.rb

@@ -1,32 +1,26 @@
 module Stimpack
   class Stim < Module
-    def initialize(path)
-      @path = path
+    def initialize(settings, namespace)
+      @settings = settings
+      @namespace = namespace
       super()
     end
 
     def included(engine)
-      engine.called_from = @path
+      engine.attr_accessor(:settings)
+      engine.settings = @settings
+      engine.called_from = @settings.path
       engine.extend(ClassMethods)
-      settings = engine.settings
 
-      if settings.isolate_namespace?
-        engine.isolate_namespace(settings.namespace)
+      if @settings.engine?
+        engine.isolate_namespace(@namespace)
       end
-
-      # if settings.implicit_namespace?
-      #   engine.paths["lib"].skip_load_path!
-      # end
     end
 
     module ClassMethods
       def find_root(_from)
         called_from
       end
-
-      def settings
-        @settings ||= Stimpack::Settings.new(self)
-      end
     end
   end
 end

data/lib/stimpack/version.rb

@@ -1,3 +1,3 @@
 module Stimpack
-  VERSION = "1.0.0.alpha3".freeze
+  VERSION = "1.0.0.alpha4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stimpack
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha3
+  version: 1.0.0.alpha4
 platform: ruby
 authors:
 - Ngan Pham
@@ -63,18 +63,14 @@ files:
 - bin/console
 - bin/setup
 - lib/stimpack.rb
-- lib/stimpack/autoloaders.rb
 - lib/stimpack/integrations.rb
 - lib/stimpack/integrations/factory_bot.rb
 - lib/stimpack/integrations/rspec.rb
-- lib/stimpack/kernel.rb
 - lib/stimpack/packs.rb
 - lib/stimpack/railtie.rb
-- lib/stimpack/require.rb
 - lib/stimpack/settings.rb
 - lib/stimpack/stim.rb
 - lib/stimpack/version.rb
-- lib/stimpack/zeitwerk_proxy.rb
 homepage: https://github.com/Gusto/stimpack
 licenses: []
 metadata:

data/lib/stimpack/autoloaders.rb

@@ -1,11 +0,0 @@
-module Stimpack
-  module Autoloaders
-    def main
-      Stimpack.autoloader(super)
-    end
-
-    def once
-      Stimpack.autoloader(super)
-    end
-  end
-end

data/lib/stimpack/kernel.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Kernel
-  module_function
-
-  alias_method :stimpack_original_require, :require
-
-  def require(path)
-    stimpack_original_require(Stimpack::Require.resolve(path) || path)
-  end
-end

data/lib/stimpack/require.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-module Stimpack
-  class Require
-    IGNORED_PATH_PREFIXES = ["/", "./"].freeze
-    RUBY_EXTENSION = ".rb"
-
-    include Singleton
-
-    attr_accessor :enabled
-
-    def self.resolve(path)
-      instance.resolve(path)
-    end
-
-    def self.setup
-      instance.setup
-    end
-
-    def initialize
-      @packs = {}
-    end
-
-    def setup
-      @setup = @setup ? return : true
-
-      Packs.each do |pack|
-        if pack.settings.implicit_namespace?
-          @packs["#{pack.settings.name}/"] = "#{pack.paths["lib"].first}/"
-        end
-      end
-    end
-
-    def resolve(path)
-      path = path.to_s
-      return if path.start_with?(*IGNORED_PATH_PREFIXES)
-
-      @packs.find do |pack_path, full_path|
-        if path.start_with?(pack_path)
-          full_pack_path = path.sub(pack_path, full_path)
-          full_pack_path.concat(RUBY_EXTENSION) unless full_pack_path.end_with?(RUBY_EXTENSION)
-          return File.exist?(full_pack_path) && full_pack_path
-        end
-      end
-    end
-  end
-end

data/lib/stimpack/zeitwerk_proxy.rb

@@ -1,24 +0,0 @@
-require "active_support"
-
-module Stimpack
-  class ZeitwerkProxy
-    delegate_missing_to :@loader
-
-    def initialize(loader)
-      @loader = loader
-    end
-
-    def push_dir(path, namespace: Object)
-      @loader.push_dir(path, namespace: _resolve_namespace(path) || namespace)
-    end
-
-    private
-
-    def _resolve_namespace(path)
-      pack = Packs.find(path)
-      return unless pack
-
-      pack.settings.namespace if pack.settings.implicit_namespace?
-    end
-  end
-end