natural_sort_jp 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 203cf55d7eec0411ac1de11e02c6c428f2a4c9249acfb70354dbaf9c3d65c63f
-  data.tar.gz: f635c841ff0466ba982f32b6658e3a9316d25dde833a03470d3352b577e25ea0
+  metadata.gz: 2f3f8838d4ac297fef67c7f6df14821bd9c8faba6d3c7fd883a5d0d757f16402
+  data.tar.gz: c97706c5e50d04416611bcd59da78111558c5b02cf054de6efb930ef691361b1
 SHA512:
-  metadata.gz: c233e4880a6de6cefac722203e79deb0d76e1b24f610f78dab726a543fd8eb49bd6c6ce0ffd8b731c9d4dd46f90390f04b62854eb6f5cc5a0aa3140bafcfa5f6
-  data.tar.gz: e17bff0c83d65e39c4d7d844085740539f0cd9d3be4db4b5ea56fa385a3abb0a0019d83a46502d2462a8c206b027acff5699c614bcb680965e06d36ed5a9baa7
+  metadata.gz: 28a0f4a70663395125b89aaa220f7ca70bf3e61be03a7d8207a49fb86741904d4bef70e691022329d154690fbe966651a1af2f2859089baac516743f4034b56b
+  data.tar.gz: 77b14aadccb905a3c986dc7534870c2c171b805d6675b7324b020bc90ec9c81ae152cdd928e80f3f07d9381fde4632ff8eb0242cbc00e0b535c560ae1a96ef84

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    natural_sort_jp (0.3.0)
+    natural_sort_jp (0.4.3)
 
 GEM
   remote: https://rubygems.org/
@@ -45,7 +45,9 @@ GEM
     unicode-display_width (2.4.2)
 
 PLATFORMS
+  ruby
   x86_64-darwin-21
+  x86_64-linux
 
 DEPENDENCIES
   bundler (~> 2.4.6)

data/README.md

@@ -36,6 +36,43 @@ NaturalSortJp.sort(
   )
 # => ["2022/1/1", "２０２２/０１/０２", "2022/01/03", "２０２２/１/１０", "2023/1/1"]
 
+
+# It can also be used in hashes, structures, and active record data structures.
+
+NaturalSortJp.sort(
+  [
+    { id: 1, date: '2022/1/1'},
+    { id: 2, date: '２０２２/０１/１０'},
+    { id: 3, date: '2022/01/03'},
+    { id: 4, date: '２０２２/１/2'},
+    { id: 5, date: '2023/1/1'}
+  ], by: :date)
+# => [
+#  {:id=>1, :date=>"2022/1/1"},
+#  {:id=>4, :date=>"２０２２/１/2"},
+#  {:id=>3, :date=>"2022/01/03"},
+#  {:id=>2, :date=>"２０２２/０１/１０"},
+#  {:id=>5, :date=>"2023/1/1"}
+#  ]
+
+# and can use asc or desc option. 
+
+NaturalSortJp.sort(
+  [
+    { id: 1, date: '2022/1/1'},
+    { id: 2, date: '２０２２/０１/１０'},
+    { id: 3, date: '2022/01/03'},
+    { id: 4, date: '２０２２/１/2'},
+    { id: 5, date: '2023/1/1'}
+  ], by: :date, desc: true)
+# => [
+# {:id=>5, :date=>"2023/1/1"},                   
+# {:id=>2, :date=>"２０２２/０１/１０"},         
+# {:id=>3, :date=>"2022/01/03"},                 
+# {:id=>4, :date=>"２０２２/１/2"},              
+# {:id=>1, :date=>"2022/1/1"}
+# ]
+
 ```
 
 ## Contributing

data/Rakefile

@@ -1,4 +1,7 @@
 # frozen_string_literal: true
 
 require "bundler/gem_tasks"
-task default: %i[]
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+task default: :spec

data/lib/natural_sort_jp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NaturalSortJp
-  VERSION = '0.4.1'
+  VERSION = '0.4.3'
 end

data/lib/natural_sort_jp.rb

@@ -15,8 +15,13 @@ module NaturalSortJp
   end
 
   def self.convert(title)
-    elements = title.to_s.gsub(/[0-9０-９]+/, ',\&,').split(',')
-    elements.map { |t| Element.new(t) }
+    elements = title.to_s.scan(/([^0-9０-９]*)([0-9０-９]*)/).flatten
+    converted = []
+    elements.each do |t|
+      next if t.empty?
+      converted << Element.new(t)
+    end
+    converted
   end
 
   def self.referenced_by_attribute(obj, attribute)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: natural_sort_jp
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - thehighhigh
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler