natural_sort_jp 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 576ae58c108d4b0db825ec54466d2bdd04ff4bea067d0232ed0a279d5f3b8680
-  data.tar.gz: bdcc15aebf0562dfed95ac4807c66e16d10dbe8aebc3d850879e3c8adfdfbda5
+  metadata.gz: 517205030e6c52eda20e34cebbaab096422d48b623875bc5631c4a62f685db93
+  data.tar.gz: f69e154214ad3147a2aa34f9ff3bb49bf2d38a03f411ee2b7b41820313eeacf9
 SHA512:
-  metadata.gz: 2b5d4da03645efd69312a451d35585553595046ef4f16ec2f4132887680e4e52b22ab7f4cc58cf03cea49eb2de7223214fa9402ee15235687aa035df6d113fb1
-  data.tar.gz: c5bfd0fb25d3617aec1a23e2d871148f775105d3a2da17b48b5823a54e8112110786e042fa076188498e7104c3f7861b9539b9879cbd2b34369082e959ab090e
+  metadata.gz: 3a7c9e5437dcd875d69c1c2af89df68e6aea62a3f0dd5ec47964ae407356baf739a461de04e238a04c6932c39381e05de3bcfe484bd6e5c7ac51fc334dbbc897
+  data.tar.gz: 11d661797d8c26ec40ac3c7468b7d4ac02d747c87d5010811edb36cafa435c38245cc62629db9778b2238454246dbf4f870e4f9053bae875b6c48cc6cafe0835

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    natural_sort_jp (0.1.0)
+    natural_sort_jp (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,25 +1,43 @@
 # NaturalSortJp
 
-natural_sort_jp can discriminate between full-width and half-width numbers, which are unique to the Japanese language, and perform natural sorting.
+**natural_sort_jp** can discriminate between full-width and half-width characters (zenkaku and hankaku), which are unique to the Japanese language, and perform natural sorting.
 
 By using this gem, you can realize the special sorting (natural sort) used in file explorers such as google drive.
 
 ## Installation
 
-TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
+```
+$ gem install natural_sort_jp
+```
 
-Install the gem and add to the application's Gemfile by executing:
+## Usage
 
-    $ bundle add UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG
+```ruby
+require 'natural_sort_jp'
 
-If bundler is not being used to manage dependencies, install the gem by executing:
+# Can use natural sort even if mix of zenkaku and hankaku number.
 
-    $ gem install UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG
+NaturalSortJp.sort(
+  ["第1回", "第２回", "第３回", "第10回", "第２０回", "第２１回"]
+  )
+# => ["第1回", "第２回", "第３回", "第10回", "第２０回", "第２１回"]
 
-## Usage
 
-TODO: Write usage instructions here
+# even if mix of zenkaku and hankaku alphabet.
+
+NaturalSortJp.sort(["a11", "a2", "ａ1０", "ａ１"])
+# => ["ａ１", "a2", "ａ1０", "a11"]
+
+
+# It is not affected by the presence or absence of 0-filling.
+
+NaturalSortJp.sort(
+  ["2022/1/1", "２０２２/０１/０２", "2022/01/03", "２０２２/１/１０", "2023/1/1"]
+  )
+# => ["2022/1/1", "２０２２/０１/０２", "2022/01/03", "２０２２/１/１０", "2023/1/1"]
+
+```
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/natural_sort_jp.
+Bug reports and pull requests are welcome on GitHub at https://github.com/thehighhigh/natural_sort_jp.

data/lib/natural_sort_jp/element.rb

@@ -7,8 +7,7 @@ module NaturalSortJp
     SORT_PRIORITY = { int: 1, str: 2 }.freeze
 
     def initialize(val)
-      val.tr!('０-９', '0-9') if val =~ /[０-９]/
-      @val = val
+      @val = zenkaku2hankaku(val)
     end
 
     def <=>(other)
@@ -22,5 +21,14 @@ module NaturalSortJp
         [SORT_PRIORITY[:str], @val]
       end
     end
+
+    private
+
+    def zenkaku2hankaku(val)
+      val.tr!('０-９', '0-9') if val =~ /[０-９]/
+      val.tr!('ａ-ｚ', 'a-z') if val =~ /[ａ-ｚ]/
+      val.tr!('Ａ-Ｚ', 'A-Z') if val =~ /[Ａ-Ｚ]/
+      val
+    end
   end
 end

data/lib/natural_sort_jp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NaturalSortJp
-  VERSION = "0.1.0"
+  VERSION = '0.3.0'
 end

data/lib/natural_sort_jp.rb

@@ -4,12 +4,28 @@ require 'natural_sort_jp/element'
 
 module NaturalSortJp
   
-  def self.sort(array)
-    array.sort_by { |x| convert(x) }
+  def self.sort(array, by: nil)
+    if by
+      self.sort_by(array, by)
+    else
+      array.sort_by { |x| convert(x) }
+    end
+  end
+
+  def self.sort_by(array, attribute)
+    array.sort_by { |obj| convert(referenced_by_attribute(obj, attribute)) }
   end
 
   def self.convert(title)
     elements = title.to_s.gsub(/[0-9０-９]+/, ',\&,').split(',')
     elements.map { |t| Element.new(t) }
   end
+
+  def self.referenced_by_attribute(obj, attribute)
+    if obj.class == Hash
+      obj[attribute]
+    else
+      obj.send(attribute)
+    end
+  end
 end

metadata

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