sterile 1.0.17 → 1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54f6ac8ea9a3e5802c5b86f5befee2a68e3aec5929e63d688fd6ad2279e056ac
-  data.tar.gz: 7924d238a5d5211a343bda5a9fb280e0686009dc2ca97fe98ebe3b4844776ecd
+  metadata.gz: 82975c959e59df1cb9411de684259be5470d4653b811a9bc0569c63bc5c7a3eb
+  data.tar.gz: cac8194311cb05acad5e0209adefb414befa6236c5545d61fc7eca9eb1899763
 SHA512:
-  metadata.gz: 2e8ccd1ae5c05c787ecaf255dafba763593e6d2405c2b4204a3984ae08a007700349c2f47d6c8334d8886f40c40183c59535cadf9f91bae947fc92875e2c4399
-  data.tar.gz: d6533af4c6e9e03808ce7a634642040d7df9c024a9b7a1a3e5cc91058ad47d522466ba4f8e2e6d1666ed3cb3dad19d1dfc9db8a4d826c3e06eadab1003fa9a7f
+  metadata.gz: ed54878488af252a7e6d8db8bea711c2b18877e24830c49c487de9eb89cd9d8527eaf4550f3037f771ad997e68ab1a24713c071d8607bd59c8180b74a9248800
+  data.tar.gz: 79df903d40aef3a6b2207a7ed988fa128de361077fa345659d4b867a80a981a4553c19e6c26bd57a1be0a844357e9ef295022f773eade617c1a23d842dbab277

data/.github/workflows/test.yml

@@ -0,0 +1,26 @@
+name: test
+
+on:
+  push:
+    paths-ignore:
+      - '**.md'
+  pull_request:
+    paths-ignore:
+      - '**.md'
+  workflow_dispatch:
+
+jobs:
+  test:
+    strategy:
+      max-parallel: 3
+      matrix:
+        os: [ubuntu, macos]
+        ruby-version: [head, 3.0, 2.7, 2.5]
+    runs-on: ${{ matrix.os }}-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - run: bundle install
+      - run: bundle exec rake test

data/.gitignore

@@ -5,5 +5,4 @@ doc/*
 .bundle
 .DS_Store
 make
-test
-vendor
+vendor

data/.ruby-version

@@ -1,3 +1 @@
-2.4
-
-
+2.7.2

data/.yardopts

@@ -0,0 +1 @@
+--no-private lib/**/*.rb - README.markdown

data/Gemfile

@@ -1,3 +1,7 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 gemspec
 
+group :development, :test do
+  gem 'minitest'
+  gem 'rake'
+end

data/Gemfile.lock

@@ -1,21 +1,27 @@
 PATH
   remote: .
   specs:
-    sterile (1.0.17)
-      nokogiri (>= 1.10.8)
+    sterile (1.0.22)
+      nokogiri (>= 1.11.7)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    mini_portile2 (2.4.0)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    mini_portile2 (2.5.3)
+    minitest (5.14.4)
+    nokogiri (1.11.7)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    racc (1.5.2)
+    rake (13.0.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  minitest
+  rake
   sterile!
 
 BUNDLED WITH
-   1.17.3
+   2.2.19

data/README.markdown

@@ -1,4 +1,4 @@
-Sterile
+Sterile ![test](https://github.com/pbhogan/sterile/actions/workflows/test.yml/badge.svg)
 =======
 
 Sterilize your strings! Transliterate, generate slugs, smart format, strip tags, encode/decode entities and more.
@@ -107,4 +107,4 @@ License
 -------
 
 Copyright (c) 2011 Patrick Hogan, released under the MIT License.
-http://www.opensource.org/licenses/mit-license
+http://www.opensource.org/licenses/mit-license

data/Rakefile

@@ -1,7 +1,14 @@
 require 'bundler'
+require 'rake/testtask'
+
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
 Rake::TestTask.new do |t|
-  t.pattern = "test/test_*.rb"
+  t.libs << 'test'
+end
+task default: :test
+
+# Watch rb files, run tests whenever something changes. Requires entr
+task :watch do
+  sh "find . -name '*.rb' | entr -c rake"
 end

data/lib/sterile/data/smart_format_rules.rb

@@ -26,7 +26,7 @@ module Sterile
         ["(c)", "©"],
         ["(r)", "®"],
         ["(R)", "®"],
-        [/\'(\d\d)(?!’|\')([\p{P}\p{Z}])/, "’\\1\\2"],
+        [/\'(\d\d)(?!’|\'|[^’\'\s]+[’\'][\p{P}\p{Z}])([\p{P}\p{Z}])/, "’\\1\\2"],
         # [/<p>"/, "<p>\\1″"],
         [/s\'([^a-zA-Z0-9])/, "s’\\1"],
         [/"([:;])/, "”\\1"],

data/lib/sterile/entities.rb

@@ -24,7 +24,8 @@ module Sterile
     # their Unicode counterparts.
     #
     def decode_entities(string)
-      string.gsub!(/&#(\d{1,4});/) { [$1.to_i].pack("U") }
+      string.gsub!(/&#x([a-zA-Z0-9]{1,7});/) { [$1.to_i(16)].pack("U") }
+      string.gsub!(/&#(\d{1,7});/) { [$1.to_i].pack("U") }
       string.gsub(/&([a-zA-Z0-9]+);/) do
         codepoint = html_entities_data[$1]
         codepoint ? [codepoint].pack("U") : $&
@@ -46,3 +47,4 @@ module Sterile
   end # class << self
 
 end # module Sterile
+

data/lib/sterile/smart_format.rb

@@ -9,6 +9,8 @@ module Sterile
     #   q{"He said, 'Away with you, Drake!'"}.smart_format # => “He said, ‘Away with you, Drake!’”
     #
     def smart_format(string)
+      string = string.to_s
+      string = string.dup if string.frozen?
       smart_format_rules.each do |rule|
         string.gsub! rule[0], rule[1]
       end
@@ -19,7 +21,7 @@ module Sterile
     # Like +smart_format+, but works with HTML/XML (somewhat).
     #
     def smart_format_tags(string)
-      string = string.gsub /[\p{Z}\s]+(<\/[a-zA-Z]+>)(['"][a-zA-Z])/, "\\1 \\2" # Fixes quote after whitespace + tag "<em>Dan. </em>'And"
+      string = string.gsub(/[\p{Z}\s]+(<\/[a-zA-Z]+>)(['"][a-zA-Z])/, "\\1 \\2") # Fixes quote after whitespace + tag "<em>Dan. </em>'And"
       string.gsub_tags do |text|
         text.smart_format
       end.encode_entities.gsub(/(\<\/\w+\>)&ldquo;/, "\\1&rdquo;").gsub(/(\<\/\w+\>)&lsquo;/, "\\1&rsquo;")

data/lib/sterile/titlecase.rb

@@ -106,18 +106,7 @@ module Sterile
     end
     alias_method :titleize, :titlecase
 
-
-    private
-
-    # Lazy load smart formatting rules
-    #
-    def smart_format_rules
-      @smart_format_rules ||= begin
-        require "sterile/data/smart_format_rules"
-        Data.smart_format_rules
-      end
-    end
-
   end # class << self
 
-end # module Sterile
+end # module Sterile
+

data/lib/sterile/version.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
 module Sterile
-  VERSION = "1.0.17"
+  VERSION = "1.0.23"
 end
 

data/sterile.gemspec

@@ -10,16 +10,14 @@ Gem::Specification.new do |s|
   s.authors     = ["Patrick Hogan"]
   s.email       = ["pbhogan@gmail.com"]
   s.homepage    = "https://github.com/pbhogan/sterile"
+  s.licenses    = ['MIT']
   s.summary     = %q{Sterilize your strings! Transliterate, generate slugs, smart format, strip tags, encode/decode entities and more.}
   s.description = s.summary
 
-  s.rubyforge_project = "sterile"
-
-  s.add_dependency("nokogiri", ">= 1.10.8")
+  s.add_dependency("nokogiri", ">= 1.11.7")
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths  = ["lib"]
 end
-

data/test/test_helper.rb

@@ -0,0 +1,2 @@
+require 'minitest/autorun'
+require 'sterile'

data/test/test_sterile.rb

@@ -0,0 +1,74 @@
+require "test_helper"
+
+class TestSterile < Minitest::Test
+  def test_decode_entities
+    assert_equal "“Hey” you", Sterile.decode_entities("&ldquo;Hey&rdquo; you")
+
+    # try all variants
+    assert_equal "°", Sterile.decode_entities("&deg;")
+    assert_equal "°", Sterile.decode_entities("&#176;")
+    assert_equal "°", Sterile.decode_entities("&#000176;")
+    assert_equal "°", Sterile.decode_entities("&#x000b0;")
+    assert_equal "°", Sterile.decode_entities("&#x000B0;")
+  end
+
+  def test_encode_entities
+    assert_equal "&ldquo;Hey&rdquo; you", Sterile.encode_entities("“Hey” you")
+  end
+
+  def test_gsub_tags
+    assert_equal "A<i>B</i>C", Sterile.gsub_tags("a<i>b</i>c", &:upcase)
+  end
+
+  def test_plain_format
+    s = "&#169; &copy; &#8482; &trade;"
+    assert_equal "(c) (c) (tm) (tm)", Sterile.plain_format(s)
+  end
+
+  def test_plain_format_tags
+    s = '<i x="&copy;">&copy;</i>'
+    assert_equal '<i x="&copy;">(c)</i>', Sterile.plain_format_tags(s)
+  end
+
+  def test_scan_tags
+    text = []
+    Sterile.scan_tags("a<i>b</i>c") { |i| text << i }
+    assert_equal %w[a b c], text
+  end
+
+  def test_sluggerize
+    assert_equal "hello-world", Sterile.sluggerize("Hello world!")
+  end
+
+  def test_smart_format
+    s = "\"He said, 'Away, Drake!'\""
+    assert_equal "“He said, ‘Away, Drake!’”", Sterile.smart_format(s)
+  end
+
+  def test_smart_format_tags
+    # ?
+  end
+
+  def test_sterilize
+    assert_equal "nasty", Sterile.sterilize("<b>nåsty</b>")
+  end
+
+  def test_strip_tags
+    s = 'Visit <a href="http://example.com">site!</a>'
+    assert_equal "Visit site!", Sterile.strip_tags(s)
+  end
+
+  def test_titlecase
+    s = "Q&A: 'That's what happens'"
+    assert_equal "Q&A: 'That's What Happens'", Sterile.titlecase(s)
+  end
+
+  def test_transliterate
+    assert_equal "yucky", Sterile.transliterate("ýůçký")
+  end
+
+  def test_trim_whitespace
+    assert_equal "Hello world!", Sterile.trim_whitespace(" Hello  world! ")
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sterile
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.23
 platform: ruby
 authors:
 - Patrick Hogan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.8
+        version: 1.11.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.8
+        version: 1.11.7
 description: Sterilize your strings! Transliterate, generate slugs, smart format,
   strip tags, encode/decode entities and more.
 email:
@@ -32,10 +32,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".yaropts"
+- ".yardopts"
 - Gemfile
 - Gemfile.lock
 - README.markdown
@@ -56,8 +57,11 @@ files:
 - lib/sterile/version.rb
 - sterile
 - sterile.gemspec
+- test/test_helper.rb
+- test/test_sterile.rb
 homepage: https://github.com/pbhogan/sterile
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -74,9 +78,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.6
 signing_key:
 specification_version: 4
 summary: Sterilize your strings! Transliterate, generate slugs, smart format, strip
   tags, encode/decode entities and more.
-test_files: []
+test_files:
+- test/test_helper.rb
+- test/test_sterile.rb

data/.yaropts

@@ -1 +0,0 @@
---no-private lib/**/*.rb - README.markdown