nswparks 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 479751f7d898254d9eda04ff4119df805d76c945
-  data.tar.gz: 897d08b002a56a135e671ca3981669de9fd47308
+  metadata.gz: 78087eb45b071ab0358298f1e3bbd1cc10ec23f1
+  data.tar.gz: 1a13baf9ec13949ec590158874a4e48421ff51f6
 SHA512:
-  metadata.gz: bc9076b43cb0dd4c5aed3f6feb08922c9750de3acebdd88ce837cc707c5fc5d701f442cee9cc10e5f309af896648f4378ef8e36105b47c59db3d7a520f21dca9
-  data.tar.gz: f99523d8ebc16b523735271361f8e1a6712fe2e22d0ddbb17c7f4603cab3a699b82f48ddcd924b8956d93a0e27d8c79e48fe9649066ab8424ccd768fb46c5dbc
+  metadata.gz: fa4af3b093853c6bdc9063a1821cc9ce40751b6d3b7a875ae0820ef9a605aa8815feed8f474f43eed67f92227d18c7b47e5d7f5919298ff35ee5f3001f1104cb
+  data.tar.gz: 979f8b7c258bd1861c01ffac241f33130a928bb842267bede8d572c215191a146a02c922012684d1b8dc528e9d111021de9e7861869d30d046858559711c57e9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nswparks (1.1.0)
+    nswparks (1.1.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -40,6 +40,11 @@ Run: `nswparks` after installing the gem.
 
 Malki Davis for the hint to use system open
 
+## Versions
+* 1.0.0 - yanked as README.md incomplete
+* 1.1.0 - added ability to auto open websites for the user
+* 1.1.1 - added new class to simplify access to park regions
+
 ## Development
 
 After checking out the repo, run `bundle exec bin/setup` to install dependencies. Then, run `bundle exec rake spec` to run the tests. You can also run `bundle exec bin/console` for an interactive prompt that will allow you to experiment.

data/bin/nswparks

@@ -2,6 +2,7 @@
 
 require_relative "../lib/nswparks"
 require_relative '../lib/nswparks/nsw_parks'
+require_relative '../lib/nswparks/nsw_regions'
 require_relative '../lib/nswparks/cli'
 
 NSWParks::CLI.new.call

data/lib/nswparks.rb

@@ -8,8 +8,7 @@ require 'bundler'
 Bundler.require
 
 require './lib/nswparks/version'
-require_relative '../lib/nswparks/nsw_parks'
-require_relative '../lib/nswparks/cli'
+
 
 
 

data/lib/nswparks/cli.rb

@@ -4,6 +4,7 @@ class NSWParks::CLI
   # Loads all the NSW National Parks, puts out welcome message and starts the app
   def call
     NSWParks::Nsw_parks.new_park
+    NSWParks::Nsw_regions.create_region
     puts ""
     puts ""
     puts " >------------------------------------------------<"
@@ -39,7 +40,7 @@ class NSWParks::CLI
   # Puts out a list of the NSW Regions that contain National Parks using Nsw_parks #nsw_areas
   def park_area
     puts ""
-    NSWParks::Nsw_parks.nsw_areas
+    NSWParks::Nsw_regions.nsw_regions
   end
 
   # Puts out a list of National Parks in a selected NSW Region
@@ -56,14 +57,14 @@ class NSWParks::CLI
     end
     puts ""
     puts "The parks in the #{areas[region_no.to_i - 1]} region are:"
-    array = NSWParks::Nsw_parks.park_region(region_no.to_s)
+    array = NSWParks::Nsw_regions.park_region(region_no.to_s)
     array.each.with_index(1) {|a,i| puts "#{i}. #{a}"} # Puts parks in region using Nsw_parks
     puts ""
     puts "Enter your park number from this list for more information:"
     input = gets.strip.to_i 
     # Validate user input - input must be numerical and exist in the list  
     while !(input.is_a? Integer) || input < 1 || input > array.length
-      array = NSWParks::Nsw_parks.park_region(region_no.to_s)
+      array = NSWParks::Nsw_regions.park_region(region_no.to_s)
       array.each.with_index(1) {|a,i| puts "#{i}. #{a}"}
       input = NSWParks::Nsw_parks.valid_input
     end

data/lib/nswparks/nsw_parks.rb

@@ -16,7 +16,7 @@ class NSWParks::Nsw_parks
 		@@all  # Access all created NSW National Parks instances
 	end
 
-	# Create new NSW National Parks from the National Parks webstie
+	# Create new NSW National Parks from the National Parks website
    	def self.new_park
    		page = Nokogiri::HTML(open("http://www.nationalparks.nsw.gov.au/conservation-and-heritage/national-parks"))		
 	    park = page.css("#content__inner .dynamicListing li a")
@@ -41,93 +41,18 @@ class NSWParks::Nsw_parks
 		end	
 		puts "----------------------------------------------------------------------------------------"
   	end
-  	
-   # Show the Regions that NSW National Parks are listed within
-   def self.nsw_areas
-   		array = []
-		regions = Nokogiri::HTML(open("http://www.nationalparks.nsw.gov.au/visit-a-park"))
-		list = regions.css("#mainParkNavJump ul li")
-		# Put out the list of Regions numerically
-		list.collect.with_index(1) do |a,i| 
-			puts "#{i}. #{a.children.text}"
-			array << a.children.text
-		end	
-		array
-   end
-
-   # Output the National Parks for each of the seven NSW Regions from the individual region websites
-   def self.park_region(region_no)
-   		array = []
-   		case region_no
-   		when "1"  # Outback Region
-			region = Nokogiri::HTML(open("http://www.nationalparks.nsw.gov.au/visit-a-park/regions/outback"))
-		 	links = region.css("#content__inner ul.detailRightColumn__linkList a")
-		 	array = region_sort(links) # Remove areas that are not National Parks 
-			array	
-		when "2"  # Country NSW Region
-			region = Nokogiri::HTML(open("http://www.nationalparks.nsw.gov.au/visit-a-park/regions/country-nsw"))	
-			links = region.css("#content__inner ul.detailRightColumn__linkList a")
-		 	array = region_sort(links) # Remove areas that are not National Parks 
-			array	
-		when "3"  # Murray Riverina Region
-			region = Nokogiri::HTML(open("http://www.nationalparks.nsw.gov.au/visit-a-park/regions/murray-riverina"))	
-			links = region.css("#content__inner ul.detailRightColumn__linkList a")
-		 	array = region_sort(links)  # Remove areas that are not National Parks 
-			array	
-		when "4"  # North Coast Region
-			region = Nokogiri::HTML(open("http://www.nationalparks.nsw.gov.au/visit-a-park/regions/north-coast"))	
-			links = region.css("#content__inner ul.detailRightColumn__linkList a")
-		 	array = region_sort(links)  # Remove areas that are not National Parks 
-			array	
-		when "5"  # South Coast Region
-			region = Nokogiri::HTML(open("http://www.nationalparks.nsw.gov.au/visit-a-park/regions/south-coast"))	
-			links = region.css("#content__inner ul.detailRightColumn__linkList a")
-		 	array = region_sort(links)  # Remove areas that are not National Parks 
-			array
-		when "6"  # Sydney and Surrounds Region
-			region = Nokogiri::HTML(open("http://www.nationalparks.nsw.gov.au/visit-a-park/regions/sydney-and-surrounds"))	
-			links = region.css("#content__inner ul.detailRightColumn__linkList a")
-		 	array = region_sort(links)  # Remove areas that are not National Parks 
-			array	
-		when "7"  # Snowy Mountains Region
-			region = Nokogiri::HTML(open("http://www.nationalparks.nsw.gov.au/visit-a-park/regions/snowy-mountains"))	
-			links = region.css("#content__inner ul.detailRightColumn__linkList a")
-		 	array = region_sort(links)  # Remove areas that are not National Parks 
-			array						
-		end				
-   end
-
-   # Removes areas that are not National Parks from the returned array
-   def self.region_sort(links)
-   		array = []
-   		clean = []
-   		links.collect {|a| array << a.children.text}
-		array.select! {|a| a.include?("National")}
-		# Remove leading and trailing white space from the park names
-		clean = array.collect {|a| a.strip}
-		clean
-   end
 
-   # Return overview for a park using its listing under its region
-   def self.park_from_region(park)
- 		@@all.each.with_index do |a,i| 
- 			# Find the park in region in the @@all array and return its overview
- 			if a.name == park
- 				park_overview(i + 1) 
- 			end
-		end	
-	end	
-
-	 def self.valid_input
-    puts ""
+  	# Validates the user input for all numerical user inputs
+	def self.valid_input
+      puts ""
       puts "---------------------------------------------------------"
       puts "Please enter one of the numbers from the list above:"  # Prompt user to enter again
       puts "---------------------------------------------------------"
       gets.strip.to_i
-  end			
+    end			
 
-   # Accesses the website information for a selected NSW National Park
-   def self.park_url
+    # Accesses the website information for a selected NSW National Park
+    def self.park_url
    		input = 0
    		@@all.each.with_index(1) {|a,i| puts "#{i}. #{a.name}"} # Puts outs list of National Parks
    		puts ""
@@ -139,18 +64,28 @@ class NSWParks::Nsw_parks
    			input = valid_input
    		end	
    		system("open #{@@all[input - 1].park_url}")  # Puts out the park website address
-   end
+    end
+
+    # Return overview for a park using its listing under its region
+    def self.park_from_region(park)
+ 		@@all.each.with_index do |a,i| 
+ 			# Find the park in region in the @@all array and return its overview
+ 			if a.name == park
+ 				park_overview(i + 1) 
+ 			end
+		end	
+	end	
 
-   # Provides user with a link to the map and instructions to open the link in their browser
-   def self.park_map
-   		system("open http://www.nationalparks.nsw.gov.au/nsw-state-map") # No url to scrape - hidden
-   end
+    # Provides user with a link to the map and instructions to open the link in their browser
+    def self.park_map
+   		system("open http://www.nationalparks.nsw.gov.au/nsw-state-map") # Cannot scrape - hidden content
+    end
 
-   # Provides user with a link to guides and instructions to open the link in their browser
-   def self.park_guide
+    # Provides user with a link to guides and instructions to open the link in their browser
+    def self.park_guide
    		page = Nokogiri::HTML(open("http://www.nationalparks.nsw.gov.au"))	
    		link = page.css("#headerNavBottom nav ul li#mainNav__about .box ul li[5] a")
-   		system("open #{link.attribute("href").value}")  # Puts out the website address forthe park guides
+   		system("open #{link.attribute("href").value}")  # Puts out the website address for the park guides
    	end	
  end 	
 

data/lib/nswparks/nsw_regions.rb

@@ -0,0 +1,56 @@
+class NSWParks::Nsw_regions
+
+	attr_accessor :region_name, :region_url
+
+	@@all = []  # Collects all NSW National Parks Regions
+
+	# Initialize each Nsw_regions instance with a region_name and region_url attribute, no default
+	def initialize(region_name, region_url)
+		@region_name = region_name
+		@region_url = region_url
+		@@all << self
+	end
+
+	def self.all
+		@@all  # Access all created NSW National Parks Regions instances
+	end
+
+	# Create new NSW National Parks Regions from the National Parks website
+	def self.create_region
+		page = Nokogiri::HTML(open("http://www.nationalparks.nsw.gov.au/visit-a-park/"))
+		puts region = page.css("#mainParkNavJump .wrapper ul li a")
+	    region.collect {|a| new(a.text.strip, "http://www.nationalparks.nsw.gov.au#{a.attribute("href").value}")}
+	end
+
+	# Show the Regions that NSW National Parks are listed within
+	def self.nsw_regions
+   		array = []
+		# Put out the list of Regions numerically
+		@@all.collect.with_index(1) do |a,i| 
+			puts "#{i}. #{a.region_name}"
+			array << a.region_name
+		end	
+		array
+    end
+
+    # Output the National Parks for each region as requested
+	def self.park_region(region_no)
+		region = @@all[region_no.to_i - 1]  # Select the region from the @@all array
+		page = Nokogiri::HTML(open("#{region.region_url}"))
+		link = page.css("#content__inner ul.detailRightColumn__linkList a")
+		array = region_sort(link) # Remove areas that are not National Parks 
+		array
+	end
+
+	# Removes areas that are not National Parks from the returned array
+   def self.region_sort(link)
+   		array = []
+   		clean = []
+   		link.collect {|a| array << a.children.text}
+		array.select! {|a| a.include?("National")}
+		# Remove leading and trailing white space from the park names
+		clean = array.collect {|a| a.strip}
+		clean
+   end
+end
+

data/lib/nswparks/version.rb

@@ -1,3 +1,3 @@
 module NSWParks
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nswparks
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Annette Drapalski
@@ -89,8 +89,10 @@ files:
 - lib/nswparks.rb
 - lib/nswparks/cli.rb
 - lib/nswparks/nsw_parks.rb
+- lib/nswparks/nsw_regions.rb
 - lib/nswparks/version.rb
 - nswparks.gemspec
+- pkg/nswparks-1.1.0.gem
 - spec.md
 - spec/nswparks_spec.rb
 - spec/spec_helper.rb