judges 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e42894e95397d8b62afd1deaf3407d31321475e378f4ebdfd88216571ff742d
-  data.tar.gz: d59aaa5f47aa2f7373b78e36869bc09aacd1c52f881c910c45d292407c3da203
+  metadata.gz: 423404090687b2214385439c28e9d5aa3e916d3eab7fcad7b406e9c795750ed0
+  data.tar.gz: 8f5c5b7f86625a2d57f3419010ea06891ca34ae3e1332a6858bd0f3edd467f8f
 SHA512:
-  metadata.gz: 1be5c4aad65f212b8bc700616851356ccf331be5b51a1ccc1e2d9d71e2225c8f648d0604e4ae5b1957d4b0623d43b8de6e78da2a8b1ed5ecdbbbe6db9eba3fc4
-  data.tar.gz: 8174ac41e04c618635c868b06164b79939cc2891066bda8063f806f9395b8985a650eab5770fd778fe86ad7f42d8f9496f46331a3cff175d570f39d0af2e00a2
+  metadata.gz: 56b32e90fb490e8664960b113b1f4aea5ff8b5be8778aab308c3d2cfdfade484d1efbe1550f523303ff8372f6065dd581ad01c19a2b48e38b4b250052ae74332
+  data.tar.gz: '0578ac5a5a17b870e887e7ba6aaafafdaf51ad02b3d32fbb77857718b427550419e04c5d9711e907f2cb2b6eb7c35d58a0b5f4bc3ead36854fe6f5733c90bb8c'

data/judges.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = '>=3.2'
   s.name = 'judges'
-  s.version = '0.13.1'
+  s.version = '0.13.2'
   s.license = 'MIT'
   s.summary = 'Command-Line Tool for a Factbase'
   s.description =

data/lib/judges/options.rb

@@ -35,48 +35,53 @@ class Judges::Options
   end
 
   def empty?
-    touch # this will trigger method_missing() method, which will create @hash
-    @hash.empty?
+    to_h.empty?
   end
 
   def +(other)
-    touch # this will trigger method_missing() method, which will create @hash
-    h = @hash.dup
-    other.touch # this will trigger method_missing() method, which will create @hash
-    other.instance_variable_get(:@hash).each do |k, v|
+    h = to_h
+    other.to_h.each do |k, v|
       h[k] = v
     end
-    Judges::Options.new(h.map { |k, v| "#{k}=#{v}" })
+    Judges::Options.new(h)
   end
 
   # Convert them all to a string (printable in a log).
   def to_s
-    touch # this will trigger method_missing() method, which will create @hash
-    @hash.map do |k, v|
+    to_h.map do |k, v|
       v = v.to_s
       v = "#{v[0..3]}#{'*' * (v.length - 4)}" if v.length > 8
       "#{k} → \"#{v}\""
     end.join("\n")
   end
 
-  # Get option by name.
-  others do |*args|
-    @hash ||= begin
+  def to_h
+    @to_h ||= begin
       pp = @pairs || []
-      pp = @pairs.map { |k, v| "#{k}=#{v}" } if pp.is_a?(Hash)
       pp = pp.split(',') if pp.is_a?(String)
-      pp.compact!
-      pp.reject!(&:empty?)
-      pp.map! do |pair|
-        p = pair.split('=', 2)
-        k = p[0].strip.upcase
-        v = p[1]
-        v = v.nil? ? 'true' : v.strip
-        [k.to_sym, v.match?(/^[0-9]+$/) ? v.to_i : v]
+      if pp.is_a?(Array)
+        pp = pp
+          .compact
+          .map(&:strip)
+          .reject(&:empty?)
+          .map { |s| s.split('=', 2) }
+          .map { |a| a.size == 1 ? [a[0], nil] : a }
+          .reject { |a| a[0].empty? }
+          .to_h
       end
-      pp.reject { |p| p[0].empty? }.to_h
+      pp
+        .reject { |k, _| k.nil? }
+        .reject { |k, _| k.is_a?(String) && k.empty? }
+        .to_h
+        .transform_values { |v| v.nil? ? 'true' : v }
+        .transform_values { |v| v.is_a?(String) ? v.strip : v }
+        .transform_values { |v| v.is_a?(String) && v.match?(/^[0-9]+$/) ? v.to_i : v }
+        .transform_keys { |k| k.to_s.strip.upcase.to_sym }
     end
-    k = args[0].upcase
-    @hash[k]
+  end
+
+  # Get option by name.
+  others do |*args|
+    to_h[args[0].upcase.to_sym]
   end
 end

data/lib/judges.rb

@@ -25,5 +25,5 @@
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
 module Judges
-  VERSION = '0.13.1'
+  VERSION = '0.13.2'
 end

data/test/test_options.rb

@@ -55,7 +55,7 @@ class TestOptions < Minitest::Test
   def test_with_empty_string
     opts = Judges::Options.new('   ')
     assert(opts.foo.nil?)
-    assert(opts.empty?)
+    assert(opts.empty?, opts)
   end
 
   def test_with_empty_strings
@@ -73,14 +73,14 @@ class TestOptions < Minitest::Test
   def test_with_hash
     opts = Judges::Options.new('foo' => 42, 'bar' => 'hello')
     assert_equal(42, opts.foo)
-    assert_equal('hello', opts.bar)
+    assert_equal('hello', opts.Bar)
     assert(opts.xxx.nil?)
   end
 
   def test_converts_to_string
     opts = Judges::Options.new('foo' => 44, 'bar' => 'long-string-maybe-secret')
     s = opts.to_s
-    assert(s.include?('FOO → "44"'))
+    assert(s.include?('FOO → "44"'), s)
     assert(s.include?('"long********************"'))
   end
 
@@ -91,4 +91,10 @@ class TestOptions < Minitest::Test
     assert_equal(44, opts.a)
     assert_equal(3, opts.c)
   end
+
+  def test_merge_by_symbols
+    opts = Judges::Options.new(a: 42) + Judges::Options.new(b: 7)
+    assert_equal(42, opts.a, opts)
+    assert_equal(7, opts.b, opts)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Yegor Bugayenko