duffy 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b26949061663fcfd666bc4479d89671494dfc81d2e14a3bb3189970de202255
-  data.tar.gz: e8dc1912140fc07fb39c4f9d15070c26397d91b9cd63fdaa7fc164e889e4cf5c
+  metadata.gz: 8873a39ece2e7a2a8ffc4423da9c6fba6c64cade3fe11abebe3c3dd24f5a779d
+  data.tar.gz: 74b38171a364c3ad4fb7565df514ec89ffb71ef0b9fe34121081fc575811a8b1
 SHA512:
-  metadata.gz: 2816bf8e70c972cc7ce9e3066f8d54d9c93cb8e00958e2bd7ada8ab060163958faaeff52ca973af982039994acdcef6a0148b907d2193976ed4cbcf0787bfa11
-  data.tar.gz: '065851c6e0a9e97533715eef0800390cd0811c2ecc3453871479be7fb9d85056fbdc4327c54cbf4555819e5aa81b5f82c1007cd94525c316c17bb905f980dae0'
+  metadata.gz: 8b90e00f3af06dfc475f46f1d3890e4c045de21b4a3217cc64e497b96c45f9932450cc6febcea049d98800074ef45ab55e3f8474d1bc3d4aac96d488f24ab2bc
+  data.tar.gz: 6fc6f7af5dd48af01ff147edb8b2526f1b98cd32348a6651957f9c22c912968b7b7631873bb89024506f1bf13305c83a76da86ddcdc00f2e35e504ffe10b5553

data/.github/workflows/rspec.yml

@@ -6,7 +6,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        ruby: [2.6, 2.7, '3.0', 3.1]
+        ruby: [2.7, 3.0, 3.2, 3.4, 4.0]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2

data/README.md

@@ -17,21 +17,21 @@ $ bundle
 
 ## String Patches:
 
-Method            | Example         | Output
-------------------|-----------------|-------
-gender_human      | "F"             | "Female"
-md5               | "duffy"         | "904bc6e21e4799ce276200117215b88b"
-md5sum            | "duffy"         | "904bc6e21e4799ce276200117215b88b"
-nl2br             | "space\nout"    | "space<br/>out"  (requires rails)
-pretty_phone      | "1234567890"    | "(123) 456-7890" 
-pretty_committer  | "bart"          | "Bartholomew Simpson" (See config)
-smart_titlecase   | "this and that" | "This and That" (Note: Has config options. See lib/duffy.rb)
-space2nbsp        | "space out"     | "space&nbsp;out" (requires rails)
-to_alpha          | "abc123"        | "abc"
-to_alpha_numeric  | "abc#$%123"     | "abc123
-to_box            | "abc".to_box    | ![Example](doc/abc.png)
-to_numeric        | "abc123"        | "123"
-to_ssn            | "123456789"     | "123-45-6789"
+Method            | Example          | Output                             | Notes
+------------------|------------------|------------------------------------|------
+gender_human      | "F"              | "Female"                           |
+md5               | "duffy"          | "904bc6e21e4799ce276200117215b88b" |
+md5sum            | "duffy"          | "904bc6e21e4799ce276200117215b88b" |
+nl2br             | "space\nout"     | "space<br/>out"                    | various OS newline permutations
+pretty_phone      | "1234567890"     | "(123) 456-7890"                   | US phone number with or without area code
+pretty_committer  | "bart"           | "Bartholomew Simpson"              | See config
+smart_titlecase   | "this and that"  | "This and That"                    | Has config options. See lib/duffy.rb
+space2nbsp        | "space  out"     | "space&nbsp;&nbsp;out"             | Double space holdouts rejoice.
+to_alpha          | "abc123"         | "abc"                              |
+to_alpha_numeric  | "abc#$%123"      | "abc123                            |
+to_box            | "abc".to_box     | ![Example](doc/abc.png)            |
+to_numeric        | "abc123"         | "123"                              |
+to_ssn            | "123456789"      | "123-45-6789"                      |
 
 
 ## Array Patches:

data/lib/duffy/string.rb

@@ -63,6 +63,7 @@ class String
 
   def pretty_phone
     number = self.to_s.gsub(/[^0-9\+]/, "")
+    number = number[2..] if number.start_with?("+1") && number.length == 12
     return "(" + number[0..2] + ") " + number[3..5] + "-" + number[6..9] if number.length == 10
     return number[0..2] + "-" + number[3..6] if number.length == 7
     number
@@ -76,12 +77,15 @@ class String
   end
 
   def space2nbsp
-    # turns double space to double nbsp
-    (self.nil?)? "" : self.to_s.gsub(/ {2}/, "  ").html_safe
+    # turns >= double space to double nbsp
+    string = (self.nil?)? "" : self.to_s.gsub(/ {2,}/, "  ")
+    defined?(html_safe) ? string.html_safe : string
   end
 
+  # Replace the various combinations of newline characters with HTML <br> tags.
   def nl2br
-    (self.nil?)? "" : self.to_s.gsub(/(\r)?\n/, "<br />").html_safe
+    string = (self.nil?)? "" : self.to_s.gsub(/(\r\n)|(\n\r)|\n|\v/, "<br>")
+    defined?(html_safe) ? string.html_safe : string
   end
 
 

data/lib/duffy/version.rb

@@ -1,8 +1,10 @@
 module Duffy
-  VERSION = '1.0.6'
+  VERSION = '1.0.8'
 end
 
 # History
+# 1.0.8 - Added support for +1 country code in pretty_phone.
+# 1.0.7 - Added vertical tab to list of characters replace with <br> in nl2br.
 # 1.0.6 - Add to_markdown Array method.
 # 1.0.5 - Update smart_titlecase to better accommodate names.
 # 1.0.4 - Added battery_percent method.

data/spec/string_spec.rb

@@ -8,11 +8,48 @@ describe String do
     end
   end
 
+  describe "nl2br" do
+    it "converts linux newlines" do
+      expect("This\nand\nthat.".nl2br).to eq "This<br>and<br>that."
+    end
+    it "converts windows newlines" do
+      expect("This\r\nand\r\nthat.".nl2br).to eq "This<br>and<br>that."
+    end
+    it "converts backwards windows newlines" do
+      expect("This\n\rand\n\rthat.".nl2br).to eq "This<br>and<br>that."
+    end
+
+    it "converts vertical tabs from dubious software newlines" do
+      expect("This\vand\vthat.".nl2br).to eq "This<br>and<br>that."
+    end
+
+    it "slash R slash N slash N becomes <br><br>" do
+      expect("This\r\n\nthat.".nl2br).to eq "This<br><br>that."
+    end
+
+    it "slash N slash R slash N becomes <br><br>" do
+      expect("This\n\r\nthat.".nl2br).to eq "This<br><br>that."
+    end
+
+    it "slash N slash N slash R becomes <br><br>" do
+      expect("This\n\n\rthat.".nl2br).to eq "This<br><br>that."
+    end
+
+    it "slash N slash N slash N becomes <br><br><br>" do
+      expect("This\n\n\nthat.".nl2br).to eq "This<br><br><br>that."
+    end
+  end
+
+
   describe "pretty_phone" do
     it "formats an American phone number with Area Code" do
       expect("1234567890".pretty_phone).to eq "(123) 456-7890"
     end
 
+    it "formats a +1 American phone number with Area Code" do
+      expect("+16081234567".pretty_phone).to eq "(608) 123-4567"
+    end
+
     it "formats an American phone number without Area Code" do
       expect("4567890".pretty_phone).to eq "456-7890"
     end
@@ -26,6 +63,21 @@ describe String do
     end
   end
 
+  describe "space2nbsp" do
+
+    it "leaves single space alone" do
+      expect("1 1".space2nbsp).to eq "1 1"
+    end
+
+    it "turns double space to double nbsp" do
+      expect("1  2".space2nbsp).to eq "1&nbsp;&nbsp;2"
+    end
+
+    it "turns triple space to double nbsp" do
+      expect("1   3".space2nbsp).to eq "1&nbsp;&nbsp;3"
+    end
+  end
+
   describe "smart_titlecase" do
     {
       "123 Main St."            => "123 Main St.",            # Numbers are allowed

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duffy
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - Jacob Duffy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2026-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Library of things