house_floor_bills 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91f2c4d62ba46bb4fc42b936fa74f78ff3326fd4
-  data.tar.gz: a0f71872a6255f6eb04db140ed000a10da5982fb
+  metadata.gz: 926d9fa88f99bc48cf0c644347eea2c39a108662
+  data.tar.gz: dcd7e633ddf5d9c641918322f3520146e20e6006
 SHA512:
-  metadata.gz: d3242b93aca411e5602b938b3e988150716f7ca6b7578358c972a09e8696fc76e7767c59f35411a16f87f777dc713f0859c7e11dd60d17d6c944d94c450a26dd
-  data.tar.gz: 42e3c6eae2fecad31b7cf8fca6edaa7021a578103ca31b2e353e24ac4a8fdcfa5b2594d573d8146fca68140dc1638c31cdfafd0d33ca5925a1eee43f3d41dae1
+  metadata.gz: 58a266409160718a1b0a59d01514487473f51e18a5a67d80380b88f947cb6bc13561e52ef9b5ed2be606e1df7f33313fc4a0d6b5c14ca368710d6da788f24cc6
+  data.tar.gz: 3ebbb7964c7e44df0818ae3923df7f7d54e8cd2d28f2a2ed979a305661d3349b058a6b261e4fdb148abf504b887276b8e4190a9065cdfba1ca0fa21aefbb9914

data/README.md

@@ -1,6 +1,6 @@
 # HouseFloorBills
 
-The house-floor-bills CLI gem provides a CLI interface to view the schedule of bills to be debated on the House of Representatives floor this week. Further details about the scheduled bills can be viewed as well.
+The house-floor-bills CLI gem provides a CLI interface to view the schedule of legislative bills to be debated on the House of Representatives floor this week. Further details about the scheduled bills can be viewed as well.
 
 ## Installation
 

data/bin/house-floor-bills

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "house_floor_bills"
+require_relative "../lib/house_floor_bills"
 
 HouseFloorBills::CLI.new.call

data/blog_post

@@ -29,9 +29,11 @@ CLI Data Game Project Steps
   - git remote add origin git@github.com:dalmaboros/house-floor-bills-cli-app.git
   - git push -u origin master
 
-6. encapsulate CLI logic in object
-  - create class HouseFloorBills::CLI in "cli.rb" file in lib
-  - define #call method
+6. create CLI object to encapsulate CLI logic:
+  a) define HouseFloorBills::CLI class in 'lib/cli.rb' and
+    - define #call method
+  b) add dependency to environment file (house_floor_bills.rb)
+    - require_relative "./house_floor_bills/cli"
 
 7. declare environment load dependencies
   - bin/house-floor-bills: require './lib/house_floor_bills'
@@ -43,8 +45,33 @@ CLI Data Game Project Steps
 
 8. stub cli.rb behaviors
 
-03/18/17
-
 9. add spec file I forgot to add!
 
-10. create 'bill.rb' and HouseFloorBills::Bill class, and add to environment file
+10. create the bill object:
+  a) define HouseFloorBills::Bill class in 'bill.rb' and
+  b) add dependency to environment file (house_floor_bills.rb)
+    - require_relative "./house_floor_bills/bill"
+
+11. hard-code fake bill data
+
+12. write real CLI behaviors
+
+13. scrape real bill data
+
+At this point, the program was working, but it wasn't truly object-oriented.
+
+14. create the scraper object:
+  a) define HouseFloorBills::Scraper class in 'scraper.rb' and
+  b) add dependency to environment file (house_floor_bills.rb)
+    - require_relative "./house_floor_bills/scraper"
+
+15. create the schedule object:
+  a) define HouseFloorBills::Schedule class in 'schedule.rb' and
+  b) add dependency to environment file (house_floor_bills.rb)
+    - require_relative "./house_floor_bills/schedule"
+
+16. Made HouseFloorBills::Scraper responsible for all scraping
+
+17. Made HouseFloorBills::Schedule responsible for containing bills
+
+18. Made HouseFloorBills::Bill responsible for containing bill data

data/house_floor_bills.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["dalma.boros@gmail.com"]
 
   spec.summary       = %q{Bills to be considered on the house floor.}
-  spec.description   = %q{Bills scheduled for debate this week on the House of Representatives floor.}
+  spec.description   = %q{Legislative bills scheduled for debate this week on the United States House of Representatives floor.}
   spec.homepage      = "https://github.com/dalmaboros/house-floor-bills-cli-gem"
   spec.license       = "MIT"
 

data/lib/house_floor_bills/bill.rb

@@ -1,4 +1,20 @@
 class HouseFloorBills::Bill
   attr_accessor :number, :name, :pdf, :url, :sponsor, :committees, :status, :summary
 
-end # class
+  @@bills = []
+
+  def initialize
+    @@bills << self
+  end
+
+  def self.all
+    @@bills.dup.freeze
+  end
+
+  def self.bills_by_status(status)
+    self.all.select do |bill|
+      bill.status.downcase == "#{status.downcase}"
+    end
+  end
+
+end

data/lib/house_floor_bills/cli.rb

@@ -7,14 +7,18 @@ class HouseFloorBills::CLI
   end
 
   def welcome
-    puts "\n************* Welcome to House Floor Bills *************"
-    puts "\nSee which bills are scheduled for debate on the House of Representatives floor."
+    puts "\n------ Welcome to House Floor Bills ------"
+    puts "\nBills to be considered on the U.S. House floor:"
   end
 
   def list_bills
     s = HouseFloorBills::Scraper.new
     @schedule = s.scrape
-    puts "\n************* #{@schedule.title} *************\n "
+
+    puts "\n-------------------------------------------"
+    puts "#{@schedule.title}"
+    puts "-------------------------------------------\n "
+
     @schedule.bills.each.with_index(1) do |bill, i|
       puts "#{i}. #{bill.number} - #{bill.name}"
     end
@@ -22,7 +26,8 @@ class HouseFloorBills::CLI
 
   def print_bill(the_bill)
     puts "\n[#{the_bill.number}] #{the_bill.name}"
-    puts "\nStatus: #{the_bill.status}"
+    puts "----------------------------------------------------------------------\n "
+    puts "Status: #{the_bill.status}"
     puts "Sponsor: #{the_bill.sponsor}"
     puts "Committees: #{the_bill.committees}"
     puts "URL: #{the_bill.url}"
@@ -31,9 +36,10 @@ class HouseFloorBills::CLI
   end
 
   def print_commands
-    puts "\nCOMMANDS:"
+    puts "\nCOMMANDS"
+    puts "-------------------------------------------"
     puts "Enter 1-#{@schedule.bills.length} for more info on corresponding bill."
-    puts "Enter 'open 1-#{@schedule.bills.length}' to open bill URL in browser."
+    puts "Enter 'open 1-#{@schedule.bills.length}' to open bill page in browser."
     puts "Enter 'pdf 1-#{@schedule.bills.length}' to open bill PDF in browser."
     puts "Enter 'list' to see the list of bills again."
     puts "Enter 'exit' to exit program."
@@ -41,12 +47,13 @@ class HouseFloorBills::CLI
 
   def menu
     input = nil
+
     while input != "exit"
       puts "\nEnter command (type 'commands' for list of commands):"
       print ">"
       input = gets.strip.downcase
 
-      if input.to_i > 0 && input.to_i <= @schedule.bills.length
+      if input.to_i.between?(1, @schedule.bills.size)
         print_bill(@schedule.find_bill(input))
       elsif input == "commands"
         print_commands

data/lib/house_floor_bills/schedule.rb

@@ -22,5 +22,5 @@ class HouseFloorBills::Schedule
       @bills << bill
     end
   end
-
+  
 end

data/lib/house_floor_bills/scraper.rb

@@ -26,13 +26,21 @@ class HouseFloorBills::Scraper
       b.number = floor_item.css("td.legisNum").text.strip
       b.name = floor_item.css("td.floorText").text.strip
       b.pdf = floor_item.css("td.files a").attr("href").text
-      b.url = "https://www.congress.gov/bill/115th-congress/house-bill/#{b.number.split.last}"
+
+      # 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}"
+      elsif b.number.split.include? "H.Res."
+        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}"
+      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").to_s.gsub("</p>","\n\n").gsub(/<\/.+>/,"").gsub(/<.+>/,"")
+      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

data/lib/house_floor_bills/version.rb

@@ -1,3 +1,3 @@
 module HouseFloorBills
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: house_floor_bills
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dalma Boros
@@ -80,8 +80,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Bills scheduled for debate this week on the House of Representatives
-  floor.
+description: Legislative bills scheduled for debate this week on the United States
+  House of Representatives floor.
 email:
 - dalma.boros@gmail.com
 executables:
@@ -89,6 +89,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -103,6 +104,7 @@ files:
 - bin/setup
 - blog_post
 - house_floor_bills.gemspec
+- lib/.DS_Store
 - lib/house_floor_bills.rb
 - lib/house_floor_bills/bill.rb
 - lib/house_floor_bills/cli.rb