moscow_metro 0.1.9 → 0.2.0

data/lib/moscow_metro/line.rb

@@ -5,7 +5,6 @@ module MoscowMetro
 
 		COLUMNS = [:color, :name, :name_en, :name_prepositional, :open_year, :uid]
 		RECORDS = YAML.load_file(DB_DIR.join("lines.yml"))
-		Record  = Struct.new(*COLUMNS)
 		UIDS = {
 			mcd:      %w[D1 D2 D3 D4 D5].freeze,
 			mck:      %w[14].freeze,
@@ -13,6 +12,12 @@ module MoscowMetro
 			monorail: %w[13].freeze
 		}
 
+		Record = Struct.new(*COLUMNS) do
+			def stations
+				MoscowMetro::Station.at_lines([uid])
+			end
+		end
+
 		def self.all
 			RECORDS.map { |record_data| Record.new(*hash_values(COLUMNS, record_data)) }
 		end

data/lib/moscow_metro/station.rb

@@ -8,7 +8,7 @@ module MoscowMetro
 
 		Record = Struct.new(*COLUMNS) do
 			def coordinates
-				(latitude && longitude) ? [latitude, longitude] : []
+				[latitude, longitude] if (latitude && longitude)
 			end
 
 			def line
@@ -16,33 +16,48 @@ module MoscowMetro
 			end
 		end
 
-		def self.all
-			RECORDS.map { |record_data| Record.new(*hash_values(COLUMNS, record_data)) }
-		end
+		class << self
 
-		def self.names
-			all.map(&:name).uniq
-		end
+			def all
+				RECORDS.map { |record_data| to_record(record_data) }
+			end
 
-		def self.at_lines(uids)
-			all.select { |station| uids.include? station.line_uid }
-		end
+			def first
+				to_record RECORDS.first
+			end
 
-		def self.at_mcd
-			at_lines Line::UIDS[:mck]
-		end
+			def last
+				to_record RECORDS.last
+			end
 
-		def self.at_mck
-			at_lines Line::UIDS[:mck]
-		end
+			def to_record(record_data)
+				Record.new(*hash_values(COLUMNS, record_data))
+			end
 
-		def self.at_metro
-			at_lines Line::UIDS[:metro]
-		end
+			def names
+				all.map(&:name).uniq
+			end
 
-		def self.at_monorail
-			at_lines Line::UIDS[:monorail]
-		end
+			def at_lines(uids)
+				all.select { |station| uids.include? station.line_uid }
+			end
+
+			def at_mcd
+				at_lines Line::UIDS[:mck]
+			end
+
+			def at_mck
+				at_lines Line::UIDS[:mck]
+			end
 
+			def at_metro
+				at_lines Line::UIDS[:metro]
+			end
+
+			def at_monorail
+				at_lines Line::UIDS[:monorail]
+			end
+
+		end
 	end
 end

data/lib/moscow_metro/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MoscowMetro
-	VERSION = "0.1.9"
+	VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moscow_metro
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Sergey Pedan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies: []
 description: Database of lines and stations metro & metro-like train transport of
   Moscow. Can be used as a database alongside a real database or as a source of data
@@ -30,6 +30,8 @@ files:
 - bin/console
 - bin/setup
 - lib/db/lines.yml
+- lib/db/sources/data-en-2015-11-30.json
+- lib/db/sources/data-ru-2020-10-26.json
 - lib/db/stations.yml
 - lib/moscow_metro.rb
 - lib/moscow_metro/line.rb
@@ -60,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.0
 signing_key:
 specification_version: 4
 summary: Database of lines and stations metro & metro-like train transport of Moscow