governator 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74a7686c22cba09e8aa50f5d696b063ab79f1720
-  data.tar.gz: cf8c6c80b7ba5c53ac84ba2841b645f9d156fc52
+  metadata.gz: '0786767ccd0fd5582e610a5624efa8637ad61996'
+  data.tar.gz: 27c94c6ec91d39c2a4f7db1508fc9175b0bdef26
 SHA512:
-  metadata.gz: 8d8dd89e1fbbbb6824ef258143836d045598b67c6212d8a74d0ffea008ee4e4cd0d9403e058799a62129d544002a962bab74a8fc3ab31ef6c2b42ad509d42419
-  data.tar.gz: 1489ec8eadcedd71e9b0310d13bdbde1e59960eb7e2d70bff6a44e4abb876c3d6448df313fd483f5de150489f9f7bd98e0ddb758275e63a1b61143700b02de56
+  metadata.gz: dc01befab8bb1465b9704709ea70df929b028fdb79aed39db6c9eb6fb4879afe5ade43623ddda86de8a5f0455f8c585ab7471cd55f12aea773e1639f3f3bde9e
+  data.tar.gz: c3ff56a12367e31f02ed04124fad148bcc2d57845e9dc677a9a610235c9daa9bd07e5dfede666446ee8015dcd9afebba0bbd5f7a1895e3f0d3ba34c4a94f7297

data/lib/governator/bio_page.rb

@@ -13,7 +13,7 @@ class Governator
     end
 
     def check_for_alt_office
-      @alt_office_present = if raw.css('address')[2].to_s.match(/Phone|Address|Fax/)
+      @alt_office_present = if raw.css('address')[2].to_s =~ /Phone|Address|Fax/
                               true
                             else
                               false
@@ -52,7 +52,7 @@ class Governator
 
     def address_array
       @_address_array ||=
-        address_panel.css('p').first.text.delete("\t\n").sub('Address:', '').split(' ') - [' ']
+        address_paragraph_text(0).delete("\t\n").sub('Address:', '').split(' ') - [' ']
     end
 
     def address
@@ -60,23 +60,27 @@ class Governator
     end
 
     def city
-      @_city ||= address_panel.css('p')[1].text.delete(',')
+      @_city ||= address_paragraph_text(1).delete(',')
     end
 
     def state
-      @_state ||= address_panel.css('p')[2]&.text
+      @_state ||= address_paragraph_text(2)
     end
 
     def zip
-      @_zip ||= address_panel.css('p')[3]&.text
+      @_zip ||= address_paragraph_text(3)
     end
 
     def phone
-      @_phone ||= address_panel.css('p')[4].text.delete("\t\nPhone: ").strip.sub('/', '-')
+      @_phone ||= address_paragraph_text(4)&.delete("\t\nPhone: ").strip.sub('/', '-')
     end
 
     def fax
-      @_fax ||= address_panel.css('p')[5]&.text&.delete("\t\nFax:")&.strip&.sub('/', '-')
+      @_fax ||= address_paragraph_text(5)&.delete("\t\nFax:")&.strip&.sub('/', '-')
+    end
+
+    def address_paragraph_text(index)
+      address_panel.css('p')[index]&.text
     end
 
     def office_type
@@ -90,7 +94,7 @@ class Governator
     def alt_address_array
       return unless alt_office_present?
       @_alt_address_array ||=
-        alt_address_panel.css('p').first.text.delete("\t\n").sub('Address:', '').split(' ') - [' ']
+        alt_address_paragraph_text(0).delete("\t\n").sub('Address:', '').split(' ') - [' ']
     end
 
     def alt_building
@@ -106,25 +110,29 @@ class Governator
     end
 
     def alt_city
-      @_alt_city ||= alt_address_panel.css('p')[1].text.delete(',') if alt_office_present?
+      @_alt_city ||= alt_address_paragraph_text(1).delete(',') if alt_office_present?
     end
 
     def alt_state
-      @_alt_state ||= alt_address_panel.css('p')[2].text if alt_office_present?
+      @_alt_state ||= alt_address_paragraph_text(2) if alt_office_present?
     end
 
     def alt_zip
-      @_alt_zip ||= alt_address_panel.css('p')[3].text if alt_office_present?
+      @_alt_zip ||= alt_address_paragraph_text(3) if alt_office_present?
     end
 
     def alt_phone
       return unless alt_office_present?
-      @_alt_phone ||= alt_address_panel.css('p')[4].text.delete("\t\nPhone: ").strip.sub('/', '-')
+      @_alt_phone ||= alt_address_paragraph_text(4).delete("\t\nPhone: ").strip.sub('/', '-')
     end
 
     def alt_fax
       return unless alt_office_present?
-      @_alt_fax ||= alt_address_panel.css('p')[5]&.text&.delete("\t\nFax:")&.strip&.sub('/', '-')
+      @_alt_fax ||= alt_address_paragraph_text(5)&.delete("\t\nFax:")&.strip&.sub('/', '-')
+    end
+
+    def alt_address_paragraph_text(index)
+      alt_address_panel.css('p')[index]&.text
     end
 
     def alt_office_type

data/lib/governator/civil_services.rb

@@ -20,9 +20,11 @@ class Governator
     end
 
     def facebook
-      if record && record['facebook_url']
-        @_facebook ||= record['facebook_url'].sub('https://www.facebook.com/', '')
-      end
+      @_facebook ||= record['facebook_url'].sub('https://www.facebook.com/', '') if facebook_url?
+    end
+
+    def facebook_url?
+      record && record['facebook_url']
     end
 
     def photo_url

data/lib/governator/office.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Governator
+  Office = Struct.new *%i[address city state zip phone fax office_type] do
+    def to_s
+      [address, city, state, zip, phone, fax].compact.join("\n")
+    end
+  end
+end

data/lib/governator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Governator
-  VERSION = '0.1.9'
+  VERSION = '0.1.10'
 end

data/lib/governator.rb

@@ -7,6 +7,7 @@ require 'twitter'
 require 'governator/bio_page'
 require 'governator/civil_services'
 require 'governator/name_parser'
+require 'governator/office'
 require 'governator/panel'
 require 'governator/twitter_client'
 require 'governator/version'
@@ -29,6 +30,7 @@ class Governator
 
       governors
     end
+    alias governate! scrape!
 
     def governors
       @_governors ||= []
@@ -85,14 +87,10 @@ class Governator
   end
 
   def to_h
-    {
-      photo_url: photo_url,
-      state_name: state_name,
-      official_full: official_full,
-      url: url,
-      party: party,
-      office_locations: office_locations
-    }
+    syms =  %i[photo_url state_name official_full url party office_locations]
+    syms.each_with_object({}) do |sym, hsh|
+      hsh[sym] = send(sym)
+    end
   end
 
   def inspect
@@ -100,14 +98,18 @@ class Governator
   end
 
   def secondary_office
-    { address: bio_page.alt_address, city: bio_page.alt_city, state: bio_page.alt_state,
-      zip: bio_page.alt_zip, phone: bio_page.alt_phone, fax: bio_page.alt_fax,
-      office_type: bio_page.alt_office_type }
+    @_secondary_office ||= office(prefix: :alt_)
   end
 
   def primary_office
-    { address: bio_page.address, city: bio_page.city, state: bio_page.state, zip: bio_page.zip,
-      phone: bio_page.phone, fax: bio_page.fax, office_type: bio_page.office_type }
+    @_primary_office ||= office
+  end
+
+  def office(prefix: nil)
+    syms = %i[address city state zip phone fax office_type]
+    syms.each_with_object(Office.new) do |sym, office|
+      office[sym] = bio_page.send("#{prefix}#{sym}")
+    end
   end
 
   def photo_url

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: governator
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - M. Simon Borg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -94,6 +94,7 @@ files:
 - lib/governator/bio_page.rb
 - lib/governator/civil_services.rb
 - lib/governator/name_parser.rb
+- lib/governator/office.rb
 - lib/governator/page_scraper.rb
 - lib/governator/panel.rb
 - lib/governator/twitter_client.rb
@@ -118,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Scraper for data on US Governors