study_the_map 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 938fe24962c2504ddaed0154595be22c9b62f0fa
-  data.tar.gz: 93cb17b26a8f6d87c4f7adb18fb0f0f35c057dde
+  metadata.gz: a7adc405e3fb54aea7a9a894124201badadb373e
+  data.tar.gz: d9cf28aaf972aed3852d1fe64de322c6249000f4
 SHA512:
-  metadata.gz: 3eefaab7b942e239dcee0d0d70ea7506dbac2e82dea5543b9968c4a2d309e81299cde9d8d03e4ffb782d94a748e5f8ee0c937f69950f9376c6dcbff1539ce125
-  data.tar.gz: 9fc8e80e499432ed0ca174dc1e324567fc3e86b655dc7be418b42013c841e905e0082a6f510703a8cbef7aaf339477ca5ab0a158bc4a05b193b785debdf52366
+  metadata.gz: b81c9fad863d21e8add560968543536af937987a4b599552e2426bce87927bd9b374942a2ff6fa3a05dd3e796c02a35231bdbad3447edb0c98b3940bca44709d
+  data.tar.gz: 4eae5de676b63375910b1a7e41615cba7e5f5d7562f71591e8da0f7c5b2314cb0ca7a455644c07d593b7de5baa1be0932b1d74d9ec9116bff15f513507435f8a

data/README.md

@@ -20,20 +20,6 @@ Or install it yourself as:
 
 ## Usage
 
-Check that it installed using require 'study_the_map'. Then you can run the app from irb with StudyTheMap::CLI.new.call or ./bin/study_the_map if you've downloaded the repo.
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/study_the_map. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
-
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+```require 'study_the_map'```
 
+```App.start```

data/bin/study_the_map

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require "bundler/setup"
-require './lib/study_the_map.rb'
+require_relative '../lib/study_the_map.rb'
 require 'pry'
 
 StudyTheMap::CLI.new.call

data/lib/study_the_map.rb

@@ -1,8 +1,14 @@
 require "bundler/setup"
 require "launchy"
 require "rake"
-require "./lib/study_the_map/version.rb"
-require_relative './study_the_map/cli'
-require './lib/study_the_map/lookupids.rb'
-require './lib/study_the_map/regions.rb'
-require './lib/study_the_map/ski_map.rb'
+require 'pry'
+require 'open-uri'
+require 'nokogiri'
+
+require_relative "../lib/study_the_map/version"
+require_relative '../lib/study_the_map/cli'
+require_relative '../lib/study_the_map/lookupids'
+require_relative '../lib/study_the_map/regions'
+require_relative '../lib/study_the_map/ski_map'
+require_relative '../lib/study_the_map/ski_map_scraper'
+require_relative '../lib/study_the_map/region_scraper'

data/lib/study_the_map/cli.rb

@@ -1,5 +1,10 @@
 #CLI controller 
-require "./lib/study_the_map.rb"
+class App
+  def self.start
+    StudyTheMap::CLI.new.call
+  end
+end
+
 class StudyTheMap::CLI
 
   def call
@@ -10,6 +15,14 @@ class StudyTheMap::CLI
 
   end
 
+  def list_map_years  
+
+    @skimaps.area_info.scrape_map_data.each do |map|
+      puts map.search("yearPublished").text
+    end
+
+  end
+
   def get_map
 
     resort_name = nil
@@ -26,9 +39,11 @@ class StudyTheMap::CLI
 
         get_areas
 
-      elsif Region.ski_area_list.include?(resort_name)
+      elsif RegionScraper.ski_area_list.include?(resort_name)
+
+        @skimaps = SkiMaps.new(resort_name)
+        self.map_count_and_pick(@skimaps.map_count)
 
-        SkiMaps.new(resort_name)
 
       else
 
@@ -37,6 +52,75 @@ class StudyTheMap::CLI
     end
   end
 
+  def map_count_and_pick(map_count)
+
+    puts "There are #{map_count} maps for this ski area."
+
+    if map_count == "0"
+
+      StudyTheMap::CLI.new.call
+
+    elsif map_count == "1"
+
+      self.pick_map(self.get_map_years.join)
+
+    else
+
+      puts "Please wait while we fetch the maps' years..."
+      puts ""
+
+      self.list_map_years
+      map_years = @skimaps.area_info.scrape_map_years
+
+      input = nil
+
+      until map_years.include?(input)
+        puts ""
+        puts "Please pick a year that is listed."
+        input = gets.strip
+      end
+
+      pick_map(input)
+
+    end
+
+  end
+
+  def pick_map(year)
+
+    map_data = @skimaps.area_info.scrape_map_data.detect do |map|
+      map.search("yearPublished").text == year
+    end
+
+    begin
+      url = map_data.search("render").attr('url').text
+    rescue Exception
+      url = map_data.search("unprocessed").attr('url').text
+    end
+
+    puts "Would you like to download the Map to your working directory or see it in your browser?"
+    puts "Type 'browser', 'download', or 'exit'"
+
+    input = gets.strip
+
+    case input 
+
+    when "download"
+
+      exec "curl -O #{url}"
+      puts "Enjoy your map!"
+
+    when "browser"
+
+      Launchy.open("#{url}")
+      puts "Enjoy your map!"
+
+    end
+
+  end
+
+
+
   def get_areas
     
     input = nil
@@ -74,8 +158,8 @@ class StudyTheMap::CLI
 
   def region
 
-    region = nil
-    while region != "back"
+    region_name = nil
+    while region_name != "back"
 
       puts "-----------------------------------------------------------------------"
       puts "1. Input a region for a list of ski resorts, or"
@@ -85,23 +169,27 @@ class StudyTheMap::CLI
       puts "3. Or 'back' to return to the main menu."
       puts '-->'
       
-      region = gets.strip
+      region_name = gets.strip
+
+      if region_name == "back"
+        call
+      end
       
-      if region.size == 1
+      if region_name.size == 1
 
-        Region.starts_with(region)
+        Region.starts_with(region_name)
         region
 
       else
 
         begin
 
-          region_object = Region.new(region)
+          region_object = Region.new(region_name)
           region_object.full_list
 
         rescue Exception
 
-          if region != "back"
+          if region_name != "back"
             puts '-----------------------------------------------------------------------'
             puts "Not a valid region."
             puts '-----------------------------------------------------------------------'

data/lib/study_the_map/lookupids.rb

@@ -1,12 +1,10 @@
-require 'pry'
-require 'open-uri'
-require 'nokogiri'
-
 class LookupIDS
 
 
   def self.index
+
     doc = Nokogiri::XML(open("./lib/fixtures/index.xml"))
+    
   end
 
   def self.find_region_id(region_name)
@@ -14,6 +12,7 @@ class LookupIDS
     region_element = self.index.css("regions region").detect do |region|
       region.text.strip == region_name
     end
+
     region_element['id']
 
   end
@@ -23,6 +22,7 @@ class LookupIDS
     ski_area_element = self.index.search("skiArea").detect do |ski_area|
       ski_area.search("name").text.strip == area_name
     end
+
     ski_area_element['id']
     
   end

data/lib/study_the_map/region_scraper.rb

@@ -0,0 +1,31 @@
+class RegionScraper
+
+  def initialize(region_name)
+    @url = "https://skimap.org/Regions/view/#{LookupIDS.find_region_id(region_name)}.xml"
+  end
+
+  def region_info
+    Nokogiri::XML(open(@url))
+  end
+
+  def scrape_ski_areas
+    self.region_info.search("skiArea").collect do |ski_area|
+      "#{ski_area.text}"
+    end
+  end
+
+  def self.regions_list
+
+    LookupIDS.index.css("regions region").collect do |region|
+      region.text.strip
+    end.uniq
+
+  end
+
+  def self.ski_area_list
+
+    LookupIDS.index.search("skiArea name").map {|ski_area| ski_area.text}
+    
+  end
+
+end

data/lib/study_the_map/regions.rb

@@ -1,38 +1,29 @@
-require './lib/study_the_map.rb'
 
 class Region
 
-  attr_accessor :ski_areas, :region_id
+  attr_accessor :ski_areas , :region_id, :region_info
 
   def initialize(region)
 
-    doc = Nokogiri::XML(open("https://skimap.org/Regions/view/#{LookupIDS.find_region_id(region)}.xml"))
-    self.region_id = doc.search("region").attr('id').text
+    region_data = RegionScraper.new(region)
+    @region_info = region_data.region_info
+ 
+    self.region_id = @region_info.search("region").attr('id').text
+    
 
     puts "Here are the ski resorts in #{region}:"
 
-    self.ski_areas = doc.search("skiArea").collect do |ski_area|
-      "#{ski_area.text}"
-    end
+    self.ski_areas = region_data.scrape_ski_areas
 
   end
 
   def self.starts_with(letter)
     # regions that start with
-    regions_starts_with_letter = self.regions_list.select {|region_name| region_name.start_with?(letter.upcase)}
+    regions_starts_with_letter = RegionScraper.regions_list.select {|region_name| region_name.start_with?(letter.upcase)}
     regions_starts_with_letter.each.with_index(1) {|region_name, index| puts "#{index}. #{region_name}"}
 
   end
 
-  def starts_with(letter)
-
-    results = self.ski_areas.select do |area| 
-      area.start_with?("#{letter}", "#{letter.upcase}")
-    end
-
-    results.each.with_index(1){|area, i| puts "#{i}. #{area}"}
-
-  end
 
   def full_list
 
@@ -40,19 +31,4 @@ class Region
 
   end
 
-  def self.regions_list
-
-    regions_list_array = []
-    LookupIDS.index.css("regions region").each do |region|
-      regions_list_array << region.text.strip
-    end
-    regions_list_array.uniq
-
-  end
-
-  def self.ski_area_list
-
-    LookupIDS.index.search("skiArea name").map {|ski_area| ski_area.text}
-    
-  end
 end

data/lib/study_the_map/ski_map.rb

@@ -1,130 +1,17 @@
-require './lib/study_the_map.rb'
+# require './lib/study_the_map.rb'
 
 class SkiMaps
 
-  attr_accessor :area_name, :area_info
+  attr_accessor :area_name, :area_info, :map_count
 
   def initialize(area_name)
 
     @area_name = area_name
-    area_doc = Nokogiri::XML(open("https://skimap.org/SkiAreas/view/#{LookupIDS.find_ski_area_id(area_name)}.xml"))
-    
-    @area_info = area_doc
 
-    map_count_and_pick
+    @area_info = SkiMapScraper.new(area_name)
+    @map_count = @area_info.map_count
 
+ 
   end
 
-  def map_count_and_pick
-
-    map_count = @area_info.search("skiMaps").attr('count').text
-
-    puts "There are #{map_count} maps for this ski area."
-
-    if map_count == "0"
-
-      StudyTheMap::CLI.new.call
-
-    elsif map_count == "1"
-
-      self.pick_map(self.get_map_years.join)
-
-    else
-
-      puts "Please wait while we fetch the maps' years..."
-      puts ""
-
-      self.list_map_years
-      map_years = self.get_map_years
-
-      input = nil
-
-      until map_years.include?(input)
-        puts ""
-        puts "Please pick a year that is listed."
-        input = gets.strip
-      end
-
-      pick_map(input)
-
-    end
-
-  end
-
-  def get_map_ids
-
-    id_array = []
-
-    @area_info.search("skiMaps skiMap").each do |map|
-      id_array << map.attr('id')
-    end
-
-    id_array
-
-  end
-
-  def get_map_data
-
-    map_data_array = []
-
-    self.get_map_ids.each do |id|
-      map_data_array << Nokogiri::XML(open("https://skimap.org/SkiMaps/view/#{id}.xml"))
-    end
-
-    map_data_array
-
-  end
-
-  def list_map_years  
-
-    self.get_map_data.each do |map|
-      puts map.search("yearPublished").text
-    end
-
-  end
-
-  def get_map_years
-
-    map_years_array = []
-
-    self.get_map_data.each do |map|
-      map_years_array << map.search("yearPublished").text
-    end
-
-    map_years_array
-
-  end
-
-  def pick_map(year)
-
-    map_data = self.get_map_data.detect do |map|
-      map.search("yearPublished").text == year
-    end
-
-    begin
-      url = map_data.search("render").attr('url').text
-    rescue Exception
-      url = map_data.search("unprocessed").attr('url').text
-    end
-
-    puts "Would you like to download the Map to your working directory or see it in your browser?"
-    puts "Type 'browser', 'download', or 'exit'"
-
-    input = gets.strip
-
-    case input 
-
-    when "download"
-
-      exec "curl -O #{url}"
-      puts "Enjoy your map!"
-
-    when "browser"
-
-      Launchy.open("#{url}")
-      puts "Enjoy your map!"
-
-    end
-
-  end
 end

data/lib/study_the_map/ski_map_scraper.rb

@@ -0,0 +1,43 @@
+class SkiMapScraper
+
+  def initialize(area_name)
+    @url = "https://skimap.org/SkiAreas/view/#{LookupIDS.find_ski_area_id(area_name)}.xml"
+  end
+
+  def area_info
+    Nokogiri::XML(open(@url))
+  end
+
+  def scrape_map_ids
+
+    id_array = []
+
+    self.area_info.search("skiMaps skiMap").each do |map|
+      id_array << map.attr('id')
+    end
+
+    id_array
+
+  end
+
+  def scrape_map_data
+
+    self.scrape_map_ids.collect do |id|
+      Nokogiri::XML(open("https://skimap.org/SkiMaps/view/#{id}.xml"))
+    end
+
+  end
+
+  def scrape_map_years
+
+    self.scrape_map_data.collect do |map|
+      map.search("yearPublished").text
+    end
+
+  end
+
+  def map_count
+    self.area_info.search("skiMaps").attr('count').text
+  end
+
+end

data/lib/study_the_map/version.rb

@@ -1,3 +1,3 @@
 module StudyTheMap
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/study_the_map.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"
 
-  spec.add_development_dependency "nokogiri"
-  spec.add_development_dependency "launchy"
+  spec.add_runtime_dependency "launchy"
+  spec.add_runtime_dependency "nokogiri"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: study_the_map
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - bshap93
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,13 +67,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -81,13 +81,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: launchy
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -117,8 +117,10 @@ files:
 - lib/study_the_map.rb
 - lib/study_the_map/cli.rb
 - lib/study_the_map/lookupids.rb
+- lib/study_the_map/region_scraper.rb
 - lib/study_the_map/regions.rb
 - lib/study_the_map/ski_map.rb
+- lib/study_the_map/ski_map_scraper.rb
 - lib/study_the_map/version.rb
 - study_the_map.gemspec
 homepage: https://github.com/bshap93/study_the_map