bikeshare 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWNjODliM2UwMzAzYmJkNTczM2E5MTE5YzYzNGZmNzk0MTgwNTQyYQ==
+    MmFiYzY3M2QxMzk1NjRmNDNkODgyZTg4YTEyZDQxZjcwOWI0NTFmMA==
   data.tar.gz: !binary |-
-    YzgyOTBiMDU1MTRkMWFkZjY4NjAwNmQ5NjlhOThlYTNiMTc1MWQ3MQ==
+    OTAyN2M3YTRlNWVhZDdhNTE4ZWMyNzNhNTU0ZmNkNjJiNjZkODNhNw==
 SHA512:
   metadata.gz: !binary |-
-    ZjQ0YzUxMGMxY2FhOGFjYjY1YjJiMjc1ZWM1NWM4YjM3Njc5MjgyOTRlNWQy
-    NGEzY2ZkMmVkNDllMmFiODAyNTQ4YWQ1MWVkMWYwMmVlMmJjZTY1MGM3N2Ez
-    MWM3NmY3M2YyZDE1ODZiNDgyZjFlMmVkOTQzMzM2YmMxYmYxYmM=
+    NTY5NzY1MGI4MTM0MjJlM2U2MGE4ZmU0Y2Y5NDg5MTQ4OTUwOGExMGQ2YTE5
+    ZDU3Yzc5YTVhMTdjOTM3MWY1ZGE3YzMwOGUwZDBkN2ExNmYzYWE3MmE1ZDIz
+    OTk5MTBjZjI3OTMxNThjOTdkYjgyNjAwZjFkYjFlNjBjOGJlMDQ=
   data.tar.gz: !binary |-
-    MGFiNzU0Nzg5NzcwYTZkMjFmZTI4YjU1MDBhODdkN2UxZGU1YTQ3YTlkZmUy
-    MmI1NDk0MmU5NWEzYTc4YmIzY2ZiNTM2YTkzOGMyMWNmZDJhYzFjNWY0Yzk0
-    YTZiNWQ0NTM1ODg4MzQxMGQ1NTU3OTZiOWU4OWM1Zjk3YWI0NmY=
+    OGY1YWNhODE1MTQ4ZjJiODI2YzI5MDI3MzljYjVkMzgzZGQyNTgwYTBlODdj
+    MmU0NGMzYjZmMjNhNzUyNDFhZjQ4MDczMjI1YWU2N2QyMzk4MzUzZWJlNGJh
+    NWQ3MzU0NjJhMGQzOGIxNDA0MTNhMDc0NWExZWI1NGVmMTA3NTg=

data/lib/bikeshare.rb

@@ -9,16 +9,19 @@ class BikeShare
     @response.last["id"]
   end
 
-  def station_info(station_id)
-    last_station = get_last_station
-
-    if station_id >= 2 && station_id <= last_station
-      station = @response.select { |station| station["id"] == station_id } 
-      station.first
+  def between?(min, max)
+    if (min >= 2 && max <= get_last_station)
+      return true
     else
       raise "Please enter a station id in between 2 and #{last_station}"
     end
+  end
 
+  def station_info(station_id)
+    if station_id.between?(2, get_last_station)
+      station = @response.select { |station| station["id"] == station_id } 
+      station.first
+    end
   end
 
   def stations(*city_name)
@@ -36,43 +39,39 @@ class BikeShare
   end
 
   def empty?(station_id)
-    last_station = get_last_station
-
-    if station_id >= 2 && station_id <= last_station
+    if station_id.between?(2, get_last_station)
       station = @response.select { |station| station["id"] == station_id }
 
       station.first["availableBikes"] == 0 ? true : false
-    else
-      raise "Please enter a station id in between 2 and #{last_station}"
     end
   end
 
-  def available_bikes(station_id)
-    last_station = get_last_station
+  def full?(station_id)
+    if station_id.between?(2, get_last_station)
+      station = @response.select { |station| station["id"] == station_id }
 
-    if station_id >= 2 && station_id <= last_station 
+      station.first["availableBikes"] == station.first["totalDocks"] ? true : false
+    end
+  end
+
+  def available_bikes(station_id)
+    if station_id.between?(2, get_last_station)
       station = @response.select { |station| station["id"] == station_id }
+
       station.first["availableBikes"]
-    else
-      raise "Please enter a station id in between 2 and #{last_station}"
     end
   end
 
   def total_docks(station_id)
-    last_station = get_last_station
-
-    if station_id >= 2 && station_id <= last_station
+    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
   end
 
   def percent_available(station_id)
-    last_station = get_last_station
-
-    if station_id >= 2 && station_id <= last_station
+    if station_id.between?(2, get_last_station)
       station = @response.select { |station| station["id"] == station_id }
 
       available = (station.first["availableBikes"]).to_f
@@ -80,8 +79,6 @@ class BikeShare
 
       percentage = (available * 100.0) / total
       percentage.round(2)
-    else 
-      raise "Please enter a station id in between 2 and #{last_station}"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bikeshare
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Zack Shapiro