From 7626621a2f8649187ae201716bf0d29606b4c387 Mon Sep 17 00:00:00 2001
From: selfeik <eleriverau@gmail.com>
Date: Wed, 21 Feb 2018 15:21:11 -0500
Subject: [PATCH 01/19] Remove .DS_Store

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 1ee84da..e03d470 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+.DS_Store
 *.sw*

From e21d73dd1a3692b2608e707d8a2676a1adff3744 Mon Sep 17 00:00:00 2001
From: selfeik <eleriverau@gmail.com>
Date: Thu, 22 Feb 2018 19:28:33 -0500
Subject: [PATCH 02/19] Archivo base de challenges

---
 ruby_1/challenges.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruby_1/challenges.rb b/ruby_1/challenges.rb
index 282508c..7783848 100644
--- a/ruby_1/challenges.rb
+++ b/ruby_1/challenges.rb
@@ -11,7 +11,7 @@
 
 3. Add the body to the funciont max_number that outputs the higher number between two inputs
 
-3. Add the body to the funciont is_in_my_range? that outputs if a number is between 0 and 100 
+3. Add the body to the funciont is_in_my_range? that outputs if a number is between 0 and 100
 
 =end
 

From 13a47b1fa00dc54bf7b4bd8cd6b68de0cbc04023 Mon Sep 17 00:00:00 2001
From: selfeik <eleriverau@gmail.com>
Date: Tue, 27 Feb 2018 11:09:14 -0500
Subject: [PATCH 03/19] Cree la clase actor

---
 objects_class/actor.rb | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 objects_class/actor.rb

diff --git a/objects_class/actor.rb b/objects_class/actor.rb
new file mode 100644
index 0000000..2e9f487
--- /dev/null
+++ b/objects_class/actor.rb
@@ -0,0 +1,3 @@
+class Actor
+
+end
\ No newline at end of file

From 5e9601e78ff87ba125d9bc71d4f4c662c8173dd5 Mon Sep 17 00:00:00 2001
From: selfeik <eleriverau@gmail.com>
Date: Tue, 27 Feb 2018 11:42:30 -0500
Subject: [PATCH 04/19] =?UTF-8?q?Defin=C3=AD=20m=C3=A9todo=20constructor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 objects_class/actor.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/objects_class/actor.rb b/objects_class/actor.rb
index 2e9f487..82d3c54 100644
--- a/objects_class/actor.rb
+++ b/objects_class/actor.rb
@@ -1,3 +1,5 @@
 class Actor
+  def initialize
 
+  end
 end
\ No newline at end of file

From af173cb4cb33adaeef15e10481d419a746d01b4e Mon Sep 17 00:00:00 2001
From: selfeik <eleriverau@gmail.com>
Date: Tue, 27 Feb 2018 11:43:05 -0500
Subject: [PATCH 05/19] Cree clase TV

---
 objects_class/tv.rb | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 objects_class/tv.rb

diff --git a/objects_class/tv.rb b/objects_class/tv.rb
new file mode 100644
index 0000000..79130c5
--- /dev/null
+++ b/objects_class/tv.rb
@@ -0,0 +1 @@
+tv.rb
\ No newline at end of file

From 78da0a46702211a04ce47e780e51570faf8c0cb8 Mon Sep 17 00:00:00 2001
From: selfeik <eleriverau@gmail.com>
Date: Tue, 27 Feb 2018 13:27:30 -0500
Subject: [PATCH 06/19] =?UTF-8?q?Defin=C3=AD=20la=20clase=20Tv=20adem?=
 =?UTF-8?q?=C3=A1s=20agregu=C3=A9=20metodos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 objects_class/tv.rb | 50 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/objects_class/tv.rb b/objects_class/tv.rb
index 79130c5..dc4c4e6 100644
--- a/objects_class/tv.rb
+++ b/objects_class/tv.rb
@@ -1 +1,49 @@
-tv.rb
\ No newline at end of file
+class Tv
+
+  def initialize(smart, screen, size, energy)
+    @smart = smart
+    @screen = screen
+    @size = size
+    @energy = energy
+  end
+
+  def show_menu
+    menu
+    @home = home
+    @channels = {"Sony channel" => 10, "Warner channel" => 20, "Fox channel" => 30}
+    @store = store
+    @netflix = netflix
+  end
+
+  def change_channels
+  end
+
+  def go_to_netflix(netflix)
+    "Netflix Dashboard"
+  end
+
+  def go_to_store
+  end
+
+  private
+  def turn_on
+    "Welcome to this new experience"
+  end
+
+  def turn_off
+    "Bye"
+  end
+
+  def menu
+    if @size >= 52
+      puts "Home"
+      puts "Channels"
+      puts "Store"
+    else
+      turn_off
+    end
+  end
+end
+
+new_tv = Tv.new("smart", "flat", 52, 260)
+puts new_tv.show_menu
\ No newline at end of file

From a0e81a26edbddff13f8441ab396e0a5743deeea9 Mon Sep 17 00:00:00 2001
From: selfeik <eleriverau@gmail.com>
Date: Tue, 27 Feb 2018 14:03:40 -0500
Subject: [PATCH 07/19] Create a superclass Entertainment. And Actress class
 going to inherit Entertainment methods.

---
 objects_class/tv.rb | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/objects_class/tv.rb b/objects_class/tv.rb
index dc4c4e6..ae1e197 100644
--- a/objects_class/tv.rb
+++ b/objects_class/tv.rb
@@ -1,3 +1,7 @@
+class Entertainment
+  #relacionar tv con actriz
+end
+
 class Tv
 
   def initialize(smart, screen, size, energy)
@@ -18,8 +22,9 @@ def show_menu
   def change_channels
   end
 
-  def go_to_netflix(netflix)
-    "Netflix Dashboard"
+  def go_to_netflix_show(netflix_show)
+    #para relacionar al tv con la actriz
+    "Netflix Show"
   end
 
   def go_to_store
@@ -46,4 +51,18 @@ def menu
 end
 
 new_tv = Tv.new("smart", "flat", 52, 260)
-puts new_tv.show_menu
\ No newline at end of file
+puts new_tv.show_menu
+
+
+class Actress < Entertainment
+  def initialize(netflix_show, genre, schedule, price)
+    @netflix_show = netflix_show
+    @genre = genre
+    @schedule = schedule
+    @price = price
+  end
+
+  def show_altered_carbon
+    go_to_netflix_show
+  end
+end
\ No newline at end of file

From 8404e55b244a29e4205b3ab5fd3eeb493d5ea4d7 Mon Sep 17 00:00:00 2001
From: selfeik <eleriverau@gmail.com>
Date: Tue, 27 Feb 2018 19:31:25 -0500
Subject: [PATCH 08/19] =?UTF-8?q?Los=20m=C3=A9todos=20turn=5Fon=20y=20turn?=
 =?UTF-8?q?=5Foff=20quedaron=20p=C3=BAblicos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 objects_class/tv.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/objects_class/tv.rb b/objects_class/tv.rb
index ae1e197..1192d51 100644
--- a/objects_class/tv.rb
+++ b/objects_class/tv.rb
@@ -11,6 +11,7 @@ def initialize(smart, screen, size, energy)
     @energy = energy
   end
 
+  #muestre el menu con las opciones
   def show_menu
     menu
     @home = home
@@ -19,26 +20,31 @@ def show_menu
     @netflix = netflix
   end
 
+  #cambie los canales
   def change_channels
   end
 
+  #vaya a la app de netflix
   def go_to_netflix_show(netflix_show)
     #para relacionar al tv con la actriz
     "Netflix Show"
   end
 
+  #vaya al store
   def go_to_store
   end
 
-  private
+  #encender
   def turn_on
     "Welcome to this new experience"
   end
 
+  #apagar
   def turn_off
     "Bye"
   end
 
+  #menú
   def menu
     if @size >= 52
       puts "Home"
@@ -62,6 +68,7 @@ def initialize(netflix_show, genre, schedule, price)
     @price = price
   end
 
+  #show en el que sale
   def show_altered_carbon
     go_to_netflix_show
   end

From c4e6250df1a98764ee0614ed1ac92a88dddfbc4b Mon Sep 17 00:00:00 2001
From: selfeik <eleriverau@gmail.com>
Date: Tue, 27 Feb 2018 21:02:17 -0500
Subject: [PATCH 09/19] Cree archivos independientes para todas las clases

---
 objects_class/actress.rb      | 13 +++++++++++++
 objects_class/entertaiment.rb |  3 +++
 objects_class/tv.rb           | 23 +++--------------------
 3 files changed, 19 insertions(+), 20 deletions(-)
 create mode 100644 objects_class/actress.rb
 create mode 100644 objects_class/entertaiment.rb

diff --git a/objects_class/actress.rb b/objects_class/actress.rb
new file mode 100644
index 0000000..2a4200d
--- /dev/null
+++ b/objects_class/actress.rb
@@ -0,0 +1,13 @@
+class Actress < Entertainment
+  def initialize(netflix_show, genre, schedule, price)
+    @netflix_show = netflix_show
+    @genre = genre
+    @schedule = schedule
+    @price = price
+  end
+
+  #show en el que sale
+  def actress_shows
+    "Show 1"
+  end
+end
\ No newline at end of file
diff --git a/objects_class/entertaiment.rb b/objects_class/entertaiment.rb
new file mode 100644
index 0000000..001a815
--- /dev/null
+++ b/objects_class/entertaiment.rb
@@ -0,0 +1,3 @@
+class Entertainment
+  #relacionar tv con actriz
+end
\ No newline at end of file
diff --git a/objects_class/tv.rb b/objects_class/tv.rb
index 1192d51..d2dedd0 100644
--- a/objects_class/tv.rb
+++ b/objects_class/tv.rb
@@ -1,6 +1,4 @@
-class Entertainment
-  #relacionar tv con actriz
-end
+require './actress'
 
 class Tv
 
@@ -27,7 +25,7 @@ def change_channels
   #vaya a la app de netflix
   def go_to_netflix_show(netflix_show)
     #para relacionar al tv con la actriz
-    "Netflix Show"
+    actress_show
   end
 
   #vaya al store
@@ -57,19 +55,4 @@ def menu
 end
 
 new_tv = Tv.new("smart", "flat", 52, 260)
-puts new_tv.show_menu
-
-
-class Actress < Entertainment
-  def initialize(netflix_show, genre, schedule, price)
-    @netflix_show = netflix_show
-    @genre = genre
-    @schedule = schedule
-    @price = price
-  end
-
-  #show en el que sale
-  def show_altered_carbon
-    go_to_netflix_show
-  end
-end
\ No newline at end of file
+puts new_tv.show_menu
\ No newline at end of file

From e73231f654caebfa244631024e184fa32bb2cde2 Mon Sep 17 00:00:00 2001
From: selfeik <eleriverau@gmail.com>
Date: Wed, 28 Feb 2018 08:52:58 -0500
Subject: [PATCH 10/19] Cree la clase car

---
 objects_class/car.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 objects_class/car.rb

diff --git a/objects_class/car.rb b/objects_class/car.rb
new file mode 100644
index 0000000..278ecc8
--- /dev/null
+++ b/objects_class/car.rb
@@ -0,0 +1,14 @@
+class Car
+  def initialize(type, energy, weather, smart)
+    @type = type
+    @energy = energy
+    @weather = weather
+    @smart = smart
+  end
+
+  def drive_car
+  end
+
+  def parking_car
+  end
+end
\ No newline at end of file

From 2494cbf3ecb9bc4bdaf79b8128eeaf2f9ebed23d Mon Sep 17 00:00:00 2001
From: selfeik <eleriverau@gmail.com>
Date: Wed, 28 Feb 2018 09:13:02 -0500
Subject: [PATCH 11/19] =?UTF-8?q?Cre=C3=A9=20clase=20Chair?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 objects_class/chair.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 objects_class/chair.rb

diff --git a/objects_class/chair.rb b/objects_class/chair.rb
new file mode 100644
index 0000000..129a80b
--- /dev/null
+++ b/objects_class/chair.rb
@@ -0,0 +1,15 @@
+class Chair
+  def initialize(material, weight, height, color, year)
+    @material = material
+    @weight = weight
+    @height = height
+    @color = color
+    @year = year
+  end
+
+  def group_party_chair
+  end
+
+  def maintenance_chair
+  end
+end
\ No newline at end of file

From 7a3ea0a144ed2ea65b9b3d50db714582fbd0c53b Mon Sep 17 00:00:00 2001
From: selfeik <eleriverau@gmail.com>
Date: Wed, 28 Feb 2018 09:21:34 -0500
Subject: [PATCH 12/19] =?UTF-8?q?Cre=C3=A9=20la=20clase=20actor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 objects_class/actor.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/objects_class/actor.rb b/objects_class/actor.rb
index 82d3c54..0d067fa 100644
--- a/objects_class/actor.rb
+++ b/objects_class/actor.rb
@@ -1,5 +1,14 @@
 class Actor
-  def initialize
+  def initialize(profile, working_years, nationality, price)
+    @profile = profile
+    @working_years = working_years
+    @nationality = nationality
+    @price = price
+  end
+
+  def theatrical_knowledge
+  end
 
+  def acting_time
   end
 end
\ No newline at end of file

From 5aa81c8012c801851ad7c4c1fedc1f63df02c960 Mon Sep 17 00:00:00 2001
From: selfeik <eleriverau@gmail.com>
Date: Wed, 28 Feb 2018 11:47:18 -0500
Subject: [PATCH 13/19] =?UTF-8?q?A=C3=B1ad=C3=AD=20metodos=20a=20la=20clas?=
 =?UTF-8?q?e=20Car?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 objects_class/car.rb | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/objects_class/car.rb b/objects_class/car.rb
index 278ecc8..6b41c6b 100644
--- a/objects_class/car.rb
+++ b/objects_class/car.rb
@@ -1,14 +1,35 @@
 class Car
-  def initialize(type, energy, weather, smart)
-    @type = type
-    @energy = energy
-    @weather = weather
-    @smart = smart
+  def initialize(gps, location, speed)
+    @gps = gps
+    @location = location
+    @speed = speed
   end
 
-  def drive_car
+  def self_driving
+    "Driving"
   end
 
-  def parking_car
+  def to_s
+    "My speed is #{@speed}"
   end
-end
\ No newline at end of file
+
+  def speed_limit
+    if @speed.eql?40
+      "You are driving OK"
+    else
+      "Slow down duuuude"
+    end
+  end
+
+  def detect_accident
+    if @location == "Bogotá" && @gps <= 30
+      "There's an accident, you should change your route"
+    else
+      "I can't find anything"
+    end
+  end
+
+end
+
+new_car = Car.new(10, "Bogotá", 80)
+p new_car.detect_accident
\ No newline at end of file

From eeba26ac0fab65d85ad42c439c0a52776ba19199 Mon Sep 17 00:00:00 2001
From: selfeik <eleriverau@gmail.com>
Date: Wed, 28 Feb 2018 14:57:28 -0500
Subject: [PATCH 14/19] =?UTF-8?q?Modifiqu=C3=A9=20las=20clases=20actor=20y?=
 =?UTF-8?q?=20chair=20adem=C3=A1s=20cree=20una=20nueva=20clase=20para=20tv?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 objects_class/actor.rb  | 23 ++++++++++++++---------
 objects_class/chair.rb  | 24 +++++++++++++++++-------
 objects_class/tv_new.rb | 26 ++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 16 deletions(-)
 create mode 100644 objects_class/tv_new.rb

diff --git a/objects_class/actor.rb b/objects_class/actor.rb
index 0d067fa..6834b7f 100644
--- a/objects_class/actor.rb
+++ b/objects_class/actor.rb
@@ -1,14 +1,19 @@
 class Actor
-  def initialize(profile, working_years, nationality, price)
-    @profile = profile
-    @working_years = working_years
-    @nationality = nationality
-    @price = price
-  end
+  attr_accessor :show_name
 
-  def theatrical_knowledge
+  def initialize(show_name)
+    @show_name = show_name
   end
 
-  def acting_time
+  def netflix_show
+    if @show_name == "Altered Carbon"
+      "I'm an actor of this show"
+    else
+      "I don't work here"
+    end
   end
-end
\ No newline at end of file
+
+end
+
+new_actor = Actor.new("Altered Carbon")
+p new_actor.netflix_show
\ No newline at end of file
diff --git a/objects_class/chair.rb b/objects_class/chair.rb
index 129a80b..1b8ed84 100644
--- a/objects_class/chair.rb
+++ b/objects_class/chair.rb
@@ -1,15 +1,25 @@
 class Chair
