usable.rb in usable-3.0.0

- old
+ new

@@ -18,23 +18,25 @@
         def usables
           self.class.usables
         end
       end
     else
+      # Define +config+ when added to a module
       base.instance_eval do
         def config(&block)
-          usables(&block)
+          if block
+            usables.instance_eval &block
+          else
+            usables
+          end
         end unless defined? config
       end
     end
   end
 
-  # @description Read and write configuration options
   def usables
     @usables ||= Config.new
-    return @usables unless block_given?
-    @usables.instance_eval &Proc.new
   end
 
   attr_writer :usables
 
   # @description Includes the given module with a set of options or block to configure it
@@ -52,33 +54,36 @@
   # @param [Module] mod
   # @param [Hash] options Customize the extension of the module as well as define config settings on the target
   # @option [Array,Symbol]  :only Limit which methods are copied from the module
   # @option [String,Symbol] :method (:include) The method to use for including the module
   # @return self
-  def usable(mod, options = {}, &block)
-    ModExtender.new(mod, only: options.delete(:only), method: options.delete(:method)).call self
-    # Define settings on @usables and on the scoped @usables
-    scope = Config.new
-    if mod.name
-      scope_name = mod.name.split('::').last.gsub(/\B([A-Z])([a-z_0-9])/, '_\1\2').downcase
-      usables[scope_name] = scope
-    end
-    if mod.respond_to? :usables
-      scope += mod.usables
-      self.usables += mod.usables
-    end
-    # any left over -options- are considered "config" settings
-    if options
-      [scope, usables].each { |x| options.each { |k, v| x[k] = v } }
-    end
-    if block_given?
-      [scope, usables].each { |x| x.instance_eval &block }
-    end
-    if mod.const_defined?(:InstanceMethods)
-      send :include, mod.const_get(:InstanceMethods)
-    end
-    if mod.const_defined?(:ClassMethods)
-      send :extend, mod.const_get(:ClassMethods)
+  def usable(*args, &block)
+    options = args.last.is_a?(Hash) ? args.pop : {}
+    args.each do |mod|
+      ModExtender.new(mod, only: options.delete(:only), method: options.delete(:method)).call self
+      # Define settings on @usables and on the scoped @usables
+      scope = Config.new
+      if mod.name
+        scope_name = mod.name.split('::').last.gsub(/\B([A-Z])([a-z_0-9])/, '_\1\2').downcase
+        usables[scope_name] = scope
+      end
+      if mod.respond_to? :usables
+        scope += mod.usables
+        self.usables += mod.usables
+      end
+      # any left over -options- are considered "config" settings
+      if options
+        [scope, usables].each { |x| options.each { |k, v| x[k] = v } }
+      end
+      if block_given?
+        [scope, usables].each { |x| x.instance_eval &block }
+      end
+      if mod.const_defined?(:InstanceMethods, false)
+        send :include, mod.const_get(:InstanceMethods, false)
+      end
+      if mod.const_defined?(:ClassMethods, false)
+        send :extend, mod.const_get(:ClassMethods, false)
+      end
     end
     self
   end
 
   # @return [Method] bound to the given -context-