japan_etc 0.5.1 → 0.9.0

data/lib/japan_etc/database_provider/past_database.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'japan_etc/database_provider/base'
+require 'japan_etc/tollbooth'
+require 'faraday'
+require 'nokogiri'
+
+module JapanETC
+  module DatabaseProvider
+    # http://www.nagoya-expressway.or.jp/etc/etc-lane.html
+    class PastDatabase < Base
+      def source_id
+        'PastDatabase'
+      end
+
+      def fetch_tollbooths
+        rows.map do |row|
+          create_tollbooth_from_row(row)
+        end
+      end
+
+      def create_tollbooth_from_row(row)
+        identifier = Tollbooth::Identifier.from(row[0])
+
+        road = Road.new(row[1], row[2])
+
+        Tollbooth.new(
+          identifier: identifier,
+          road: road,
+          name: row[3],
+          direction: row[4],
+          entrance_or_exit: row[5],
+          note: row[6],
+          source: source_id,
+          priority: -1
+        )
+      end
+
+      def rows
+        CSV.parse(csv, headers: :first_row)
+      end
+
+      def csv
+        path = File.join(__dir__, 'past_database.csv')
+        File.read(path)
+      end
+    end
+  end
+end

data/lib/japan_etc/road.rb

@@ -5,6 +5,7 @@ require 'japan_etc/util'
 
 module JapanETC
   Road = Struct.new(:name, :route_name) do
+    include Comparable
     include Util
 
     IRREGULAR_ABBREVIATIONS = {
@@ -22,7 +23,7 @@ module JapanETC
     def initialize(name, route_name = nil)
       raise ValidationError, '#name cannot be nil' if name.nil?
 
-      super(normalize(name), normalize(route_name))
+      super(remove_whitespaces(normalize(name)), remove_whitespaces(normalize(route_name)))
     end
 
     def abbreviation
@@ -49,5 +50,14 @@ module JapanETC
 
       abbreviation
     end
+
+    def <=>(other)
+      [:name, :route_name].each do |attribute|
+        result = send(attribute) <=> other.send(attribute)
+        return result unless result.zero?
+      end
+
+      0
+    end
   end
 end

data/lib/japan_etc/tollbooth.rb

@@ -8,9 +8,11 @@ require 'japan_etc/util'
 
 module JapanETC
   class Tollbooth
+    include Comparable
     include Util
 
-    attr_accessor :identifier, :road, :name, :entrance_or_exit, :direction, :notes
+    attr_accessor :identifier, :road, :name, :entrance_or_exit, :direction, :notes,
+                  :source, :priority
 
     def self.create(
       road_number:,
@@ -20,23 +22,46 @@ module JapanETC
       name:,
       direction: nil,
       entrance_or_exit: nil,
-      note: nil
+      note: nil,
+      source: nil,
+      priority: 0
     )
       identifier = Identifier.new(road_number, tollbooth_number)
       road = Road.new(road_name, route_name)
-      new(identifier, road, name, direction, entrance_or_exit, note)
+
+      new(
+        identifier: identifier,
+        road: road,
+        name: name,
+        direction: direction,
+        entrance_or_exit: entrance_or_exit,
+        note: note,
+        source: source,
+        priority: priority
+      )
     end
 
-    def initialize(identifier, road, name, direction = nil, entrance_or_exit = nil, note = nil) # rubocop:disable Metrics/LineLength
+    def initialize(
+      identifier:,
+      road:,
+      name:,
+      direction:,
+      entrance_or_exit:,
+      note:,
+      source:,
+      priority:
+    )
       raise ValidationError if identifier.nil? || road.nil? || name.nil?
 
       @identifier = identifier
       @road = road
-      @name = normalize(name)
+      @name = remove_whitespaces(normalize(name))
       @direction = direction
       @entrance_or_exit = entrance_or_exit
       @notes = []
       notes << normalize(note) if note
+      @source = source
+      @priority = priority
 
       normalize!
     end
@@ -56,6 +81,24 @@ module JapanETC
       identifier.hash
     end
 
+    def <=>(other)
+      result = identifier <=> other.identifier
+      return result unless result.zero?
+
+      result = priority <=> other.priority
+      return -result unless result.zero? # Tollbooth with higher priority comes first
+
+      return -1 if !obsolete? && other.obsolete?
+      return 1 if obsolete? && !other.obsolete?
+
+      %i[road name source].each do |attribute|
+        result = send(attribute) <=> other.send(attribute)
+        return result unless result.zero?
+      end
+
+      0
+    end
+
     def to_a
       [
         identifier.to_s,
@@ -63,10 +106,17 @@ module JapanETC
         name,
         direction,
         entrance_or_exit,
-        notes.empty? ? nil : notes.join(' ')
+        notes.empty? ? nil : notes.join(' '),
+        source
       ].flatten
     end
 
+    def obsolete?
+      notes.any? { |note| note.include?('迄') }
+    end
+
+    private
+
     def normalize!
       extract_notes_from_name!
       extract_direction_from_notes!
@@ -180,8 +230,13 @@ module JapanETC
     end
 
     Identifier = Struct.new(:road_number, :tollbooth_number) do
+      include Comparable
       include Util
 
+      def self.from(string)
+        new(*string.split('-'))
+      end
+
       def initialize(road_number, tollbooth_number)
         road_number = convert_to_integer(road_number)
         raise ValidationError, '#road_number cannot be nil' if road_number.nil?
@@ -195,7 +250,11 @@ module JapanETC
       end
 
       def to_s
-        format('%02d-%03d', road_number, tollbooth_number)
+        @string ||= format('%02d-%03d', road_number, tollbooth_number)
+      end
+
+      def <=>(other)
+        to_s <=> other.to_s
       end
     end
   end

data/lib/japan_etc/util.rb

@@ -7,7 +7,7 @@ module JapanETC
     def normalize(string)
       return nil unless string
 
-      convert_fullwidth_characters_to_halfwidth(string).strip
+      convert_fullwidth_characters_to_halfwidth(string)
     end
 
     def convert_fullwidth_characters_to_halfwidth(string)
@@ -16,6 +16,12 @@ module JapanETC
       string.tr('　Ａ-Ｚａ-ｚ０-９', ' A-Za-z0-9')
     end
 
+    def remove_whitespaces(string)
+      return nil unless string
+
+      string.tr(' ', '')
+    end
+
     def convert_to_integer(object)
       case object
       when Numeric

data/lib/japan_etc/version.rb

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

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: japan_etc
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-13 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     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
@@ -102,12 +116,16 @@ files:
 - japan_etc.gemspec
 - lib/japan_etc.rb
 - lib/japan_etc/database.rb
-- lib/japan_etc/database_provider.rb
 - lib/japan_etc/database_provider/base.rb
+- lib/japan_etc/database_provider/base_nexco.rb
 - lib/japan_etc/database_provider/hanshin_expressway.rb
 - lib/japan_etc/database_provider/metropolitan_expressway.rb
 - lib/japan_etc/database_provider/nagoya_expressway.rb
-- lib/japan_etc/database_provider/nexco.rb
+- lib/japan_etc/database_provider/nexco_central.rb
+- lib/japan_etc/database_provider/nexco_east.rb
+- lib/japan_etc/database_provider/nexco_west.rb
+- lib/japan_etc/database_provider/past_database.csv
+- lib/japan_etc/database_provider/past_database.rb
 - lib/japan_etc/direction.rb
 - lib/japan_etc/entrance_or_exit.rb
 - lib/japan_etc/error.rb
@@ -134,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Japan ETC (Electronic Toll Collection System) database

data/lib/japan_etc/database_provider.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-require 'japan_etc/database_provider/metropolitan_expressway'
-require 'japan_etc/database_provider/hanshin_expressway'
-require 'japan_etc/database_provider/nagoya_expressway'
-require 'japan_etc/database_provider/nexco'