japan_etc 0.5.1 → 0.5.2

data/lib/japan_etc/database.rb

@@ -20,7 +20,7 @@ module JapanETC
     end
 
     def tollbooths
-      @tollbooths ||= providers.map(&:fetch_tollbooths).flatten.uniq
+      @tollbooths ||= providers.map(&:fetch_tollbooths).flatten.sort.uniq
     end
 
     def save_as_csv(filename: 'database/japan_etc_tollbooths.csv')

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 = {
@@ -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,6 +8,7 @@ require 'japan_etc/util'
 
 module JapanETC
   class Tollbooth
+    include Comparable
     include Util
 
     attr_accessor :identifier, :road, :name, :entrance_or_exit, :direction, :notes
@@ -56,6 +57,21 @@ module JapanETC
       identifier.hash
     end
 
+    def <=>(other)
+      result = identifier <=> other.identifier
+      return result unless result.zero?
+
+      return -1 if !obsolete? && other.obsolete?
+      return 1 if obsolete? && !other.obsolete?
+
+      [:road, :name].each do |attribute|
+        result = send(attribute) <=> other.send(attribute)
+        return result unless result.zero?
+      end
+
+      0
+    end
+
     def to_a
       [
         identifier.to_s,
@@ -67,6 +83,12 @@ module JapanETC
       ].flatten
     end
 
+    def obsolete?
+      notes.any? { |note| note.include?('迄') }
+    end
+
+    private
+
     def normalize!
       extract_notes_from_name!
       extract_direction_from_notes!
@@ -180,6 +202,7 @@ module JapanETC
     end
 
     Identifier = Struct.new(:road_number, :tollbooth_number) do
+      include Comparable
       include Util
 
       def initialize(road_number, tollbooth_number)
@@ -195,7 +218,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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: japan_etc
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-13 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday