conventional_extensions 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ae73a75b482203013f89eb32515cd611d1b198b8cedeba8681032185bf5f51a
-  data.tar.gz: 6952f8616ad0e94edab0822888d02fd881468110d0d0546ba5117ab5ec1a6d27
+  metadata.gz: 10071e280679d17703caf2d303edbe063cd04f8899ebc40a990412f23465fe31
+  data.tar.gz: c2aca1a4cb4536d2b14e454aaca6b26c3c90c70e67b5ed59e4fe533ae9901d74
 SHA512:
-  metadata.gz: 9d1afc244d40c11bb184d0bbed288eac9f2f134d64e0a3957b5f7d08b69892914ba32e764c643d89c3612256e90d74888a8b31a00ad6ec48ff62068ed9f5a4c6
-  data.tar.gz: 22b5807a59e13c7a61bc7bebd6b91e7fac3617e2f3dc61d5119435c78a7a47eafc7540f46c00ca0b616f2f0151cce06300112b9df92e489b9481e9b65b874070
+  metadata.gz: de54d07c7645e960afad9ea1c23925135fa2884e0af195ec201cba7fdfe4dd66e79c1a7542d6a8db5664e0227c6b3ec3e0f201db2377bb4035610d57a66e5ea1
+  data.tar.gz: e2f06c3aefedb9d7f0fe0338876d15a4b1030c7f3bf9ab3a683bf3b11ad7c066eed8fbeca57eab5bfb47a0bbaa2c0fbd775a69f4fc44df32077cd0e02f6f928c

data/Gemfile.lock

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

data/lib/conventional_extensions/loader.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
+require "set"
+
 class ConventionalExtensions::Loader
   def initialize(klass, path)
     @klass, @name = klass, klass.name
-    @directory_name = File.join path.match(/(?=\/extensions|\.rb)/).pre_match, "extensions/"
+    @directory_name = File.join path.chomp(".rb"), "extensions/"
+
+    @loaded = Set.new
   end
 
   def load(*extensions)
@@ -21,14 +25,12 @@ class ConventionalExtensions::Loader
     end
 
     def load_one(extension)
-      contents = File.read extension
-
-      case
-      when contents.match?(/\s*class #{@name}/)
-        require extension
-      when !$LOADED_FEATURES.include?(extension)
-        $LOADED_FEATURES << extension
-        @klass.class_eval contents, extension, 0
+      if @loaded.add?(extension)
+        if contents = File.read(extension) and contents.match?(/\s*class #{@name}/)
+          ::Kernel.load extension
+        else
+          @klass.class_eval contents, extension, 0
+        end
       end
     end
 end

data/lib/conventional_extensions/version.rb

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

data/lib/conventional_extensions.rb

@@ -6,7 +6,12 @@ module ConventionalExtensions
   Object.extend self # We're enriching object itself, so any object can call `load_extensions`.
 
   def load_extensions(*extensions)
-    Loader.new(self, caller_locations(1, 1).first.path).load(*extensions)
+    loader_defined_before_entrance = defined?(@loader)
+
+    @loader ||= Loader.new(self, caller_locations(1, 1).first.path)
+    @loader.load(*extensions)
+  ensure
+    @loader = nil unless loader_defined_before_entrance
   end
   alias load_extension load_extensions
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conventional_extensions
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Kasper Timm Hansen