citibike_trips 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fb47c44deab61a7ecaf6bc39f6ff1c337302989
-  data.tar.gz: 8811c205511718fad6dce86f0b655faab8cac151
+  metadata.gz: 6fba8e04a64f48c175b81ccd0a4f0710d701f9a4
+  data.tar.gz: 52337dcffc7f85acc1c5273ae1ea003c8973ee9f
 SHA512:
-  metadata.gz: 84fee389d791bfcb30e85fce4b54bf36c789f1d6f523c3ad1602bcff9ecd0faa08e345f16232403d09283432ab4c744d1edfe24f4f94a6fd1f848c0d66bca31e
-  data.tar.gz: d29e44c8e56a7c5058ea68ddf85c23d27c3c36ec1b69e5a370d4f7db41f57db0f2faffcae84251996f8cfedb6349e97522c684ac73ecd540a0ae84d344088e64
+  metadata.gz: 612f2a71a88604036f83728a0f6e3f1a790b23a91e1c45960ad81bc71354455a599464f6c50f88182de57a39d28985dcb561d38ac0822cffeb9546545029aba7
+  data.tar.gz: cdd34b158aa712dbe06012ee1adfe9709df4550f6b755e6b44c9ebbf53cd119035c05a62328620893d1a9cc1cabfedc585f9f8b10d600cbefdc497aac09d3eb0

data/README.md

@@ -21,13 +21,13 @@ Or install it yourself as:
 Each trip has a unique id, start station, end station, start timestamp and end timestamp.  The stations will be an instance of CitibikeTrips::Station.
 
     trips = CitibikeTrips::Trips.new
-    puts trips.trips.length
     puts trips.first.start_station.name
     puts trips.first.end_timestamp
+    trips.each{|trip| puts trip.id}
 
     stations = CitibikeTrips::Stations.new
-    puts stations.stations.length
     puts stations[72].name
+    stations.each{|id, station| puts station.name}
 
 ## Contributing
 

data/lib/citibike_trips.rb

@@ -3,15 +3,17 @@ require 'citibike_trips/station'
 require 'citibike_trips/stations'
 require 'citibike_trips/trip'
 require 'citibike_trips/trips'
-require 'highline/import'
+require 'highline'
 require 'mechanize'
 
 module CitibikeTrips
   LOGIN_URL = 'https://www.citibikenyc.com/login'
-  def self.login(page)
+  def self.login(page, options={})
+    stdout = options[:stdout] || $stdout
+    h = HighLine.new($stdin, stdout)
     page.form_with(action: LOGIN_URL) do |form|
-      form.subscriberUsername = ask('Citi Bike username: ')
-      form.subscriberPassword = ask('Citi Bike password: ') {|q| q.echo = false}
+      form.subscriberUsername = h.ask('Citi Bike username: ')
+      form.subscriberPassword = h.ask('Citi Bike password: ') {|q| q.echo = false}
       form.click_button(form.button_with(name: 'login_submit'))
     end
   end

data/lib/citibike_trips/station.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 class CitibikeTrips::Station
   attr_reader :id, :name,
     :available_docks, :total_docks, :available_bikes,
@@ -34,4 +36,7 @@ class CitibikeTrips::Station
     @last_communication_time = data['lastCommunicationTime']
     @landmark = data['landMark']
   end
+  def to_json(*a)
+    Hash[instance_variables.collect{|i| [i[1..-1], instance_variable_get(i)]}].to_json(*a)
+  end
 end

data/lib/citibike_trips/stations.rb

@@ -1,4 +1,7 @@
+require 'json'
+
 class CitibikeTrips::Stations
+  include Enumerable
   STATIONS_URL = 'https://www.citibikenyc.com/stations/json'
   
   attr_reader :timestamp, :stations
@@ -18,4 +21,10 @@ class CitibikeTrips::Stations
   def [](id)
     @stations[id]
   end
+  def each(&block)
+    @stations.each(&block)
+  end
+  def to_json(*a)
+    @stations.to_json(*a)
+  end
 end

data/lib/citibike_trips/trip.rb

@@ -1,12 +1,18 @@
+require 'json'
+
 class CitibikeTrips::Trip
   attr_reader :id, :start_station, :end_station, :start_timestamp, :end_timestamp
   
-  def initialize(id, start_station, end_station, start_timestamp, end_timestmap)
+  def initialize(id, start_station, end_station, start_timestamp, end_timestamp)
     @id = id
     stations = CitibikeTrips::Stations.new
     @start_station = stations[start_station.to_i]
     @end_station = stations[end_station.to_i]
     @start_timestamp = Time.at(start_timestamp.to_i)
-    @end_timestamp = Time.at(end_timestmap.to_i)
+    @end_timestamp = Time.at(end_timestamp.to_i)
+  end
+
+  def to_json(*a)
+    Hash[instance_variables.collect{|i| [i[1..-1], instance_variable_get(i)]}].to_json(*a)
   end
 end

data/lib/citibike_trips/trips.rb

@@ -1,9 +1,12 @@
+require 'json'
+
 class CitibikeTrips::Trips
+  include Enumerable
   TRIPS_URL = 'https://www.citibikenyc.com/member/trips'
   
   attr_reader :trips
   
-  def initialize
+  def initialize(options={})
     agent = Mechanize.new
     @trips = []
     url = TRIPS_URL
@@ -24,10 +27,20 @@ class CitibikeTrips::Trips
           break
         end
       elsif page.uri.to_s == CitibikeTrips::LOGIN_URL
-        CitibikeTrips.login(page)
+        CitibikeTrips.login(page, {stdout: options[:stdout]})
       else
         raise "Got redirected to unexpected page #{page.uri.to_s}"
       end
     end
   end
+
+  def [](index)
+    @trips[index]
+  end
+  def each(&block)
+    @trips.each(&block)
+  end
+  def to_json(*a)
+    @trips.to_json(*a)
+  end
 end

data/lib/citibike_trips/version.rb

@@ -1,3 +1,3 @@
 module CitibikeTrips
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/test_station.rb

@@ -22,20 +22,32 @@ class StationTests < Test::Unit::TestCase
       "testStation"=>false,
       "lastCommunicationTime"=>nil,
       "landMark"=>""}
+    @station = CitibikeTrips::Station.new(@data)
   end
 
   def test_initialize
-    station = CitibikeTrips::Station.new(@data)
     # Some regular fields
-    assert_equal 72, station.id
-    assert_equal 'W 52 St & 11 Ave', station.name
-    assert_equal false, station.test_station
+    assert_equal 72, @station.id
+    assert_equal 'W 52 St & 11 Ave', @station.name
+    assert_equal false, @station.test_station
     # Test conversion of empty string values to nil
-    assert_nil station.location
+    assert_nil @station.location
     # Test special handling of city
-    assert_equal 'New York', station.city
+    assert_equal 'New York', @station.city
     # Virtual fields
-    assert_equal ['W 52 St & 11 Ave'], station.street_address_array
-    assert_equal 'W 52 St & 11 Ave', station.street_address
+    assert_equal ['W 52 St & 11 Ave'], @station.street_address_array
+    assert_equal 'W 52 St & 11 Ave', @station.street_address
+  end
+  def test_to_json
+    json = @station.to_json
+    assert_kind_of String, json
+    data = JSON.parse(json)
+    assert_equal 72, data['id']
+    assert_equal 'W 52 St & 11 Ave', data['name']
+    assert_equal false, data['test_station']
+    assert_nil data['location']
+    assert_equal 'New York', data['city']
+    assert_equal ['W 52 St & 11 Ave'], data['street_address_array']
+    assert_equal 'W 52 St & 11 Ave', data['street_address']
   end
 end

data/test/test_stations.rb

@@ -22,4 +22,21 @@ class StationsTests < Test::Unit::TestCase
     assert_equal 'W 52 St & 11 Ave', @stations[72].name
     assert_equal 20, @stations[3002].available_docks
   end
+  def test_each
+    count = 0
+    @stations.each{|id, station| count += 1}
+    assert_equal 332, count
+  end
+  def test_includes_enumerable
+    assert @stations.any?{|id, station| id == 72 && station.name == 'W 52 St & 11 Ave'}
+    assert @stations.all?{|id, station| station.name}
+  end
+  def test_to_json
+    json = @stations.to_json
+    assert_kind_of String, json
+    data = JSON.parse(json)
+    assert_equal 332, data.length
+    assert_equal 'W 52 St & 11 Ave', data['72']['name']
+    assert_equal 20, data['3002']['available_docks']
+  end
 end

data/test/test_trip.rb

@@ -2,19 +2,27 @@ require 'test/unit'
 require 'citibike_trips'
 
 class TripTests < Test::Unit::TestCase
-  def test_initialize
+  def setup
     page = Mechanize::Page.new
     Mechanize.any_instance.stubs(:get).with(CitibikeTrips::Stations::STATIONS_URL).returns(page)
     json = File.read("#{File.dirname(__FILE__)}/samples/stations.json")
     page.stubs(:body).returns(json)
-    
-    trip = CitibikeTrips::Trip.new('trip-13150976', '151', '517', '1406760278', '1406761369')
-    assert_equal 'trip-13150976', trip.id
-    assert_kind_of CitibikeTrips::Station, trip.start_station
-    assert_equal 'Cleveland Pl & Spring St', trip.start_station.name
-    assert_kind_of CitibikeTrips::Station, trip.end_station
-    assert_equal 'E 41 St & Madison Ave', trip.end_station.name
-    assert_equal Time.at(1406760278), trip.start_timestamp
-    assert_equal Time.at(1406761369), trip.end_timestamp
+    @trip = CitibikeTrips::Trip.new('trip-13150976', '151', '517', '1406760278', '1406761369')
+  end
+  def test_initialize
+    assert_equal 'trip-13150976', @trip.id
+    assert_kind_of CitibikeTrips::Station, @trip.start_station
+    assert_equal 'Cleveland Pl & Spring St', @trip.start_station.name
+    assert_kind_of CitibikeTrips::Station, @trip.end_station
+    assert_equal 'E 41 St & Madison Ave', @trip.end_station.name
+    assert_equal Time.at(1406760278), @trip.start_timestamp
+    assert_equal Time.at(1406761369), @trip.end_timestamp
+  end
+  def test_to_json
+    json = @trip.to_json
+    assert_kind_of String, json
+    data = JSON.parse(json)
+    assert_equal 'trip-13150976', data['id']
+    assert_equal 'E 41 St & Madison Ave', data['end_station']['name']
   end
 end

data/test/test_trips.rb

@@ -3,7 +3,7 @@ require 'mocha/test_unit'
 require 'citibike_trips'
 
 class TripsTests < Test::Unit::TestCase
-  def test_initialize
+  def setup
     agent = Mechanize.new
     uri1 = 'https://www.citibikenyc.com/member/trips'
     uri2 = 'https://www.citibikenyc.com/member/trips/2'
@@ -25,14 +25,38 @@ class TripsTests < Test::Unit::TestCase
     json = File.read("#{File.dirname(__FILE__)}/samples/stations.json")
     page.stubs(:body).returns(json)
     
-    trips = CitibikeTrips::Trips.new
+    @trips = CitibikeTrips::Trips.new
+  end
+
+  def test_initialize
     # 26+20+4
-    assert_equal 50, trips.trips.length
-    trips.trips.each do |t|
+    assert_equal 50, @trips.trips.length
+    @trips.trips.each do |t|
       assert_kind_of CitibikeTrips::Trip, t
     end
-    assert_equal 'trip-13150976', trips.trips.first.id
-    assert_equal Time.at(1369869537), trips.trips.last.start_timestamp
-    assert_equal 'Broadway & W 58 St', trips.trips.last.start_station.name
+    assert_equal 'trip-13150976', @trips.trips.first.id
+    assert_equal Time.at(1369869537), @trips.trips.last.start_timestamp
+    assert_equal 'Broadway & W 58 St', @trips.trips.last.start_station.name
+  end
+  def test_index_access
+    assert_equal 'trip-13150976', @trips[0].id
+    assert_equal 'Broadway & W 58 St', @trips[-1].start_station.name
+  end
+  def test_each
+    count = 0
+    @trips.each{|trip| count += 1}
+    assert_equal 50, count
+  end
+  def test_includes_enumerable
+    assert @trips.any?{|trip| trip.id == 'trip-13150976'}
+    assert @trips.all?{|trip| trip.id}
+  end
+  def test_to_json
+    json = @trips.to_json
+    assert_kind_of String, json
+    data = JSON.parse(json)
+    assert_equal 50, data.length
+    assert_equal 'trip-13150976', data[0]['id']
+    assert_equal 'Broadway & W 58 St', data[-1]['start_station']['name']
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: citibike_trips
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jason Heiss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,4 +140,3 @@ test_files:
 - test/test_stations.rb
 - test/test_trip.rb
 - test/test_trips.rb
-has_rdoc: