From db6b21bdac635f740b23568dd2541ac6dd14b9d8 Mon Sep 17 00:00:00 2001 From: Patil Varvarian Date: Mon, 18 Nov 2013 15:48:28 -0800 Subject: [PATCH 01/11] PTE --- block_review.rb | 19 +++++++++++++++++-- config/database.yml.sample | 6 ------ 2 files changed, 17 insertions(+), 8 deletions(-) delete mode 100644 config/database.yml.sample diff --git a/block_review.rb b/block_review.rb index fcdefc7..cbcfe6a 100644 --- a/block_review.rb +++ b/block_review.rb @@ -2,6 +2,21 @@ require 'bundler/setup' require_relative 'db/setup' -Dir.glob("./**/*.rb").each {|f| require f} +Dir.glob("./models/*").each {|f| require f} + +auto1 = Auto.new(color: 'Blue', make: 'Honda', model: "Accord", year: '2007') #self +motor1 = Motor.new(color: 'Red', make: 'Yamaha', model: "Z9", year: '2012') +puts +puts "A car has #{Auto.wheels} wheels" +puts "A motorcycle has #{Motor.wheels} wheels" +puts +puts "Auto1: #{auto1.to_s}" +puts "Motor1: #{motor1.to_s}" +puts +puts 'All Vehicles:' +puts Vehicle.vehicles +puts +puts 'Best car ever!!!' +puts Vehicle.favorite_car + -puts "Serenity now!" diff --git a/config/database.yml.sample b/config/database.yml.sample deleted file mode 100644 index 2e5c2a9..0000000 --- a/config/database.yml.sample +++ /dev/null @@ -1,6 +0,0 @@ -host: 'localhost' -adapter: 'postgresql' -database: 'episode5' -username: XXXXXXX -encoding: 'utf8' -pool: 5 From aa2d68c8f522f773080dd9719a2c28e8706ef826 Mon Sep 17 00:00:00 2001 From: var114 Date: Mon, 18 Nov 2013 15:56:04 -0800 Subject: [PATCH 02/11] Create vehicle.rb --- models/vehicle.rb | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 models/vehicle.rb diff --git a/models/vehicle.rb b/models/vehicle.rb new file mode 100644 index 0000000..8e3b407 --- /dev/null +++ b/models/vehicle.rb @@ -0,0 +1,29 @@ +class Vehicle + +@@vehicle = [] #can be used anywhere. + + attr_reader :color, :make, :model, :year, :model + def initialize(hash={}) + @@vehicle << self + @color = hash.fetch(:color) + @make = hash.fetch(:make) + @model = hash.fetch(:model) + @year = hash.fetch(:year) + end + + def self.wheels + @wheels = nil + end + + def self.vehicles + @@vehicle + end + + def self.favorite_car + @@vehicle.select { |i| i.color == 'Blue' && i.model == 'Accord'} #select returns the ary that's true to the conditon + end + + def to_s + "#{color}, #{make}, #{model}, #{year}" + end +end From 67f656c874a5518a773ebad1931ce72f04d75600 Mon Sep 17 00:00:00 2001 From: var114 Date: Mon, 18 Nov 2013 15:56:39 -0800 Subject: [PATCH 03/11] Create auto.rb --- models/auto.rb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 models/auto.rb diff --git a/models/auto.rb b/models/auto.rb new file mode 100644 index 0000000..96d6b2f --- /dev/null +++ b/models/auto.rb @@ -0,0 +1,8 @@ +require_relative "Vehicle" + +class Auto < Vehicle + + def self.wheels + @wheels = 4 + end +end From dcf8498b6a715ca9f165a1092212342ca89fe7bb Mon Sep 17 00:00:00 2001 From: var114 Date: Mon, 18 Nov 2013 15:57:01 -0800 Subject: [PATCH 04/11] Create motor.rb --- models/motor.rb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 models/motor.rb diff --git a/models/motor.rb b/models/motor.rb new file mode 100644 index 0000000..dcfbefc --- /dev/null +++ b/models/motor.rb @@ -0,0 +1,8 @@ +require_relative "Vehicle" + +class Motor < Vehicle + + def self.wheels + @wheels = 2 + end +end From 62542eb894c2bd90f1676d48cfa642a6bebaaf64 Mon Sep 17 00:00:00 2001 From: var114 Date: Mon, 18 Nov 2013 15:58:52 -0800 Subject: [PATCH 05/11] Create vehicle_spec.rb --- spec/vehicle_spec.rb | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 spec/vehicle_spec.rb diff --git a/spec/vehicle_spec.rb b/spec/vehicle_spec.rb new file mode 100644 index 0000000..01b2b37 --- /dev/null +++ b/spec/vehicle_spec.rb @@ -0,0 +1,24 @@ +require_relative "spec_helper" + +describe Vehicle do + + it "should start with no wheels" do + Vehicle.wheels.should eq(nil) + end + + it "should take input to describe the automobile" do + auto = Vehicle.new(color: "black", make: "Honda", model: "Accord", year: "2007") + auto.color.should eq("black") + auto.make.should eq("Honda") + auto.model.should eq("Accord") + auto.year.should eq("2007") + end + + it "should be able to filter the vehicles to only blue honda accords" do + auto1 = Vehicle.new(color: "Blue", make: "Honda", model: "Accord", year: "2007") + auto2 = Vehicle.new(color: "Blue", make: "Honda", model: "Accord", year: "2009") + auto3 = Vehicle.new(color: "Orange", make: "Yamaha", model: "Z7.0", year: "2019") + results = Vehicle.favorite_car + results.count.should eq(2) + end +ends From d896431a056981e34b59e19fd33a69c65be35a4a Mon Sep 17 00:00:00 2001 From: var114 Date: Mon, 18 Nov 2013 15:59:23 -0800 Subject: [PATCH 06/11] Create auto_spec.rb --- spec/auto_spec.rb | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 spec/auto_spec.rb diff --git a/spec/auto_spec.rb b/spec/auto_spec.rb new file mode 100644 index 0000000..3346812 --- /dev/null +++ b/spec/auto_spec.rb @@ -0,0 +1,9 @@ + +require_relative "spec_helper" + +describe Auto do + it "should have four wheels" do + Auto.wheels.should eq(4) + end + +end From 2f39034854bd45777a66186d16d09bb0528e82a4 Mon Sep 17 00:00:00 2001 From: var114 Date: Mon, 18 Nov 2013 15:59:52 -0800 Subject: [PATCH 07/11] Create motor_spec --- spec/motor_spec | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 spec/motor_spec diff --git a/spec/motor_spec b/spec/motor_spec new file mode 100644 index 0000000..ed449aa --- /dev/null +++ b/spec/motor_spec @@ -0,0 +1,9 @@ + +require_relative "spec_helper" + +describe Motor do + it "should have four wheels" do + Motor.wheels.should eq(2) + end + +end From 6defed1c796f5c014b84f3bdd087ffc800457a21 Mon Sep 17 00:00:00 2001 From: var114 Date: Mon, 18 Nov 2013 16:00:30 -0800 Subject: [PATCH 08/11] Create spec_helper --- spec/spec_helper | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 spec/spec_helper diff --git a/spec/spec_helper b/spec/spec_helper new file mode 100644 index 0000000..34eadb4 --- /dev/null +++ b/spec/spec_helper @@ -0,0 +1,6 @@ +require "rspec" +require 'bundler/setup' +require_relative '../db/setup' +require_relative "../models/vehicle" +require_relative "../models/auto" +require_relative "../models/motor" From 0eb8b709166112a7bce1626a3125981732b6e7b6 Mon Sep 17 00:00:00 2001 From: var114 Date: Tue, 19 Nov 2013 09:56:33 -0800 Subject: [PATCH 09/11] Update vehicle_spec.rb --- spec/vehicle_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/vehicle_spec.rb b/spec/vehicle_spec.rb index 01b2b37..d2ea4f7 100644 --- a/spec/vehicle_spec.rb +++ b/spec/vehicle_spec.rb @@ -3,7 +3,7 @@ describe Vehicle do it "should start with no wheels" do - Vehicle.wheels.should eq(nil) + Vehicle.wheels.should be_nil end it "should take input to describe the automobile" do From 3c2923fae9184d66eb7939af518894a72cd81947 Mon Sep 17 00:00:00 2001 From: var114 Date: Tue, 19 Nov 2013 10:17:58 -0800 Subject: [PATCH 10/11] Update motor.rb --- models/motor.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/motor.rb b/models/motor.rb index dcfbefc..192ac3b 100644 --- a/models/motor.rb +++ b/models/motor.rb @@ -3,6 +3,6 @@ class Motor < Vehicle def self.wheels - @wheels = 2 + @@wheels = 2 end end From c7013c7099de3857827b57aacd3cc8cf473dcca4 Mon Sep 17 00:00:00 2001 From: var114 Date: Tue, 19 Nov 2013 10:18:58 -0800 Subject: [PATCH 11/11] Update auto.rb --- models/auto.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/auto.rb b/models/auto.rb index 96d6b2f..71ac2ee 100644 --- a/models/auto.rb +++ b/models/auto.rb @@ -3,6 +3,6 @@ class Auto < Vehicle def self.wheels - @wheels = 4 + @@wheels = 4 end end