cycle_hire 1.0.2 → 1.0.3

data/README.md

@@ -18,11 +18,11 @@ Bundler installs:
 
 ## Installation
 
-    gem install cycle-hire
+    gem install cycle_hire
 
 Or, add this to your Gemfile:
 
-    gem 'cycle-hire'
+    gem 'cycle_hire'
 
 ## Usage (binaries)
 

data/lib/cycle_hire.rb

@@ -1,6 +1,6 @@
 module CycleHire
   ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 
   autoload :Session, "#{ROOT}/cycle_hire/session"
   autoload :JourneyParser, "#{ROOT}/cycle_hire/journey_parser"

data/lib/cycle_hire/journey_parser.rb

@@ -15,9 +15,11 @@ class CycleHire::JourneyParser
       # ignore the header and other column types
       if columns[4] == 'Hire'
         start_time = parse_time(columns[0])
+        start_station = CycleHire::Station.new(columns[2])
         end_time = parse_time(columns[1])
+        end_station = CycleHire::Station.new(columns[3])
         cost = parse_cost(columns[5])
-        CycleHire::Journey.new(start_time, columns[2], end_time, columns[3], cost)
+        CycleHire::Journey.new(start_time, start_station, end_time, end_station, cost)
       else
         nil
       end

data/lib/cycle_hire/station.rb

@@ -1,11 +1,7 @@
 class CycleHire::Station
   attr_reader :name, :area, :id, :latitude, :longitude, :bikes, :empty_docks, :installed, :locked, :temporary, :timestamp
 
-  def initialize(name)
-    parse_name!(name)
-  end
-
-  def initialize(name, id, latitude, longitude, bikes, empty_docks, installed, locked, temporary, timestamp)
+  def initialize(name, id = nil, latitude = nil, longitude = nil, bikes = nil, empty_docks = nil, installed = nil, locked = nil, temporary = nil, timestamp = nil)
     parse_name!(name)
     @id = id
     @latitude = latitude
@@ -36,6 +32,10 @@ class CycleHire::Station
     }
   end
 
+  def to_s
+    @name + ', ' + @area
+  end
+
   protected
 
   def parse_name!(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cycle_hire
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70329444113300 !ruby/object:Gem::Requirement
+  requirement: &70114578105800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70329444113300
+  version_requirements: *70114578105800
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70329444112640 !ruby/object:Gem::Requirement
+  requirement: &70114578105140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70329444112640
+  version_requirements: *70114578105140
 description: 
 email: luca@stackednotion.com
 executables: