usable 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa0cb884552cb07e0a3d903e528bb66cb6f111dc
-  data.tar.gz: 8faac4e475d6c9cdc08310d7d0a79daf03fd5a6d
+  metadata.gz: 3820825f72ea24881e17662498e419f3aba04e78
+  data.tar.gz: 7c5ae702b5d0e293ba188ea4362fe8d4ece9c935
 SHA512:
-  metadata.gz: 25c94039ef7c234eaea76ce5e44ea7bf319371ce1bf79d049c1b7c86d67e94bd173d1b762eca3d1d148b29d045844f9fbb12ab202d22fd534cc115afdc623e21
-  data.tar.gz: 3ffd8a3aff44bcceaa14dbebc5319ce756368c300eb80bca928f5e466320f734efc00408615bee76eb538a216284ff33f95616e454ee095f3155df64424e5e6a
+  metadata.gz: b235afa4781dbc735133ef2635d15924bd62ce2fe5e5821f697f11c27b44f2697ffc33497cbfba6bb7e7f6cfd9e98d94e45300c1148e5aee3060ad0f0dceefdd
+  data.tar.gz: 246d2b78ebc8fce4b396dec9eb5368e15951f4571cb1e29de0f90402296da40ba99fe967d7d45bd724d91fc7887715a3c6abccb19f388608dd73f957b79b49b0

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+2.2.0 (9/30/2016)
+==================
+
+* Usable config options can now accept blocks as values, which will be lazy loaded once and memoized for future calls ([#6](https://github.com/ridiculous/usable/pull/6))
+

data/README.md

@@ -8,6 +8,7 @@ module VersionMixin
   extend Usable
   config.max_versions = 25
   config.table_name = 'versions'
+  config.model { Audit }
   
   def save_version
     "Saving #{usables.max_versions} #{usables.table_name}"

data/bin/console

@@ -61,6 +61,7 @@ class Example
   usable Mixin
   usable VersionMixin do
     max_versions 10
+    model { Model }
   end
   usable Nested::Extension
 end

data/lib/usable/config.rb

@@ -1,24 +1,15 @@
+require 'usable/config_multi'
+require 'usable/config_register'
+
 module Usable
+  # Store and manage configuration settings. Keep methods to a minimum since this class relies on method_missing to read
+  # and write to the underlying @spec object
   class Config
-    # = Class
-    # Store and manage configuration settings. Keep methods to a minimum since this class relies on method_missing to read
-    # and write to the underlying @spec object
-    #
-
-    def available_methods
-      modules.each_with_object(Hash.new(Null.instance_method(:default_method))) do |mod, result|
-        mod.instance_methods.each do |method_name|
-          result[method_name] = mod.instance_method method_name
-        end
-      end
-    end
+    include ConfigRegister
+    include ConfigMulti
 
-    def add_module(mod)
-      modules << mod
-    end
-
-    def modules
-      @modules ||= []
+    def initialize
+      @spec = OpenStruct.new
     end
 
     def each(&block)
@@ -26,14 +17,18 @@ module Usable
     end
 
     def spec(key, value = nil)
-      @spec ||= OpenStruct.new
       if value
         @spec[key.to_s.tr('=', '')] = value
       else
-        @spec[key]
+        # Handle the case where the value may be defined with a block, in which case it's a method
+        @spec[key] ||= call_lazy_method(key)
       end
     end
 
+    def _spec
+      @spec
+    end
+
     def [](key)
       spec key
     end
@@ -42,19 +37,22 @@ module Usable
       spec key, val
     end
 
-    def method_missing(method_name, *args)
-      spec method_name, *args
-    rescue
-      super
+    def call_lazy_method(key)
+      @spec.public_send(key.to_s.tr('=', ''))
     end
 
-    def respond_to_missing?(method_name, _private = false)
-      method_name.to_s.end_with?('=') || @spec.respond_to?(method_name)
+    def method_missing(method_name, *args, &block)
+      if block
+        _spec.define_singleton_method(method_name) { yield }
+      else
+        spec method_name, *args
+      end
+    rescue => e
+      super
     end
 
-    module Null
-      def default_method(*, &_block)
-      end
+    def respond_to_missing?(method_name, _private = false)
+      method_name.to_s.end_with?('=') || _spec.respond_to?(method_name)
     end
   end
 end

data/lib/usable/config_multi.rb

@@ -0,0 +1,19 @@
+module Usable
+  module ConfigMulti
+    # It's important to define all block specs we need to lazy load
+    # Set block specs to nil values so it will fallback to calling the underlying singleton method defined by Config#method_missing
+    def +(other)
+      config = clone
+      specs = other._spec.to_h
+      specs.each { |key, val| config.spec key, val }
+      methods = other._spec.singleton_methods - specs.keys
+      methods.each do |name|
+        config._spec[name] = nil
+        config._spec.define_singleton_method(name) do
+          other._spec.public_method(name).call
+        end
+      end
+      config
+    end
+  end
+end

data/lib/usable/config_register.rb

@@ -0,0 +1,26 @@
+module Usable
+  # Keep track of "used" modules and their "available" methods
+  # Mixin for Config
+  module ConfigRegister
+    def available_methods
+      modules.each_with_object(Hash.new(Null.instance_method(:default_method))) do |mod, result|
+        mod.instance_methods.each do |method_name|
+          result[method_name] = mod.instance_method method_name
+        end
+      end
+    end
+
+    def add_module(mod)
+      modules << mod
+    end
+
+    def modules
+      @modules ||= []
+    end
+
+    module Null
+      def default_method(*, &_block)
+      end
+    end
+  end
+end

data/lib/usable/mod_extender.rb

@@ -18,7 +18,9 @@ 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)
-      override
+      unwanted.each do |method_name|
+        copy.send :remove_method, method_name
+      end
       if copy.name.nil?
         const_name = "#{mod_name}Used"
         target.send :remove_const, const_name if target.const_defined? const_name, false
@@ -28,25 +30,6 @@ module Usable
       target.send options[:method], copy
     end
 
-    # @note Destructive, as it changes @copy
-    def override
-      unwanted.each do |method_name|
-        copy.send :remove_method, method_name
-      end
-    end
-
-    # @description Extends the target with the module's ClassMethod mod
-    def use_class_methods!(target)
-      return unless mod.const_defined? :ClassMethods
-      target.extend mod.const_get :ClassMethods
-    end
-
-    # @description Extends the target with the module's ClassMethod mod
-    def use_instance_methods!(target)
-      return unless mod.const_defined? :InstanceMethods
-      target.include mod.const_get :InstanceMethods
-    end
-
     def mod_name
       if name
         name.split('::').last

data/lib/usable/version.rb

@@ -1,3 +1,3 @@
 module Usable
-  VERSION = "2.1.3".freeze
+  VERSION = "2.2.0".freeze
 end

data/lib/usable.rb

@@ -61,15 +61,23 @@ module Usable
       usables[scope_name] = scope
     end
     if mod.respond_to? :usables
-      mod.usables.each do |k, v|
-        [scope, usables].each { |x| x.spec k, v }
-      end
+      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)
     end
-    [scope, usables].each { |x| options.each { |k, v| x[k] = v } }
-    [scope, usables].each { |x| x.instance_eval &block } if block_given?
     ModExtender.new(mod, usable_options).call self
-    send :include, mod.const_get(:InstanceMethods) if mod.const_defined?(:InstanceMethods)
-    send :extend, mod.const_get(:ClassMethods) if mod.const_defined?(:ClassMethods)
     self
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usable
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Ryan Buckley
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,6 +70,7 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -78,6 +79,8 @@ files:
 - bin/setup
 - lib/usable.rb
 - lib/usable/config.rb
+- lib/usable/config_multi.rb
+- lib/usable/config_register.rb
 - lib/usable/mod_extender.rb
 - lib/usable/version.rb
 - usable.gemspec