fat_core 5.5.2 → 5.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fed5378f234eb9dffdbfcc63a3520afc343e0879734d990576ac5871059d7bf3
-  data.tar.gz: eb267ad2fd68502779a921535655b24edc3311cad9a901dc5768b3e3ef41e44c
+  metadata.gz: e6cdea468a6e0d1208469b2d079d89694e3f70d62f8c9805e8f7372677430127
+  data.tar.gz: bb58238999c2d549e834f28a7dc300be835dbf3b3ef722c92f57480c0c426dd5
 SHA512:
-  metadata.gz: 3ad4723ce97c1f7c765be45abafa288b57146f787ce3a355025ddb7b86bbe1f197f0308e9a603753b79589c392e0092dd38c0cec012a973e0da116e35afe6d1d
-  data.tar.gz: 142bd5d034880bcb2a5418db6a05c38e9a88463294669bb3a823535a8ecd35a1d6878847548fbdbe4edad12e91832099e53f1ffca820d43ee4b93d7dd0950689
+  metadata.gz: 685e201065051cf82122aa799e2f08fb5ea44c6e5cccf3a454dd3389dfbb2af8cdf4b0bcffbc5d1e68571af8c9e96328d7272a9eb16ffd14194bd6a2f9a45150
+  data.tar.gz: 50c4b04bfb61fd22005add98c38a8cd0b29a8d67a479512dbc08f3c34f35669fbc93d8958a89fc3c8f2807c17935e3a451d4ad9755e0dbfb7cfd30568596c321

data/README.org

