most_haunted 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b74d8d20398da5da51ca41ae6a96e3a8be7fcde3
-  data.tar.gz: 81570263b0825f9f696e8d659494cccd2f55e33f
+SHA256:
+  metadata.gz: e608c2cfc119130c11cb3f6f9aa92624bb11a87cd9fbac5247d9ca5fb84dadf9
+  data.tar.gz: f8338e0204313f5de88984750da9065f1253247ec8e233ce3b2d29a2130afdb6
 SHA512:
-  metadata.gz: 536cba7b0148846a734ed299e000d2ae3ec829b4fe9e24c6ccd774e8ae685c976704d8f79800eebe2a038c660094031396ffd09c2c03de7ec649f596e41495d8
-  data.tar.gz: 2a1d3a6c711ac768fd4a2c227012e62642425ba43105d31ca233d0edea3a1b6604068f2658406de010e4b0ab81d4efa5a8fe3a790774dc45867df721cdeeeb9f
+  metadata.gz: 1b0e283795c2d0f83dd669d9b6a6051394f77d17c28ed181b67b6b09ed8ca80e3f3bbf600c63fd46e8c51dc172f8d63aa56b447d5002ff9a7c511f9577a5e458
+  data.tar.gz: 410fbb1423b6bbc081dddf1b52ffb800df6a1f09ddc07c07a1bedc0b8e5d6fd0d0b2a6d489ca6f39e04283d361de99ea5702abed7a8279dc36894c77eb72d410

data/config/environment.rb

@@ -1,10 +1,9 @@
 require 'nokogiri'
 require 'open-uri'
-require 'pry'
 
 require_relative "../lib/most_haunted/version"
 require_relative "../lib/most_haunted/cli"
 require_relative "../lib/most_haunted/america"
 require_relative "../lib/most_haunted/scraper"
 require_relative "../lib/most_haunted/states"
-require_relative "../lib/most_haunted"
+require_relative "../lib/most_haunted"

data/lib/most_haunted/america.rb

@@ -1,48 +1,61 @@
 class MostHauntedCli::America
-    attr_accessor :location, :description
-    
-    @@haunted = []
-    
+    attr_accessor :id, :name, :location, :description
+
+    @@all = []
+
     INDEXES = [
-        (46..48).to_a,
-        (41..44).to_a,
-        (36..39).to_a,
-        (32..34).to_a,
-        (28..30).to_a,
-        (25..26).to_a,
-        (21..23).to_a,
-        (17..19).to_a,
-        (13..15).to_a,
-        (8..11).to_a,
+        (46..48),
+        (41..44),
+        (36..39),
+        (32..34),
+        (28..30),
+        (25..26),
+        (21..23),
+        (17..19),
+        (13..15),
+        (8..11),
          ]
-    
-    def initialize(location, description)
+
+    def initialize(id, name, location, description)
+        @id = id
+        @name = name
         @location = location
         @description = description
-        @@haunted << self
+        @@all << self
     end
-  
+
     def self.create(array)
-        array.each do |h|
-            location = h
-            d = h.split(".")[0].to_i
-            description = INDEXES[d-1]
-            self.new(location, description)
+        array.each do |unparsed_info|
+            parsed_info = unparsed_info.split(",", 2)
+            name = parsed_info[0]
+            location = parsed_info[1]
+            id = unparsed_info.split(".")[0].to_i
+            description = indexes[id-1]
+
+            self.new(id, name, location, description)
         end
     end
-    
-    def self.haunted
-        @@haunted 
+
+    def self.all
+        @@all
     end
-    
+
     def self.indexes
-        INDEXES
+        INDEXES.each{|range| (range).to_a }
     end
-    
-    def self.list_locations
-        self.haunted.each{|l| puts l.location}
+
+    def self.found(input)
+        self.all.find{|america| america.id == input.to_i}
+    end
+
+    def self.list_location_names
+        self.all.each{|l| puts "#{l.name}"}
     end
-    
+
+    def self.find_description_by_input(input)
+       self.all[input.to_i - 1].description
+    end
+
     def self.america_descriptions(input)
         input.each do |i|
             description = MostHauntedCli::Scraper.scrape_america_descriptions.children[i].text
@@ -51,4 +64,4 @@ class MostHauntedCli::America
         end
     end
 
-end
+end

data/lib/most_haunted/cli.rb

@@ -1,34 +1,34 @@
 class MostHauntedCli::CLI
