japanese_address_parser 2.2.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 713a2974b9ccf061e4c834969e879e37918ffc49c8b312a63daf42b91abc98a1
-  data.tar.gz: a3e41f696082da17e49b29ddec7a52228c8526fd8f74a9929f88aac9ba9b90a6
+  metadata.gz: 72363aa74cf45e200716ce789f6755ea43b23b556d913a76cd4479e88c44e571
+  data.tar.gz: 844e5565b51f6cb3d630b244d77c6197cbbc35e6f57015d807ef546173e03f59
 SHA512:
-  metadata.gz: e77067fd81c5347bfbe5af1d87f2da12de8814024c08bc79cfbdcd0c0eae2282b5a55a4cb62d789024b5fe028e62b39432c16bf5ab85dd29a9d2b845677640b8
-  data.tar.gz: 3d92174c193a17f0eb7566d7bec1ea54cddb22dca403dcd1c8e365a3c34c164404ce09ce00ed4f3cb9ff3bbd9243363ded73eca87c7ea80128dc776c8d5fba29
+  metadata.gz: 780a695538d70fdded3cc8a2be167241f006fa4719658cb7d556d52911be7a91addb6fdea8a7989fcccd945229fa3f8a4dc76007f982f9ba8a5c9a39c175e6e8
+  data.tar.gz: 98ba158b5ccce3fd5b49f6e1ca1eb0f9a3958dbaf0f0d1bb6bddd944208cea89f29195b5688ed43d2b687653e92e9caad3d60f0c0a8cad00e0cd3a0797d3d0ab

data/.rubocop.yml

@@ -6,6 +6,7 @@ require:
 
 AllCops:
   EnabledByDefault: true
+  TargetRubyVersion: 2.7
 
 Metrics/BlockLength:
   Exclude:
@@ -35,3 +36,6 @@ Style/StringHashKeys:
 # elseがない場合にはcase文ではなくif文を許容する。
 Style/MissingElse:
   EnforcedStyle: case
+
+Gemspec/DependencyVersion:
+  EnforcedStyle: forbidden

data/CHANGELOG.md

@@ -17,6 +17,15 @@ Change Log の形式は [Keep a Changelog](http://keepachangelog.com/) に従い
 
 ### Security
 
+## [3.0.0] - 2022-09-25
+### Added
+
+- [#49](https://github.com/yamat47/japanese_address_parser/pull/49) Dockerを使って開発環境の準備をできるようにした。([@yamat47](https://github.com/yamat47))
+
+### Security
+
+- [#51](https://github.com/yamat47/japanese_address_parser/pull/51) Ruby 2.6 のサポートを切った。([@yamat47](https://github.com/yamat47))
+
 ## [2.2.1] - 2022-07-16
 ### Changed
 

data/Dockerfile

@@ -0,0 +1,15 @@
+FROM ruby:3.1.2-alpine
+
+ENV LANG=C.UTF-8 \
+    APP_HOME=/gemsrc
+
+# `japanese_address_parser.gemspec` needs git.
+RUN apk update && \
+    apk add --virtual build-dependencies --no-cache git nodejs make gcc musl-dev
+
+RUN mkdir $APP_HOME
+WORKDIR $APP_HOME
+
+COPY . $APP_HOME
+
+RUN bundle install

data/Gemfile.lock

@@ -1,32 +1,32 @@
 PATH
   remote: .
   specs:
-    japanese_address_parser (2.2.1)
+    japanese_address_parser (3.0.0)
       schmooze
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.6)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
-    factory_bot (6.2.0)
+    factory_bot (6.2.1)
       activesupport (>= 5.0.0)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.15.0)
-    parallel (1.21.0)
-    parser (3.1.1.0)
+    json (2.6.2)
+    minitest (5.16.3)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.1)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
@@ -34,42 +34,43 @@ GEM
       rspec-mocks (~> 3.11.0)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.25.1)
+    rspec-support (3.11.1)
+    rubocop (1.36.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
+    rubocop-ast (1.21.0)
       parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.9.0)
