rzd 0.1.0 → 0.2.0

data/bin/rzd

@@ -1,19 +1,31 @@
 #!/usr/bin/env ruby
 
 unless ARGV[0] && ARGV[1] && ARGV[2]
-  puts 'Usage: rzd [FROM] [TO] [DAY.MONTH]'
+  puts 'Usage: rzd [FROM] [TO] [DAY.MONTH] [TRAIN]'
   exit
 end
 
 require 'rubygems'
 require 'rzd'
 
-trains = Rzd.get_trains( ARGV[0], ARGV[1], ARGV[2] )
+if ARGV[3]
+  coaches = Rzd.get_coaches( ARGV[0], ARGV[1], ARGV[2], ARGV[3] )
 
-if trains.empty?
-  puts " -- "
+  if coaches.empty?
+    puts " -- "
+  else
+    coaches.each do |coach|
+      puts "#{coach.num} \t#{coach.type} \t#{coach.cost} \t#{coach.seats[:all]}"
+    end
+  end
 else
-  trains.each do |train|
-    puts "#{train.num} \t#{train.name}   \t#{train.seat_table}"
+  trains = Rzd.get_trains( ARGV[0], ARGV[1], ARGV[2] )
+
+  if trains.empty?
+    puts " -- "
+  else
+    trains.each do |train|
+      puts "#{train.num} \t#{train.name}   \t#{train.seat_table}"
+    end
   end
 end

data/lib/rzd.rb

@@ -10,7 +10,14 @@ class Rzd
       Rzd::Commands::GetTrains.new.execute( from, to, date )
     end
 
+    def get_coaches( from, to, date, train )
+      require 'rzd/commands/get_coaches'
+
+      Rzd::Commands::GetCoaches.new.execute( from, to, date, train )
+    end
+
   end
 end
 
 require 'rzd/train'
+require 'rzd/coach'

data/lib/rzd/coach.rb

@@ -0,0 +1,3 @@
+class Rzd::Coach < Struct.new(:type,:num,:cost,:seats)
+
+end

data/lib/rzd/commands/get_coaches.rb

@@ -0,0 +1,34 @@
+require 'mechanize'
+
+class Rzd::Commands::GetCoaches
+
+  def initialize
+    @agent = Mechanize.new
+  end
+
+  def execute( from, to, date, train )
+    page = @agent.get "http://pass.rzd.ru/isvp/public/pass/express?route_id=&schd_id=6&action=submit&schd_ref_id=1&refererLayerId=4922&STRUCTURE_ID=735&layer_id=4923&src=#{CGI::escape from}&dst=#{CGI::escape to}&date=#{CGI::escape date}&train=#{CGI::escape train}"
+    table = page.parser.css('form table.result').first
+    if table
+      rows = table.css('tr')
+      rows.shift
+      rows.shift
+      rows.map do |row|
+        cells = row.css('td')
+
+        seat_types = [:upper,:lower,:upper_side,:lower_side,:other]
+        seats = {}
+        cells[7..11].each_with_index do |c,i|
+          s = c.text.gsub("\302\240", "").strip.to_i
+          seats[seat_types[i]] = s unless s == 0
+        end
+        seats[:all] = seats.values.inject(0, :+)
+
+        Rzd::Coach.new cells[1].text.strip.gsub(/\n[\s\302\240]+/,' '), cells[5].text.strip, cells[6].text.strip, seats
+      end
+    else
+      []
+    end
+  end
+
+end

data/lib/rzd/version.rb

@@ -1,7 +1,7 @@
 class Rzd
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rzd
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Alexey Noskov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-15 00:00:00 +04:00
+date: 2011-05-28 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,8 @@ extra_rdoc_files:
 files: 
 - lib/rzd.rb
 - lib/rzd/commands/get_trains.rb
+- lib/rzd/commands/get_coaches.rb
+- lib/rzd/coach.rb
 - lib/rzd/version.rb
 - lib/rzd/train.rb
 - bin/rzd