-  def initialize(material, weight, height, color, year)
-    @material = material
-    @weight = weight
-    @height = height
-    @color = color
+  def initialize(year, type)
     @year = year
+    @type = type
   end
 
-  def group_party_chair
+  def group_car_chair
+    if @type == "car"
+      "This is a chair for a car"
+    else
+      "This is another type of chair"
+    end
   end
 
   def maintenance_chair
+    if @year < 2000
+      "You should check the state of your chair"
+    else
+      "It's functional"
+    end
   end
-end
\ No newline at end of file
+end
+
+new_chair = Chair.new(2018, "car")
+p new_chair.maintenance_chair
\ No newline at end of file
diff --git a/objects_class/tv_new.rb b/objects_class/tv_new.rb
new file mode 100644
index 0000000..cb23682
--- /dev/null
+++ b/objects_class/tv_new.rb
@@ -0,0 +1,26 @@
+class TvNew
+  def initialize(app, genre)
+    @app = app
+    @genre = genre
+  end
+
+  def go_to_netflix
+    if @app == "netflix"
+      "This is Netflix what you want to watch?"
+    else
+      "You're watching \'Sábados Felices\'"
+    end
+  end
+
+  def altered_carbon_show
+    if @app == "netflix" && @genre == "scifi"
+      "Altered Carbon -> Play"
+    else
+      "Choose another show"
+    end
+  end
+
+end
+
+new_tv = TvNew.new("netflix", "scifi")
+p new_tv.altered_carbon_show
\ No newline at end of file

From 17aa20ff6dfdd75db754309142bf312983ba3a8a Mon Sep 17 00:00:00 2001
From: selfeik <eleriverau@gmail.com>
Date: Wed, 28 Feb 2018 20:17:53 -0500
Subject: [PATCH 15/19] =?UTF-8?q?Relaci=C3=B3n=20entre=20dos=20clases=20TV?=
 =?UTF-8?q?=20y=20Actor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 objects_class/actor.rb         | 16 ++++++++++------
 objects_class/car.rb           |  4 ++--
 objects_class/entertainment.rb |  7 +++++++
 objects_class/tv_new.rb        | 15 ++++++++++++---
 objects_examples/tv.rb         | 12 ++++++------
 5 files changed, 37 insertions(+), 17 deletions(-)
 create mode 100644 objects_class/entertainment.rb

diff --git a/objects_class/actor.rb b/objects_class/actor.rb
index 6834b7f..06b10b1 100644
--- a/objects_class/actor.rb
+++ b/objects_class/actor.rb
@@ -1,11 +1,11 @@
 class Actor
-  attr_accessor :show_name
 
-  def initialize(show_name)
+  def initialize(show_name, actor_name)
     @show_name = show_name
+    @actor_name = actor_name
   end
 
-  def netflix_show
+  def altered_carbon_show
     if @show_name == "Altered Carbon"
       "I'm an actor of this show"
     else
@@ -13,7 +13,11 @@ def netflix_show
     end
   end
 
-end
+  def actor
+    @actor_name
+  end
 
-new_actor = Actor.new("Altered Carbon")
-p new_actor.netflix_show
\ No newline at end of file
+  def show_name
+    @show_name
+  end
+end
\ No newline at end of file
diff --git a/objects_class/car.rb b/objects_class/car.rb
index 6b41c6b..f037eb4 100644
--- a/objects_class/car.rb
+++ b/objects_class/car.rb
@@ -22,7 +22,7 @@ def speed_limit
   end
 
   def detect_accident
-    if @location == "Bogotá" && @gps <= 30
+    if @location.eql?("Bogotá") && @gps <= 30
       "There's an accident, you should change your route"
     else
       "I can't find anything"
@@ -31,5 +31,5 @@ def detect_accident
 
 end
 
-new_car = Car.new(10, "Bogotá", 80)
+new_car = Car.new(10, "Bogotá", 30)
 p new_car.detect_accident
\ No newline at end of file
diff --git a/objects_class/entertainment.rb b/objects_class/entertainment.rb
new file mode 100644
index 0000000..67830f7
--- /dev/null
+++ b/objects_class/entertainment.rb
@@ -0,0 +1,7 @@
+require './tv_new'
+
+
+new_tv = TvNew.new("netflix", "scifi")
+puts new_tv.inspect
+puts new_tv.new_actor("Mute", "Lina")
+puts new_tv.show_actor_shows
diff --git a/objects_class/tv_new.rb b/objects_class/tv_new.rb
index cb23682..dbf7f4d 100644
--- a/objects_class/tv_new.rb
+++ b/objects_class/tv_new.rb
@@ -1,4 +1,8 @@
+require './actor'
+
 class TvNew
+  attr_accessor :lina
+
   def initialize(app, genre)
     @app = app
     @genre = genre
@@ -20,7 +24,12 @@ def altered_carbon_show
     end
   end
 
-end
+  def new_actor(show_name, actor_name)
+    @lina ||= Actor.new(show_name, actor_name)
+  end
 
-new_tv = TvNew.new("netflix", "scifi")
-p new_tv.altered_carbon_show
\ No newline at end of file
+  def show_actor_shows
+    lina.show_name
+    lina.actor
+  end
+end
\ No newline at end of file
diff --git a/objects_examples/tv.rb b/objects_examples/tv.rb
index 7ce92ce..38cf2fa 100644
--- a/objects_examples/tv.rb
+++ b/objects_examples/tv.rb
@@ -25,12 +25,12 @@ def change_channel(new_channel)
     end
   end
 
-  def actor(actor_name)
-    Actor.new(actor_name)
-  end
-
 #  def actor(actor_name)
-#    @actor ||= Actor.new(actor_name)
+#    Actor.new(actor_name)
 #  end
 
-end
+  def actor(actor_name)
+    @actor ||= Actor.new(actor_name)
+  end
+
+end
\ No newline at end of file

From a7f920c3115861f833e9437933ba2a01ffcdbd0a Mon Sep 17 00:00:00 2001
From: selfeik <eleriverau@gmail.com>
Date: Wed, 28 Feb 2018 20:33:54 -0500
Subject: [PATCH 16/19] =?UTF-8?q?Agregu=C3=A9=20un=20nuevo=20par=C3=A1metr?=
 =?UTF-8?q?o=20al=20la=20clase=20actor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 objects_class/actor.rb         |  5 ++++-
 objects_class/entertainment.rb |  3 ++-
 objects_class/tv_new.rb        | 10 +++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/objects_class/actor.rb b/objects_class/actor.rb
index 06b10b1..d831598 100644
--- a/objects_class/actor.rb
+++ b/objects_class/actor.rb
@@ -1,8 +1,11 @@
 class Actor
 
-  def initialize(show_name, actor_name)
+  attr_accessor :genre
+
+  def initialize(show_name, actor_name, genre)
     @show_name = show_name
     @actor_name = actor_name
+    @genre = genre
   end
 
   def altered_carbon_show
diff --git a/objects_class/entertainment.rb b/objects_class/entertainment.rb
index 67830f7..7d504b6 100644
--- a/objects_class/entertainment.rb
+++ b/objects_class/entertainment.rb
@@ -3,5 +3,6 @@
 
 new_tv = TvNew.new("netflix", "scifi")
 puts new_tv.inspect
-puts new_tv.new_actor("Mute", "Lina")
+puts new_tv.new_actor("Mute", "Lina", "Drama")
 puts new_tv.show_actor_shows
+puts new_tv.show_actor_genre
\ No newline at end of file
diff --git a/objects_class/tv_new.rb b/objects_class/tv_new.rb
index dbf7f4d..a45bfc9 100644
--- a/objects_class/tv_new.rb
+++ b/objects_class/tv_new.rb
@@ -1,6 +1,7 @@
 require './actor'
 
 class TvNew
+
   attr_accessor :lina
 
   def initialize(app, genre)
@@ -24,12 +25,15 @@ def altered_carbon_show
     end
   end
 
-  def new_actor(show_name, actor_name)
-    @lina ||= Actor.new(show_name, actor_name)
+  def new_actor(show_name, actor_name, genre)
+    @lina ||= Actor.new(show_name, actor_name, genre)
   end
 
   def show_actor_shows
     lina.show_name
-    lina.actor
+  end
+
+  def show_actor_genre
+    lina.genre
   end
 end
\ No newline at end of file

From a76eb3f7568a7991320a0ba83b0c000b7d257477 Mon Sep 17 00:00:00 2001
From: selfeik <eleriverau@gmail.com>
Date: Wed, 28 Feb 2018 20:56:56 -0500
Subject: [PATCH 17/19] Intento de relacionar Tv con Car

---
 objects_class/car.rb           |  5 +++--
 objects_class/entertainment.rb |  8 ++++++--
 objects_class/tv_new.rb        | 16 ++++++++++++++--
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/objects_class/car.rb b/objects_class/car.rb
index f037eb4..ff07e29 100644
--- a/objects_class/car.rb
+++ b/objects_class/car.rb
@@ -1,4 +1,7 @@
 class Car
+
+  attr_accessor :location
+
   def initialize(gps, location, speed)
     @gps = gps
     @location = location
@@ -31,5 +34,3 @@ def detect_accident
 
 end
 
-new_car = Car.new(10, "Bogotá", 30)
-p new_car.detect_accident
\ No newline at end of file
diff --git a/objects_class/entertainment.rb b/objects_class/entertainment.rb
index 7d504b6..79e797a 100644
--- a/objects_class/entertainment.rb
+++ b/objects_class/entertainment.rb
@@ -1,8 +1,12 @@
 require './tv_new'
 
 
-new_tv = TvNew.new("netflix", "scifi")
+new_tv = TvNew.new("netflix", "scifi", "Comercial carros")
 puts new_tv.inspect
+puts new_tv.comercial
 puts new_tv.new_actor("Mute", "Lina", "Drama")
 puts new_tv.show_actor_shows
-puts new_tv.show_actor_genre
\ No newline at end of file
+puts new_tv.show_actor_genre
+
+puts new_tv.new_car(100, "Cali", 60)
+puts new_tv.go_to_comercial
\ No newline at end of file
diff --git a/objects_class/tv_new.rb b/objects_class/tv_new.rb
index a45bfc9..69e8873 100644
--- a/objects_class/tv_new.rb
+++ b/objects_class/tv_new.rb
@@ -1,19 +1,22 @@
 require './actor'
+require './car'
 
 class TvNew
 
   attr_accessor :lina
+  attr_accessor :comercial
 
-  def initialize(app, genre)
+  def initialize(app, genre, comercial)
     @app = app
     @genre = genre
+    @comercial = comercial
   end
 
   def go_to_netflix
     if @app == "netflix"
       "This is Netflix what you want to watch?"
     else
-      "You're watching \'Sábados Felices\'"
+      "You're watching "
     end
   end
 
@@ -36,4 +39,13 @@ def show_actor_shows
   def show_actor_genre
     lina.genre
   end
+
+  def new_car(gps, location, speed)
+    @car_new ||= Car.new(gps, location, speed)
+  end
+
+
+  def go_to_comercial
+    car_new.speed
+  end
 end
\ No newline at end of file

From 32116aedfdda803b6d22bf9862f4576388f20e2b Mon Sep 17 00:00:00 2001
From: selfeik <eleriverau@gmail.com>
Date: Thu, 1 Mar 2018 20:22:05 -0500
Subject: [PATCH 18/19] =?UTF-8?q?Cre=C3=A9=20nuevo=20m=C3=B3dulo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 objects_class/module.rb | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 objects_class/module.rb

diff --git a/objects_class/module.rb b/objects_class/module.rb
new file mode 100644
index 0000000..28bbd21
--- /dev/null
+++ b/objects_class/module.rb
@@ -0,0 +1,3 @@
+module ActorShow
+
+end
\ No newline at end of file

From 7c35712e72542f97d3478474c367ccb57e0f719b Mon Sep 17 00:00:00 2001
From: selfeik <eleriverau@gmail.com>
Date: Fri, 2 Mar 2018 18:09:44 -0500
Subject: [PATCH 19/19] =?UTF-8?q?A=C3=B1adir=20m=C3=B3dulo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 objects_class/module.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/objects_class/module.rb b/objects_class/module.rb
index 28bbd21..84b1e9f 100644
--- a/objects_class/module.rb
+++ b/objects_class/module.rb
@@ -1,3 +1,6 @@
+require '.tv_new'
+require '.actor'
+
 module ActorShow
 
 end
\ No newline at end of file