-      rubocop (~> 1.19)
+    rubocop-rspec (2.13.2)
+      rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     schmooze (0.2.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
-    zeitwerk (2.5.4)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
+  aarch64-linux-musl
   arm64-darwin-21
   x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
-  activesupport (< 7)
+  activesupport
   factory_bot
   japanese_address_parser!
   rake

data/README.md

@@ -111,6 +111,14 @@ address.furigana #=> "トウキョウトミナトクシバコウエン 4"
 bin/setup
 ```
 
+開発環境の構築は Docker を使ってもできます。
+MacOS でしか試していないので、他プラットフォームで動かなかったら issue でご報告ください。
+
+```
+docker compose build
+docker compose run --rm gemsrc sh
+```
+
 自動テストやリンターを実行するには、このコマンドを実行してください：
 
 ```

data/docker-compose.yml

@@ -0,0 +1,6 @@
+version: "3"
+services:
+  gemsrc:
+    build: .
+    volumes:
+      - .:/gemsrc

data/japanese_address_parser.gemspec

@@ -12,7 +12,7 @@ require_relative 'lib/japanese_address_parser/version'
   spec.description = 'JapaneseAddressParser is a Ruby gem that parses Japanese address. To detect the address, it uses geolonia/japanese-addresses (https://github.com/geolonia/japanese-addresses) CSV data.'
   spec.homepage = 'https://github.com/yamat47/japanese_address_parser'
   spec.license = 'MIT'
-  spec.required_ruby_version = '>= 2.6.0'
+  spec.required_ruby_version = '>= 2.7.0'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/yamat47/japanese_address_parser'
@@ -31,7 +31,7 @@ require_relative 'lib/japanese_address_parser/version'
   spec.require_paths = ['lib']
 
   spec.add_dependency('schmooze')
-  spec.add_development_dependency('activesupport', '< 7')
+  spec.add_development_dependency('activesupport')
   spec.add_development_dependency('factory_bot')
   spec.add_development_dependency('rake')
   spec.add_development_dependency('rspec')

data/lib/japanese_address_parser/models/prefecture.rb

@@ -12,12 +12,7 @@ module JapaneseAddressParser
       def self.all
         filepath = Pathname(__FILE__).dirname.join('../data/prefectures.csv')
         ::CSV.table(filepath, converters: nil).map do |prefecture|
-          new(
-            code: prefecture[:code],
-            name: prefecture[:name],
-            name_kana: prefecture[:name_kana],
-            name_romaji: prefecture[:name_romaji]
-          )
+          new(code: prefecture[:code], name: prefecture[:name], name_kana: prefecture[:name_kana], name_romaji: prefecture[:name_romaji])
         end
       end
 
@@ -35,13 +30,7 @@ module JapaneseAddressParser
       def cities
         filepath = Pathname(__FILE__).dirname.join("../data/#{code}.csv")
         ::CSV.table(filepath, converters: nil).map do |city|
-          ::JapaneseAddressParser::Models::City.new(
-            code: city[:code],
-            prefecture_code: city[:prefecture_code],
-            name: city[:name],
-            name_kana: city[:name_kana],
-            name_romaji: city[:name_romaji]
-          )
+          ::JapaneseAddressParser::Models::City.new(code: city[:code], prefecture_code: city[:prefecture_code], name: city[:name], name_kana: city[:name_kana], name_romaji: city[:name_romaji])
         end
       end
     end

data/lib/japanese_address_parser/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module JapaneseAddressParser
-  VERSION = '2.2.1'
+  VERSION = '3.0.0'
   public_constant :VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: japanese_address_parser
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Yamaguchi Takuya
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-16 00:00:00.000000000 Z
+date: 2022-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: schmooze
@@ -28,16 +28,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,7 @@ files:
 - ".rubocop_todo.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -143,6 +144,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docker-compose.yml
 - japanese_address_parser.gemspec
 - js/.gitignore
 - js/node_modules/.package-lock.json
@@ -4117,7 +4119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="