lakes 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b37a1e19a3fa73eb9d98aec3c498c7e6bd6246b9
-  data.tar.gz: b54c92c15b0cea9b3763c10ab596073da9b7c6b5
+  metadata.gz: 30258a90e0c078f8458d0e9b5a4d684feacffee4
+  data.tar.gz: cadf28eca8c3a73171d478ffaa78f4ca5a10b2db
 SHA512:
-  metadata.gz: cf721b20906467b1e1a3c1da47e9f112a3262953d5031b1712203d499e461f409eb1709fcc95f0f4d8d4575b7e4890b9b6cc38bd2f0cf21dd8dc7e96740e85e9
-  data.tar.gz: d1091d98b424c34a74b3e5a2af7140fadb010f70e4648b212491a1a0a762bde4d917b3710d58364384fa1f61ad123d918f706ff12a7159927838dd765cb75ea4
+  metadata.gz: 1eadff3e5c00966942b00fa265f2414d4079bdf0b71b3032ac535cd707380b739a94311e98c479805fbf5810c314f957eef410ef428851f05172c01240096222
+  data.tar.gz: 848ec09caf3c99270c8daa156d35795f2b2931600a6a9261d21c7535062a165e8b5f3ab92fdc475f1b9344416ddc13c56fec18b36130c5de90d221b739f1679b

data/lib/lakes/helper.rb

@@ -15,7 +15,8 @@ module Lakes
     end
 
     def cleanup_raw_text(raw_text)
-      raw_text.try(:gsub, /\s+/, ' ').try(:strip)
+      v = raw_text.try(:gsub, /\s+/, ' ').try(:strip)
+      v == "" ? nil : v
     end
 
     # converts this:

data/lib/lakes/texas/share_lunker.rb

@@ -5,6 +5,16 @@ module Lakes
       include Lakes::Helper
       URL = 'https://tpwd.texas.gov/spdest/visitorcenters/tffc/sharelunker/archives/lunkersearch_adv.phtml'
 
+      WEEKDAYS = {
+        'mon' => 'Monday',
+        'tue' => 'Tuesday',
+        'wed' => 'Wednesday',
+        'thu' => 'Thursday',
+        'fri' => 'Friday',
+        'sat' => 'Saturday',
+        'sun' => 'Sunday'
+      }
+
       def initialize
         @lunker_data = []
       end
@@ -17,31 +27,58 @@ module Lakes
         results = []
         html_doc.search('div#contentwide table tr').each_with_index do |row, index|
           next if index == 0
-          data = row.search('th, td').to_a
+          data = row.search('th, td')
+
+          girth = cleanup_raw_text(data[6].text)
+          girth = girth.nil? ? nil : girth.to_f
+
+          length = cleanup_raw_text(data[5].text)
+          length = length.nil? ? nil : length.to_f
+
+          status = cleanup_raw_text(data[15].text)
+          died = status.try(:downcase)
+          died = if !died.nil? 
+            died.match('died').try(:length) == 1
+          end
 
           results << {
             id: data[0].text.to_i,
-            details_uri: data[0].search('a')[0][:href],
+            details_uri: convert_relative_href("../" + data[0].search('a')[0][:href], URL),
             date_caught: Date.strptime(cleanup_raw_text(data[1].text), '%m/%d/%Y'),
             angler: cleanup_raw_text(data[2].text),
             angler_location: cleanup_raw_text(data[3].text),
             weight: cleanup_raw_text(data[4].text).to_f,
-            length: cleanup_raw_text(data[5].text).to_f,
-            girth: cleanup_raw_text(data[6].text).to_f,
+            length: length,
+            girth: girth,
             type: cleanup_raw_text(data[7].text),
             lake: cleanup_raw_text(data[8].text),
             record: cleanup_raw_text(data[9].text),
             caught_on: cleanup_raw_text(data[10].text),
-            day_of_week: cleanup_raw_text(data[11].text),
+            day_of_week: WEEKDAYS[cleanup_raw_text(data[11].text).try(:downcase)],
             moon_phase: cleanup_raw_text(data[12].text),
-            spawned: cleanup_raw_text(data[13].text),
-            returned_to_lake: cleanup_raw_text(data[14].text),
-            status: cleanup_raw_text(data[15].text)
+            spawned: convert_YN_boolean(cleanup_raw_text(data[13].text)),
+            returned_to_lake: convert_YN_boolean(cleanup_raw_text(data[14].text)),
+            status: cleanup_raw_text(data[15].text),
+            died: died
           }
         end
         @lunker_data = results
         return @lunker_data
       end
+
+      private
+      def convert_YN_boolean(value)
+        v = value.try(:downcase)
+        v = if v == 'Y'
+          true
+        elsif v == 'N'
+          false
+        else
+          nil
+        end
+        v
+      end
+
     end
   end
 end

data/lib/lakes.rb

@@ -5,5 +5,5 @@ require 'lakes/texas/water_data_parser'
 require 'lakes/texas/fishing_report_parser'
 require 'lakes/texas/share_lunker'
 module Lakes
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lakes
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Shane Sherman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2018-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler