hulse 0.1 → 0.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    N2U1NzMxZWVmZWZmZDI3YTQ5YWNkNzg2ODIyMzE3NWI1ZjM2MWY3Ng==
-  data.tar.gz: !binary |-
-    MTlkN2I2N2EyOWIwNTQ4Y2YyZWIwN2JlYWZkYmVmYzE0ZDcxNWU5NA==
+SHA1:
+  metadata.gz: 15df258b833015587148bb55dc2ac84eed7b0847
+  data.tar.gz: c5c0342fc6cd999ffc09ef37cfeba1ae12c859de
 SHA512:
-  metadata.gz: !binary |-
-    OGM4NzAzMjNjM2FiYzA2ZWFlMDBlNjQyZTk4Yzk2NGEwYWI2NDkyMTFhYjAw
-    NWFjMGYzOThiMmY0YmY4NmZjYzljNjkzZGY1MDQwMjQ3MDhjZWM5ZmMxNTBk
-    NWE2NmI2N2U3MGRkMWJiZTlmMWIyMGQ5MzRhYjNjMGZjOGEzYjQ=
-  data.tar.gz: !binary |-
-    Njk5MWY2MTE2ZGI0OWRkZjU1MWMzNzg2ZjNiMTZmN2FhZGExMzI3MDk2MDI0
-    OWEyM2I2ZDQyYjc3NWZjYTJhZGUwNzY2MzcxNWM0YzBlYTg2NjJhNDAyNTcz
-    ZTVkMGI4MjhiZDE2MTE3MmMzNGJmNmRlOGY3MDU3YzEzNjRhOWY=
+  metadata.gz: 61de40fec032187360350d9392bd57899f2decd9ef8b676fe74893aebb31610e1d10820f79061e477d71c59f2cc6a31b494f040dacdf128d740d7b69fbe57ce2
+  data.tar.gz: 870095110842826ce38ad502fb6ac1d69f34837d7a6dbe5b77235609437f4b0aa4ab1a482d608244bbf00e4a23ee4561eab17b854b705ada8e58280f653a6a4f

data/README.md

@@ -1,6 +1,6 @@
 # Hulse
 
-Hulse is a Ruby gem for accessing House and Senate roll call votes from the official sources on [house.gov](http://clerk.house.gov/evs/2013/index.asp) and [senate.gov](http://www.senate.gov/pagelayout/legislative/a_three_sections_with_teasers/votes.htm). It is developed under Ruby 1.9.3.
+Hulse is a Ruby gem for accessing House and Senate roll call votes from the official sources on [house.gov](http://clerk.house.gov/evs/2013/index.asp) and [senate.gov](http://www.senate.gov/pagelayout/legislative/a_three_sections_with_teasers/votes.htm). It works using Ruby 1.9.3 and 2.0.0.
 
 Hulse has two classes, `HouseVote` and `SenateVote`, which create Ruby objects using the XML attributes available from roll call vote data (voice votes are not covered by Hulse or available as data from official sources). Hulse makes a few changes, renaming some attributes for clarity and consistency, and collapsing each House vote's date and time into a single datetime attribute. Otherwise it does not alter the original data.
 
@@ -27,20 +27,29 @@ Or install it yourself as:
 For both House and Senate votes, pass the year and roll call number into the `find` class method:
 
 ```ruby
-1.9.3-p484> require 'hulse'
-1.9.3-p484> include Hulse
-1.9.3-p484> hv = HouseVote.find(2013, 628)
-1.9.3-p484> hv.question
+2.0.0p353 :001 > require 'hulse'
+2.0.0p353 :002 > include Hulse
+2.0.0p353 :003 > hv = HouseVote.find(2013, 628)
+2.0.0p353 :004 > hv.question
  => "On Agreeing to the Amendment"
- 1.9.3-p484> hv.vote_count
+2.0.0p353 :005 > hv.vote_count
   => {:yea_total=>157, :nay_total=>258, :present_total=>0, :not_voting_total=>16}
 ```
 
 Be aware that in 2012, there were 5 House votes that occurred on Jan. 1, 2013. These are considered "2012" votes by [the Clerk of the House](http://clerk.house.gov/evs/2012/index.asp), so use 2012 as the year for these.
 
+For Senate votes, you can grab a year's SenateVote objects (with a limited set of attributes) by using the `summary` method:
+
+```ruby
+2.0.0p353 :006 > senate_2013 = SenateVote.summary(2013)
+2.0.0p353 :007 > senate_2013.first
+=> #<Hulse::SenateVote:0x000001017f0d58 @congress=113, @session=1, @year=2013, @vote_number="00291", @vote_date=<Date: 2013-12-20 ((2456647j,0s,0n),+0s,2299161j)>, @issue="PN921", @question="On the Cloture Motion", @vote_result="Agreed to", @vote_count={:yeas=>"59", :nays=>"34"}, @vote_title="Motion to Invoke Cloture on the Nomination of Janet L. Yellen to be Chairman of the Board of Governors of the Federal Reserve System">
+```
+
 ## Authors
 
 * [Derek Willis](https://github.com/dwillis)
+* [Eric Mill](https://github.com/konklone)
 
 ## Contributing
 

data/lib/hulse/senate_vote.rb

@@ -2,16 +2,16 @@ module Hulse
   class SenateVote
 
     attr_reader :congress, :session, :year, :vote_number, :vote_timestamp, :updated_at, :vote_question_text, :vote_document_text,
-    :vote_result_text, :question, :vote_title, :majority_requirement, :vote_result, :document, :amendment, :vote_count, :tie_breaker, :members
+    :vote_result_text, :question, :vote_title, :majority_requirement, :vote_result, :document, :amendment, :vote_count, :tie_breaker, :members, 
+    :vote_date, :issue
 
     def initialize(params={})
       params.each_pair do |k,v|
         instance_variable_set("@#{k}", v)
       end
     end
-
+    
     def self.find(year, vote)
-      # TODO: need to special-case 2013 votes from 112th congress, 2nd session
       congress, session = Hulse::Utils.convert_year_to_congress_and_session(year)
       url = "http://www.senate.gov/legislative/LIS/roll_call_votes/vote#{congress}#{session}/vote_#{congress}_#{session}_#{vote.to_s.rjust(5,"0")}.xml"
       response = HTTParty.get(url)
@@ -43,7 +43,14 @@ module Hulse
         members: members
       )
     end
-
-
+    
+    def self.summary(year)
+      congress, session = Hulse::Utils.convert_year_to_congress_and_session(year)
+      url = "http://www.senate.gov/legislative/LIS/roll_call_lists/vote_menu_#{congress}_#{session}.xml"
+      response = HTTParty.get(url)
+      votes = response.parsed_response['vote_summary']['votes']['vote']
+      votes.map{|v| self.new(congress: congress, session: session, year: year, vote_number: v['vote_number'], vote_date: Date.strptime(v['vote_date']+"-#{year}", "%d-%b-%Y"), issue: v['issue'], 
+        question: v['question'], vote_result: v['result'], vote_count: v['vote_tally'].inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}, vote_title: v['title'])}
+    end
   end
 end

data/lib/hulse/version.rb

@@ -1,3 +1,3 @@
 module Hulse
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hulse
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Derek Willis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,42 +28,42 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   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: oj
   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'
 description: Turns House and Senate votes into Ruby objects for your legislative pleasure.
@@ -93,17 +93,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Hulse is a Ruby gem for accessing House and Senate roll call votes from the