jsedwards · December 24, 2015 05:19 · Sep 29, 2013 · Sep 29, 2013 · Jun 25, 2013 · Jun 11, 2013
diff --git a/P5: OO Inheritance.rb b/P5: OO Inheritance.rb
@@ -1,4 +1,5 @@
 class Vehicle
+  attr_reader :color
   def initialize(args)
     @color = args[:color]
   end
@@ -8,6 +9,9 @@ def brake
   def drive
     @status = :driving
   end
+  def ok_to_text?
+    @status != :driving
+  end
 end
 
 class Car < Vehicle
@@ -85,5 +89,11 @@ def assert(expression, message)
 assert(harley = Motorbike.new(color: "black"), "new bikes can be created")
 assert(harley.drive == :fast, "bikes can drive, they go fast")
 assert(harley.weave_through_traffic == :driving_like_a_crazy_person, "bikes weave through traffic like a crazy person")
-
+#part 3 tests
+assert(harley.color == "black", "bikes can have colors")
+assert(red_rocket.color == "red", "bikes can have colors")
+assert(big_bird.color == "yellow", "bikes can have colors")
+assert(red_rocket.ok_to_text? == true, "ok for car to text when stopped")
+red_rocket.drive
+assert(red_rocket.ok_to_text? == false, "not ok for car to text when driving")
 
diff --git a/P5: OO Inheritance.rb b/P5: OO Inheritance.rb
@@ -1,39 +1,45 @@
-class Car
- @@WHEELS = 4
- def initialize(args)
-   @color = args[:color]
-   @wheels = @@WHEELS
- end
- def drive
-   @status = :driving
- end
+class Vehicle
+  def initialize(args)
+    @color = args[:color]
+  end
  def brake
-   @status = :stopped    
+   @status = :stopped 
  end
- def needs_gas?
+  def drive
+    @status = :driving
+  end
+end
+
+class Car < Vehicle
+ @@WHEELS = 4
+  def initialize(args)
+    super
+    @wheels = args[:wheels]
+  end
+
+  def needs_gas?
    return [true,true,false].sample
- end
+  end
 
 end
-class Bus
+
+class Bus < Vehicle
  attr_reader :passengers
  def initialize(args)
-   @color = args[:color]
-   @wheels = args[:wheels]
+   super
+   @wheels = args[:wheels] 
    @num_seats = args[:num_seats]
    @fare = args[:fare]
    @passengers=[]
  end
  def drive
    return self.brake if stop_requested?
-   @status = :driving
+   super
  end
  def admit_passenger(passenger,money)
    @passengers << passenger if money > @fare
  end
- def brake
-   @status = :stopped
- end 
+
  def stop_requested?
    return [true,false].sample
  end
@@ -45,26 +51,39 @@ def needs_gas?
 end
 
 
-class Motorbike
+class Motorbike < Vehicle
  @@WHEELS = 2
- def initialize(args)
-   @color = args[:color]
-   @wheels = @@WHEELS
-
- end
 
  def drive
-   @status = :driving
+   super
    @speed = :fast
  end
 
- def brake
-   @status = :stopped 
- end
  def needs_gas?
    return [true,false,false,false].sample
  end 
  def weave_through_traffic
    @status = :driving_like_a_crazy_person
  end
-end
+end
+
+
+#TESTS
+def assert(expression, message)
+  raise message unless expression
+end
+
+assert(red_rocket = Car.new({color: "red"}), "new car can be created")
+assert(red_rocket.drive, "cars can drive")
+assert(red_rocket.brake, "cars can brake")
+#assert(!!red_rocket.needs_gas? == red_rocket.needs_gas?, " weird test cars either need gas or they don't")
+assert(big_bird = Bus.new(color: "yellow", fare: 2, num_seats: 48, wheels: 10), "new bus can be created")
+assert(big_bird.passengers == [], "new buses don't have any passengers")
+assert(big_bird.drive == :stopped || :driving, "buses drive")
+assert(big_bird.admit_passenger("Joe",5), "buses admit passengers with more money than the fare")
+assert(big_bird.admit_passenger("Cheap Skate",1)==nil, "buses dont' admit passengers with less money than the fare")
+assert(harley = Motorbike.new(color: "black"), "new bikes can be created")
+assert(harley.drive == :fast, "bikes can drive, they go fast")
+assert(harley.weave_through_traffic == :driving_like_a_crazy_person, "bikes weave through traffic like a crazy person")
+
+
diff --git a/vehicle.rb → P5: OO Inheritance.rb b/vehicle.rb → P5: OO Inheritance.rb
diff --git a/vehicle.rb b/vehicle.rb
@@ -0,0 +1,70 @@
+class Car
+ @@WHEELS = 4
+ def initialize(args)
+   @color = args[:color]
+   @wheels = @@WHEELS
+ end
+ def drive
+   @status = :driving
+ end
+ def brake
+   @status = :stopped    
+ end
+ def needs_gas?
+   return [true,true,false].sample
+ end
+
+end
+class Bus
+ attr_reader :passengers
+ def initialize(args)
+   @color = args[:color]
+   @wheels = args[:wheels]
+   @num_seats = args[:num_seats]
+   @fare = args[:fare]
+   @passengers=[]
+ end
+ def drive
+   return self.brake if stop_requested?
+   @status = :driving
+ end
+ def admit_passenger(passenger,money)
+   @passengers << passenger if money > @fare
+ end
+ def brake
+   @status = :stopped
+ end 
+ def stop_requested?
+   return [true,false].sample
+ end
+ def needs_gas?
+   return [true,true,true,false].sample
+ end
+
+
+end
+
+
+class Motorbike
+ @@WHEELS = 2
+ def initialize(args)
+   @color = args[:color]
+   @wheels = @@WHEELS
+
+ end
+
+ def drive
+   @status = :driving
+   @speed = :fast
+ end
+
+ def brake
+   @status = :stopped 
+ end
+ def needs_gas?
+   return [true,false,false,false].sample
+ end 
+ def weave_through_traffic
+   @status = :driving_like_a_crazy_person
+ end
+end