conventional_extensions 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 247b8f8bd45e5773afe0f35f6cf4210321bca59d901637f460e65381e6111711
-  data.tar.gz: 6dcf112c67bb3ec3df18ac7ff3b8c7c77b11dc513be3da153c4b825ef8de8775
+  metadata.gz: 3a9c04f9382953e08d30d29f802edd622ef28f91da4314d77c21d7f0eb09f2fe
+  data.tar.gz: b51b6c673302e93aec88613b42e1e7c44a7c0d4055165057ffac546614fd357f
 SHA512:
-  metadata.gz: 0cbb425f5eb691dcaaec2755cdd426e4950d0c26fde845739a23e663939899eb1baeb1e4ebb66f761350ada334eb67b96e0fa929671be246c1016b4a7856f983
-  data.tar.gz: 54dc95e8c7bdc679192b1ca5a2bb7e2d9deb38da220036401a9b34ed6d38e48bda24a5e1db80389ab6287d1d788d89e9f97b59fd2829ebcb86ef4fcddbbaee66
+  metadata.gz: ed770c9838eb07f7c752bf2f1973edf9a5ad77511ec6d939600114d203a3e6db9270d5ec8ef3b354c6914728ca0afe259c128d569aef0c9639928c6c4ed36895
+  data.tar.gz: d5035eff9ad821562a828dc671927a89fffe2ad1f1fe49d91b3c3147131837ecc9c82caa8adaaf26ab48149bc92a9520a3bce514efdd11380a53ff36fa657b18

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## [Unreleased]
 
+## [0.3.0] - 2022-09-27
+
+- Fixes defining a nested extension, e.g. `Organization::User` with `app/models/organization/user/extensions/`.
+- Removes support for defining a nested extension within the namespace file. I couldn't unify it with the fix above, so it went.
+
+## [0.2.2] - 2022-09-08
+
+- Fixes Zeitwerk 2.6.0 compatibility issue where extensions wouldn't load and throw an exception. See https://github.com/kaspth/conventional_extensions/commit/7fc25f1e860637e8df9fd0e81e7ca038c8c34aa0
+
 ## [0.2.1] - 2022-09-07
 
 - Fixes `extend ConventionalExtensions.load_on_inherited` not finding the right directory to load extensions from. See https://github.com/kaspth/conventional_extensions/commit/1f6fe9cbf2fe44ed9d699a5dd485eaa366d875a4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    conventional_extensions (0.2.0)
+    conventional_extensions (0.3.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/conventional_extensions/loader.rb

@@ -5,7 +5,7 @@ require "set"
 class ConventionalExtensions::Loader
   def initialize(klass, path)
     @loaded, @klass, @matcher = Set.new, klass, /\s*class #{klass.name}/
-    @path_format = File.join File.dirname(path), underscore(klass.name), "extensions", "%s.rb"
+    @path_format = File.join path.sub(/\.rb$/, "/extensions/%s.rb")
   end
 
   def load(*extensions)
@@ -14,12 +14,6 @@ class ConventionalExtensions::Loader
   end
 
   private
-    # Logic borrowed from Active Support:
-    # https://github.com/rails/rails/blob/a2fc96a80cf26c11df3e86e86c1b2b61736af80c/activesupport/lib/active_support/inflector/methods.rb#L99
-    def underscore(name)
-      name.gsub("::", "/").tap { _1.gsub!(/([A-Z]+)(?=[A-Z][a-z])|([a-z\d])(?=[A-Z])/) { ($1 || $2) << "_" } }.tap(&:downcase!)
-    end
-
     def extension_paths
       Dir.glob extension_path_for("*")
     end

data/lib/conventional_extensions/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ConventionalExtensions
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/conventional_extensions.rb

@@ -5,8 +5,8 @@ require_relative "conventional_extensions/version"
 module ConventionalExtensions
   Object.extend self # We're enriching object itself, so any object can call `load_extensions`.
 
-  def load_extensions(*extensions)
-    @loader = Loader.new(self, Object.const_source_location(name).first) unless loader_defined_before_entrance = defined?(@loader)
+  def load_extensions(*extensions, from: Frame.previous.path)
+    @loader = Loader.new(self, from) unless loader_defined_before_entrance = defined?(@loader)
     @loader.load(*extensions)
   ensure
     @loader = nil unless loader_defined_before_entrance
@@ -19,7 +19,13 @@ module ConventionalExtensions
   module LoadOnInherited
     def inherited(klass)
       super
-      klass.load_extensions
+      klass.load_extensions from: Frame.previous.path
+    end
+  end
+
+  module Frame
+    def self.previous
+      caller_locations(2, 1).first # Use 2 instead of 1 so we get the frame of who called us.
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conventional_extensions
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Kasper Timm Hansen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies: []
 description:
 email: