trick_bag 0.58.0 → 0.58.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10d4086b2610d6e23ce59201321b731e05a74df3
-  data.tar.gz: f64bd3abeeb2ee2c948173d39fb2cb1e464d5111
+  metadata.gz: 3bc667fb430486e4cc7923ea12c615bc658cdd7e
+  data.tar.gz: 4db0fde0dd906dda2a46ebacb975908ac18eb154
 SHA512:
-  metadata.gz: f36e566103aee54e599824f739a23b02c2a9957cfd857d4cc2c91d5aa086d3371638d61628766439569c4562f09e9fa182a95b20128b3c1e23b8624ea54429d1
-  data.tar.gz: 43ba1d249627e9205dc853d9fbde3e0bed51b1931cc5a28819bb6da64dbafb48cda72ee063578969926265deff5ea7384a9014ab40e8984429dac56d8bcf3750
+  metadata.gz: f51ab665365c45131ac6f90932a58c2f33d604ea2ce13ad00cd0eac622b4816ece6e79d0ced9e73d487fed1ff71ec071a485e54f87bb890387b194a08d6d3d68
+  data.tar.gz: 44d8d27beb484babc4be8a78f773129ac0d2c790a989208c23fd2ac233a0634cc79fc5fa055b19f5b7a25cbdac53f3fd1cdb5e3e9710dd9f49add4898b11bdc6

data/RELEASE_NOTES.md

@@ -1,3 +1,8 @@
+## v0.58.1
+
+* For KmgtNumericString, support returning of nil/false on nil input.
+
+
 ## v0.58.0
 
 * Added KmbtNumericString, Formatters.thousands_separated.

data/lib/trick_bag/numeric/kmgt_numeric_string.rb

@@ -35,18 +35,19 @@ module KmgtNumericString
     object.is_a?(String) ? ToNumberConverter.new(object).to_number : object
   end
 
-  # Returns whether or not this is a number range.  Specifically, tests that
+  # Returns whether or not this is a number range string.  Specifically, tests that
   # the string contains only 2 numeric strings separated by '..'.
   def range_string?(string)
+    return false unless string.is_a?(String)
     number_strings = string.split('..')
     number_strings.size == 2 && number_strings.all? { |str| VALID_STRING_REGEX.match(str) }
   end
 
   # Converts the passed string to a range (see range_string? above for the string's format).
-  # If the passed parameter is a Range already, returns it unchanged.
+  # If the passed parameter is nil or is a Range already, returns it unchanged.
   # This eliminates the need for the caller to do their own type test.
   def to_range(object)
-    return object if object.is_a?(Range)
+    return object if object.is_a?(Range) || object.nil?
     unless range_string?(object)
         raise ArgumentError.new("Invalid argument (#{object}); Range must be 2 numbers separated by '..', e.g. 10..20 or 900K..1M")
     end
@@ -55,11 +56,11 @@ module KmgtNumericString
   end
 
   # Converts a string such as '3' or '1k..2k' into a number or range.
-  # If an Integer or Range is passed, it is returned unchanged.
+  # If nil or an Integer or Range is passed, it is returned unchanged.
   # This eliminates the need for the caller to do their own type test.
   def to_number_or_range(object)
     case object
-      when Integer, Range
+      when Integer, Range, NilClass
         object
       when String
         range_string?(object) ? to_range(object) : to_number(object)

data/lib/trick_bag/version.rb

@@ -1,3 +1,3 @@
 module TrickBag
-  VERSION = "0.58.0"
+  VERSION = "0.58.1"
 end

data/spec/trick_bag/numeric/kmgt_numeric_string_spec.rb

@@ -39,6 +39,10 @@ end
         expect(to_number('-10k')).to eq(-10 * 1000)
         expect(to_number('-10')).to eq(-10)
       end
+
+      specify 'nil is returned unchanged' do
+        expect(to_number(nil)).to eq(nil)
+      end
     end
 
 
@@ -58,6 +62,10 @@ end
         expect(range_string?('-1..1')).to eq(true)
         expect(range_string?('10K..10M')).to eq(true)
       end
+
+      specify 'nil returns false' do
+        expect(range_string?(nil)).to eq(false)
+      end
     end
 
 
@@ -70,6 +78,10 @@ end
       specify 'ascending ranges are supported' do
         expect(to_range('3k..4k')).to eq((3000..4000))
       end
+
+      specify 'nil is returned unchanged' do
+        expect(to_range(nil)).to eq(nil)
+      end
     end
 
     context '.to_number_or_range' do
@@ -78,6 +90,10 @@ end
         expect(to_number_or_range('12k')).to eq(12_000)
         expect(to_number_or_range('12k..24k')).to eq(12_000..24_000)
       end
+
+      specify 'nil is returned unchanged' do
+        expect(to_number_or_range(nil)).to eq(nil)
+      end
     end
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trick_bag
 version: !ruby/object:Gem::Version
-  version: 0.58.0
+  version: 0.58.1
 platform: ruby
 authors:
 - Keith Bennett