lakes 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2234be1dd9e85792994fd9943a08ecf2768128c2
-  data.tar.gz: 727102c0fa0e2f682ac22bd45bcde550a244f9e6
+  metadata.gz: 4fd4734a4458713c26f87380650f9f997b69ee47
+  data.tar.gz: 98432482a89cac25e45637a1acd4a50d4d3fd5e3
 SHA512:
-  metadata.gz: c3182d5719093b93edfc3e44a05d831c689e263321be8dd639582a22dcc4026e316e636206c0543989012042d01eb41f62bb3b65447d443debc64aa46a52ab1e
-  data.tar.gz: 4ef88d976d9d2d8fec82ecb7bf3735158ad4fe84e45f53a4ff01da13dd586035a51f944c2b64c345b94aea582d49578580a9519ce565e90de1e7524973b6ac14
+  metadata.gz: 1e95cffa65e7e8778f7ae086dfc651d4b1f1dcd0e602b57fdad0a942745e0be6eff3e81a660020951184317811af5527d88ab477c1355df22f40c660576dadb2
+  data.tar.gz: ed6fb9047856f64ea9ab52fbda4ea31e6895132998f2e06ce4877d649136968fd2d5ac0e7431e00afd94dd206f909481d228dfc44127ebcff243ee171ecca2d6

data/lakes.gemspec

@@ -16,10 +16,10 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency 'nokogiri', "~> 1.6"
+  spec.add_development_dependency 'nokogiri', "~> 1.7"
 end

data/lib/lakes/texas/lake_characteristics_parser.rb

@@ -0,0 +1,57 @@
+class LakeCharacteristicsParser
+  attr_reader :raw_text, :location_desc
+  attr_reader :surface_area_raw_text, :surface_area_in_acres
+  attr_reader :max_depth_raw_text, :max_depth_in_feet
+  attr_reader :year_impounded_raw_text, :year_impounded
+
+  def initialize(text)
+    @raw_text = text
+    parse
+  end
+
+  def parse
+    @location_desc = @raw_text.match(/^location:(.*)(surface area)|(surface acres)|(maximum depth|impounded):/im).captures.first
+    @surface_area_raw_text = @raw_text.match(/surface (area|acres):(.*)/i).try(:captures).try(:[], 1)
+    @max_depth_raw_text = @raw_text.match(/maximum depth:(.*)/i).try(:captures).try(:first)
+    @year_impounded_raw_text = @raw_text.match(/impounded:(.*)/im).try(:captures).try(:first)
+
+    @location_desc = cleanup_raw_text(@location_desc)
+
+    @surface_area_in_acres = cleanup_raw_text(@surface_area_raw_text)
+      .try(:match, /^([0-9,]+)/)
+      .try(:captures)
+      .try(:first)
+      .try(:delete, ',')
+      .try(:to_i)
+
+    @max_depth_in_feet = cleanup_raw_text(@max_depth_raw_text)
+      .try(:match, /^([0-9,]+)/)
+      .try(:captures)
+      .try(:first)
+      .try(:delete, ',')
+      .try(:to_i)
+
+    # need to handle bad data like Lake Fryer which is:
+    # Maximum depth: Average 13 feet, maximum 25 feet
+    if @max_depth_in_feet.nil?
+      @max_depth_in_feet = cleanup_raw_text(@max_depth_raw_text)
+        .try(:match, /maximum ([0-9,]+) feet/i)
+        .try(:captures)
+        .try(:first)
+        .try(:delete, ',')
+        .try(:to_i)
+    end
+
+    @year_impounded = cleanup_raw_text(@year_impounded_raw_text)
+      .try(:match, /([0-9,]+)/)
+      .try(:captures)
+      .try(:first)
+      .try(:delete, ',')
+      .try(:to_i)
+
+  end
+
+  def cleanup_raw_text(raw_text)
+    raw_text.try(:gsub, /\s+/, ' ').try(:strip)
+  end
+end

data/lib/lakes/texas.rb

@@ -31,10 +31,11 @@ module Lakes
     end
 
     def get_details(lake_name)
+      puts "getting details for #{lake_name}"
       list
       data = lake_data[lake_name]
       raise 'Lake not found' if data.nil?
-
+      data[:name] = lake_name
       parse_lake_details(data)
     end
 
@@ -50,15 +51,15 @@ module Lakes
       parse_reservoir_controlling_authority(main_div, lake_data)
       parse_aquatic_vegetation(main_div, lake_data)
       parse_predominant_fish_species(main_div, lake_data)
-      parse_lake_records(main_div, lake_data)
       parse_current_fishing_report(main_div, lake_data)
-      parse_stocking_history(main_div, lake_data)
       parse_lake_surveys(main_div, lake_data)
       parse_lake_maps(main_div, lake_data)
       parse_fishing_regulations(main_div, lake_data)
       parse_angling_opportunities(main_div, lake_data)
       parse_fishing_structure(main_div, lake_data)
       parse_tips_and_tactics(main_div, lake_data)
+      parse_lake_records(main_div, lake_data)
+      parse_stocking_history(main_div, lake_data)
       lake_data
     end
 
@@ -108,7 +109,17 @@ module Lakes
     end
 
     def parse_lake_characteristics(main_div, lake_data)
-      process_simple_section(main_div, lake_data, 'Lake Characteristics', :lake_characteristics, false)
+      data = main_div.xpath("//h6[contains(text(), 'Lake Characteristics')]").first
+      content = data.try(:next_element).try(:text).try(:strip)
+      lake_data[:raw_lake_characteristics] = content
+
+      parser = LakeCharacteristicsParser.new(content)
+
+      lake_data[:lake_characteristics] = {}
+      lake_data[:lake_characteristics][:location_desc] = parser.location_desc
+      lake_data[:lake_characteristics][:surface_area_in_acres] = parser.surface_area_in_acres
+      lake_data[:lake_characteristics][:max_depth_in_feet] = parser.max_depth_in_feet
+      lake_data[:lake_characteristics][:year_impounded] = parser.year_impounded
     end
 
     def parse_water_conditions(main_div, lake_data)

data/lib/lakes.rb

@@ -1,4 +1,5 @@
 require 'lakes/texas'
+require 'lakes/texas/lake_characteristics_parser'
 module Lakes
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lakes
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Shane Sherman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2017-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
 description: I wrote this gem to originally parse texas lake data
 email:
 - shane.sherman@gmail.com
@@ -85,6 +85,7 @@ files:
 - lakes.json
 - lib/lakes.rb
 - lib/lakes/texas.rb
+- lib/lakes/texas/lake_characteristics_parser.rb
 - lib/try.rb
 homepage: 
 licenses:
@@ -106,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: This gem parses lake details from various government websites