zen_to_i 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3839de0a246d873410c9acd82dc4d4317c08112c12c9e3593e847cc61b6fff80
-  data.tar.gz: 79de8b4c92b8c373b3c0d10ae46e381cd265d5579630206302b59b571d5feeb8
+  metadata.gz: c17322f7e45062265d402a73f26fdb4204e39fd8385feb3dd69746956703e720
+  data.tar.gz: 8531336638b87ad8dcd182d7b8692ffe6403830c6c3203375bde8f64c34d4109
 SHA512:
-  metadata.gz: 7ad359f8a19fc3ec4db4e9cb0be5d589a7405f2b7d35f234326991f0ea0a939525f1e31f6140748939d70b86a9928bac17e4ff3cec2a3c0a1f90b21dad32a52f
-  data.tar.gz: 5253f8272185f802f772b5145923e842236690324e69c5623c468fed4420c0cdb85c5c432ea285b09c6b920ea1c3eee7229e200963ad09a193a289b30ddf833e
+  metadata.gz: 2db39986d5ce76e554a94945dabe40363d9c3fa6966aabbb605a25ba3409b4beadffbc90095173db3369e307bcc570186c9849c8de2d5cee74f4ce9c269bdb7b
+  data.tar.gz: 2d8c718b07f4d40aa1fc77ab901dd8ade5ed3a0d1c1709a0d47abc83efc3a3676f6ad0f394528800aae86fbaf12ac94555474a761a446158e74dc53f44909950

data/.github/workflows/ci.yaml

@@ -0,0 +1,23 @@
+name: test
+
+on: [push]
+
+jobs:
+  build:
+    name: >-
+      Ruby: ${{ matrix.ruby }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby:
+          - '3.4'
+          - '4.0'
+    steps:
+    - uses: actions/checkout@v7
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: run rspec
+      run: |
+        bundle exec rspec

data/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '37 20 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'ruby' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

data/README.md

@@ -2,7 +2,7 @@
 兆までの漢数字を半角数字に変換します。
 漢数字が続いていたらそれぞれ変換します。
 
-[![Build Status](https://travis-ci.org/yoshitsugu/zen_to_i.svg)](https://travis-ci.org/yoshitsugu/zen_to_i)
+[![Actions Status](https://github.com/yoshitsugu/zen_to_i/workflows/test/badge.svg)](https://github.com/yoshitsugu/zen_to_i/actions)
 
 ## Installation
 
@@ -61,10 +61,10 @@ require "zen_to_i/refine"
 using ZenToI::Refine
 
 "一二三".zen_to_i
-#=> "103"
+#=> "123"
 
 "一二三".to_i
-#=> 103
+#=> 123
 ```
 
 Also, you can implicitly overwrite `to_i` method by `require "zen_to_i/string_ext"`.  
@@ -74,10 +74,10 @@ Of course it is very dangerous. Please be careful to use it.
 require "zen_to_i/string_ext"
 
 "一二三".zen_to_i
-#=> "103"
+#=> "123"
 
 "一二三".to_i
-#=> 103
+#=> 123
 ```
 
 

data/lib/zen_to_i/constant.rb

@@ -2,17 +2,21 @@
 
 module ZenToI
   module Constant
-    KANNUM = { "〇" => 0, "" => 1, "一" => 1, "二" => 2, "三" => 3, "四" => 4,
-               "五" => 5, "六" => 6, "七" => 7, "八" => 8, "九" => 9,
-               "零" => 0, "壱" => 1, "弐" => 2, "参" => 3, "肆" => 4,
-               "伍" => 5, "陸" => 6, "漆" => 7, "捌" => 8, "玖" => 9 }.freeze
-    KANORDER = { "十" => 10, "百" => 100, "千" => 1000, "" => 1, "拾" => 10,
-                 "陌" => 100, "佰" => 100, "阡" => 1000, "仟" => 1000 }.freeze
-    KANORDER_F = { "万" => 10**4, "億" => 10**8, "兆" => 10**12,
-                   "" => 1, "萬" => 10**4 }.freeze
-    ALL_KANSUUJI = KANNUM.keys + KANORDER.keys + KANORDER_F.keys
-    MAX_LOOP = 100
-    KANORDER_F_KEYS_REGEX = /([^#{KANORDER_F.keys.join('')}]*)([#{KANORDER_F.keys.join('')}]?)/.freeze
-    KANORDER_KEYS_REGEX = /([^#{KANORDER.keys.join('')}]*)([#{KANORDER.keys.join('')}]?)/.freeze
-  end.freeze
+    unless const_defined?(:KANNUM, false)
+      KANNUM = { "〇" => 0, "" => 1, "一" => 1, "二" => 2, "三" => 3, "四" => 4,
+                 "五" => 5, "六" => 6, "七" => 7, "八" => 8, "九" => 9,
+                 "零" => 0, "壱" => 1, "弐" => 2, "参" => 3, "肆" => 4,
+                 "伍" => 5, "陸" => 6, "漆" => 7, "捌" => 8, "玖" => 9 }.freeze
+      KANORDER = { "十" => 10, "百" => 100, "千" => 1000, "" => 1, "拾" => 10,
+                   "陌" => 100, "佰" => 100, "阡" => 1000, "仟" => 1000 }.freeze
+      KANORDER_F = { "万" => 10**4, "億" => 10**8, "兆" => 10**12,
+                     "" => 1, "萬" => 10**4 }.freeze
+      ALL_KANSUUJI = KANNUM.keys + KANORDER.keys + KANORDER_F.keys
+      MAX_LOOP = 100
+      KANORDER_F_KEYS_REGEX = /([^#{KANORDER_F.keys.join('')}]*)([#{KANORDER_F.keys.join('')}]?)/.freeze
+      KANORDER_KEYS_REGEX = /([^#{KANORDER.keys.join('')}]*)([#{KANORDER.keys.join('')}]?)/.freeze
+    end
+  end
+
+  Constant.freeze
 end

data/lib/zen_to_i/mixin.rb

@@ -70,12 +70,5 @@ module ZenToI
           end
         end
       end
-
-      def format_location(string)
-        location_map.each do |key, value|
-          string.gsub!(/#{key}/, value)
-        end
-        string
-      end
   end
 end

data/lib/zen_to_i/refine.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
 require_relative "../zen_to_i"
+require_relative "to_i"
 
-module ZenToI::Refine
-  refine String do
-    alias_method :_to_i, :to_i
-
-    def to_i
-      self.zen_to_i._to_i
+module ZenToI
+  unless const_defined?(:Refine, false)
+    module Refine
+      refine String do
+        define_method(:_to_i, ZenToI::ToI.instance_method(:_to_i))
+        define_method(:to_i, ZenToI::ToI.instance_method(:to_i))
+      end
     end
   end
 end

data/lib/zen_to_i/string_ext.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 require_relative "../zen_to_i"
+require_relative "to_i"
 
 class String
-  alias_method :_to_i, :to_i
-
-  def to_i
-    self.zen_to_i._to_i
+  unless String.instance_methods(false).include?(:_to_i)
+    alias_method :_to_i, :to_i
   end
+
+  define_method(:to_i, ZenToI::ToI.instance_method(:to_i))
 end

data/lib/zen_to_i/to_i.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_relative "../zen_to_i"
+
+module ZenToI
+  # String#to_i を漢数字変換に差し替えるための実装。
+  # string_ext.rb（グローバルに適用）と refine.rb（refinement 経由）で共有する。
+  module ToI
+    # 差し替え前の String#to_i を保持する。読み込み時点で String 自身が持つ
+    # ネイティブ実装を捕捉し、どのロード順でも素の to_i を参照できるようにする。
+    unless const_defined?(:ORIGINAL_TO_I, false)
+      ORIGINAL_TO_I = String.instance_method(:to_i)
+    end
+
+    def to_i
+      ORIGINAL_TO_I.bind(self.zen_to_i).call
+    end
+
+    def _to_i(*args)
+      ORIGINAL_TO_I.bind(self).call(*args)
+    end
+  end
+end

data/lib/zen_to_i/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZenToI
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/constant_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "zen_to_i"
+
+describe ZenToI::Constant do
+  describe "複数回読み込んでも例外にならない" do
+    it "constantを再度読み込んでも定数が残る" do
+      expect { load File.expand_path("../lib/zen_to_i/constant.rb", __dir__) }.not_to raise_error
+
+      expect(ZenToI::Constant::KANNUM["一"]).to eq 1
+      expect("一二三".zen_to_i).to eq "123"
+    end
+
+    it "定数定義がスキップされModuleがfrozenのまま維持される" do
+      load File.expand_path("../lib/zen_to_i/constant.rb", __dir__)
+
+      expect(ZenToI::Constant).to be_frozen
+    end
+  end
+end

data/spec/load_order_spec.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require "open3"
+require "rbconfig"
+
+RSpec.describe "ロード順" do
+  # refinement の定義は読み込み時点のグローバル String#to_i に影響されるため、
+  # ロード順によって挙動が変わらないことをサブプロセスで検証する。
+  def run_script(script)
+    stdout, stderr, status = Open3.capture3(
+      RbConfig.ruby, "-I", File.expand_path("../lib", __dir__), "-e", script
+    )
+    raise "script failed: #{stderr}" unless status.success?
+
+    stdout.strip
+  end
+
+  it "string_ext の後に refine を読み込んでも to_i が変換結果を返す" do
+    output = run_script(<<~RUBY)
+      require "zen_to_i/string_ext"
+      require "zen_to_i/refine"
+      using ZenToI::Refine
+      print "一二三".to_i
+    RUBY
+
+    expect(output).to eq "123"
+  end
+
+  it "refine の後に string_ext を読み込んでも to_i が変換結果を返す" do
+    output = run_script(<<~RUBY)
+      require "zen_to_i/refine"
+      require "zen_to_i/string_ext"
+      using ZenToI::Refine
+      print "一二三".to_i
+    RUBY
+
+    expect(output).to eq "123"
+  end
+
+  it "ロード順によらず _to_i は素の to_i と同じ結果を返す" do
+    outputs = [
+      <<~RUBY,
+        require "zen_to_i/string_ext"
+        require "zen_to_i/refine"
+        using ZenToI::Refine
+        print "一二三"._to_i
+      RUBY
+      <<~RUBY,
+        require "zen_to_i/refine"
+        require "zen_to_i/string_ext"
+        using ZenToI::Refine
+        print "一二三"._to_i
+      RUBY
+    ].map { |script| run_script(script) }
+
+    expect(outputs).to eq ["0", "0"]
+  end
+
+  it "先に定義された String#_to_i を上書きしない" do
+    output = run_script(<<~RUBY)
+      class String
+        def _to_i(*)
+          "third-party"
+        end
+      end
+      require "zen_to_i/string_ext"
+      print "一二三"._to_i, " ", "一二三".to_i
+    RUBY
+
+    expect(output).to eq "third-party 123"
+  end
+end

data/spec/refine_spec.rb

@@ -10,4 +10,21 @@ describe ZenToI::Refine do
       expect("一二三".to_i).to eq 123
     end
   end
+
+  describe "String#_to_i refined" do
+    it "_to_iは差し替え前のto_iと同じ結果を返す" do
+      expect("一二三"._to_i).to eq 0
+      expect("123"._to_i).to eq 123
+    end
+  end
+
+  describe "複数回読み込んでも無限再帰にならない" do
+    it "refineを再度読み込んでもto_iが動作する" do
+      load File.expand_path("../lib/zen_to_i/refine.rb", __dir__)
+
+      expect { "一二三".to_i }.not_to raise_error
+      expect("一二三".to_i).to eq 123
+      expect("四五六".to_i).to eq 456
+    end
+  end
 end

data/spec/string_ext_spec.rb

@@ -8,4 +8,21 @@ describe String do
       expect("一二三".to_i).to eq 123
     end
   end
+
+  describe "String#_to_i overwritten" do
+    it "_to_iは差し替え前のto_iと同じ結果を返す" do
+      expect("一二三"._to_i).to eq 0
+      expect("123"._to_i).to eq 123
+    end
+  end
+
+  describe "複数回読み込んでも無限再帰にならない" do
+    it "string_extを再度読み込んでもto_iが動作する" do
+      load File.expand_path("../lib/zen_to_i/string_ext.rb", __dir__)
+
+      expect { "一二三".to_i }.not_to raise_error
+      expect("一二三".to_i).to eq 123
+      expect("四五六".to_i).to eq 456
+    end
+  end
 end

data/zen_to_i.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["zeroinon1206bass@gmail.com"]
   spec.description   = "全角文字に含まれる数字を半角の数値に変換。兆まで対応"
   spec.summary       = "Japanese zenkaku to number"
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/yoshitsugu/zen_to_i"
   spec.license       = "MIT"
   spec.required_ruby_version = ">= 2.4.6"
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: zen_to_i
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - yoshitsugu
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-21 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,9 +87,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yaml"
+- ".github/workflows/codeql-analysis.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -101,16 +101,18 @@ files:
 - lib/zen_to_i/mixin.rb
 - lib/zen_to_i/refine.rb
 - lib/zen_to_i/string_ext.rb
+- lib/zen_to_i/to_i.rb
 - lib/zen_to_i/version.rb
+- spec/constant_spec.rb
+- spec/load_order_spec.rb
 - spec/refine_spec.rb
 - spec/string_ext_spec.rb
 - spec/zen_to_i_spec.rb
 - zen_to_i.gemspec
-homepage: ''
+homepage: https://github.com/yoshitsugu/zen_to_i
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -125,11 +127,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Japanese zenkaku to number
 test_files:
+- spec/constant_spec.rb
+- spec/load_order_spec.rb
 - spec/refine_spec.rb
 - spec/string_ext_spec.rb
 - spec/zen_to_i_spec.rb

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-  - 2.6.3
-  - 2.5.5
-  - 2.4.6
-script: bundle exec rspec