natural_sort_jp 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '06468e39e925af897dbcf27ee6c04ec4e8941d89d3d3ce0bd17021414568f2c6'
-  data.tar.gz: 1c5845917fdabd93bbb3dfa51f875d04256999d903967ec1270ebac00316087c
+  metadata.gz: e0ebb8dc4b56eab8c1c5cdedab1261f956ab2f56aad1675db0848bb4939caf95
+  data.tar.gz: 6570669777808d13972061b9e06c86ed0738387ae65af3b4486be53b1331c030
 SHA512:
-  metadata.gz: e1ad6d01f561694ebc8836424a9ebbb32205199da71d4a8436c385db100fb0dbc8d26bb794b0215b51ad08feb34cc6bd1f10f09384a493fbb96b908bf0fe271f
-  data.tar.gz: f304379728764ea4a660b339a198f0a34b5bd3ee189fb79852f4b397b4c6a1cd9dc4d91c650b58bf1ded07efa5923ec0c42b0a8c4cf105ee66c21a1858c8a884
+  metadata.gz: 3e83f0eeeeabdb9c4b08dac4027b8c96eb4ebc12114c6b9610e1d38fccf638899f12fdb3760338c327225b3b9d97759da2fed62183f693316e254e9dc4f568f3
+  data.tar.gz: aac3d39976a60699c03ba62454504e469739cc9252016807f630ac2f5e5f71476ee9137b6e73f3bb23ddefe670a5b8ea1dd5a255548ea693d139635727562bb2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    natural_sort_jp (0.3.0)
+    natural_sort_jp (0.4.2)
 
 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/License.txt

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Yuto Takahashi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -36,8 +36,49 @@ 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
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/thehighhigh/natural_sort_jp.
+
+## License
+
+The gem is available as open source under the terms of the MIT License.

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.0'
+  VERSION = '0.4.2'
 end

data/lib/natural_sort_jp.rb

@@ -15,8 +15,8 @@ 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
+    elements.map { |t| Element.new(t) if t != '' }
   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.0
+  version: 0.4.2
 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
@@ -76,6 +76,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- License.txt
 - README.md
 - Rakefile
 - lib/natural_sort_jp.rb