bootinq 1.5 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1e1d6c92b8790ff798d3ac3af73aa4d1ba51d65e5d30a710e71b109dff4a1d2
-  data.tar.gz: ff41e0be38f693a836592446d3a8600613497595228075a325bfa3cd06a36585
+  metadata.gz: 33cdc97b02b2407bf6cf031dbac9e0fdae903d6a97a60e266b058729d6a43895
+  data.tar.gz: 1cba1d8a6a48ff92ba80dbcad36623a7389f95f512b8d844debc5c7c22644e6b
 SHA512:
-  metadata.gz: f6d003846a5991fef4e37aaf9ab72c03878eaaecb98b0b347b8ac537f4d583a880b578bda284ec1d1539396b3a822a0d72511cf349d54cb6638892052768a563
-  data.tar.gz: 28a35e3389f226c94126dc11adcecbdde73cb6b8b9b02876ffb987cddaec8f0d32274e3831d61ba163c64bde0eebe00c505bb0b24c7aa3032e445e840fb350dd
+  metadata.gz: 7a4b636bbdea12800a0b367bd5e4294c9681738200597100725595bd3ce3f4f6a5d4b95c14594249cba8755fa11206ba6a01fc516923e1e72493a34efbb79b1d
+  data.tar.gz: b6c5e5d242ffff08ac9f00a680dd760979879769e9a752193e039453f31d86684ce97f9d7e19167e36de4ede4003ae9e7a1e42647288082e36bee6badd58095e

data/lib/bootinq.rb

@@ -73,15 +73,6 @@ class Bootinq
 
   private_constant :FilterNegValue
 
-  class << self
-    protected def delegated(sym) # :no-doc:
-      location = caller_locations(1, 1).first
-      file, line = location.path, location.lineno
-      definiton = %(def self.#{sym}(*args, &block); instance.#{sym}(*args, &block); end)
-      class_eval definiton, file, line
-    end
-  end
-
   # :call-seq:
   #   Bootinq.require(*groups, verbose: false, &block)
   #
@@ -117,15 +108,17 @@ class Bootinq
     instance.ready!
   end
 
+  # Reads config from the given or default path, deserializes it and returns as a hash.
+  def self.deserialized_config(path: nil)
+    bootinq_yaml = File.read(path || ENV.fetch('BOOTINQ_PATH'))
+    YAML.safe_load(bootinq_yaml, [Symbol])
+  end
+
   attr_reader :flags
   attr_reader :components
 
-  delegated :flags
-  delegated :components
-
   def initialize # :no-doc:
-    config_path = ENV.fetch('BOOTINQ_PATH')
-    config = YAML.safe_load(File.read(config_path), [Symbol])
+    config = self.class.deserialized_config
     config.merge!(DEFAULT) { |_, l, r| l.nil? ? r : l }
 
     @_orig_value = ENV.fetch(config['env_key']) { config['default'] }
@@ -140,7 +133,7 @@ class Bootinq
     config['mount'].each { |flag, name| enable_component(name, flag: flag.to_s, as: Mountable) }
   end
 
-  delegated def ready? # :no-doc:
+  def ready? # :no-doc:
     !!@ready
   end
 
@@ -149,7 +142,7 @@ class Bootinq
   #
   # At the first call marks Bootinq as ready and returns the instance,
   # otherwise returns nil.
-  delegated def ready!
+  def ready!
     return if ready?
     @ready = true
     if defined?(@_on_ready)
@@ -162,7 +155,7 @@ class Bootinq
   # :call-seq:
   #   Bootinq.enable_component(name, flag: [, as: Component])
   #
-  delegated def enable_component(name, flag:, as: Component)
+  def enable_component(name, flag:, as: Component)
     if is_dependency?(name) || @_value.include?(flag)
       @flags      << flag
       @components << as.new(name)
@@ -174,7 +167,7 @@ class Bootinq
   #
   # Checks if a component with the given name (i.e. the same gem group)
   # is enabled
-  delegated def enabled?(name)
+  def enabled?(name)
     components.include?(name)
   end
 
@@ -183,12 +176,11 @@ class Bootinq
   #   Bootinq[name] -> Bootinq::Component
   #
   # Returns a <tt>Bootinq::Component</tt> object by its name
-  delegated def component(name)
+  def component(name)
     components[components.index(name)]
   end
 
   alias :[] :component
-  delegated :[]
 
   # :call-seq:
   #   Bootinq.each_mountable { |part| block } -> Array
@@ -198,7 +190,7 @@ class Bootinq
   # passing that part as a parameter. Returns the array of all mountable components.
   #
   # If no block is given, an Enumerator is returned.
-  delegated def each_mountable(&block) # :yields: part
+  def each_mountable(&block) # :yields: part
     components.select(&:mountable?).each(&block)
   end
 
@@ -208,7 +200,7 @@ class Bootinq
   # Merges enabled Bootinq's groups with the given groups and, if loaded with Rails,
   # passes them to <tt>Rails.groups</tt> method, otherwise just returns the merged list
   # to use with <tt>Bundler.require</tt>.
-  delegated def groups(*groups)
+  def groups(*groups)
     groups.unshift(*components.map(&:group))
     if defined?(Rails)
       Rails.groups(*groups)
@@ -240,7 +232,7 @@ class Bootinq
   #   Bootinq.on all: %i(frontend backend) do
   #     # do something when frontend and backend are enabled
   #   end
-  delegated def on(name = nil, any: nil, all: nil) # :yields:
+  def on(name = nil, any: nil, all: nil) # :yields:
     if name.nil? && any.nil? && all.nil?
       raise ArgumentError, "wrong arguments (given 0, expected 1)"
     elsif (any && all) || (name && (any || all))
@@ -260,7 +252,7 @@ class Bootinq
   #
   # Takes a list of component names and yields a given block (optionally)
   # if all of them are enabled. Returns boolean matching status.
-  delegated def on_all(*parts) # :yields:
+  def on_all(*parts) # :yields:
     is_matched = parts.all? { |p| enabled?(p) }
     yield if is_matched && block_given?
     is_matched
@@ -271,7 +263,7 @@ class Bootinq
   #
   # Takes a list of component names and yields a given block  (optionally)
   # if any of them are enabled. Returns boolean matching status.
-  delegated def on_any(*parts) # :yields:
+  def on_any(*parts) # :yields:
     is_matched = parts.any? { |p| enabled?(p) }
     yield if is_matched && block_given?
     is_matched
@@ -288,7 +280,7 @@ class Bootinq
   #     part.frontend { … }
   #     part.backend { … }
   #   end
-  delegated def switch # :yields: Bootinq::Switch.new
+  def switch # :yields: Bootinq::Switch.new
     yield(Switch.new)
     nil
   end
@@ -309,4 +301,26 @@ class Bootinq
     @components.freeze
     super
   end
+
+  delegate_template = <<~RUBY
+    def self.%1$s(*args, &block)
+      instance.%1$s(*args, &block)
+    end
+  RUBY
+
+  %I(flags
+     components
+     ready?
+     ready!
+     enable_component
+     enabled?
+     component
+     []
+     each_mountable
+     groups
+     on
+     on_all
+     on_any
+     switch
+  ).each { |sym| class_eval(delegate_template  % sym, *instance_method(sym).source_location) }
 end

data/lib/bootinq/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Bootinq
-  VERSION = "1.5"
+  VERSION = "1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootinq
 version: !ruby/object:Gem::Version
-  version: '1.5'
+  version: '1.6'
 platform: ruby
 authors:
 - Anton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2021-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler