house_floor_bills 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 245f6c1bd3d3a1a953f5711dff79b1df8cf81a42
-  data.tar.gz: 3f1d13c80255e97a4ea7c4068ad94706aace599a
+  metadata.gz: 94d99cd5e475e372bd9e0245e5cdb667910c91cc
+  data.tar.gz: 39e999418718201edb8049fae13c1d089f2715b9
 SHA512:
-  metadata.gz: 3fb4426f40cd1a576509e4f2b50ebd75e92174c8ed0f53847a2c132e13541e4c1c36243918e8c0cb714f6e11d4b70467f7b53b79bde5306c8501c760cac54577
-  data.tar.gz: 25783e5f28570b6cb60a33757def66a2b3f31f557025b1397297a946427a101bd9b7ab150919da6bd03cd27a4e46c8bb8c0d7978d727d5dc852dafc8c577aff3
+  metadata.gz: 22476ffc79b1e4660b35526739b53209905c52696d4d09b057859348415a2de251274715ef3fd83bf7227b1d339ef10ef5d90cd1a6f01717f94c93683ad8bb0b
+  data.tar.gz: 1c61b16207aff2654686b3fb3f32507c2dcced8cf94ac337060d0ca10f2920bb467b10bb561e93f279c0a74543375c25cb7e2e4ec6e5bf831d251170465dbaef

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.3.0
+  - 2.4.0
 before_install: gem install bundler -v 1.11.2

data/house_floor_bills.gemspec

@@ -29,9 +29,9 @@ Gem::Specification.new do |spec|
   spec.executables   = ["house-floor-bills"]
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "bundler", ">= 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"
-  spec.add_dependency "nokogiri", "~> 1.7"
+  spec.add_dependency "nokogiri", "~> 1.0"
 end

data/lib/house_floor_bills/scraper.rb

@@ -3,7 +3,7 @@ class HouseFloorBills::Scraper
 
   def initialize(week = "") # Format of week must be "2017-03-27"
     @schedule = HouseFloorBills::Schedule.new
-    @doc_schedule = Nokogiri::HTML(open("http://docs.house.gov/floor/Default.aspx?date=#{week}"))
+    @doc_schedule = Nokogiri::HTML(open("https://docs.house.gov/floor/Default.aspx?date=#{week}"))
   end
 
   def scrape
@@ -19,6 +19,7 @@ class HouseFloorBills::Scraper
   end
 
   def scrape_bills
+    print "Loading "
     @doc_schedule.search("table.floorItems > tr.floorItem").collect do |floor_item|
       # Instantiate the bill
       b = HouseFloorBills::Bill.new
@@ -27,6 +28,8 @@ class HouseFloorBills::Scraper
       b.name = floor_item.css("td.floorText").text.strip
       b.pdf = floor_item.css("td.files a").attr("href").text
 
+      print "."
+
       # Set URL conditionally, based on type of bill:
       if b.number.split.include? "H.R."
         b.url = "https://www.congress.gov/bill/115th-congress/house-bill/#{b.number.split.last}"
@@ -34,15 +37,26 @@ class HouseFloorBills::Scraper
         b.url = "https://www.congress.gov/bill/115th-congress/house-resolution/#{b.number.split.last}"
       elsif b.number.split.include? "S."
         b.url = "https://www.congress.gov/bill/115th-congress/senate-bill/#{b.number.split.last}"
+      else
+        b.url = ""
       end
 
-      doc_bill ||= Nokogiri::HTML(open(b.url))
-      b.sponsor = doc_bill.search("table.standard01 > tr:first-child a").text.strip
-      b.committees = doc_bill.search("table.standard01 > tr:nth-child(2) td").text.strip
-      b.status = doc_bill.search("ol.bill_progress li.selected  > text()").text.strip
-      b.summary = doc_bill.search("div#bill-summary > p, div#bill-summary li").to_s.gsub("</p>","\n\n").gsub("</li>","\n\n").gsub(/<\/.+>/,"").gsub(/<.+>/,"")
-      if b.summary == ""
-        b.summary = doc_bill.search("div#main > p").text
+      # Handle error if couldn't get bill URL
+      if b.url == ""
+        # Set all to blank
+        b.sponsor = ""
+        b.committees = ""
+        b.status = ""
+        b.summary = ""
+      else
+        doc_bill ||= Nokogiri::HTML(open(b.url))
+        b.sponsor = doc_bill.search("table.standard01 > tr:first-child a").text.strip
+        b.committees = doc_bill.search("table.standard01 > tr:nth-child(2) td").text.strip
+        b.status = doc_bill.search("ol.bill_progress li.selected  > text()").text.strip
+        b.summary = doc_bill.search("div#bill-summary > p, div#bill-summary li").to_s.gsub("</p>","\n\n").gsub("</li>","\n\n").gsub(/<\/.+>/,"").gsub(/<.+>/,"")
+        if b.summary == ""
+          b.summary = doc_bill.search("div#main > p").text
+        end
       end
       # Add the bill to the schedule
       @schedule.add_bill(b)

data/lib/house_floor_bills/version.rb

@@ -1,3 +1,3 @@
 module HouseFloorBills
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: house_floor_bills
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Dalma Boros
@@ -14,14 +14,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.0'
 description: Legislative bills scheduled for debate this week on the United States
   House of Representatives floor.
 email:
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Bills to be considered on the house floor.