lakes 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2f90d9155261969985aeb991728e30ff9adbbe3
-  data.tar.gz: be510c54220703644f910f3983a0e196956050a3
+  metadata.gz: 2234be1dd9e85792994fd9943a08ecf2768128c2
+  data.tar.gz: 727102c0fa0e2f682ac22bd45bcde550a244f9e6
 SHA512:
-  metadata.gz: 308594624b25d80c2dccae8301f31088297f53072cdbc75037d9d23279536e7520f7a84f5f1d46034dde4e86db5980aa2cdfd648b63e905b29abe465fc44c6da
-  data.tar.gz: 6d62789d2a0f3cdefa2bfd6f6a5976e1a015dc3949bad710d4e2888d074b9fb1cb09cc64727767ff09c232f0934720d20ac92359c66316dab1c1d430986e1358
+  metadata.gz: c3182d5719093b93edfc3e44a05d831c689e263321be8dd639582a22dcc4026e316e636206c0543989012042d01eb41f62bb3b65447d443debc64aa46a52ab1e
+  data.tar.gz: 4ef88d976d9d2d8fec82ecb7bf3735158ad4fe84e45f53a4ff01da13dd586035a51f944c2b64c345b94aea582d49578580a9519ce565e90de1e7524973b6ac14

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/lib/lakes/texas.rb

@@ -15,8 +15,7 @@ module Lakes
       return @lake_data.keys unless @lake_data.empty?
 
       base_url = 'http://tpwd.texas.gov/fishboat/fish/recreational/lakes/'
-      uri = URI("#{base_url}lakelist.phtml")
-      content = Net::HTTP.get(uri)
+      content = http_get("#{base_url}lakelist.phtml")
       html_doc = Nokogiri::HTML(content)
       
       # remove elements not needed to make parsing easier
@@ -42,9 +41,7 @@ module Lakes
     protected
 
     def parse_lake_details(lake_data)
-      uri = URI(lake_data[:details_uri] + '/')
-      content = Net::HTTP.get(uri).encode('UTF-8', 'Windows-1252')
-
+      content = http_get(lake_data[:details_uri] + '/')
       html_doc = Nokogiri::HTML(content)
       main_div = html_doc.at('div#maincontent')
 
@@ -103,39 +100,27 @@ module Lakes
     end
 
     def parse_fishing_regulations(main_div, lake_data)
-      data = main_div.xpath('//h6[contains(text(), "Fishing Regulations")]').first
-      content = data.try(:next_element).try(:to_html)
-      lake_data[:fishing_regulations] = content
+      process_simple_section(main_div, lake_data, 'Fishing Regulations', :fishing_regulations, true)
     end
 
     def parse_lake_maps(main_div, lake_data)
-      data = main_div.xpath('//h6[contains(text(), "Lake Maps")]').first
-      content = data.try(:next_element).try(:text)
-      lake_data[:lake_maps] = content
+      process_simple_section(main_div, lake_data, 'Lake Maps', :lake_maps, false)
     end
 
     def parse_lake_characteristics(main_div, lake_data)
-      data = main_div.xpath('//h6[contains(text(), "Lake Characteristics")]').first
-      content = data.try(:next_element).try(:text)
-      lake_data[:lake_characteristics] = content
+      process_simple_section(main_div, lake_data, 'Lake Characteristics', :lake_characteristics, false)
     end
 
     def parse_water_conditions(main_div, lake_data)
-      data = main_div.xpath('//h6[contains(text(), "Water Conditions")]').first
-      content = data.try(:next_element).try(:to_html)
-      lake_data[:water_conditions] = content
+      process_simple_section(main_div, lake_data, 'Water Conditions', :water_conditions, true)
     end
 
     def parse_reservoir_controlling_authority(main_div, lake_data)
-      data = main_div.xpath('//h6[contains(text(), "Reservoir Controlling Authority")]').first
-      content = data.try(:next_element).try(:text)
-      lake_data[:reservoir_controlling_authority] = content
+      process_simple_section(main_div, lake_data, 'Reservoir Controlling Authority', :reservoir_controlling_authority, false)
     end
 
     def parse_aquatic_vegetation(main_div, lake_data)
-      data = main_div.xpath('//h6[contains(text(), "Aquatic Vegetation")]').first
-      content = data.try(:next_element).try(:text)
-      lake_data[:aquatic_vegetation] = content
+      process_simple_section(main_div, lake_data, 'Aquatic Vegetation', :aquatic_vegetation, false)
     end
 
     def parse_predominant_fish_species(main_div, lake_data)
@@ -163,8 +148,7 @@ module Lakes
         uri = link['href']
         lake_data[:stocking_history_uri] = convert_relative_href(uri, lake_data[:details_uri])
 
-        uri = URI(lake_data[:stocking_history_uri])
-        content = Net::HTTP.get(uri).encode('UTF-8', 'Windows-1252')
+        content = http_get(lake_data[:stocking_history_uri])
         stocking_history_doc = Nokogiri::HTML(content)
 
         stocking_history_table = stocking_history_doc.at('div#maincontent table')
@@ -184,8 +168,7 @@ module Lakes
         uri = link['href']
         lake_data[:current_fishing_report_uri] = convert_relative_href(uri, lake_data[:details_uri])
 
-        uri = URI(lake_data[:current_fishing_report_uri])
-        content = Net::HTTP.get(uri).encode('UTF-8', 'Windows-1252')
+        content = http_get(lake_data[:current_fishing_report_uri])
         current_fishing_report_doc = Nokogiri::HTML(content)
         current_fishing_report_dl = current_fishing_report_doc.at('div.row.report div.container dl')
 
@@ -206,8 +189,7 @@ module Lakes
       uri = link['href']
       lake_data[:fishing_records_uri] = convert_relative_href(uri, lake_data[:details_uri])
 
-      uri = URI(lake_data[:fishing_records_uri])
-      content = Net::HTTP.get(uri).encode('UTF-8', 'Windows-1252')
+      content = http_get(lake_data[:fishing_records_uri])
       lake_records_doc = Nokogiri::HTML(content)
       lake_records_main_div = lake_records_doc.at('div#maincontent')
 
@@ -286,5 +268,18 @@ module Lakes
       value = value.strip.gsub(nbsp, '')
       value.empty? ? nil : value
     end
+
+    def process_simple_section(main_div, lake_data, section_title, data_name, html)
+      data = main_div.xpath("//h6[contains(text(), \"#{section_title}\")]").first
+      element_type_function = html ? :to_html : :text
+      content = data.try(:next_element).try(element_type_function)
+      lake_data[data_name] = content
+    end
+
+    # texas lake pages are encoded in Windows-1252 :(
+    def http_get(url)
+      uri = URI(url)
+      Net::HTTP.get(uri).encode('UTF-8', 'Windows-1252')
+    end
   end
 end

data/lib/lakes.rb

@@ -1,4 +1,4 @@
 require 'lakes/texas'
 module Lakes
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lakes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Shane Sherman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler