trendster 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d1069ed9b349e2d8f4b5665a060579939223c0a
-  data.tar.gz: 7b72a01b70605929d736638fd26d7138d38977e6
+  metadata.gz: a40c3649bcdeb0875c82cdb3455a483fa2aab1f5
+  data.tar.gz: fc0b64e2da71c8204e90333d8f12a8d0a0444bf0
 SHA512:
-  metadata.gz: 53359e7e1cfb846b9b16fcaae6cd71b067081b80bab4767fbab5b5fbb42670a97d7267abbf98f1d594caa9195f2b07e829dfaa06befe19aec53c0202902a84ce
-  data.tar.gz: 98f961c61bd9d79f7c2f5af2e49082583e0b8ee53df3efbb834bddaab0a12a1526fe8bbb316d0be5df4e95d036469885b685e3f5dde1d85a1900a390ea889aa9
+  metadata.gz: ee4c569f55d0db2b884cdb1f7ddc80723cb5668e2f2758a0326b0b4906dd9444f66c67311d9c93b974a2cacce7d58af0c27bde3b7b7d11f8e3f90bada90edddf
+  data.tar.gz: d626b0071e63bacbd9a4ba3723d15eaf42edd55dcce7323fc33cce934333ead79a512205a9b9cbc88b79fe0ba36bd17eb08baba056421c7d1f87a4ce086668a4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trendster (1.0.6)
+    trendster (1.0.7)
       nokogiri
 
 GEM

data/lib/trendster.rb

@@ -1,11 +1,7 @@
 require 'open-uri'
 require 'nokogiri'
 
-require "trendster/version"
-require "trendster/scraper"
-require "trendster/event"
-require "trendster/cli"
-
-module Trendster
-
-end
+require_relative "trendster/version"
+require_relative "trendster/scraper"
+require_relative "trendster/event"
+require_relative "trendster/cli"

data/lib/trendster/cli.rb

@@ -18,24 +18,27 @@ class Trendster::CLI
 
   def list_events
     puts "Here are the most recent events at the Cuyahoga County Public Library:"
-    @events = []
-    Trendster::Event.all.each{|x| @events << x.name}
-    counter = 0
-    @events.each{|event_name| counter +=1; puts "#{counter}. #{event_name}"}
+    all_events = Trendster::Event.all
+    all_events.each do |event|
+      puts "#{all_events.index(event) + 1}. #{event.name}"
+    end
   end
 
   def menu
     input = nil
+
     while input != "exit"
-    puts "Enter the number of the event you'd like more info on, 'list' to see the events again, or type 'exit'."
-    input = gets.strip
+   
+      puts "Enter the number of the event you'd like more info on, 'list' to see the events again, or type 'exit'."
+      input = gets.strip
 
       if input.to_i > 0 && Trendster::Event.all[input.to_i - 1] != nil
-        puts Trendster::Event.all[input.to_i - 1].name
-        puts Trendster::Event.all[input.to_i - 1].description
-        puts Trendster::Event.all[input.to_i - 1].date
-        puts "Location: #{Trendster::Event.all[input.to_i - 1].location}"
-        puts "Audience: #{Trendster::Event.all[input.to_i - 1].audience}"
+        selected_event = Trendster::Event.all[input.to_i - 1]
+          puts selected_event.name
+          puts selected_event.description
+          puts selected_event.date
+          puts "Location: #{selected_event.location}"
+          puts "Audience: #{selected_event.audience}"
       elsif input == "list"
         list_events
       elsif input == "exit"
@@ -43,6 +46,7 @@ class Trendster::CLI
       else
         puts "Please enter a valid number, 'list' or 'exit'"
       end
+      
     end
   end
 

data/lib/trendster/event.rb

@@ -2,7 +2,7 @@ class Trendster::Event
 
  attr_accessor :name, :description, :date, :location, :audience
 
-@@all = []
+  @@all = []
 
   @events_array = Trendster::Scraper.scrape_library_page
 
@@ -16,6 +16,7 @@ class Trendster::Event
   end
 
   def self.create_from_collection(events_array)
+
     events_array.each do |event_hash|
       self.new(event_hash)
     end

data/lib/trendster/scraper.rb

@@ -1,40 +1,29 @@
-
 class Trendster::Scraper
 
-@@all = []
+  @@all = []
 
-attr_accessor :name, :description, :date, :location, :audience
+  attr_accessor :name, :description, :date, :location, :audience
   
-  def self.all
-    @@all
-  end
+    def self.all
+      @@all
+    end
 
-  def self.scrape_library_page
-    url_endings = []
-    index_url = "http://cuyahogalibrary.org/Events/Event-Results.aspx"
-    index_doc = Nokogiri::HTML(open(index_url))
-      index_doc.css("article.sixcol").each do |event|
-        url_endings << event.css("a")[0]['href']
-      end
-    event_urls = []
-      url_endings.each do |url_ending|
-        event_urls << "http://cuyahogalibrary.org" + url_ending
-      end
-    event_doc_array = []
-      event_urls.each do |event_url|
-        event_doc = Nokogiri::HTML(open(event_url))
-       event_doc_array << event_doc
-      end
+    def self.scrape_library_page
       all_array = []
-    event_doc_array.each do |event_doc|
-     all_array << {
-      name: event_doc.css("h3").text,
-      description: event_doc.css("p.one-large-content").text || "",
-      date: event_doc.css("strong").text,
-      location: event_doc.css("p").css("a").text,
-      audience: event_doc.css("p").text.match("Adults") || event_doc.css("p").text.match("Children") 
-    }
+      index_url = "http://cuyahogalibrary.org/Events/Event-Results.aspx"
+      index_doc = Nokogiri::HTML(open(index_url))
+        index_doc.css("article.sixcol").each do |event|
+          event_url = "http://cuyahogalibrary.org" + event.css("a")[0]['href'] 
+          event_doc = Nokogiri::HTML(open(event_url))
+          all_array << {
+            name: event_doc.css("h3").text,
+            description: event_doc.css("p.one-large-content").text || "",
+            date: event_doc.css("strong").text,
+            location: event_doc.css("p").css("a").text,
+            audience: event_doc.css("p").text.match("Adults") || event_doc.css("p").text.match("Children") || event_doc.css("p").text.match("Families") || event_doc.css("p").text.match("Teens") || event_doc.css("p").text.match("All") || event_doc.css("p").text.match("Preschool") 
+          }
+      end
+      all_array
     end
-    all_array
-  end
+
 end

data/lib/trendster/version.rb

@@ -1,3 +1,3 @@
 module Trendster
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

data/trendster.gemspec

@@ -7,11 +7,11 @@ Gem::Specification.new do |spec|
   spec.name          = "trendster"
   spec.date          = '2016-06-07'
   spec.version       = Trendster::VERSION
-  spec.authors       = ["Jason"]
+  spec.authors       = ["Jason Kwong"]
   spec.email         = ["jasonkwong11@gmail.com"]
 
   spec.summary       = "CLI interface to Cuyahoga County Public Library events."
-  spec.description   = "Provides details to upcoming events at library with CLI interface."
+  spec.description   = "Provides details of upcoming events at library with CLI interface."
   spec.homepage      = "https://github.com/jasonkwong11/trendster-cli-gem"
   spec.license       = "MIT"
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: trendster
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
-- Jason
+- Jason Kwong
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Provides details to upcoming events at library with CLI interface.
+description: Provides details of upcoming events at library with CLI interface.
 email:
 - jasonkwong11@gmail.com
 executables:
@@ -75,7 +75,7 @@ files:
 - lib/trendster/event.rb
 - lib/trendster/scraper.rb
 - lib/trendster/version.rb
-- trendster-1.0.6.gem
+- pkg/trendster-1.0.7.gem
 - trendster.gemspec
 homepage: https://github.com/jasonkwong11/trendster-cli-gem
 licenses:
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: CLI interface to Cuyahoga County Public Library events.