japan_etc 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e9c69496048a7c00e45664d9cc4d386ff9200db91ba261611a431e46c958682
-  data.tar.gz: 0514e9d494279edcfbd4343ea41544b277a006ed9cbe564d8698df65a0d9fd93
+  metadata.gz: 80927a63d2f7ab359f8d86a56fccff3c8ad59b35b09fa76bfcae424dfcb71baf
+  data.tar.gz: 7909db6b620d029a2858f18d5fbd80086c74443418d777957c2680e3a7640e40
 SHA512:
-  metadata.gz: 67e7d6dc187410257b98ae1d679104dd015fc0b6c2db8552fc7a8bc0b3199d3f0b996ed6d9a26399c98b9137a9fcdddf87f664f4ce67382b7aaf4eb42ac284c7
-  data.tar.gz: 0b8a5cede546eaf914a06797b7709d689fa755523695c15a2df51f25b4efbf001b2ad0fbb2c2f93dcd1a7341177a63592d06b2d29a194e96035cee197625fb9b
+  metadata.gz: f8bb79c606c15be0e9239a236ec466d5dd20ba82dea755bc1ec1cb9b8b650184cd48d2f7e82f1532e3ee059af89783d36dfd3b5d295937f3f2e7561006868e4f
+  data.tar.gz: 4bb6922c5d20808bcafc6b3304a7fa7f687cda464dc9bc81f8b221a9175ba675a6d97128575f4333a76b697718e490119b218917e7c87d4d01a58fc25c348b93

data/.rubocop.yml

@@ -1,5 +1,10 @@
 inherit_from: .rubocop_todo.yml
 
+Layout/LineLength:
+  Max: 100
+  Exclude:
+    - 'spec/**/*_spec.rb'
+
 Lint/ShadowingOuterLocalVariable:
   Enabled: false
 
@@ -10,11 +15,6 @@ Metrics/BlockLength:
 Metrics/ClassLength:
   Enabled: false
 
-Metrics/LineLength:
-  Max: 100
-  Exclude:
-    - 'spec/**/*_spec.rb'
-
 Metrics/ParameterLists:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -1,25 +1,69 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-06-06 16:49:59 +0900 using RuboCop version 0.71.0.
+# on 2020-03-09 22:15:16 +0900 using RuboCop version 0.80.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 3
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: aligned, indented, indented_relative_to_receiver
+Layout/MultilineMethodCallIndentation:
+  Exclude:
+    - 'lib/japan_etc/road.rb'
+
+# Offense count: 5
 Metrics/AbcSize:
-  Max: 20
+  Max: 25
 
 # Offense count: 1
+# Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Max: 44
+
+# Offense count: 2
 Metrics/CyclomaticComplexity:
   Max: 9
 
-# Offense count: 6
+# Offense count: 7
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
-  Max: 18
+  Max: 21
 
 # Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ModuleLength:
-  Max: 103
+# Configuration parameters: EnforcedStyleForLeadingUnderscores.
+# SupportedStylesForLeadingUnderscores: disallowed, required, optional
+Naming/MemoizedInstanceVariableName:
+  Exclude:
+    - 'lib/japan_etc/tollbooth.rb'
+
+# Offense count: 2
+# Configuration parameters: .
+# SupportedStyles: annotated, template, unannotated
+Style/FormatStringToken:
+  EnforcedStyle: unannotated
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'lib/japan_etc/road.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
+Style/MutableConstant:
+  Exclude:
+    - 'lib/japan_etc/road.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: .
+# SupportedStyles: percent, brackets
+Style/SymbolArray:
+  EnforcedStyle: percent
+  MinSize: 3

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 
 group :development do
   gem 'pry-byebug', '~> 3.7'
-  gem 'rake', '~> 10.0'
+  gem 'rake', '~> 13.0'
   gem 'rspec', '~> 3.8'
   gem 'rubocop', '~> 0.71'
   gem 'vcr', '~> 5.0'

data/database/japan_etc_tollbooths.csv

@@ -1,5 +1,6 @@
 tollbooth_id,road_name,route_name,tollbooth_name,direction,entrance_or_exit,notes
-01-024,中央自動車道,,三鷹本線,,入口,
+01-021,中央自動車道,,高井戸,,入口,
+01-024,中央自動車道,,高井戸,,入口,
 01-025,中央自動車道,,調布,,入口,
 01-027,中央自動車道,,国立府中,,入口,
 01-044,東水戸道路,,水戸南,,,
@@ -614,6 +615,7 @@ tollbooth_id,road_name,route_name,tollbooth_name,direction,entrance_or_exit,note
 03-029,富津館山道路,,鋸南保田,,,
 03-030,富津館山道路,,鋸南富山,,,
 03-031,富津館山道路,,富浦,,,
+03-040,首都圏中央連絡自動車道,,茂原長柄スマート,,,
 03-043,東関東自動車道,,習志野本線,上り,,
 03-045,首都圏中央連絡自動車道,,茂原北,,,
 03-046,首都圏中央連絡自動車道,,茂原長南,,,
@@ -765,6 +767,7 @@ tollbooth_id,road_name,route_name,tollbooth_name,direction,entrance_or_exit,note
 04-130,常磐自動車道,,鳥の海スマート,,,
 04-131,常磐自動車道,,山元南スマート,,,
 04-132,仙台東部道路,,名取中央スマート,,,
+04-133,常磐自動車道,,常磐双葉,,,
 04-134,常磐自動車道,,大熊,,,
 04-222,常磐自動車道,,東海スマート,,,
 04-268,常磐自動車道,,三郷スマート,,,
@@ -2432,7 +2435,9 @@ tollbooth_id,road_name,route_name,tollbooth_name,direction,entrance_or_exit,note
 21-101,横浜新道,,新保土ヶ谷,下り,,
 21-102,横浜新道,,今井,,,
 21-104,横浜新道,,戸塚本線,下り,,
+21-201,横浜新道,,新保土ヶ谷,上り,,
 21-204,横浜新道,,戸塚本線,上り,,
+21-301,横浜新道,,新保土ヶ谷,下り,,
 21-304,横浜新道,,戸塚本線,下り,,
 23-002,第二京阪道路,,伏見,,,
 23-003,第二京阪道路,,城南宮南,,,
@@ -2782,6 +2787,7 @@ tollbooth_id,road_name,route_name,tollbooth_name,direction,entrance_or_exit,note
 73-003,日光宇都宮道路,,日光本線,,,
 73-004,日光宇都宮道路,,日光,,,
 73-005,日光宇都宮道路,,篠井,,,
+73-011,日光宇都宮道路,,大沢本線,,,
 74-310,日高自動車道,,苫小牧東本線,,,
 78-001,山陰自動車道,,安来,,,
 78-002,山陰自動車道,,安来本線,,,

data/japan_etc.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'faraday', '~> 0.15'
+  spec.add_runtime_dependency 'faraday', '~> 1.0'
   spec.add_runtime_dependency 'nokogiri'
   spec.add_runtime_dependency 'pdf-reader', '~> 2.2'
   spec.add_runtime_dependency 'spreadsheet', '~> 1.2'

data/lib/japan_etc/tollbooth.rb

@@ -28,7 +28,7 @@ module JapanETC
       new(identifier, road, name, direction, entrance_or_exit, note)
     end
 
-    def initialize(identifier, road, name, direction = nil, entrance_or_exit = nil, note = nil) # rubocop:disable Metrics/LineLength
+    def initialize(identifier, road, name, direction = nil, entrance_or_exit = nil, note = nil)
       raise ValidationError if identifier.nil? || road.nil? || name.nil?
 
       @identifier = identifier

data/lib/japan_etc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JapanETC
-  VERSION = '0.5.2'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: japan_etc
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement