lakes 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d715fcb7ee6e872c00d366c0a1d4f603de76a5e9380d7f02041c6d9745e3e619
-  data.tar.gz: e8e4955be7f0480f76e73d13e75e200a23b1112113aeee84eb97e71251a43e69
+SHA1:
+  metadata.gz: bb5405a6f87376435d2c48c39cf5b7eba4a8dcfa
+  data.tar.gz: 359f1231edc11c4beaf58331dbfa0ecdc86b7d57
 SHA512:
-  metadata.gz: e0b3fe98905c5a3cef4a4ce629c8c15be85fb32ecaacd0f157c460164bb090fbc0417b01814f7725c2b2dbfb2657d97a2658f3a41643a9be5edc3f57751d2efc
-  data.tar.gz: 4c0c9aa02c2392ec3b216621481ab00a3f9bc71b1e4730fc54947e8cf9d3e16d058fe0cd7ad88bd677c031f09996cdad850a3ded129992097f4d29f1c97fb900
+  metadata.gz: '0390ee61eba90d6ad65454f6ddec96f74b5c0a0c33de32e0adfadca583ea69937d5dbb0de78316458b42406eebb45fc5b12e560411900876a69ff2ea7f8c75e9'
+  data.tar.gz: 9831a247e4c11c9b952d1776c9b835b2d470e5e29a1441febb9723e4c60defaeccca452f0d45676dac8be9e309b473d055590904c293a7984255c6813fd5cd41

data/lakes.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "minitest", "~> 5.11"
   spec.add_development_dependency "mocha", "~> 1.2"
-  spec.add_dependency 'nokogiri', "~> 1.8"
+  spec.add_dependency 'nokogiri', "~> 1.10"
 end

data/lib/lakes.rb

@@ -4,3 +4,4 @@ require 'lakes/texas/water_conditions_parser'
 require 'lakes/texas/water_data_parser'
 require 'lakes/texas/fishing_report_parser'
 require 'lakes/texas/share_lunker'
+require 'lakes/texas/lake_records_parser'

data/lib/lakes/helper.rb

@@ -19,6 +19,28 @@ module Lakes
       v == "" ? nil : v
     end
 
+    # converts a html table with headers and rows into
+    # an array of hashes with header => value
+    def process_data_table(headers, rows)
+      data = []
+      header_count = headers.length
+      row_count = rows.count / header_count
+
+      row_data_index = 0
+      row_count.times do |row_index|
+
+        entry = {}
+        header_count.times do |header_index|
+          header = cleanup_data(headers[header_index])
+          table_data = cleanup_data(rows[row_data_index])
+          row_data_index += 1
+          entry[header] = table_data
+        end
+        data << entry
+      end
+      data
+    end
+
     # converts this:
     # ../../../action/waterecords.php?WB_code=0001
     # into this:

data/lib/lakes/texas.rb

@@ -234,62 +234,8 @@ module Lakes
       lake_data[:fishing_records_uri] = convert_relative_href(uri, lake_data[:details_uri])
 
       content = http_get(lake_data[:fishing_records_uri])
-      lake_records_doc = Nokogiri::HTML(content)
-      lake_records_main_div = lake_records_doc.at('div#maincontent')
-
-      # H2's are record types like:
-      # - weight records
-      # - catch and release records (by length)
-
-      element = lake_records_main_div.children.first
-      current_record_type = nil # Weight or Length
-      current_age_group = nil # all ages, youth, etc
-      fishing_records_data = {}
-      while element = element.next_element
-        case element.name
-        when 'h2'
-          current_record_type = cleanup_data(element.text)
-          fishing_records_data[current_record_type] = {}
-        when 'h3'
-          current_age_group = cleanup_data(element.text)
-          fishing_records_data[current_record_type][current_age_group] = {}
-        when 'table'
-          fishing_method = cleanup_data(element.xpath('caption/big').text)
-
-          if fishing_records_data[current_record_type][current_age_group][fishing_method].nil?
-            fishing_records_data[current_record_type][current_age_group][fishing_method] = []
-          end
-
-          headers = element.xpath('tr/th').map{ |r| r.text }
-          rows = element.xpath('tr/td').map{ |r| r.text }
-
-          table_data = process_data_table(headers, rows)
-          fishing_records_data[current_record_type][current_age_group][fishing_method] = table_data
-        end
-      end
-      lake_data[:fishing_records] = fishing_records_data
-    end
-
-    # converts a html table with headers and rows into
-    # an array of hashes with header => value
-    def process_data_table(headers, rows)
-      data = []
-      header_count = headers.length
-      row_count = rows.count / header_count
-
-      row_data_index = 0
-      row_count.times do |row_index|
-
-        entry = {}
-        header_count.times do |header_index|
-          header = cleanup_data(headers[header_index])
-          table_data = cleanup_data(rows[row_data_index])
-          row_data_index += 1
-          entry[header] = table_data
-        end
-        data << entry
-      end
-      data
+      parser = LakeRecordsParser.new(content)
+      lake_data[:fishing_records] = parser.records
     end
 
     def process_simple_section(main_div, lake_data, section_title, data_name, html)

data/lib/lakes/texas/lake_records_parser.rb

@@ -0,0 +1,53 @@
+require 'nokogiri'
+module Lakes
+  class Texas
+    class LakeRecordsParser
+      include Lakes::Helper
+
+      attr_reader :raw_text
+      attr_reader :records
+
+      def initialize(text)
+        @raw_text = text
+        @records = {}
+        parse
+      end
+
+      def parse
+        lake_records_doc = Nokogiri::HTML(@raw_text)
+        lake_records_main_div = lake_records_doc.at('div#maincontent')
+
+        # H2's are record types like:
+        # - weight records
+        # - catch and release records (by length)
+
+        element = lake_records_main_div.children.first
+        current_record_type = nil # Weight or Length
+        current_age_group = nil # all ages, youth, etc
+        while element = element.next_element
+          case element.name
+          when 'h2'
+            current_record_type = cleanup_data(element.text)
+            @records[current_record_type] = {}
+          when 'h3'
+            current_age_group = cleanup_data(element.text)
+            @records[current_record_type][current_age_group] = {}
+          when 'table'
+            fishing_method = cleanup_data(element.xpath('caption/big').text)
+
+            if @records[current_record_type][current_age_group][fishing_method].nil?
+              @records[current_record_type][current_age_group][fishing_method] = []
+            end
+
+            headers = element.xpath('tr/th').map{ |r| r.text }
+            rows = element.xpath('tr/td').map{ |r| r.text }
+
+            table_data = process_data_table(headers, rows)
+            @records[current_record_type][current_age_group][fishing_method] = table_data
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Lakes
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lakes
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Shane Sherman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2019-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
 description: I wrote this gem to originally parse texas lake data
 email:
 - shane.sherman@gmail.com
@@ -102,6 +102,7 @@ files:
 - lib/lakes/texas.rb
 - lib/lakes/texas/fishing_report_parser.rb
 - lib/lakes/texas/lake_characteristics_parser.rb
+- lib/lakes/texas/lake_records_parser.rb
 - lib/lakes/texas/share_lunker.rb
 - lib/lakes/texas/water_conditions_parser.rb
 - lib/lakes/texas/water_data_parser.rb
@@ -127,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: This gem parses lake details from various government websites