jp_local_gov 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1064004563bbd71eb56c0a781e3463c8c23e0d935266502be61ec6656c64c52d
-  data.tar.gz: b146e13771053689affcd052749a813663ccd050c00b2cd409aeeb793d8b4b6d
+  metadata.gz: 4e26bf255e214fe5c02ed9107514ea8ef6035f30d05fe6d8c81046b207017d6f
+  data.tar.gz: 91459fd623a506b3d413822c315c1e8dd9a2c4836f72f8f57610e56ef9bafda3
 SHA512:
-  metadata.gz: 539a20cd3cd47024b0f6eafae555bded886a3e6535991896a4bc00c08c79f7cf4440902551f6d4144e57decf5364b5fd278e7e553b1087ddf6d9be21a11f4a01
-  data.tar.gz: ff280b50246b7226889384844efab5eb9560ca065ad29c8ca00ed4437ae375a9578602e1468a2fc4fbbfbe8ecf4c1c8594770c9567e9c3008cf4b666544b74c7
+  metadata.gz: 5b823186ad99d95abbe568abcde106dc6a219325925ebd86e33b68d8a0298493d780189827e62d4d592c1af3ca62f4c30ab1213ea01379f9e6fd976eba622e93
+  data.tar.gz: 401a89148433d2061da067688160c25d381544184f2601b948bd0f2bd6f2efdf9346f5404b5c36736408e97cd38c0cdc3c94afcf8e0cc96c8689b054d2d6dc92

data/.github/workflows/lint.yml

@@ -9,12 +9,15 @@ on:
 jobs:
   lint:
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        ruby: [2.7, '3.0', 3.1]
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
       - name: Rubocop

data/.github/workflows/steep.yml

@@ -10,10 +10,14 @@ on:
 jobs:
   check:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.7, '3.0', 3.1]
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - run: bundle exec appraisal install
       - run: |
@@ -21,10 +25,14 @@ jobs:
         shell: bash
   stats:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.7, '3.0', 3.1]
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - run: bundle exec appraisal install
       - run: bundle exec rake steep:stats

data/.github/workflows/test.yml

@@ -7,14 +7,17 @@ on:
     branches: ["main"]
 
 jobs:
-  lint:
+  test:
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        ruby: [2.7, '3.0', 3.1]
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - run: bundle exec appraisal install
       - run: bundle exec appraisal rspec

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 2.7
 
 Style/StringLiterals:
   Enabled: true

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [0.3.0](https://github.com/IkumaTadokoro/jp_local_gov/compare/v0.2.1...v0.3.0) (2022-01-28)
+
+### feat
+
+* Loosen Ruby version requirement to 2.7.0 ([e3d5f6da](https://github.com/IkumaTadokoro/jp_local_gov/commit/e3d5f6dafcb6665444e81289fcb91ce7d4365a3a))
+* Removing `.ruby-version` file lets other devs to use their preferred version of Ruby ([3b3bd483](https://github.com/IkumaTadokoro/jp_local_gov/commit/3b3bd483c167266338fe07d627d58de3d833b37d))
+
 ## [0.2.1](https://github.com/IkumaTadokoro/jp_local_gov/compare/v0.2.0...v0.2.1) (2022-01-14)
 
 ### docs

data/jp_local_gov.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = "Convert japan local government code (JIS X 0402 based) into the local government name."
   spec.homepage      = "https://github.com/IkumaTadokoro/jp_local_gov"
   spec.license       = "MIT"
-  spec.required_ruby_version = ">= 3.0.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

data/lib/jp_local_gov/random.rb

@@ -4,7 +4,7 @@ require_relative "../jp_local_gov"
 
 module JpLocalGov
   module Random
-    DATA_DIR = "#{File.dirname(__FILE__)}/../../data/json/".freeze
+    DATA_DIR = "#{File.dirname(__FILE__)}/../../data/json/"
     RANDOMIZE_TARGET = %w[code city city_kana prefecture prefecture_code prefecture_kana].freeze
 
     module_function

data/lib/jp_local_gov/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JpLocalGov
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/jp_local_gov.rb

@@ -7,10 +7,10 @@ require_relative "jp_local_gov/random"
 require "json"
 
 module JpLocalGov
-  DATA_DIR = "#{File.dirname(__FILE__)}/../data/json/".freeze
+  DATA_DIR = "#{File.dirname(__FILE__)}/../data/json/"
   CHECK_DIGITS_INDEX = 5
   CHECK_BASE = 11
-  PREFECTURE_RANGE = 1..47
+  PREFECTURE_RANGE = (1..47).freeze
   VALID_CODE_LENGTH = 6
 
   module_function
@@ -23,7 +23,7 @@ module JpLocalGov
     return nil unless valid_code?(local_gov_code)
 
     json_file = "#{DATA_DIR}#{local_gov_code[0..1]}.json"
-    data = JSON.parse(File.open(json_file).read, { symbolize_names: true })
+    data = json_data_from(json_file)
     local_gov_data = data[local_gov_code.to_sym]
     return nil if local_gov_data.nil?
 
@@ -35,7 +35,7 @@ module JpLocalGov
 
     json_files = prefecture_code_list.map { "#{DATA_DIR}#{_1}.json" }
     results = json_files.map do |json_file|
-      data = JSON.parse(File.read(json_file), { symbolize_names: true })
+      data = json_data_from(json_file)
       build_local_gov(data, conditions)
     end.flatten.compact
     return nil if results.empty?
@@ -62,7 +62,7 @@ module JpLocalGov
   def all
     json_files = prefecture_code_list.map { "#{DATA_DIR}#{_1}.json" }
     json_files.flat_map do |json_file|
-      data = JSON.parse(File.read(json_file), { symbolize_names: true })
+      data = json_data_from(json_file)
       data.values.map { |value| JpLocalGov::LocalGov.new(value) }
     end
   end
@@ -82,6 +82,10 @@ module JpLocalGov
     [*PREFECTURE_RANGE].map { format("%02<number>d", number: _1) }
   end
 
-  private_class_method :build_local_gov, :filter, :prefecture_code_list
+  def json_data_from(json_file)
+    JSON.parse(File.read(json_file), { symbolize_names: true })
+  end
+
+  private_class_method :build_local_gov, :filter, :prefecture_code_list, :json_data_from
   private_constant :CHECK_DIGITS_INDEX, :CHECK_BASE
 end

data/sig/jp_local_gov.rbs

@@ -24,4 +24,6 @@ module JpLocalGov
   def self?.filter: (Hash[Symbol, untyped] target, Hash[Symbol, String] conditions) -> bool
 
   def prefecture_code_list: () -> Array[String]
+
+  def self?.json_data_from: (String) -> Hash[Symbol, untyped]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jp_local_gov
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - ikuma-t
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2022-01-28 00:00:00.000000000 Z
 dependencies: []
 description: Convert japan local government code (JIS X 0402 based) into the local
   government name.
@@ -32,7 +32,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".ruby-version"
 - Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -126,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.ruby-version

@@ -1 +0,0 @@
-3.0.0