roqua-support 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0104ee377feaa85014f2a233e86c618a08de92e7b55cd273fe7832f491f070b4
-  data.tar.gz: 7c04430ab277f7c69cb0d1cf8d54a0901cb127460b2b68e3b91ad3c01b171204
+  metadata.gz: 774c4b5c612eff02c808d6dac48cc599664c641deb96b97c923a6d293875a5b4
+  data.tar.gz: 0b2dd8489e5ec1a6216db145f511d7313776efe7ea07db0604f4bb4c7bfeb3e1
 SHA512:
-  metadata.gz: da8540ad9f35f3738485ec3f58b28ba14c2a330ae6ae2cd4d1bfefbe46206f0c7c8b842053829dcf4e668d57c03890137f2536c559d805d51ba1c04755daf58c
-  data.tar.gz: 01a31a8402b496e30298ceda86e2ebcbf06eb09d7453e9a56a681f159335eab03d3436487e4bb138afbe027990a1c4747acf0c3d06756a4d3ae56749144635da
+  metadata.gz: d69bb02afb3adb3bdf1dd64a526466d7b24f8f8b068829a8ce9dfafa2930d29de30cff451fec7ff2d91c933e390c27b2addb336124dd257856c3dc6c510d3b56
+  data.tar.gz: 316fedffd3ede41f162fb6b294b409b446b204e89412d29dd7f6cc7d07af300e6b3eb5abc8471cea6970944aae74b443adfcef4a3a25843d3b82d40ca39d24e9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.2
+
+* Make sort_by_alphanum stable for chunks that parse to the same int like 04 and 4.
+
 ## 0.4.1
 
 * Add timezone to logging timestamps. Use milliseconds instead of microseconds precision. 

data/Gemfile.lock

@@ -10,7 +10,7 @@ GIT
 PATH
   remote: .
   specs:
-    roqua-support (0.4.1)
+    roqua-support (0.4.2)
       active_interaction (>= 3.0, < 5.0)
       activesupport (>= 5.2, < 6.2)
       appsignal (>= 2.9, < 3.1)
@@ -33,9 +33,9 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_interaction (4.0.5)
-      activemodel (>= 5, < 7)
-      activesupport (>= 5, < 7)
+    active_interaction (4.1.0)
+      activemodel (>= 5, < 8)
+      activesupport (>= 5, < 8)
     activemodel (6.0.2.2)
       activesupport (= 6.0.2.2)
     activerecord (6.0.2.2)
@@ -51,7 +51,7 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    appsignal (3.0.13)
+    appsignal (3.0.19)
       rack
     ast (2.4.2)
     builder (3.2.4)

data/lib/roqua/core_ext/enumerable/sort_by_alphanum.rb

@@ -21,29 +21,45 @@ module Enumerable
 
   private
 
-  def grouped_compare(a, b)
-    loop {
-      a_chunk, a = extract_alpha_or_number_group(a)
-      b_chunk, b = extract_alpha_or_number_group(b)
+  ALL_NUM = /\d+/
+  ALL_ALPHA = /[A-Za-z]+/
+  NON_ALPHANUM = /[^A-Za-z0-9]+/
 
-      ret = if a_chunk =~ /\d/ and b_chunk =~ /\d/
+  def grouped_compare(a, b)
+    a_scanner = StringScanner.new(a)
+    b_scanner = StringScanner.new(b)
+    # each loop has to do exactly 1 non-nil-scan on both scanners or return a non-zero value.
+    loop do
+      ret = \
+        if a_scanner.eos?
+          -1
+        elsif (a_chunk = a_scanner.scan(ALL_NUM))
+          if (b_chunk = b_scanner.scan(ALL_NUM))
+            if a_chunk.to_i != b_chunk.to_i
               a_chunk.to_i <=> b_chunk.to_i
-            else
+            else # 03 vs 3
               a_chunk <=> b_chunk
             end
-
-      return -1 if a_chunk == ''
+          elsif b_scanner.scan(ALL_ALPHA)
+            -1
+          else # NON_ALPHANUM
+            1
+          end
+        elsif (a_chunk = a_scanner.scan(ALL_ALPHA))
+          if (b_chunk = b_scanner.scan(ALL_ALPHA))
+            a_chunk <=> b_chunk
+          else # ALL_NUM or NON_ALPHANUM
+            1
+          end
+        else # NON_ALPHANUM
+          a_chunk = a_scanner.scan(NON_ALPHANUM)
+          if (b_chunk = b_scanner.scan(NON_ALPHANUM))
+            a_chunk <=> b_chunk
+          else
+            -1
+          end
+        end
       return ret if ret != 0
-    }
-  end
-
-  def extract_alpha_or_number_group(item)
-    matchdata = /([A-Za-z]+|[\d]+)/.match(item)
-
-    if matchdata.nil?
-      ["", ""]
-    else
-      [matchdata[0], item = item[matchdata.offset(0)[1] .. -1]]
     end
   end
 end

data/lib/roqua-support/version.rb

@@ -1,5 +1,5 @@
 module Roqua
   module Support
-    VERSION = '0.4.1'.freeze
+    VERSION = '0.4.2'.freeze
   end
 end

data/spec/roqua/core_ext/enumerable/sort_by_alphanum_spec.rb

@@ -11,8 +11,18 @@ describe Enumerable do
       expect(input.sort_by_alphanum(&:reverse)).to eq ["004some10thing", "004some11thing", "3another"]
     end
 
+    it 'treats non-alphanum as lower than alpha and num' do
+      input = %w[b3a b{c bԘb]  # curlies are above alpha in utf-8, Ԙ is multi-byte
+      expect(input.sort_by_alphanum).to eq %w[b{c bԘb b3a]
+    end
+
     it 'compares number chunks as integers' do
       expect(%w(004 3).sort_by_alphanum).to eq %w(3 004)
     end
+
+    it 'sorts identical integers by asci'  do
+      input = %w[b4e b0004e b04e b004e]
+      expect(input.sort_by_alphanum).to  eq %w[b0004e b004e b04e b4e]
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roqua-support
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Marten Veldthuis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_interaction
@@ -266,7 +266,7 @@ homepage: https://github.com/roqua/roqua-support
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -281,8 +281,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Helper objects and proxies used by a lot of RoQua applications
 test_files: