upcoming_movies_in_the_park 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 067949bb69ec00c66196f1e4d0437474d1bc9c29
-  data.tar.gz: 2567a11a8088795401de5b9d6deedab82bc2b950
+  metadata.gz: 4b0745e1f5bb40f1fb99715a96b8c8af5996bbaa
+  data.tar.gz: 1d9d9b2ab25e2d2279b040cf5b5f1af3ca524003
 SHA512:
-  metadata.gz: ad16ce5aa7015b0a65eace691e1f6bfa5580f3e8a7b69646a4cac752849dde86d45f40a83f8447fe234fdb00825ff469e8405d26080b5d4008ee78ea687b5cb9
-  data.tar.gz: 7fe5fc7daba6319ff41373d2a6d3d7f0d03a19637a2efea8a8048f4814edbe40f293e3fea8b2d55ec385112cd457e88a0f35ef9b8f61badfcd25a95b85a51d63
+  metadata.gz: 2b82c6604723c229bc51220901d4d6a37c93cc94e457eb1f7b11f656a11ada7b51ef10c798b3d06ab1eaf2cb394feee17b498e6523abd7b874fca3cb8bf844d3
+  data.tar.gz: 0cd935d4f4e93d4a54a7a0c7b861f65d9344a113a043be6580afe829108b7c3cf8665108a9c1b29eb7b9a1ffdf3a31d2957905a00f044362559c55961fc3bead

data/config/environment.rb

@@ -7,4 +7,5 @@ require_relative '../lib/upcoming_movies_in_the_park/cli'
 require_relative '../lib/upcoming_movies_in_the_park/showing'
 require_relative '../lib/upcoming_movies_in_the_park/park'
 require_relative '../lib/upcoming_movies_in_the_park/gate'
-require_relative '../lib/upcoming_movies_in_the_park/scraper'
+require_relative '../lib/upcoming_movies_in_the_park/scraper'
+require_relative '../lib/upcoming_movies_in_the_park/super'

data/lib/upcoming_movies_in_the_park.rb

@@ -1,5 +1,5 @@
 require_relative '../config/environment'
 
 module UpcomingMoviesInThePark
-  # Your code goes here...
+  
 end

data/lib/upcoming_movies_in_the_park/cli.rb

@@ -41,7 +41,7 @@ class UpcomingMoviesInThePark::CLI
         break
       else
         puts "\n"
-        puts "Hrm, I don't understand what you want.".colorize(:blue)
+        puts hrm.colorize(:blue)
         print "Please enter".colorize(:blue)
         print " by name"
         print ", ".colorize(:blue)
@@ -55,6 +55,10 @@ class UpcomingMoviesInThePark::CLI
     end
   end 
 
+  def hrm
+    "Hrm, I don't understand what you want."
+  end
+
   def by_name_path
     puts "\n"
     UpcomingMoviesInThePark::Showing.list_by_name
@@ -74,7 +78,7 @@ class UpcomingMoviesInThePark::CLI
         menu
         break
       else
-        puts "Hrm, I don't understand what you want.".colorize(:green)
+        puts hrm.colorize(:green)
         by_name_instructions
       end 
     end
@@ -104,35 +108,39 @@ class UpcomingMoviesInThePark::CLI
         puts "\n"
         by_date_instructions_2
         input = nil
-        while input != "return"
-          input = gets.strip
-          if input.to_i > 0 && input.to_i <= date.showings.length
-            showing = date.showings[input.to_i - 1]
-            puts "\n"
-            showing.display_details
-            puts "\n"
-            by_date_instructions_2
-          elsif input == "return"
-            puts "\n"
-            UpcomingMoviesInThePark::Gate.list_by_date
-            puts "\n"
-            by_date_instructions_1
-            break
-          else
-            puts "Hrm, I don't understand what you want.".colorize(:cyan)
-            by_date_instructions_2
-          end 
-        end
+        by_date_path_2
       elsif input == "back"
         menu
         break
       else
-        puts "Hrm, I don't understand what you want.".colorize(:green)
+        puts hrm.colorize(:green)
         by_date_instructions_1
       end 
     end
   end
 
+  def by_date_path_2
+    while input != "return"
+    input = gets.strip
+    if input.to_i > 0 && input.to_i <= date.showings.length
+      showing = date.showings[input.to_i - 1]
+      puts "\n"
+      showing.display_details
+      puts "\n"
+      by_date_instructions_2
+    elsif input == "return"
+      puts "\n"
+      UpcomingMoviesInThePark::Gate.list_by_date
+      puts "\n"
+      by_date_instructions_1
+      break
+    else
+      puts hrm.colorize(:cyan)
+      by_date_instructions_2
+    end 
+  end
+  end
+
   def by_date_instructions_1
     print "Enter ".colorize(:green)
     print "a number "
@@ -167,35 +175,39 @@ class UpcomingMoviesInThePark::CLI
         puts "\n"
         by_park_instructions_2
         input = nil
-        while input != "return"
-          input = gets.strip
-          if input.to_i > 0 && input.to_i <= park.showings.length
-            showing = park.showings[input.to_i - 1]
-            puts "\n"
-            showing.display_details
-            puts "\n"
-            by_park_instructions_2
-          elsif input == "return"
-            puts "\n"
-            UpcomingMoviesInThePark::Park.list_by_name
-            puts "\n"
-            by_park_instructions_1
-            break
-          else 
-            puts "Hrm, I don't understand what you want.".colorize(:cyan)
-            by_park_instructions_2
-          end 
-        end
+        by_park_path_2
       elsif input == "back"
         menu
         break
       else 
-        puts "Hrm, I don't understand what you want.".colorize(:green)
+        puts hrm.colorize(:green)
         by_park_instructions_1
       end 
     end
   end
 
+  def by_park_path_2
+    while input != "return"
+    input = gets.strip
+    if input.to_i > 0 && input.to_i <= park.showings.length
+      showing = park.showings[input.to_i - 1]
+      puts "\n"
+      showing.display_details
+      puts "\n"
+      by_park_instructions_2
+    elsif input == "return"
+      puts "\n"
+      UpcomingMoviesInThePark::Park.list_by_name
+      puts "\n"
+      by_park_instructions_1
+      break
+    else 
+      puts hrm.colorize(:cyan)
+      by_park_instructions_2
+    end 
+  end
+  end
+
   def by_park_instructions_1
     print "Enter ".colorize(:green)
     print "a number"

data/lib/upcoming_movies_in_the_park/gate.rb

@@ -1,17 +1,16 @@
+require_relative './super'
+
 class UpcomingMoviesInThePark::Gate
   attr_accessor :name, :day, :month, :year, :showings
 
-  @@all = []
-  # date info pulled from web, this'll be the name, then parse it to get desired info
-  #"\n              Date & Time:\n              Mon, Jun 11, 2018 from 8:30 PM - 10:22 PM\n            "
+  include UpcomingMoviesInThePark::Super::InstanceMethods
+  include UpcomingMoviesInThePark::Super::GateParkInstanceMethods
 
-  def save
-    @@all << self
-  end 
+  @@all =[]
 
   def self.all
     @@all
-  end 
+  end
 
   def initialize(name)
     @showings =[]
@@ -32,18 +31,9 @@ class UpcomingMoviesInThePark::Gate
     end
   end
 
-  def add_showing(showing)
-    @showings << showing
-  end
-
   def self.list_by_date
     self.all.each_with_index {|gate, i|
       puts "#{i +1}. #{gate.month} #{gate.day}, #{gate.year}".colorize(:green)}
   end
 
-  def list_showings
-    @showings.each_with_index {|showing, i| 
-      puts "#{i +1}. #{showing.name}".colorize(:cyan)}
-  end
-
 end

data/lib/upcoming_movies_in_the_park/park.rb

@@ -1,11 +1,15 @@
+require_relative './super'
+
 class UpcomingMoviesInThePark::Park
   attr_accessor :name, :showings
+  include UpcomingMoviesInThePark::Super::InstanceMethods
+  include UpcomingMoviesInThePark::Super::GateParkInstanceMethods
 
-  @@all = []
+  @@all =[]
 
-  def save
-    @@all << self
-  end 
+  def self.all
+    @@all
+  end
 
   def initialize(name)
     @name = name
@@ -13,10 +17,6 @@ class UpcomingMoviesInThePark::Park
     self.save
   end
 
-  def self.all
-    @@all
-  end
-
   def self.find_or_create_by_name(name)
     if @@all.any? {|park| park.name == name}
       @@all.find {|park| 
@@ -26,18 +26,9 @@ class UpcomingMoviesInThePark::Park
     end
   end
 
-  def add_showing(showing)
-    @showings << showing
-  end
-
   def self.list_by_name
     self.all.each_with_index {|park, i|
     puts "#{i +1}. #{park.name}".colorize(:green)}
   end
 
-  def list_showings
-    @showings.each_with_index {|showing, i| 
-      puts "#{i +1}. #{showing.name}".colorize(:cyan)}
-  end
-
 end

data/lib/upcoming_movies_in_the_park/showing.rb

@@ -1,7 +1,10 @@
 require_relative './park'
 require_relative './gate'
+require_relative './super'
 
 class UpcomingMoviesInThePark::Showing
+  include UpcomingMoviesInThePark::Super::InstanceMethods
+
   attr_accessor :name, :url
   attr_reader :date, :park
 
@@ -21,10 +24,6 @@ class UpcomingMoviesInThePark::Showing
     puts "on #{@date.month} #{@date.day}, #{@date.year} in #{@park.name}.".colorize(:red)
   end
 
-  def save
-    @@all << self
-  end
-
   def time
     data = self.date.name.split(/, | |\n/)
     time = "#{data[37]} #{data[38]} to #{data[40]} #{data[41]}"

data/lib/upcoming_movies_in_the_park/super.rb

@@ -0,0 +1,24 @@
+module UpcomingMoviesInThePark::Super
+  
+  module InstanceMethods
+    
+    def save
+      self.class.all << self
+    end 
+
+    def list_showings
+    self.showings.each_with_index {|showing, i| 
+      puts "#{i +1}. #{showing.name}".colorize(:cyan)}
+    end
+
+  end
+
+  module GateParkInstanceMethods
+    
+    def add_showing(showing)
+      self.showings << showing
+    end
+  
+  end
+
+end

data/lib/upcoming_movies_in_the_park/version.rb

@@ -1,3 +1,3 @@
 module UpcomingMoviesInThePark
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upcoming_movies_in_the_park
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - sgibson47
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2018-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,6 +106,7 @@ files:
 - lib/upcoming_movies_in_the_park/park.rb
 - lib/upcoming_movies_in_the_park/scraper.rb
 - lib/upcoming_movies_in_the_park/showing.rb
+- lib/upcoming_movies_in_the_park/super.rb
 - lib/upcoming_movies_in_the_park/version.rb
 - spec.md
 - upcoming_movies_in_the_park-0.1.0.gem