museum_day 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a4414b743dfe3ba0049410446b42b0a729e6faf5f1f3f6b2ed5398a134fa4be
-  data.tar.gz: 03a4e03e2f30f7a81a2394086e99ad0ab78c88b7bd21874b864fb9d3042df9d5
+  metadata.gz: d938321beef4fed01f48eeec3bf71810e44a6d985bf19016e5431c4a4b20f43b
+  data.tar.gz: e3eb4b10c9d9ca4f22f0aafdff50f643fda270b130c90cca12586dd21e3664fa
 SHA512:
-  metadata.gz: a2fa2f2ebf1ec02d96e9747869d18463edef174a16a879f4e68162df23a436e805d8345cd5b3d4fd6a75e5a14b9e407dfbb8527c948340fd48c02886231eb27d
-  data.tar.gz: 75ef79ba09dee66454f6da71cbcd2d4295519ac626e5e4664304bde68f66a1581a9b1e5762d4bc03463d774abe0f215336499496cfeb5cce4d239c447b6790a5
+  metadata.gz: ac309afc924b9b76d27d71275bd8fa68704cc4ccbed3383d6cf8417df87d71d6a3cfbf9fb0d1b99c76ea6faf7124b7673b68177fcb4a37a95e879f136bebf63b
+  data.tar.gz: cb95c512b1483d69fffa9ce58936fd045f97a12bd38451dc8f1131b51a886183172f3a69511826e9aefeeb4f175b84c50e5986a6a77814c9d77d9d7110f7a9aa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    museum_day (0.1.1)
+    museum_day (0.1.2)
       nokogiri
 
 GEM

data/README.md

