From 21d41a8cc4c49d602aa2d020ab2f085f578d5ee3 Mon Sep 17 00:00:00 2001
From: Huy Du <dugiahuy@gmail.com>
Date: Mon, 21 Jun 2021 13:47:27 +0700
Subject: [PATCH] Guard value on option transform

---
 CHANGELOG.md                               |  6 ++++++
 lib/stimpack/options_declaration/option.rb |  2 +-
 lib/stimpack/version.rb                    |  2 +-
 spec/stimpack/options_declaration_spec.rb  | 21 +++++++++++++++++----
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7c1f6e..8336dd9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.6.1
+
+### New features
+
+- Allow transform declaration with optional value to `OptionsDeclaration`.
+
 ## 0.6.0
 
 ### New features
diff --git a/lib/stimpack/options_declaration/option.rb b/lib/stimpack/options_declaration/option.rb
index 1e2072a..7a07349 100644
--- a/lib/stimpack/options_declaration/option.rb
+++ b/lib/stimpack/options_declaration/option.rb
@@ -27,7 +27,7 @@ def default_value
       end
 
       def transformed_value(value)
-        transform? ? transform.to_proc.(value) : value
+        transform? && value ? transform.to_proc.(value) : value
       end
 
       def required?
diff --git a/lib/stimpack/version.rb b/lib/stimpack/version.rb
index 89f7991..da2cadd 100644
--- a/lib/stimpack/version.rb
+++ b/lib/stimpack/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Stimpack
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end
diff --git a/spec/stimpack/options_declaration_spec.rb b/spec/stimpack/options_declaration_spec.rb
index df644d9..4e02269 100644
--- a/spec/stimpack/options_declaration_spec.rb
+++ b/spec/stimpack/options_declaration_spec.rb
@@ -18,11 +18,12 @@
       option :corge, transform: ->(value) { value.upcase }
       option :grault, default: "bar", transform: ->(value) { value.upcase }
       option :garply, default: "baz", transform: :upcase
+      option :waldo, required: false, transform: :to_sym
     end
   end
 
   describe ".option" do
-    it { expect(service.options_configuration.size).to eq(9) }
+    it { expect(service.options_configuration.size).to eq(10) }
     it { expect(service.options_configuration.values).to all(be_a(described_class::Option)) }
 
     describe "private_reader (option)" do
@@ -30,12 +31,12 @@
       let(:private_instance_methods) { service.private_instance_methods(false) }
 
       it { expect(public_instance_methods).to contain_exactly(:baz) }
-      it { expect(private_instance_methods).to contain_exactly(:foo, :bar, :qux, :quux, :quuz, :corge, :grault, :garply) } # rubocop:disable Layout/LineLength
+      it { expect(private_instance_methods).to contain_exactly(:foo, :bar, :qux, :quux, :quuz, :corge, :grault, :garply, :waldo) } # rubocop:disable Layout/LineLength
     end
   end
 
   describe ".options" do
-    it { expect(service.options).to contain_exactly(:foo, :bar, :baz, :qux, :quux, :quuz, :corge, :grault, :garply) }
+    it { expect(service.options).to contain_exactly(:foo, :bar, :baz, :qux, :quux, :quuz, :corge, :grault, :garply, :waldo) } # rubocop:disable Layout/LineLength
   end
 
   describe ".required_options" do
@@ -43,7 +44,7 @@
   end
 
   describe ".optional_options" do
-    it { expect(service.optional_options).to contain_exactly(:bar, :qux, :quux, :quuz, :grault, :garply) }
+    it { expect(service.optional_options).to contain_exactly(:bar, :qux, :quux, :quuz, :grault, :garply, :waldo) }
   end
 
   describe ".default_options" do
@@ -110,6 +111,18 @@
       context "when using a method name for transform" do
         it { expect(instance.send(:garply)).to eq("BAZ") }
       end
+
+      context "when transform is applied to optional" do
+        context "with no value provided" do
+          it { expect(instance.send(:waldo)).to eq(nil) }
+        end
+
+        context "with value provided" do
+          before { options.merge!(waldo: "fubaz") }
+
+          it { expect(instance.send(:waldo)).to eq(:fubaz) }
+        end
+      end
     end
   end