-   
+
     def initialize
         MostHauntedCli::Scraper.scrape_america
         MostHauntedCli::Scraper.states
     end
-    
+
     def call
         puts "--" * 17
-        puts "Search for Scary Places Near You!" 
+        puts "Search for Scary Places Near You!"
         puts "--" * 17
         start
         goodbye
     end
-    
+
     def start
         puts ''
         puts <<-DOC.gsub /^\s*/, ''
-        
+
             1. Most Haunted Places in America
             2. Choose a State
         DOC
-        
+
         input = nil
         puts ''
         while input != "exit"
             puts "--" * 17
             puts "Please enter '1', '2', or 'exit'"
-            puts "" 
+            puts ""
             input = gets.strip.downcase
-            
+
             case input
             when "1"
                 puts "--" * 17
@@ -52,35 +52,65 @@ class MostHauntedCli::CLI
             end
         end
     end
-    
-    def list_america 
+
+    def list_america
         puts ''
-        MostHauntedCli::America.list_locations
+        MostHauntedCli::America.list_location_names
     end
-    
+
+    def america_descriptions
+        input = nil
+        while input != "exit"
+            puts "--" * 30
+            puts  <<-DOC.gsub /^\s*/, ''
+
+            * choose an index (1-10) for more information on a location
+            * 'list' for the 10 Most Haunted Places in America
+            * 'main menu'
+            * 'exit'
+            DOC
+            input = gets.strip.downcase
+
+            if input.to_i.between?(1, MostHauntedCli::America.all.size)
+                puts ''
+                puts "Location: #{MostHauntedCli::America.all[input.to_i].location}"
+                puts ''
+                MostHauntedCli::America.america_descriptions(MostHauntedCli::America.find_description_by_input(input))
+            elsif input == "list"
+                puts ''
+                MostHauntedCli::America.list_location_names
+            elsif input == "main menu"
+                start
+            elsif input == 'exit'
+                goodbye
+                exit
+            else
+                puts ''
+                puts "** Please enter valid input **"
+                america_descriptions
+            end
+        end
+    end
+
     def list_states
         MostHauntedCli::States.state_columns
     end
-    
+
     def state_options
         input = nil
         while input != "exit"
         puts "--" * 30
             puts <<-DOC.gsub /^\s*/, ''
-            
+
             * choose an index (1-52) to discover the state's most haunted locations!
             * 'list' for a list of states
             * 'main menu'
             * 'exit'
-            
+
             DOC
             input= gets.strip.downcase
-            
-            if input.to_i > 0 && input.to_i < 53
-                puts "--" * 20
-                MostHauntedCli::Scraper.scrape_state_title(input.to_i)
-                puts "--" * 20
-                puts ''
+
+            if input.to_i.between?(1, MostHauntedCli::States.all.length)
                 MostHauntedCli::States.open_state_info(input.to_i)
             elsif input == 'main menu'
                 start
@@ -97,41 +127,9 @@ class MostHauntedCli::CLI
             end
         end
     end
-    
-    def america_descriptions
-        input = nil
-        while input != "exit"
-            puts "--" * 30
-            puts  <<-DOC.gsub /^\s*/, ''
-            
-            * choose an index (1-10) for more information on a location
-            * 'list' for the 10 Most Haunted Places in America
-            * 'main menu' 
-            * 'exit'
-            DOC
-            input = gets.strip.downcase
-                
-            if input.to_i > 0 && input.to_i < 11
-                puts ''
-                MostHauntedCli::America.america_descriptions(MostHauntedCli::America.indexes[input.to_i-1])
-            elsif input == "list"
-                puts ''
-                MostHauntedCli::America.list_locations
-            elsif input == "main menu"
-                start
-            elsif input == 'exit' 
-                goodbye
-                exit
-            else
-                puts ''
-                puts "** Please enter valid input **" 
-                america_descriptions
-            end
-        end
-    end
-    
+
     def goodbye
         puts ''
         puts "Scare ya later!"
     end
-end
+end

data/lib/most_haunted/scraper.rb

@@ -1,73 +1,60 @@
 class MostHauntedCli::Scraper
-    
+
     @@america = []
-    @@s = []
+    @@states = []
     @@urls = []
-    
+
     URL = "https://hauntedrooms.com/haunted-places"
-    
+
     def self.america
-        @@america 
+        @@america
     end
-    
-    def self.s
-        @@s
-    end
-    
-    def self.urls
-       @@urls 
-    end
-   
+
     def self.scrape_america
         doc = Nokogiri::HTML(open(URL))
-        new = doc.search("h3.section-title.clearfix span").children
-        new.each do |list|
-            self.america << list.text
+        list = doc.search("h3.section-title span").children
+        list.each do |l|
+            self.america << l.text.strip
         end
         MostHauntedCli::America.create(self.america)
     end
-    
+
     def self.scrape_america_descriptions
         doc = Nokogiri::HTML(open(URL))
         paragraphs = doc.search("div.entry-content p")
         paragraphs
     end
-    
+
      # Individual State Information
-    
-    def self.states
-        doc = Nokogiri::HTML(open(URL))
-        states = doc.search("tbody li").children
-        states.each do |t|
-           self.s << t.text
-        end
-        MostHauntedCli::States.create_state(self.s)
+
+    def self.all_states
+        @@states
     end
-    
-    def self.scrape_state_url
+
+    def self.urls
+       @@urls
+    end
+
+    def self.states
         doc = Nokogiri::HTML(open(URL))
         states = doc.search("tbody li").children
         states.each do |t|
+            self.all_states << t.text
             self.urls << t.attribute("href").value
         end
-        self.urls
-    end
-    
-    def self.scrape_state_title(input)
-        title = []
-        u = MostHauntedCli::States.haunted
-        url = u[input - 1].url
-        doc = Nokogiri::HTML(open(url)) 
-        t = doc.search("h1.entry-title").text
-            title << t
-            puts title
+        MostHauntedCli::States.create_state(self.all_states)
     end
-    
+
     def self.scrape_state_locations(input)
         list = []
-        u = MostHauntedCli::States.haunted
+        title = []
+        u = MostHauntedCli::States.all
         url = u[input.to_i - 1].url
-            doc = Nokogiri::HTML(open(url)) 
+            doc = Nokogiri::HTML(open("https://hauntedrooms.com"+"#{url}"))
+
+            t = doc.search("h1.entry-title").text.strip
+            title << t
+
             locations = doc.search("div.entry-content h2").children
             if locations.empty? == true
                 locations = doc.search("div.entry-content i").children
@@ -78,6 +65,10 @@ class MostHauntedCli::Scraper
             locations.each do |l|
                 list << l.text.gsub("end section_title", " ") unless l.text == "(Stay Here)" || l.text == "(Book Now)" || l.text == "(Book a Room)"
             end
+        puts "--" * 20
+        puts title
+        puts "--" * 20
+        puts ''
         list
     end
-end
+end

data/lib/most_haunted/version.rb

@@ -1,3 +1,3 @@
 module MostHauntedCli
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: most_haunted
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - jamiegiuliano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +81,6 @@ files:
 - lib/most_haunted/america.rb
 - lib/most_haunted/cli.rb
 - lib/most_haunted/scraper.rb
-- lib/most_haunted/states.rb
 - lib/most_haunted/version.rb
 homepage: https://github.com/jamiegiuliano/most_haunted_cli_gem
 licenses:
@@ -117,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Most Haunted Places in America

data/lib/most_haunted/states.rb

@@ -1,60 +0,0 @@
-class MostHauntedCli::States
-    attr_accessor :name, :url
-    
-    @@haunted = []
-    @@states = []
-    
-    def initialize(name)
-       @name = name
-       @@haunted << self
-    end
-
-    def self.create_state(array)
-        array.each do |s|
-            name = s
-            self.new(name)
-        end
-        add_urls
-    end
-    
-    def self.haunted
-        @@haunted
-    end
-    
-    def self.states
-        @@states
-    end
-     
-    def self.states_list
-        self.haunted.collect.with_index(1){|s, i| "#{i}. #{s.name}"}
-    end
-    
-    def self.create_columns(slice)
-        l = slice[0].length
-        if l >= 24
-            puts "#{slice[0]}"+"      "+"#{slice[1]}"
-        else
-            puts "#{slice[0]}"+" " * (30 - l)+"#{slice[1]}"
-        end 
-    end
-    
-    def self.state_columns
-        states_list.each.each_slice(2) do |slice|
-            create_columns(slice)
-        end
-    end
-    
-    # Individual State Information
-    
-    def self.open_state_info(input)
-        info = MostHauntedCli::Scraper.scrape_state_locations(input)
-        info.each{|i| puts i.gsub(' –', '.')}
-    end
-    
-    def self.add_urls
-        u = MostHauntedCli::Scraper.scrape_state_url
-        self.haunted.each.with_index do |h, i|
-            h.url = u[i]
-        end
-    end
-end