usable 3.9.0 → 3.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fa4a0c548f6ca951a0db1d9e24da33e518a92533
-  data.tar.gz: 11696a77417b8d5ecdae9aed37eb85193d9242c4
+SHA256:
+  metadata.gz: 5cf9d19795cfe5f243f7d50765251306761edf87790628b28438503bfd28a93c
+  data.tar.gz: 238dab15466918520cdf25408e0bad760a5013687e2025e560ada0e725bd2020
 SHA512:
-  metadata.gz: 067d4568b1fe8ab89c69416f9a6b3df5b887d2365350de9a29d3812a8d0069e52b631c8b8d683c6693a7a39a7d87b31178115737861bc60d2fbd02968ac7bfcb
-  data.tar.gz: ab73c2429972136e8eb628e449b7f283bdb01c594eab8b829b34d61b50b45cf50489942e1d3bb779a09b4cacc876b671a7fd821326da469d6ef1c4a009da0b6e
+  metadata.gz: e8d4b8b59389b40d377b23775f9f4bef80839bc833b18f0ea0d0c8bccbebd6acddf548bd28b0a745cb3908fd73cccafc74b4612df5c847d66c5cb11cb4e40076
+  data.tar.gz: 95212036395041fcda47c5eb3c6eab5a9d422767689254736e612221175143a2088d8990db4609adc8d8cc14c524fb11d38906542e6231bc24170d18bf131907

data/lib/usable.rb

@@ -53,7 +53,7 @@ module Usable
       base.instance_eval do
         def config(&block)
           if block
-            usables.instance_eval &block
+            usables.instance_eval(&block)
           else
             usables
           end
@@ -128,7 +128,8 @@ module Usable
       ModExtender.new(mod, only: only, method: extension_method).call self
       # Define settings on @usables and on the scoped @usables
       scope = Config.new
-      if mod.name
+      # Nest the new config under a namespace based on it's name, unless it's the default name we gave
+      if mod.name && !mod.name.include?("UsableMod")
         scope_name = mod.name.split('::').last.gsub(/\B([A-Z])([a-z_0-9])/, '_\1\2').downcase
         usables[scope_name] = scope
       end
@@ -141,7 +142,7 @@ module Usable
         [scope, usables].each { |x| options.each { |k, v| x[k] = v } }
       end
       if block_given?
-        [scope, usables].each { |x| x.instance_eval &block }
+        [scope, usables].each { |x| x.instance_eval(&block) }
       end
       if mod.const_defined?(:InstanceMethods, false)
         send :include, mod.const_get(:InstanceMethods, false)

data/lib/usable/config.rb

@@ -30,8 +30,12 @@ module Usable
       @spec.to_h.each(&block)
     end
 
+    # @note The @spec[key] could already be set in cases where the config was merged with another
+    #   For example, a usable module defines a default with a block, and when mounting the module
+    #   the same usable option is overridden as an options hash (usable mod, key: 'val')
     def to_h
-      @lazy_loads.each { |key| @spec[key] = call_spec_method(key) }
+      @lazy_loads.each { |key| @spec[key] ||= @spec.public_send(key) }
+      @lazy_loads.clear
       @spec.to_h
     end
 
@@ -58,7 +62,7 @@ module Usable
     def method_missing(key, *args, &block)
       if block
         @lazy_loads << key
-        @spec.define_singleton_method(key) { yield }
+        @spec.define_singleton_method(key, &block)
       else
         # Needs to be a symbol so we can consistently access @lazy_loads
         key = key.to_s.tr('=', '').to_sym

data/lib/usable/mod_extender.rb

@@ -18,9 +18,7 @@ module Usable
     # @description Directly include a module whose methods you want made available in +usables.available_methods+
     #   Gives the module a name when including so that it shows up properly in the list of ancestors
     def call(target)
-      unwanted.each do |method_name|
-        copy.send :remove_method, method_name
-      end
+      unwanted.each(&method(:remove_from_module))
       if copy.name.nil?
         const_name = "#{mod_name}Used"
         target.send :remove_const, const_name if target.const_defined? const_name, false
@@ -46,5 +44,16 @@ module Usable
         @copy.instance_methods - Array(only)
       end
     end
+
+    def remove_from_module(method_name)
+      begin
+        copy.send :remove_method, method_name
+      rescue NameError => e
+        # Expected sometimes, like it could be raised trying to remove a superclass method
+        Usable.logger.debug("#{e.class}: #{e.message}")
+      end
+      # Block access to superclass method, and prevent it from being copied to the target
+      copy.send :undef_method, method_name if copy.instance_methods.include?(method_name)
+    end
   end
 end

data/lib/usable/persistence.rb

@@ -68,7 +68,8 @@ module Usable
       def _config_file
         return @_config_file if @_config_file
         FileUtils.mkdir_p(usables.dir) unless File.directory?(usables.dir)
-        @_config_file = File.join(usables.dir, "#{self.class.name.downcase.gsub('::', '_')}.yml")
+        filename = self.class.name ? self.class.name.downcase.gsub('::', '_') : 'usable'
+        @_config_file = File.join(usables.dir, "#{filename}.yml")
         FileUtils.touch(@_config_file) unless File.exists?(@_config_file)
         @_config_file
       end

data/lib/usable/version.rb

@@ -1,3 +1,3 @@
 module Usable
-  VERSION = "3.9.0".freeze
+  VERSION = "3.9.4".freeze
 end

data/usable.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.10'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '>= 3.2', '< 4'
+  spec.add_development_dependency "bundler", "~> 2.2.11"
+  spec.add_development_dependency "rake", ">= 12.3.3"
+  spec.add_development_dependency "rspec", ">= 3.2", "< 4"
   # spec.add_development_dependency 'rspec-scaffold', '>= 1.0', '< 2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usable
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.9.4
 platform: ruby
 authors:
 - Ryan Buckley
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 2.2.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 2.2.11
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ homepage: https://github.com/ridiculous/usable
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,9 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.2.11
+signing_key:
 specification_version: 4
 summary: Mounts and configures modules
 test_files: []