@@ -4,18 +4,6 @@ This Ruby Gem provides a CLI to view the participating Museums for Museum Day ti
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'museum_day'
-```
-
-And then execute:
-
-    $ bundle install
-
-Or install it yourself as:
-
     $ gem install museum_day
 
 ## Usage

data/lib/museum_day/cli.rb

@@ -8,50 +8,30 @@ class MuseumDay::CLI
 
 
   def start
-    if !zipcode
-      get_zipcode
-    end
 
-    exit?(zipcode)
-    list_museums(zipcode)
+    get_zipcode if !zipcode
 
-    input = 0
-
-    while !input.to_i.between?(1, MuseumDay::Museum.all.size)
-      puts ""
-      puts "Enter the number of the museum you'd like more info on or type exit"
-      input = gets.strip
+    exit?(zipcode)
 
-      exit?(input)
-      if input.to_i.between?(1, MuseumDay::Museum.all.size)
-        print_museum_details(input)
-      else
-        puts "Invalid number"
+    list_museums(zipcode)
 
-      end
-    end
+    get_user_input_for_details_and_print
 
     menu
 
     input = gets.strip.downcase
     exit?(input)
 
-    if input ==  "new"
-      MuseumDay::Museum.clear_all
-      @zipcode = nil
-      start
-    elsif input == "back"
-      MuseumDay::Museum.clear_all
-      start
-    end
+    new_or_back?(input)
+
   end
 
   def list_museums(input)
 
-    MuseumDay::Scraper.new(input).make_museums
+    @scraper = MuseumDay::Scraper.new(input)
+    @scraper.make_museums
 
-    puts ""
-    puts "--------------Listing museums near #{zipcode}--------------"
+    puts "\n--------------Listing museums near #{zipcode}--------------"
 
     MuseumDay::Museum.all.each.with_index(1) do |museum, idx|
       puts "#{idx}. #{museum.name} - #{museum.city}"
@@ -62,55 +42,71 @@ class MuseumDay::CLI
 
     museum = MuseumDay::Museum.find(input.to_i)
 
-    puts ""
-    puts "--------------#{museum.name}--------------"
+    @scraper.scrape_details(museum)
+
+    puts "\n--------------#{museum.name}--------------"
     puts "#{museum.address}"
     puts "      Hours: #{museum.hours}"
-    puts ""
-    puts "Phone Number: #{museum.phone_number}"
+    puts "\nPhone Number: #{museum.phone_number}"
     puts "Website:      #{museum.website_url}"
+    puts "Facebook:     #{museum.fb}" if museum.fb
+    puts "Twitter:      #{museum.twitter}" if museum.twitter
+    puts "\n--------------Description--------------"
+    puts "#{museum.description}"
+  end
 
-    museum.social_urls
-    if museum.fb
-      puts "Facebook:     #{museum.fb}"
-    end
+  def get_user_input_for_details_and_print
+    input = 0
 
-    if museum.twitter
-      puts "Twitter:      #{museum.twitter}"
-    end
+    while !input.to_i.between?(1, MuseumDay::Museum.all.size)
+      puts "\nEnter the number of the museum you'd like more info on or type exit"
+      input = gets.strip
 
-    puts ""
-    puts "--------------Description--------------"
-    puts "#{museum.description}"
+      exit?(input)
+      if input.to_i.between?(1, MuseumDay::Museum.all.size)
+        print_museum_details(input)
+      else
+        puts "Invalid number"
+
+      end
+    end
   end
 
   def menu
-    puts ""
-    puts "To go back to list of museum, enter 'back'."
+    puts "\n---------------------------------------------"
+    puts "To go back to list of museums, enter 'back'."
     puts "To search a new zipcode, enter 'new'."
     puts "To quit, enter 'exit'."
+    puts "---------------------------------------------"
   end
 
   def get_zipcode
-    puts ""
-    puts "Please enter your zipcode or type exit"
+    puts "\nPlease enter your zipcode or type exit"
 
-    @zipcode = gets.strip
+    self.zipcode = gets.strip
     exit?(zipcode)
 
     if zipcode.size != 5
-      puts ""
-      puts "Invalid Zipcode"
+      puts "\nInvalid Zipcode"
       get_zipcode
     end
   end
 
-  def exit?(input)
-    if input.downcase == "exit"
-      goodbye
+  def new_or_back?(input)
+    if input ==  "new"
+      MuseumDay::Museum.clear_all
+      self.zipcode = nil
+      start
+    elsif input == "back"
+      MuseumDay::Museum.clear_all
+      start
     end
   end
 
+  def exit?(input)
+    goodbye if input.downcase == "exit"
+  end
+
   def goodbye
     puts "-----------------"
     puts "|    Goodbye    |"

data/lib/museum_day/museum.rb

@@ -5,20 +5,11 @@ class MuseumDay::Museum
 
   @@all = []
 
-  def self.new_from_index(museum)
-    self.new(
-      museum.css("h4.name").text,
-      museum.css("h5.location").text,
-      museum.css("a").attribute("href").value,
-      museum.at("div strong").next_sibling.text.strip
-    )
-  end
-
-  def initialize(name = nil, city = nil, url = nil, hours = nil)
-    @name = name
-    @city = city
-    @url = url
-    @hours = hours
+  def initialize(attributes)
+    @name = attributes[:name]
+    @city = attributes[:city]
+    @url = attributes[:url]
+    @hours = attributes[:hours]
     @@all << self
   end
 
@@ -30,38 +21,6 @@ class MuseumDay::Museum
     self.all[id-1]
   end
 
-  def address
-    @address ||= doc.css("p.address").text.strip
-  end
-
-  def phone_number
-    @phone_number ||= doc.at("i.fa-phone").next_sibling.text.strip
-  end
-
-  def website_url
-    @website_url ||= doc.css("i.fa-external-link + a").attribute("href").value
-  end
-
-  def social_urls
-    social_links = doc.css("div.contact a").collect { |link| link.attribute("href").value }
-
-    social_links.each do |link|
-      if link.include?("twitter")
-        self.twitter = link
-      elsif link.include?("facebook")
-        self.fb = link
-      end
-    end
-  end
-
-  def description
-    @description ||= doc.css("div.aux-info p").first.text
-  end
-
-  def doc
-    @doc ||= Nokogiri::HTML(open("https://www.smithsonianmag.com#{self.url}"))
-  end
-
   def self.clear_all
     @@all.clear
   end

data/lib/museum_day/scraper.rb

@@ -16,8 +16,30 @@ class MuseumDay::Scraper
 
   def make_museums
     scrape_museums_index.each do |museum|
-      MuseumDay::Museum.new_from_index(museum)
+      attribute_hash = {
+        name: museum.css("h4.name").text,
+        city: museum.css("h5.location").text,
+        url: museum.css("a").attribute("href").value,
+        hours: museum.at("div strong").next_sibling.text.strip
+      }
+      MuseumDay::Museum.new(attribute_hash)
     end
   end
 
+  def scrape_details(museum)
+    doc = Nokogiri::HTML(open("https://www.smithsonianmag.com#{museum.url}"))
+    museum.description = doc.css("div.aux-info p").first.text
+    museum.address = doc.css("p.address").text.strip
+    museum.website_url = doc.css("i.fa-external-link + a").attribute("href").value
+    museum.phone_number = doc.at("i.fa-phone").next_sibling.text.strip
+
+    #Scrape Socials
+    doc.css("div.contact a").collect { |link| link.attribute("href").value }.each do |link|
+      if link.include?("twitter")
+        museum.twitter = link
+      elsif link.include?("facebook")
+        museum.fb = link
+      end
+    end
+  end
 end

data/lib/museum_day/version.rb

@@ -1,3 +1,3 @@
 module MuseumDay
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: museum_day
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Darrel Castellano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2019-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,6 +75,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile