hyperloop-config 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95068ff66d67af089b732fc44f910fe3663f19f1
-  data.tar.gz: aaabff976a2d6a97edda22f99700d38568f49ba1
+  metadata.gz: 75342342daae3957c0ad9e88d1bec7dca6adb2bb
+  data.tar.gz: 57c7e5e204cd0b267591c9c7e0e999b456938c31
 SHA512:
-  metadata.gz: c8dfac20f0ae09fff156473d905e26b15f41c88fae4cde3a304d9f8187e83d866389f73c7484ec58b4f827efea657f104852a21adcd66b695513ec2a17a9ddad
-  data.tar.gz: 98185f221412cb3ee91b02f0659ae28f68a492596753243df95451a9e641956f989c41bc923d4b0b107e596a13f63cbd3c75051ca8d7f34be409bc241196d943
+  metadata.gz: 25a85fc640349989a12f861c8dff13e9d4d02f485e6f587b882b72a79d51d781283bc97ace866f2f3eeb1b4634b0ab4586baf20cc86c924d06a7eec02d4296f0
+  data.tar.gz: a3836f359230798716a5840f19c9da877972ab4f26b2e290e1fa21e2e92d0a717dfed51eb39f45c5184bca28597c80931f9e8e0cf2383a7f9eeae5ef1ef5c1e3

data/hyperloop-config.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "hyperloop-config"
-  spec.version       = "0.9.5"
+  spec.version       = "0.9.6"
   spec.authors       = ["catmando"]
   spec.email         = ["mitch@catprint.com"]
 

data/lib/hyperloop/context.rb

@@ -5,26 +5,32 @@ module Hyperloop
   # the provided block will be rerun and the instance variable re-initialized
   # when the reset! method is called
   module Context
-    # pass self, an instance var name (symbol) and a block
-    # if reset! has been called, then record the var and block for future resets
-    # then if var is currently empty it will be initialized with block
-    def self.set_var(ctx, var, &block)
-      @context_hash[ctx] ||= [var, block] if @context_hash
-      ctx.instance_variable_get(var) || ctx.instance_variable_set(var, yield)
+    # Replace @foo ||= ... with
+    # Context.set_var(self, :@foo) { ... }
+    # If reset! has been called then the instance variable will be record, and
+    # will be reset on the next call to reset!
+    # If you want to record the current value of the instance variable then set
+    # force to true.
+    def self.set_var(ctx, var, force: nil)
+      puts "calling set_var(#{var})"
+      inst_value_b4 = ctx.instance_variable_get(var)
+      if @context && !@context[ctx].key?(var) && (force || !inst_value_b4)
+        @context[ctx][var] = (inst_value_b4 && inst_value_b4.dup)
+      end
+      inst_value_b4 || ctx.instance_variable_set(var, yield)
     end
 
     def self.reset!(reboot = true)
-      # if @context_hash is already initialized then reset all the instance
+      # if @context is already initialized then reset all the instance
       # vars using their corresponding blocks.  Otherwise initialize
-      # @context_hash.
-      if @context_hash
-        @context_hash.each do |context, var_and_block|
-          var, block = var_and_block
-          context.instance_variable_set(var, block.call)
+      # @context.
+      if @context
+        @context.each do |ctx, vars|
+          vars.each { |var, init| ctx.instance_variable_set(var, init) }
         end
         Hyperloop::Application::Boot.run if reboot
       else
-        @context_hash = {}
+        @context = Hash.new { |h, k| h[k] = {} }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperloop-config
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - catmando
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-25 00:00:00.000000000 Z
+date: 2017-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal