jipcode-address_locator 0.1.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88540f570e9468b62d7bb0cf8412a7502f9498ac6d36b1ad8c5d361b919baece
-  data.tar.gz: 71534dc3a70ad972b8dd6833bed51022c6a6d90dfad86d4fe52e0f354febb8e9
+  metadata.gz: c8fb0e1df3739ff41305aa26517b6e94f6d26a5d576a1338bf2a995ca6df807d
+  data.tar.gz: 8636df1a0aab36c354f11d8c057b7df351df9600d0cf720db66070d3fe2b5f2c
 SHA512:
-  metadata.gz: 627e8115e8dfd99daa16e9bfdbbe128c5d67baff42a3c92fede5303d85743b266ed503c9923c9f6ce2577f27c299c53bd450f6e88b20af181f0d706012305180
-  data.tar.gz: ff134cb1873b7a0b7ad0ea481a23d86e7ce24cf97f0e5bb7c8e81e9b2e7bbc9a848c746dbc675e6c857dcbbd4add76ba314fb3bc76de85dd1823eef5abb6c690
+  metadata.gz: 4b9a03d622369f457a0c9ec99fe8343fd7a9b8d2e29494c432f57eade5910270eaec1f7e90277cfd518387827b12a7f4a92b2e1248b23e4bca6c5dda411f04b0
+  data.tar.gz: 9b27fc26da58939c9497bac86efe4092b94f0a3c9fc0906c74fce62145ba5998a13706f32b1b766a0e178d55ba78dc8d5775a0c0a9e83950d710814a47c6520d

data/.github/workflows/ruby.yml

@@ -0,0 +1,35 @@
+name: Ruby
+
+on:
+  push:
+    branches: '*'
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby 3.2
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.2
+    - name: Build and test with Rake
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bundle exec rspec
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby 3.2
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.2
+    - name: Build and test with Rake
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bundle exec rubocop

data/.rubocop.yml

@@ -1,3 +1,13 @@
+require:
+  - rubocop-rake
+  - rubocop-rspec
+
+AllCops:
+  NewCops: enable
+
+Layout/LineLength:
+  Max: 130
+
 Naming/FileName:
   Enabled: false
 
@@ -5,11 +15,29 @@ Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'
 
-Metrics/LineLength:
-  Max: 130
+Metrics/MethodLength:
+  CountAsOne:
+    - array
+    - hash
+    - heredoc
 
 Style/Documentation:
   Enabled: false
 
 Style/AsciiComments:
   Enabled: false
+
+RSpec/ContextWording:
+  Enabled: false
+
+RSpec/FilePath:
+  Enabled: false
+
+RSpec/ExampleLength:
+  CountAsOne:
+    - array
+    - hash
+    - heredoc
+
+RSpec/NamedSubject:
+  Enabled: false

data/Gemfile

@@ -6,3 +6,12 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in jipcode.gemspec
 gemspec
+
+# for development
+gem 'bundler'
+gem 'byebug'
+gem 'rake'
+gem 'rspec'
+gem 'rubocop'
+gem 'rubocop-rake'
+gem 'rubocop-rspec'

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/jipcode-address_locator.svg)](https://badge.fury.io/rb/jipcode-address_locator)
-[![Build Status](https://travis-ci.com/oieioi/jipcode-address_locator.svg?branch=master)](https://travis-ci.com/oieioi/jipcode-address_locator)
+![Ruby](https://github.com/oieioi/jipcode-address_locator/workflows/Ruby/badge.svg)
 
 # Jipcode::AddressLocator
 

data/jipcode-address_locator.gemspec

@@ -9,6 +9,7 @@ Gem::Specification.new do |spec|
   spec.version       = Jipcode::AddressLocator::VERSION
   spec.authors       = ['oieioi']
   spec.email         = ['atsuinatsu.samuifuyu@gmail.com']
+  spec.required_ruby_version = '>= 2.7.0'
 
   spec.summary       = 'Extend jipcode.gem to locate zipcode data by address'
   spec.description   = 'Extend jipcode.gem to locate zipcode data by address'
@@ -21,10 +22,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'jaro_winkler', '~> 1.5.3'
-  spec.add_dependency 'jipcode', '>= 1.5.0'
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'byebug'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
+  spec.add_dependency 'jipcode', '>= 3.0.0'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/jipcode/address_locator/indexer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'csv'
+require 'fileutils'
 require 'jipcode/address_locator/helper'
 require 'jipcode/address_locator/normalizer'
 
@@ -23,20 +24,18 @@ module Jipcode
 
       export_index(index)
 
-      File.open(INDEX_VERSION_FILE, 'w') do |f|
-        f.write(Jipcode::VERSION)
-      end
+      File.write(INDEX_VERSION_FILE, Jipcode::VERSION)
     end
 
     # @private
     def self.refresh_index_dir
-      FileUtils.rm_rf(INDEX_PATH) if File.exist?(INDEX_PATH)
+      FileUtils.rm_rf(INDEX_PATH)
       Dir.mkdir(INDEX_PATH)
     end
 
     # @private
     def self.collect_index
-      index = 47.times.each_with_object({}) { |item, memo| memo[item + 1] = []; }
+      index = 47.times.each_with_object({}) { |item, memo| memo[item + 1] = [] }
 
       Dir.glob("#{ZIPCODE_PATH}/*.csv").each do |file_name|
         CSV.read(file_name).each do |row|
@@ -55,7 +54,16 @@ module Jipcode
       index.each do |prefecture_code, rows|
         rows.sort_by! { |row| [row[0], row[2], row[3]] }
         CSV.open("#{INDEX_PATH}/#{prefecture_code}.csv", 'wb') do |csv|
-          csv << %w[zipcode prefecture_name city town normalized_address]
+          csv << %w[
+            zipcode
+            prefecture_name
+            city
+            town
+            prefecture_kana
+            city_kana
+            town_kana
+            normalized_address
+          ]
           rows.each { |row| csv << row }
         end
       end

data/lib/jipcode/address_locator/normalizer.rb

@@ -10,8 +10,8 @@ module Jipcode
     # @return [String] normalized address
     def self.normalize_address(raw_address)
       zenkaku2hankaku(raw_address)
-        .yield_self { |address| kansuji2hankaku(address) }
-        .yield_self { |address| jukyohyouji2hyphen(address) }
+        .then { |address| kansuji2hankaku(address) }
+        .then { |address| jukyohyouji2hyphen(address) }
     end
 
     # 全角数字ハイフン→半角数字ハイフン

data/lib/jipcode/address_locator/version.rb

@@ -2,6 +2,6 @@
 
 module Jipcode
   module AddressLocator
-    VERSION = '0.1.1'
+    VERSION = '3.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jipcode-address_locator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - oieioi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2023-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jaro_winkler
@@ -30,84 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 description: Extend jipcode.gem to locate zipcode data by address
 email:
 - atsuinatsu.samuifuyu@gmail.com
@@ -115,10 +45,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -137,8 +67,9 @@ files:
 homepage: https://github.com/oieioi/jipcode-address_locator
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,15 +77,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Extend jipcode.gem to locate zipcode data by address
 test_files: []

data/.travis.yml

@@ -1,10 +0,0 @@
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.5.0
-before_install:
-  - gem install bundler -v 1.16.1
-script:
-  - bundle exec rubocop
-  - bundle exec rspec