QuarantineLiveStreams 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90b1753bfc1e5543cd0c5e1dd84ae5e6a5dac45c022b4c08ca961d50028b0b08
-  data.tar.gz: dc427283450842321241d7c3d90a31c853aa4c798a5a61b106181e2e015efe24
+  metadata.gz: 33d57f4e47a08abbf378b6dd31797782838331a3ffd4f904940ff01653e58e71
+  data.tar.gz: 026420e64659a371ae774b77e0ae89fee52475f60bffa6f9c82cfed8c51c6719
 SHA512:
-  metadata.gz: 25f56453c5f67f146f3cdf4dbd35cce3502b45f5f2036eee64fddfcc545a693f1832198a9be9b767351d08aad4dc9cd472eac02130b7994f921ceda916f2a60d
-  data.tar.gz: f2eb3223502d96427a944ceea9ce05f2af44fe93094464b32ddc55ca8af8f34a0be5d81d9b404462b8bc595e70f155d7c59effab1b30e8bece12e64c7ff947bc
+  metadata.gz: 644beb588f1d92eb2545da2f2968457f1c55964f65e96e39fe9a43085d5d7ac0a6631a22151d7c4529ae6845b14b9bb47304dcbed38da513e0fc71327cbb30d7
+  data.tar.gz: f932baa4d132bce79c7792ff4ecd6a9d2bdd0527db19eb5250fd1bc0bfbf3dedd9a0deb5b91f34950db8817016cb1e79bfdad43545c1bccb0d3da82ed1bbc7ad

data/Gemfile.lock

@@ -0,0 +1,34 @@
+PATH
+  remote: .
+  specs:
+    QuarantineLiveStreams (0.1.1)
+      colorize (~> 0.8.1)
+      nokogiri
+      uri
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    coderay (1.1.2)
+    colorize (0.8.1)
+    method_source (1.0.0)
+    mini_portile2 (2.4.0)
+    nokogiri (1.10.9)
+      mini_portile2 (~> 2.4.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (13.0.1)
+    uri (0.10.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  QuarantineLiveStreams!
+  bundler (~> 2.0)
+  pry
+  rake (~> 13.0)
+
+BUNDLED WITH
+   2.1.4

data/QuarantineLiveStreams.gemspec

@@ -12,19 +12,16 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 
-  #spec.metadata["allowed_push_host"] = spec.homepage
-
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/mattenbar/QLS"
-  #spec.metadata["changelog_uri"] = "https://github.com/mattenbar/QLS.git"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir        = "bin"
+  spec.executables   = ["QLS"] 
   spec.require_paths = ["lib"]
   
   spec.add_development_dependency "bundler", "~> 2.0"

data/bin/QLS

@@ -1,4 +1,10 @@
 #!/usr/bin/env ruby
-require_relative "../lib/QuarantineLiveStreams"
+
+# Have bundler/setup run so that that setup script, which loads dependencies, can run.
+# Once done, you can require your gem from source itself.
+# You can actually just require the gem, it will know to look lin lib QuarantineLiveStreams
+# require_relative "../lib/QuarantineLiveStreams"
+require "bundler/setup"
+require 'QuarantineLiveStreams'
 
 QuarantineLiveStreams::CLI.new.call

data/lib/QuarantineLiveStreams.rb

@@ -1,8 +1,12 @@
+require 'nokogiri'
+require 'open-uri'
+require 'pry'
+require 'colorize'
+
 require_relative "./QuarantineLiveStreams/version"
 require_relative "./QuarantineLiveStreams/cli"
 require_relative "./QuarantineLiveStreams/scraper"
 require_relative "./QuarantineLiveStreams/event"
-require 'nokogiri'
-require 'open-uri'
-require 'pry'
-require 'colorize'
+
+module QuarantineLiveStreams
+end

data/lib/QuarantineLiveStreams/cli.rb

@@ -19,147 +19,129 @@ class QuarantineLiveStreams::CLI
 
             case input
              when "all"
-                puts ""
-                puts "Enter the number of the event you would like to see,"
-                puts "or 0 to go back to menu"
-                display_all_event_names
-                puts ""
-                puts "Enter the number of the event you would like to see,"
-                puts "or 0 to go back to menu"
-                puts ""
-                all_input = gets.strip.to_i
+                all
+             when "dates"
+                dates
+             when "genres"
+                genres  
+            end
+        end
+    end
+
+    def all
+        puts ""
+        puts "Enter the number of the event you would like to see,"
+        puts "or 0 to go back to menu"
+        QuarantineLiveStreams::Event.display_all_event_names
+        puts ""
+        puts "Enter the number of the event you would like to see,"
+        puts "or 0 to go back to menu"
+        puts ""
+        all_input = gets.strip.to_i
                 
-                if all_input > 0 && all_input <= QuarantineLiveStreams::Event.all.length
+        if all_input > 0 && all_input <= QuarantineLiveStreams::Event.all.length
                     
-                    @current_event = QuarantineLiveStreams::Event.all[all_input - 1]
+            current_event = QuarantineLiveStreams::Event.all[all_input - 1]
                     
-                    puts ""
-                    puts "Live Stream: #{@current_event.name}"
-                    puts "Genre: #{@current_event.genre}"
-                    puts "Date: #{@current_event.date}"
-                    puts "Time: #{@current_event.time} ET."
-                    puts "Link: #{@current_event.link.colorize(:green)}"
-                    puts ""
-                end
+            puts ""
+            puts "Live Stream: #{current_event.name}"
+            puts "Genre: #{current_event.genre}"
+            puts "Date: #{current_event.date}"
+            puts "Time: #{current_event.time} ET."
+            puts "Link: #{current_event.link.colorize(:green)}"
+            puts ""
+        end
+    end
 
-             when "dates"
-                puts ""
-                display_all_dates #shows all dates
-                puts ""
-                puts "Please enter the number for the date to see events for that date,"
-                puts "or 0 to go back to main menu"
-                puts ""
-                date_input = gets.strip.to_i #gets what date we want from user
-                puts ""
+    def dates           
+        puts ""
+        QuarantineLiveStreams::Event.display_all_dates #shows all dates
+        puts ""
+        puts "Please enter the number for the date to see events for that date,"
+        puts "or 0 to go back to main menu"
+        puts ""
+        date_input = gets.strip.to_i #gets what date we want from user
+        puts ""
                 
 
-                current_date = @all_dates_array[date_input - 1] 
+        current_date = QuarantineLiveStreams::Event.all_dates_array[date_input - 1] 
 
-                QuarantineLiveStreams::Event.find_by_date(@all_dates_array.index(current_date)) #searching by string name
+        QuarantineLiveStreams::Event.display_by_date(QuarantineLiveStreams::Event.all_dates_array.index(current_date)) #searching by string name
 
-                if date_input > 0 && date_input <= @all_dates_array.length
-                    @events_by_date = QuarantineLiveStreams::Event.all.each_with_index do |event_obj, index|
-                        if event_obj.date == current_date
-                            puts "#{index + 1}. #{event_obj.name}"
-                            event_obj
-                        end
+        if date_input > 0 && date_input <= QuarantineLiveStreams::Event.all_dates_array.length
+            @events_by_date = QuarantineLiveStreams::Event.all.each_with_index do |event_obj, index|
+                if event_obj.date == current_date
+                    puts "#{index + 1}. #{event_obj.name}"
+                    event_obj
                     end
+                end
 
-                    puts ""
-                    puts "Please enter the number of the event you would like more info about,"
-                    puts "or 0 to return to main menu"
-                    puts ""
-                    event_input = gets.strip.to_i
-                    puts ""
+            puts ""
+            puts "Please enter the number of the event you would like more info about,"
+            puts "or 0 to return to main menu"
+            puts ""
+            event_input = gets.strip.to_i
+            puts ""
                     
                 
-                    if event_input > 0 && event_input <= QuarantineLiveStreams::Event.all.length
+            if event_input > 0 && event_input <= QuarantineLiveStreams::Event.all.length
                         @current_event = QuarantineLiveStreams::Event.all[event_input - 1]
 
-                        puts "Live Stream: #{@current_event.name}"
-                        puts "Genre: #{@current_event.genre}"
-                        puts "Date: #{@current_event.date}"
-                        puts "Time: #{@current_event.time} ET."
-                        puts "Link: #{@current_event.link.colorize(:green)}"
-                    end 
-                end
+                puts "Live Stream: #{@current_event.name}"
+                puts "Genre: #{@current_event.genre}"
+                puts "Date: #{@current_event.date}"
+                puts "Time: #{@current_event.time} ET."
+                puts "Link: #{@current_event.link.colorize(:green)}"
+            end 
+        end
+    end
 
-            when "genres"
-                puts ""
-                
-                display_all_genres
-                puts ""
-                puts "please enter the number of the genre you would like to see events for," 
-                puts "or 0 to go back to main menu"
-                puts ""
-                genre_input = gets.strip.to_i
-                puts ""
-
-                current_genre = @all_genres_array[genre_input - 1]
-                QuarantineLiveStreams::Event.find_by_genre(@all_genres_array.index(current_genre))
+    def genres           
+        puts ""
+        QuarantineLiveStreams::Event.display_all_genres
+        puts ""
+        puts "please enter the number of the genre you would like to see events for," 
+        puts "or 0 to go back to main menu"
+        puts ""
+        genre_input = gets.strip.to_i
+        puts ""
+
+        current_genre = QuarantineLiveStreams::Event.all_genres_array[genre_input - 1]
+        QuarantineLiveStreams::Event.find_by_genre(QuarantineLiveStreams::Event.all_genres_array.index(current_genre))
                 
 
-                if genre_input > 0 && genre_input <= @all_genres_array.length
-                    @events_by_genre = QuarantineLiveStreams::Event.all.each_with_index do |event_obj, index|
-                        if event_obj.genre == current_genre
-                            puts "#{index + 1}. #{event_obj.name}"
-                            event_obj
-                        end
+        if genre_input > 0 && genre_input <= QuarantineLiveStreams::Event.all_genres_array.length
+            @events_by_genre = QuarantineLiveStreams::Event.all.each_with_index do |event_obj, index|
+                if event_obj.genre == current_genre
+                    puts "#{index + 1}. #{event_obj.name}"
+                    event_obj
                     end
+                end
                     
-                    puts ""
-                    puts "Please enter the number of the event you would like more info about"
-                    puts "or 0 to go back to main menu"
-                    puts ""
-                    event_input = gets.strip.to_i
-                    puts ""
-
-                    if event_input > 0 && event_input <= QuarantineLiveStreams::Event.all.length
-                        @current_event = QuarantineLiveStreams::Event.all[event_input - 1]
+            puts ""
+            puts "Please enter the number of the event you would like more info about"
+            puts "or 0 to go back to main menu"
+            puts ""
+            event_input = gets.strip.to_i
+            puts ""
+
+            if event_input > 0 && event_input <= QuarantineLiveStreams::Event.all.length
+                current_event = QuarantineLiveStreams::Event.all[event_input - 1]
                         
-                        puts "Live Stream: #{@current_event.name}"
-                        puts "Genre: #{@current_event.genre}"
-                        puts "Date: #{@current_event.date}"
-                        puts "Time: #{@current_event.time} ET."
-                        puts "Link: #{@current_event.link.colorize(:green)}"
-                    end
-                end    
+                puts "Live Stream: #{current_event.name}"
+                puts "Genre: #{current_event.genre}"
+                puts "Date: #{current_event.date}"
+                puts "Time: #{current_event.time} ET."
+                puts "Link: #{current_event.link.colorize(:green)}"
             end
-        end
+        end  
     end
 
     def make_events
+        # Let's talk about memoization
         QuarantineLiveStreams::Event.create_from_collection
     end
 
-    def display_all_event_names
-        QuarantineLiveStreams::Event.all.each_with_index do |event_obj, index|
-            puts "#{index + 1}. #{event_obj.name}"
-        end
-    end
-
-    def display_all_dates
-        @all_dates_array = QuarantineLiveStreams::Event.all.map do |event_obj|
-            event_obj.date
-        end
-
-        @all_dates_array = @all_dates_array.uniq
-        @all_dates_array.each_with_index do |date, index|
-            puts "#{index + 1}. #{date}"
-        end
-    end
-
-    def  display_all_genres
-        @all_genres_array = QuarantineLiveStreams::Event.all.map do |event_obj|
-            event_obj.genre
-        end
-
-        @all_genres_array = @all_genres_array.uniq
-        @all_genres_array.each_with_index do |genre, index|
-            puts "#{index + 1}. #{genre}"
-        end
-    end
-
     def welcome
         puts ""
         puts "|******************************|".colorize(:light_blue)

data/lib/QuarantineLiveStreams/event.rb

@@ -2,7 +2,9 @@ class QuarantineLiveStreams::Event
     attr_accessor :date, :genre, :name, :time, :link
 
      @@all = []
-     @events_by_genre = []
+     @@events_by_genre = [] 
+     @@events_by_date = []
+     @@all_dates_array = []
 
     def initialize(event_hash)
         @date = event_hash[:date]
@@ -12,8 +14,10 @@ class QuarantineLiveStreams::Event
         @link = event_hash[:link]
         @@all << self
     end
-    
-    def self.create_from_collection(events_array = QuarantineLiveStreams::Scraper.scrape_site)
+
+    def self.create_from_collection(events_array = nil)
+        # Nicer way to allow for an argument with a default that's complex.
+        events_array ||= QuarantineLiveStreams::Scraper.scrape_npr
         events_array.each do |event_hash|
          self.new(event_hash)
         end
@@ -24,26 +28,63 @@ class QuarantineLiveStreams::Event
     end
 
     def self.find_by_genre(genre)
-        @events_by_genre = []
-        QuarantineLiveStreams::Event.all.each do |event_obj|
-            if event_obj.genre == genre
-                @events_by_genre << event_obj
-            end
+        @@events_by_genre = QuarantineLiveStreams::Event.all.map{|e| e.genre == genre}
+    end
+
+    def self.display_by_date(date)
+        @@events_by_date = QuarantineLiveStreams::Event.all.map {|e| e.date == date}
+    end
+
+    def self.display_all_dates
+        self.create_dates_array
+        self.print_dates
+    end
+
+    def self.create_dates_array
+        @@all_dates_array = QuarantineLiveStreams::Event.all.map do |event_obj|
+            event_obj.date
+        end
+
+        @@all_dates_array = @@all_dates_array.uniq
+    end
+    
+    def self.print_dates
+        @@all_dates_array.each_with_index do |date, index|
+            puts "#{index + 1}. #{date}"
         end
-        @events_by_genre.each_with_index do |event_obj, index|
+    end
+    
+    def self.display_all_event_names
+        # This sounds like it should be part of the Event class...
+        self.all.each_with_index do |event_obj, index|
             puts "#{index + 1}. #{event_obj.name}"
         end
     end
 
-    def self.find_by_date(date)
-        @events_by_date = []
-        QuarantineLiveStreams::Event.all.each do |event_obj|
-            if event_obj.date == date
-                @events_by_date << event_obj
-            end
+    def self.all_dates_array
+        @@all_dates_array
+    end
+
+    def  self.display_all_genres
+        self.create_genres_array
+        self.print_genres
+    end
+
+    def self.print_genres
+        @@all_genres_array.each_with_index do |genre, index|
+            puts "#{index + 1}. #{genre}"
         end
-        @events_by_date.each_with_index do |event_obj, index|
-            puts "#{index + 1}. #{event_obj.name}"
+    end
+
+    def self.create_genres_array
+        @@all_genres_array = QuarantineLiveStreams::Event.all.map do |event_obj|
+            event_obj.genre
         end
+
+        @@all_genres_array = @@all_genres_array.uniq
+    end
+
+    def self.all_genres_array
+        @@all_genres_array
     end
 end

data/lib/QuarantineLiveStreams/scraper.rb

@@ -1,13 +1,16 @@
 class QuarantineLiveStreams::Scraper
-    @events_array = []
+    @events_array = [] # Not sure if you need these class instance variables.
+                       # Let's go over them.
     
-    def self.scrape_site
+    def self.scrape_npr
         url = "https://www.npr.org/2020/03/17/816504058/a-list-of-live-virtual-concerts-to-watch-during-the-coronavirus-shutdown"
         doc = Nokogiri::HTML(open(url))
         content = doc.css(".storytext")
         found = false
         date = "test"  
         genre = "test"
+        # This is pretty messy but scraping always is but this could probably be
+        # cleaned up a ton if I looked at the page.
         content.children.each do |el|
             if (el.name == 'h3')
                 found = true
@@ -27,7 +30,8 @@ class QuarantineLiveStreams::Scraper
                         time = el.text.gsub(/.*?(?=Time)/im, "")
                         event_hash[:time] = time = time.slice(0..(time.index('. ETL')))
                         if event_hash[:link] = el.css('a').attr('href')
-                        event_hash[:link] = el.css('a').attr('href').value
+                        # INDENT
+                            event_hash[:link] = el.css('a').attr('href').value
                         end
                         @events_array << event_hash
                 end

data/lib/QuarantineLiveStreams/version.rb

@@ -1,3 +1,3 @@
 module QuarantineLiveStreams
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: QuarantineLiveStreams
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - mattenbar
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
 date: 2020-04-29 00:00:00.000000000 Z
 dependencies:
@@ -98,7 +98,8 @@ description: Scrapes upcoming events that are being live streamed and then retur
   the date time and link ot the event
 email:
 - matthew.enbar@gmail.com
-executables: []
+executables:
+- QLS
 extensions: []
 extra_rdoc_files: []
 files:
@@ -106,8 +107,10 @@ files:
 - ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - NOTES.md
+- QuarantineLiveStreams-0.1.0.gem
 - QuarantineLiveStreams.gemspec
 - README.md
 - Rakefile