deimos-ruby 1.4.0.pre.beta1 → 1.4.0.pre.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b4c2a6f41276ada5bf402ac01c6cf445a014a155bbcc6fe48e83bbb9aa1d8a2
-  data.tar.gz: 1041a4c5051900134f66893e86564c0ef896df269d0af9973aaf7f1f7cecb733
+  metadata.gz: af6aca3bfdec091463dfbc9774d0c3f41e38020c2f8c634609d2471dc327479e
+  data.tar.gz: 727a05937a6814e650898fd239aa53075b16d354600909cd76308aa6b697226a
 SHA512:
-  metadata.gz: fdea52b89a1b788d9bdd5b6244d4f278139fb01e10b201720dd2afe052a418251a784d2756624cb3896d705016dbca0252206b27163a2c5e2c7eb200294b5979
-  data.tar.gz: 5df060deb523e4b4879f47a18034960afb905edde95da9ac98f7dd5f5e0a022e1e8be3b81c13685c26c6837ed3ef6505394607469b075b8e2b1068ddabf61bcb
+  metadata.gz: 26c751b958de521c87a8824c77f3c47db65806aad257c4948f27b4be4a4b559cf768b3d0291a10060539f9306c748d3028e43c15599f87680be83d8001b751d3
+  data.tar.gz: 8f97fb5eb5fb8538f2fce6806f9d8a152d6b458f56da30ae0e68fa9892bfe6f86679e55b295e2b342b687a912cb7e6345e9047ec4d7d783f0e4f539f52245405

data/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+# [1.4.0-beta2] - 2019-11-22
+- FIX: settings with default_proc were being called immediately
+  instead of being lazy-evaluated.
+
 # [1.4.0-beta1] - 2019-11-22
 - Complete revamp of configuration method.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    deimos-ruby (1.4.0.pre.beta1)
+    deimos-ruby (1.4.0.pre.beta2)
       avro-patches (~> 0.3)
       avro_turf (~> 0.8)
       phobos (~> 1.8.2.pre.beta2)

data/lib/deimos/config/configurable.rb

@@ -38,8 +38,6 @@ module Deimos
       def reset!
         if self.value.is_a?(ConfigStruct)
           self.value.reset!
-        elsif self.default_proc
-          self.value = self.default_proc.call
         else
           self.value = self.default_value
         end
@@ -206,7 +204,11 @@ module Deimos
           @settings[config_key].value = args[0]
         else
           # Get the value
-          @settings[config_key].value
+          setting = @settings[config_key]
+          if setting.default_proc && setting.value.nil?
+            setting.value = setting.default_proc.call
+          end
+          setting.value
         end
       end
 

data/lib/deimos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deimos
-  VERSION = '1.4.0-beta1'
+  VERSION = '1.4.0-beta2'
 end

data/spec/config/configurable_spec.rb

@@ -29,6 +29,22 @@ describe Deimos::Configurable do
     expect { MyConfig.config.group.set4 }.to raise_error(NameError)
   end
 
+  it 'should not call the proc until it has to' do
+    num_calls = 0
+    value_proc = proc do
+      num_calls += 1
+      num_calls
+    end
+    MyConfig.configure do
+      setting :set_with_proc, default_proc: value_proc
+    end
+    expect(num_calls).to eq(0)
+    expect(MyConfig.config.set_with_proc).to eq(1)
+    # calling twice should not call the proc again
+    expect(MyConfig.config.set_with_proc).to eq(1)
+    expect(num_calls).to eq(1)
+  end
+
   it "should raise error when setting configs that don't exist" do
     expect { MyConfig.configure { set15 'some_value' } }.to raise_error(NameError)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 1.4.0.pre.beta1
+  version: 1.4.0.pre.beta2
 platform: ruby
 authors:
 - Daniel Orner