congress_v3 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de4beab59d795874ea746a15b6c5d9e1140086d0
-  data.tar.gz: fa31dd69988db7629bd5d4ae4022cadc2d89dd5a
+  metadata.gz: 2ade7d194872c4bfac099b3003bbf2ebdf07aded
+  data.tar.gz: d14bd115745bba6e0dad22ea80823c0a518d9c33
 SHA512:
-  metadata.gz: c68f9dfbcfc605fb058a7ecb4427401500d4a95af25ea3b31231952b968b102543bce62d94ec3ab76ea20b9f251d3673425f127e5e8ae853a1b80cf8b9478b3e
-  data.tar.gz: ef2dfe10682d1f7c58a1fb2e4e98843aef096fb2297c517b02392ec0416179447d920241e6c1d976a222ae23f85272c293b5c8bcf9ff335237d44d098dcab46c
+  metadata.gz: 2985c6210623d17744687d24c00c471ceba16cbbfd105f92acadcc9acc7b3a685c08b61c81d9f1bf2fe24dd4b013e47579fe743969604928bd6bf99f50f4bbcf
+  data.tar.gz: 2e76ca5566d17625831e4b2306f8490bcb933c3f55c4a0e56058176c77c765f96f5aa0e7b1ae22e499b6d7e79882e2f3c32d1e90c325ee8ab1a1cef37e528d06

data/.gitignore

@@ -11,3 +11,4 @@
 .env
 /vcr_cassettes
 *.gem
+.DS_Store

data/.travis.yml

@@ -4,4 +4,4 @@ rvm:
   - 2.3.0
   - 2.2.4
   - 2.0.0
-before_install: gem install bundler -v 1.11.2
+before_install: gem install bundler -v 1.12.3

data/congress_v3.gemspec

@@ -20,8 +20,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "nokogiri", "~> 1.6.7"
+  spec.add_dependency "open_uri_redirections"
 
-  spec.add_development_dependency "bundler", "~> 1.11.2"
+  spec.add_development_dependency "bundler", "~> 1.12.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry", "~> 0.10.0"

data/lib/congress_v3.rb

@@ -4,6 +4,7 @@ require 'congress_v3/request'
 require 'congress_v3/response'
 require 'congress_v3/legislator'
 require 'congress_v3/bill'
+require 'congress_v3/vote'
 
 module CongressV3
 end

data/lib/congress_v3/bill.rb

@@ -21,4 +21,8 @@ class CongressV3::Bill
                 "No text for this bill"
               end
   end
+
+  def votes(params={})
+    @votes ||= CongressV3::Request.bill_votes(bill_id, params)
+  end
 end

data/lib/congress_v3/legislator.rb

@@ -21,4 +21,8 @@ class CongressV3::Legislator
   def term
     Time.parse(term_start)...Time.parse(term_end)
   end
+
+  def votes(params={})
+    @votes ||= CongressV3::Request.legislator_votes(bioguide_id, params)
+  end
 end

data/lib/congress_v3/request.rb

@@ -2,6 +2,7 @@ require 'net/http'
 require 'json'
 require 'nokogiri'
 require 'open-uri'
+require 'open_uri_redirections'
 
 class CongressV3::Request
   BASE_URI = 'https://congress.api.sunlightfoundation.com'
@@ -47,15 +48,70 @@ class CongressV3::Request
     response
   end
 
+  def self.votes(params)
+    response = new('/votes', params).request
+
+    response.results.map! do |vote|
+      CongressV3::Vote.new(vote)
+    end
+
+    response
+  end
+
   def self.bill_text(uri)
-    html = Nokogiri::HTML(open(uri))
+    html = Nokogiri::HTML(open(uri, allow_redirections: :all))
     html.css('body pre').text
   end
 
+  def self.bill_votes(bill_id, params={})
+    params[:bill_id] = bill_id
+    params[:fields] = "voters,chamber"
+    response = new('/votes', params).request
+
+    senators = []
+    representatives = []
+
+    response.results.each do |result|
+      chamber = result["chamber"]
+      if (chamber == "house" && representatives.empty?) || (chamber == "senate" && senators.empty?)
+        result["voters"].each do |_, voter|
+          voter["voter"].merge!(vote: voter["vote"])
+          voter = CongressV3::Legislator.new(voter["voter"])
+          case chamber
+          when "house"
+            representatives << voter
+          when "senate"
+            senators << voter
+          end
+        end
+      end
+    end
+
+    { senate: senators, house: representatives }
+  end
+
+  def self.legislator_votes(legislator_id, params={})
+    request = new('/votes', params)
+    uri = URI(BASE_URI + '/votes')
+    uri.query = URI.encode_www_form(request.params) + '&voter_ids.' + legislator_id
+    response = request.parse_response_body(uri)
+
+    response.results.map! do |vote|
+      CongressV3::Vote.new(vote)
+    end
+
+    response
+  end
+
   def request
     uri = URI(BASE_URI + route)
     uri.query = URI.encode_www_form(params)
-    response = Net::HTTP.get(uri)
-    CongressV3::Response.new(JSON.parse(response))
+    parse_response_body(uri)
+  end
+
+  def parse_response_body(uri)
+    response_body = Net::HTTP.get(uri)
+    json_response = JSON.parse(response_body)
+    CongressV3::Response.new(json_response)
   end
 end

data/lib/congress_v3/version.rb

@@ -1,3 +1,3 @@
 module CongressV3
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/congress_v3/vote.rb

@@ -0,0 +1,12 @@
+class CongressV3::Vote
+  def self.all(params={})
+    CongressV3::Request.votes(params)
+  end
+
+  def initialize(params)
+    params.each do |key, value|
+      instance_variable_set("@#{key}", value)
+      self.class.send(:attr_reader, key)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: congress_v3
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - charlesmassry
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -24,20 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.7
+- !ruby/object:Gem::Dependency
+  name: open_uri_redirections
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.12.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.12.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +174,7 @@ files:
 - lib/congress_v3/request.rb
 - lib/congress_v3/response.rb
 - lib/congress_v3/version.rb
+- lib/congress_v3/vote.rb
 homepage: https://github.com/CharlesMassry/CongressV3
 licenses:
 - MIT