babosa 2.0.0.beta → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef1346a05f1b3a1104af8a095b7829eaa853427927335c7905d41d5ab47b2e9c
-  data.tar.gz: 54e543a250c7eff0c9613bea3f22d2e79317707f60cbb364e6e68979237c4c53
+  metadata.gz: 84fa74468828d44925314cc1bcf6d297aa3a94ebfd993bca491686c92c936667
+  data.tar.gz: 618a52e9d52878fe8bc5933879115d32dd31b212a9cd2178e78bb7320d186c43
 SHA512:
-  metadata.gz: d4f6732579088cda9d4514b4d1dddd32f2cd933f2818ed4c74bf0f00168ccc3b20e6ce220bc1c473a0453d29ef50de256689ed17e1f809b42dcb8956377c0e76
-  data.tar.gz: 797887db1d626a92b28249883f2dcc55e3b92d9f423aa23052ba74cc45856a15ace2b6c823c983b6e6baa0907cfc3d467b9a52e05cd9de9d9fcf37c779bd0647
+  metadata.gz: d8d86867859c5af0f8f80631b5d7aefe14cf87d61ec5908fa08d68fa38cc2e287c77c2c59c41377eb41e6524ba723ed511d1d09e5837259aad4a1ced7162c25a
+  data.tar.gz: 005dbd796a469420ddc905e2fcf4261703f3777ab29000102039e52b907d51d51c3ab69f11779bfc3e76ed19c24fad997733d008c7d08f50dc1446fa230b7e3d

data/README.md

@@ -1,7 +1,6 @@
 # Babosa
 
