From c104ea04092a47bc0a7d66c8327f190ce03c0984 Mon Sep 17 00:00:00 2001 From: mee213 Date: Wed, 22 Jan 2014 12:54:11 -0600 Subject: [PATCH 1/7] Panda Assignment - automobile.rb --- models/automobile.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 models/automobile.rb diff --git a/models/automobile.rb b/models/automobile.rb new file mode 100644 index 0000000..d265d03 --- /dev/null +++ b/models/automobile.rb @@ -0,0 +1,13 @@ +class Automobile + attr_accessor :color, :make, :model, :year + def initialize(color, make, model, year) + @color = color + @make = make + @model = model + @year = year + end + + def wheels + 4 + end +end \ No newline at end of file From 41b5aed42b2df1c97015d0f9f9d1ebbc7cdf3104 Mon Sep 17 00:00:00 2001 From: mee213 Date: Wed, 22 Jan 2014 13:05:42 -0600 Subject: [PATCH 2/7] Tiger assignment - automobile.rb, vehicle.rb, motorcycle.rb --- models/automobile.rb | 7 +++---- models/motorcycle.rb | 5 +++++ models/vehicle.rb | 5 +++++ 3 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 models/motorcycle.rb create mode 100644 models/vehicle.rb diff --git a/models/automobile.rb b/models/automobile.rb index d265d03..298c07d 100644 --- a/models/automobile.rb +++ b/models/automobile.rb @@ -1,5 +1,7 @@ -class Automobile +class Automobile < Vehicle + attr_accessor :color, :make, :model, :year + def initialize(color, make, model, year) @color = color @make = make @@ -7,7 +9,4 @@ def initialize(color, make, model, year) @year = year end - def wheels - 4 - end end \ No newline at end of file diff --git a/models/motorcycle.rb b/models/motorcycle.rb new file mode 100644 index 0000000..5da4d00 --- /dev/null +++ b/models/motorcycle.rb @@ -0,0 +1,5 @@ +class Motorcycle < Vehicle + def self.tires + 2 + end +end \ No newline at end of file diff --git a/models/vehicle.rb b/models/vehicle.rb new file mode 100644 index 0000000..0c9893c --- /dev/null +++ b/models/vehicle.rb @@ -0,0 +1,5 @@ +class Vehicle + def self.tires + 4 + end +end From c0105c9b11ab15e36187564da68c1f5c8ecf723b Mon Sep 17 00:00:00 2001 From: mee213 Date: Wed, 22 Jan 2014 14:18:50 -0600 Subject: [PATCH 3/7] Eagle Assignment - first attempt at #1 & #2 --- models/vehicle.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/models/vehicle.rb b/models/vehicle.rb index 0c9893c..11d678c 100644 --- a/models/vehicle.rb +++ b/models/vehicle.rb @@ -1,5 +1,21 @@ class Vehicle + + @@allvehicles = [] + + def initialize + @@allvehicles << self + end + def self.tires 4 end + + def self.filter + @@allvehicles.select do |i| + i.color == "Blue" + i.make == "Honda" + i.model == "Accord" + end + end + end From 8e9eb1950d25a5b6add44b18ca6bbe96a01fdf03 Mon Sep 17 00:00:00 2001 From: mee213 Date: Wed, 22 Jan 2014 14:40:35 -0600 Subject: [PATCH 4/7] Eagle Assignment - second attempt at #2 --- models/vehicle.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/models/vehicle.rb b/models/vehicle.rb index 11d678c..d8f7686 100644 --- a/models/vehicle.rb +++ b/models/vehicle.rb @@ -12,9 +12,7 @@ def self.tires def self.filter @@allvehicles.select do |i| - i.color == "Blue" - i.make == "Honda" - i.model == "Accord" + i.color == "Blue" && i.make == "Honda" && i.model == "Accord" end end From 39e38bccd6b74376d0819d31a0b1929c5bd734e4 Mon Sep 17 00:00:00 2001 From: mee213 Date: Wed, 22 Jan 2014 14:53:08 -0600 Subject: [PATCH 5/7] Eagle Assignment - second attempt at #1 --- models/vehicle.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/models/vehicle.rb b/models/vehicle.rb index d8f7686..fada4d1 100644 --- a/models/vehicle.rb +++ b/models/vehicle.rb @@ -1,7 +1,5 @@ class Vehicle - @@allvehicles = [] - def initialize @@allvehicles << self end From b78286df024ee07eb5bc37468fdca7202e042b8a Mon Sep 17 00:00:00 2001 From: mee213 Date: Wed, 22 Jan 2014 15:05:47 -0600 Subject: [PATCH 6/7] Eagle Assignment - third attempt at #1 --- models/vehicle.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/models/vehicle.rb b/models/vehicle.rb index fada4d1..3403cef 100644 --- a/models/vehicle.rb +++ b/models/vehicle.rb @@ -1,8 +1,6 @@ class Vehicle - def initialize - @@allvehicles << self - end + @@allvehicles = [] def self.tires 4 From cadf9adb67086d2efa0efeef2b3d9f2ea7074898 Mon Sep 17 00:00:00 2001 From: mee213 Date: Wed, 22 Jan 2014 19:43:04 -0600 Subject: [PATCH 7/7] Eagle Assignment - third attempt for #1 --- models/vehicle.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/models/vehicle.rb b/models/vehicle.rb index 3403cef..d8f7686 100644 --- a/models/vehicle.rb +++ b/models/vehicle.rb @@ -2,6 +2,10 @@ class Vehicle @@allvehicles = [] + def initialize + @@allvehicles << self + end + def self.tires 4 end