use_context 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90aac299a67f5dbfbb1e2580c29021dafdd1ba06e0c4e6771a15faa6a673a3dc
-  data.tar.gz: 4241b82b90fb4c902bae71dc2609f4651dc2eaf3ccd3cea1bddc54d08fdc1916
+  metadata.gz: 363ef63550d6dcfed54db9b34b3e940ad8d40b319702a6fc1aff79dba9039d78
+  data.tar.gz: d3cf0e008a950921ba1117e845472d4326fca8989013c0cbd99e72c0bb867353
 SHA512:
-  metadata.gz: 7527e2b3c96f0470f4997bd366d3b8071f4a17a07b00d101e2fa6b868fa435a54e991fdd6997594374a989dd16b9dadd8deea1c1806da09749dd16307fd6b053
-  data.tar.gz: 9d23e93d4ff8c0c85c7d618fd2d38f2d46617fd048ba2ec39069fb3f0d529c1caba5f8cef50dd7d80eacc3087385096fc548f771d2f6827fb04a062f1042892c
+  metadata.gz: 923d2555ea24de3247ed722ec82f3d36ec9e0b1515f1e00b268c6a4600ada5ca3e7f696121d36b3db8da57db685d579b7cb3af59119c9171621827181843d83f
+  data.tar.gz: 0af1b6f61e278ff6b7ae1e9d22ece69131016575841ba1aac8ea448e0489bfb0210593a5c7b4095a2c5508ce689ad8c829ed3021be5dd5c2d0b495a5823b4e50

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.2.0
+* Augments the behavior of `use_context` to return the context object or the extracted values if a block is not provided:
+    ```ruby
+    use_context(:foo)             # returns the context object
+    use_context(:foo, :bar)       # => "bar"
+    use_context(:foo, :bar, :baz) # => ["bar", "baz"]
+    ```
+
 # 1.1.1
 * Fix bug in context extraction that would yield an array instead of a value when only a single key was specified.
 

data/lib/use_context/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UseContext
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/lib/use_context.rb

@@ -85,9 +85,15 @@ module UseContext
       context = UseContext.context[name]&.context || EmptyContext.instance
 
       if keys.empty?
-        yield context
+        block_given? ? yield(context) : context
       else
-        yield(*keys.map { |key| context[key] })
+        values = keys.map { |key| context[key] }
+
+        if block_given?
+          yield(*values)
+        else
+          values.size == 1 ? values.first : values
+        end
       end
     end
   end

data/test/kernel_test.rb

@@ -117,4 +117,27 @@ class KernelTest < Minitest::Test
       end
     end
   end
+
+  def test_use_context_returns_context_object_when_given_no_keys_and_no_block
+    provide_context(:test, { setting1: :a, setting2: :b }) do
+      context = use_context(:test)
+      assert_equal :a, context[:setting1]
+      assert_equal :b, context[:setting2]
+    end
+  end
+
+  def test_use_context_returns_extracted_values_when_given_keys_and_no_block
+    provide_context(:test, { setting1: :a, setting2: :b }) do
+      setting1, setting2 = use_context(:test, :setting1, :setting2)
+      assert_equal :a, setting1
+      assert_equal :b, setting2
+    end
+  end
+
+  def test_use_context_returns_single_extracted_value_when_given_a_key_and_no_block
+    provide_context(:test, { setting1: :a, setting2: :b }) do
+      setting1 = use_context(:test, :setting1)
+      assert_equal :a, setting1
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: use_context
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Cameron Dutro