@@ -503,9 +503,9 @@ so that
 
 FatCore::String has methods for performing matching of one string with another
 (~#matches_with~, ~#fuzzy_match~), for converting a string to title-case as
-might by used in the title of a book (~#entitle~), for converting a String into
-a useable Symbol (~#as_sym~) and vice-versa (~#as_string~ also
-~Symbol#as_string~), for wrapping with an optional hanging indent (~#wrap~),
+might by used in the title of a book (~#entitle~), for converting a String
+into a useable Symbol (~#as_sym~) and vice-versa (~#as_str~ also
+~Symbol#as_str~), for wrapping with an optional hanging indent (~#wrap~),
 cleaning up errant spaces (~#clean~), and computing the Damerau-Levenshtein
 distance between strings (~#distance~). And several others.
 

data/lib/fat_core/date.rb

@@ -1331,7 +1331,7 @@ module FatCore
         nth_wday_in_month?(1, 1, 9)
       when 10
         # Columbus Day (Oct 12) 1909--1953
-        year >= 1909 && year <= 1953 && day == 12
+        year.between?(1909, 1953) && day == 12
       when 11
         if tuesday?
           # Election Day. Until 1968 all Election Days.  From 1972 to 1980
@@ -1363,7 +1363,7 @@ module FatCore
           end
         elsif day == 11
           # Armistice or Veterans Day.  1918--1921; 1934--1953.
-          (year >= 1918 && year <= 1921) || (year >= 1934 && year <= 1953)
+          year.between?(1918, 1921) || year.between?(1934, 1953)
         else
           false
         end

data/lib/fat_core/nil.rb

@@ -2,13 +2,12 @@
 
 module FatCore
   module NilClass
-    # Allow nils to respond to #as_string like String and Symbol
+    # Allow nils to respond to #entitle like String and Symbol
     #
     # @return [String] empty string
-    def as_string
+    def entitle
       ''
     end
-    alias_method :entitle, :as_string
 
     # Allow nils to respond to #tex_quote for use in TeX documents
     #

data/lib/fat_core/string.rb

@@ -22,28 +22,25 @@ module FatCore
       strip.squeeze(' ')
     end
 
-    # Convert to a lower-case symbol with all white space converted to a single
-    # '_' and all non-alphanumerics deleted, such that the string will work as
-    # an unquoted Symbol.
+    # Convert to a lower-case symbol with all hyphens and white space
+    # converted to a single '_' and all non-alphanumerics deleted, such that
+    # the string will work as an unquoted Symbol.
     #
     # @example
     #   "Hello World" -> :hello_world
     #   "Hello*+World" -> :helloworld
+    #   "jack-in-the-box" -> :jack_in_the_box
     #
     # @return [Symbol] self converted to a Symbol
     def as_sym
       clean
         .gsub(/\s+/, '_')
+        .tr('-', '_')
         .gsub(/[^_A-Za-z0-9]/, '')
         .downcase.to_sym
     end
 
-    # Return self unmodified. This method is here so to comply with the API of
-    # Symbol#as_string so that it can be applied to a variable that is either a
-    # String or a Symbol.
-    #
-    # @return [String] self unmodified
-    def as_string
+    def as_str
       self
     end
 
@@ -117,6 +114,7 @@ module FatCore
     end
 
     UPPERS = ('A'..'Z').to_a
+    REGEXP_META_CHARACTERS = "\\$()*+.<>?[]^{|}".chars.freeze
 
     private
 
@@ -313,8 +311,6 @@ module FatCore
       matched_text
     end
 
-    REGEXP_META_CHARACTERS = "\\$()*+.<>?[]^{|}".chars.freeze
-
     # Convert a string of the form '/.../Iixm' to a regular
     # expression. However, make the regular expression case-insensitive by
     # default and extend the modifier syntax to allow '/I' to indicate

data/lib/fat_core/symbol.rb

@@ -9,22 +9,32 @@ module FatCore
     #
     # @example
     #   :hello_world.entitle #=> "Hello World"
-    #   :hello_world.as_string #=> "Hello World"
     #   :joy_to_the_world #=> 'Joy to the World'
     #
     # @return [String]
-    def as_string
+    def entitle
       to_s.tr('_', ' ').split.join(' ').entitle
     end
-    alias_method :entitle, :as_string
 
-    # Return self. This (together with String#as_sym) allows `#as_sym` to be
-    # applied to a string or Symbol and get back a Symbol with out testing for
-    # type.
+    # Return self in a form suitable as an identifier. Ruby allows symbols to
+    # have arbitrary characters in them that are not permitted as an
+    # identifier.  Convert this symbol to one that is a legal identifier. This
+    # (together with String#as_sym) allows `#as_sym` to be applied to a string
+    # or Symbol and get back a Symbol with out testing for type.
     #
     # @return [Symbol] just self
     def as_sym
-      self
+      as_str.as_sym
+    end
+
+    # Convert this symbol to a string in such a manner that for simple cases,
+    # it is the inverse of String#as_sym and vice-versa.
+    def as_str
+      to_s
+        .downcase
+        .tr('_', '-')
+        .gsub(/\s+/, '_')
+        .gsub(/[^-_A-Za-z0-9]/, '')
     end
 
     # Prepare this symbol for use in a TeX document by converting to String then

data/lib/fat_core/version.rb

@@ -2,8 +2,8 @@
 
 module FatCore
   MAJOR = 5
-  MINOR = 5
-  PATCH = 2
+  MINOR = 6
+  PATCH = 1
 
   # FatCore version number
   VERSION = [MAJOR, MINOR, PATCH].compact.join('.')

data/spec/lib/range_spec.rb

@@ -74,10 +74,10 @@ describe Range do
 
     it 'knows the difference with another range' do
       # Other is same as self
-      # rubocop:disable Lint/BinaryOperatorWithIdenticalOperands
+      # xrubocop:disable Lint/BinaryOperatorWithIdenticalOperands
       expect(((4..10) - (4..10)).size).to eq(0)
       expect(((4..10) - (4..10))).to be_empty
-      # rubocop:enable Lint/BinaryOperatorWithIdenticalOperands
+      # xrubocop:enable Lint/BinaryOperatorWithIdenticalOperands
 
       # Other is proper subset of self
       expect(((4..10) - (6..7)).first).to eq((4..5))

data/spec/lib/string_spec.rb

@@ -139,7 +139,7 @@ the people, for the people, shall not perish from the earth."
         expect('-8.008'.number?).to be true
         expect('8.008e33'.number?).to be true
         expect('-8.008e33'.number?).to be true
-        expect('0x8.008'.number?).to be_truthy
+        expect('0x8.008').to be_number
         expect('hello world'.number?).to be false
       end
     end
@@ -192,12 +192,17 @@ the people, for the people, shall not perish from the earth."
       expect('hello world'.as_sym).to eq :hello_world
       expect("hello world   it's me".as_sym).to eq :hello_world_its_me
       expect('Street1'.as_sym).to eq :street1
+      expect('jack-in-the-box'.as_sym).to eq :jack_in_the_box
+      expect('jack_in-the-box'.as_sym).to eq :jack_in_the_box
+      expect('jack_in_the_box'.as_sym).to eq :jack_in_the_box
+      expect('Jack in the Box'.as_sym).to eq :jack_in_the_box
+      expect("Four Score  \t\n   and 7 years ago".as_sym).to eq :four_score_and_7_years_ago
     end
 
-    it 'does nothing in response to as_string' do
-      expect('joke'.as_string).to eq 'joke'
-      expect('hello world'.as_string).to eq 'hello world'
-      expect("hello world   it's me".as_string).to eq "hello world   it's me"
+    it 'does nothing in response to as_str' do
+      expect('joke'.as_str).to eq 'joke'
+      expect('hello world'.as_str).to eq 'hello world'
+      expect("hello world   it's me".as_str).to eq "hello world   it's me"
     end
 
     it 'properly capitalizes a string as a title' do

data/spec/lib/symbol_spec.rb

@@ -4,14 +4,25 @@ require 'fat_core/symbol'
 describe Symbol do
   it 'converts to a capitalized string' do
     expect(:i_am_a_symbol.entitle).to eq 'I Am a Symbol'
-    expect(:i_am_a_symbol.as_string).to eq 'I Am a Symbol'
+    2
   end
 
   it 'responds to tex_quote' do
     expect(:i_am_a_symbol.tex_quote).to eq 'i\\_am\\_a\\_symbol'
   end
 
-  it 'responds to :as_sym as identity' do
+  it 'return self :as_sym as a symbol but also a legal identifier' do
     expect(:i_am_a_symbol.as_sym).to eq :i_am_a_symbol
+    expect(:'i-am-a_symbol'.as_sym).to eq :i_am_a_symbol
+    expect(:'Four Score     and 7 years ago'.as_sym).to eq :four_score_and_7_years_ago
+    expect(:four_score_and_7_years_ago.as_sym).to eq :four_score_and_7_years_ago
+  end
+
+  it 'as_str is the inverse of as_sym for simple cases' do
+    expect('jack-in-the-box'.as_sym.as_str).to eq 'jack-in-the-box'
+    expect('jack_in-the-box'.as_sym.as_str).to eq 'jack-in-the-box'
+    expect('jack_in-the-box'.as_sym.as_str).to eq 'jack-in-the-box'
+    expect(:four_score_and_7_years_ago.as_str).to eq 'four-score-and-7-years-ago'
+    expect(:four_score_and_7_years_ago.as_str.as_sym).to eq :four_score_and_7_years_ago
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fat_core
 version: !ruby/object:Gem::Version
-  version: 5.5.2
+  version: 5.6.1
 platform: ruby
 authors:
 - Daniel E. Doherty
 bindir: bin
 cert_chain: []
-date: 2025-02-23 00:00:00.000000000 Z
+date: 2025-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport