bikeshare 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjdlMGQxOWIxY2Y2ZWJmNGM2MTU1MjMyNGU4Mzk2NDhlZGVmYTAxNA==
+    MDVhZTYyNTljNjAzMGUwMWEwYjBiMDYwODljYTYyYzMwYTg1MjgwNA==
   data.tar.gz: !binary |-
-    Nzc4MDUxNzA0ZjNhN2RmYmRiOTc0NTUzOTI5YmU5OTE0Y2MzZDVlOA==
-SHA512:
+    YTM5MmJmZWIwN2QyM2JhNDlhZmNlNGI3NTRhZjk5Y2Y5N2FmMjNhZA==
+!binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjdjNjI1YzFjYzIwMmM4ZjM3NWIyNDk1ZWM1MWQ2MzlhY2ExYzdhMWJkZWQ4
-    NjkzZWY1NTg5ZTU2YjEyMDk0ZTA5MTc3YTBmYzQ0NzdiMDcyY2VjYWIwODAx
-    ZTBlYWJjMjZkMGZiNmZjMWE1MDZmOTUwZTliYTcyZWRmYzU1NDc=
+    OTAzMDJhNDFlZmFlMmQxMmVkNTY3MmVjZmY0MGM5OTI2ZWY4ZmVlNTdmNDlj
+    NDRhOTcxOTFmOTg5YWIzYzVkNWNiNjM1NzQ5OWI2OWI5NjRiMzVlMjdmMmUz
+    MDNhZDYxZWU4YzE2MzkzNDVkMzM0YzQ2Zjk3ZmYwNzkwMGJlZWE=
   data.tar.gz: !binary |-
-    YjEzZmE4ODI4YmNlYThiMzMxZGQ4MDg5YmZmM2I4ZGNkYjEwNmRjYzE2ZWZm
-    YTY1OTI0MWQ3YzAzMmY2YTYzZWRjY2QxZTYxZTk2YTk3YjA2YWZkNDRhMWU5
-    NTJkMzljNTI2MDljZjA0MWFjYzU2MWExYmVkN2VmMDgxN2FmNGY=
+    Yzk1ZjUxYzQzZWExNjBkY2E0MTMyNjYzYjM0ZDY4ZTIzYmU5MWQyY2Q3NzMy
+    YmI4Njk4NjIxNDkwMTFlOTg0NmYzMDdiMzk5ZjhlMGIxNjU2MzI0NDQ3MWQ0
+    ZDU3YWFlZWFmYjgxMWU1ZjcyMzYyNGRmMmJjZTkzNDdkOWNlMTU=

data/lib/bikeshare.rb

@@ -1,5 +1,7 @@
 class BikeShare
 
+  FIRST_STATION_ID = 2
+
   def initialize
     response = JSON.parse(open("http://bayareabikeshare.com/stations/json").read)
     @response = response["stationBeanList"]
@@ -9,17 +11,11 @@ class BikeShare
     @response.last["id"]
   end
 
-  def between?(min, max)
-    (min >= 2 && max <= get_last_station) ? true : false
-  end
-
   def station_info(station_id)
-    if station_id.between?(2, get_last_station)
-      station = @response.select { |station| station["id"] == station_id } 
-      station.first
-    else
-      raise "Please enter a station id in between 2 and #{last_station}"
-    end
+    check_valid_station_id!(station_id)
+
+    station = @response.select { |station| station["id"] == station_id } 
+    station.first
   end
 
   def stations(*city_name)
@@ -37,56 +33,46 @@ class BikeShare
   end
 
   def empty?(station_id)
-    if station_id.between?(2, get_last_station)
-      station = @response.select { |station| station["id"] == station_id }
+    check_valid_station_id!(station_id)
 
-      station.first["availableBikes"] == 0 ? true : false
-    else
-      raise "Please enter a station id in between 2 and #{last_station}"
-    end
+    station = @response.select { |station| station["id"] == station_id }
+
+    station.first["availableBikes"] == 0 ? true : false
   end
 
   def full?(station_id)
-    if station_id.between?(2, get_last_station)
-      station = @response.select { |station| station["id"] == station_id }
+    check_valid_station_id!(station_id)
 
-      station.first["availableBikes"] == station.first["totalDocks"] ? true : false
-    else
-      raise "Please enter a station id in between 2 and #{last_station}"
-    end
+    station = @response.select { |station| station["id"] == station_id }
+
+    station.first["availableBikes"] == station.first["totalDocks"] ? true : false
   end
 
   def available_bikes(station_id)
-    if station_id.between?(2, get_last_station)
-      station = @response.select { |station| station["id"] == station_id }
+    check_valid_station_id!(station_id)
 
-      station.first["availableBikes"]
-    else
-      raise "Please enter a station id in between 2 and #{last_station}"
-    end
+    station = @response.select { |station| station["id"] == station_id }
+
+    station.first["availableBikes"]
   end
 
   def total_docks(station_id)
-    if station_id.between?(2, get_last_station)
-      station = @response.select { |station| station["id"] == station_id }
-      station.first["totalDocks"]
-    else
-      raise "Please enter a station id in between 2 and #{last_station}"
-    end
+    check_valid_station_id!(station_id)
+
+    station = @response.select { |station| station["id"] == station_id }
+    station.first["totalDocks"]
   end
 
   def percent_available(station_id)
-    if station_id.between?(2, get_last_station)
-      station = @response.select { |station| station["id"] == station_id }
+    check_valid_station_id!(station_id)
 
-      available = (station.first["availableBikes"]).to_f
-      total = (station.first["totalDocks"]).to_f
+    station = @response.select { |station| station["id"] == station_id }
 
-      percentage = (available * 100.0) / total
-      percentage.round(2)
-    else 
-      raise "Please enter a station id in between 2 and #{last_station}"
-    end
+    available = (station.first["availableBikes"]).to_f
+    total = (station.first["totalDocks"]).to_f
+
+    percentage = (available * 100.0) / total
+    percentage.round(2)
   end
 
   def offline_stations
@@ -95,4 +81,13 @@ class BikeShare
     list.empty? ? [] : list
   end
 
+private
+  
+  def check_valid_station_id!(station_id)
+    first = FIRST_STATION_ID
+    last = get_last_station
+
+    raise "Please enter a station id in between #{first} and #{last}" unless station_id.between?(first, last)
+  end
+
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: bikeshare
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Zack Shapiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-10-06 00:00:00.000000000 Z
 dependencies: []
-description: A Ruby wrapper for Bay Area Bike Share station information
+description: Ditto
 email: zack@zackshapiro.com
 executables: []
 extensions: []
@@ -37,7 +37,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: A Ruby wrapper for Bay Area Bike Share station information