-[![Build Status](https://travis-ci.org/norman/babosa.png?branch=master)](https://travis-ci.org/norman/babosa)
-
+[![Build Status](https://github.com/norman/babosa/actions/workflows/main.yml/badge.svg)](https://github.com/norman/babosa/actions)
 
 Babosa is a library for creating human-friendly identifiers, aka "slugs". It can
 also be useful for normalizing and sanitizing data.

data/lib/babosa/identifier.rb

@@ -110,7 +110,7 @@ module Babosa
       # `^\p{letter}` = Any non-Unicode letter
       # `&&` = add the following character class
       # `[^ _\n\r]` = Anything other than space, underscore, newline or linefeed
-      gsub!(/[[^\p{letter}]&&[^ _\-\n\r]]/, "")
+      gsub!(/[[^\p{letter}]&&[^ \d_\-\n\r]]/, "")
       to_s
     end
 
@@ -125,10 +125,10 @@ module Babosa
 
       if options[:transliterate]
         option = options[:transliterate]
-        if option != true
-          transliterate!(*option)
-        else
+        if option == true
           transliterate!(*options[:transliterations])
+        else
+          transliterate!(*option)
         end
       end
       to_ascii! if options[:to_ascii]
@@ -148,6 +148,7 @@ module Babosa
       transliterate!
       to_ascii!
       word_chars!
+      strip_leading_digits!
       clean!
       @wrapped_string += last_char if allow_bangs && ["!", "?"].include?(last_char)
       raise Error, "Input generates impossible Ruby method name" if self == ""
@@ -206,6 +207,14 @@ module Babosa
       to_s
     end
 
+    # Strip any leading digits.
+    #
+    # @return String
+    def strip_leading_digits!
+      gsub!(/^\d+/, "")
+      to_s
+    end
+
     # Attempt to convert characters encoded using CP1252 and IS0-8859-1 to
     # UTF-8.
     # @return String
@@ -216,16 +225,20 @@ module Babosa
       to_s
     end
 
-    %w[transliterate clean downcase word_chars normalize normalize_utf8
-       tidy_bytes to_ascii to_ruby_method truncate truncate_bytes upcase
-       with_separators].each do |method|
+    %w[clean downcase normalize normalize_utf8 strip_leading_digits
+       tidy_bytes to_ascii transliterate truncate truncate_bytes upcase
+       with_separators word_chars].each do |method|
       class_eval(<<-METHOD, __FILE__, __LINE__ + 1)
         def #{method}(*args)
-          send_to_new_instance(:#{method}!, *args)
+          with_new_instance { |id| id.send(:#{method}!, *args) }
         end
       METHOD
     end
 
+    def to_ruby_method(allow_bangs: true)
+      with_new_instance { |id| id.to_ruby_method!(allow_bangs: allow_bangs) }
+    end
+
     def to_identifier
       self
     end
@@ -243,12 +256,13 @@ module Babosa
 
     private
 
-    # Used as the basis of the bangless methods.
-    def send_to_new_instance(*args)
-      id = Identifier.allocate
-      id.instance_variable_set :@wrapped_string, to_s
-      id.send(*args)
-      id
+    # Used as the basis of the non-mutating (bangless) methods.
+    def with_new_instance
+      Identifier.allocate.tap do |id|
+        id.instance_variable_set :@wrapped_string, to_s
+
+        yield id
+      end
     end
   end
 end

data/lib/babosa/version.rb

@@ -2,6 +2,6 @@
 
 module Babosa
   module Version
-    STRING = "2.0.0.beta"
+    STRING = "2.0.0"
   end
 end

data/spec/identifier_spec.rb

@@ -16,9 +16,9 @@ describe Babosa::Identifier do
   end
 
   describe "#word_chars" do
-    it "word_chars! should leave only letters and spaces" do
-      string = "a*$%^$@!@b$%^&*()*!c"
-      expect(string.to_slug.word_chars!).to match(/[a-z ]*/i)
+    it "word_chars! should leave only letters, numbers, and spaces" do
+      string = "a*$%^$@!@b$%^&*()*!c 123"
+      expect(string.to_slug.word_chars!).to eq "abc 123"
     end
   end
 
@@ -139,6 +139,7 @@ describe Babosa::Identifier do
       expect("カタカナ: katakana is über cool".to_slug.to_ruby_method).to eql("katakana_is_uber_cool")
       expect("カタカナ: katakana is über cool!".to_slug.to_ruby_method).to eql("katakana_is_uber_cool!")
       expect("カタカナ: katakana is über cool".to_slug.to_ruby_method(allow_bangs: false)).to eql("katakana_is_uber_cool")
+      expect("not 2 much 4 ruby".to_slug.to_ruby_method).to eql("not_2_much_4_ruby")
     end
 
     it "should optionally remove trailing punctuation" do
@@ -146,7 +147,6 @@ describe Babosa::Identifier do
     end
 
     it "should raise an error when it would generate an impossible method name" do
-      # "1".to_identifier.to_ruby_method
       expect { "1".to_identifier.to_ruby_method }.to raise_error(Babosa::Identifier::Error)
     end
 

metadata

@@ -1,14 +1,40 @@
 --- !ruby/object:Gem::Specification
 name: babosa
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta
+  version: 2.0.0
 platform: ruby
 authors:
 - Norman Clarke
 autorequire:
 bindir: bin
-cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEMjCCApqgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhnZW1z
+  L0RDPXAvREM9YXJuZHQvREM9aW8wHhcNMjEwNjIzMDkyNzU2WhcNMjIwNjIzMDky
+  NzU2WjAjMSEwHwYDVQQDDBhnZW1zL0RDPXAvREM9YXJuZHQvREM9aW8wggGiMA0G
+  CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQD0CYnD37uLlJ3Urla2EnnUQ8S6s16k
+  AGMpAzpmARo8YwSqtYMJVGyBzUeI7y93Fk9ncswhIFSH/hnh/Ouat/ki9flHlZ+w
+  anv0M+9v3wCLyZSC5BQIWpoduFM/fuvLoDUJDWxL50RjwMS0qo2x2LvfQdHN8gn3
+  JdSIV5WLJKIvlmIl9S3pw0JO5KRUGn1PcBO7C0S0SlbhVjRHtlao1ycWUULsX109
+  hCh39MPGtnZpdCcxheh0TH/UA/jV0/du9/rQdoidkNHkaC24pPfBJ3nS+rAbWaHP
+  WmP+0rjfk/XnGBu/HZpKvlnwQjP3QdK4UMtWl8zewqFMNcIiBRALQugnL/SfrP/4
+  CSlha9LwkiE6ByeY4WGnNjNqpi5J3IzjEkZRAxG7u9gCB3FzTaBTyXZYI6jplYNw
+  TcCJIBHuoPaa+m9brpjb3Uv94nfM97ZP+OmpGYCCAMq4TT7OOV+t8wJc0w8bb0FO
+  ROhmVNTxrBaNcl6MkZn88EMRCsGgoWklOG0CAwEAAaNxMG8wCQYDVR0TBAIwADAL
+  BgNVHQ8EBAMCBLAwHQYDVR0OBBYEFGu7pbmeILyHnBmannuaNRfdN8MsMBoGA1Ud
+  EQQTMBGBD2dlbXNAcC5hcm5kdC5pbzAaBgNVHRIEEzARgQ9nZW1zQHAuYXJuZHQu
+  aW8wDQYJKoZIhvcNAQELBQADggGBANlxc4uAnkPC3zbztG7uZfBfn4HSuvv655Pa
+  UaYZ6hNETFrqg78mGs3PkFe2Ru7cVWwckbmH46aq50QoNnx4ClxT03vr03n76Jg1
+  8WWHkf0+rcINFlbtIFcmcFrois5Ow3n7pH+xstDtzoWcbh41WwuZStNhrIYsnjAK
+  /ovz8D5JlboxceOpVLB/0NiqNEWltK+EMQHmX25Sqf/r5o5rAL9zwEKPFp1Y5X+z
+  t2jBjYt2ymr1eMWxux6e+N2uKZL4MblHawxvKlI8UHsIiV9xrc4BwlwlbitcvNIL
+  ZykdSlpTJd0Guy92iYjCJMC09tMRUNxiVBwD3jRGSeW9YAPIZGXIcVlm6srIRDjJ
+  o8wB6oOvHAkRXnntOo/4bBDH+ehmgvhh/O/mI+au6C0M430fv+ooH0w08LEXLx1k
+  e17ZNASZffbQRP09MH2GZ2AOlkildTX6looWRforZEZi+qamognrozd3MI5QHi1W
+  UAZUzHLrrFu7gnkFvLVpxOUf4ItOkA==
+  -----END CERTIFICATE-----
+date: 2021-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -122,7 +148,8 @@ files:
 - spec/transliterators/ukrainian_spec.rb
 - spec/transliterators/vietnamese_spec.rb
 homepage: http://github.com/norman/babosa
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -135,11 +162,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A library for creating slugs.

metadata.gz.sig

@@ -0,0 +1,2 @@
+Q/�C�����5-S��D�A
+�l@���y]+�/l`��Rr?