hulse 0.0.1 → 0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjllNjg3OGYwNTNkMjdlYzRhY2Y4ZjQ1Yjg4ZWJiNDA0ODQxZGY1Mg==
+    N2U1NzMxZWVmZWZmZDI3YTQ5YWNkNzg2ODIyMzE3NWI1ZjM2MWY3Ng==
   data.tar.gz: !binary |-
-    ZWZiMzliODMzM2Y2NDM5MDA3MDJhNGEyMmZlYmI3YjIyMjUwOWUzOA==
+    MTlkN2I2N2EyOWIwNTQ4Y2YyZWIwN2JlYWZkYmVmYzE0ZDcxNWU5NA==
 SHA512:
   metadata.gz: !binary |-
-    OGNiMjkxOGVmOTA1NGJmMzMzNWM2NGM1YmE3ZTA1NTcyNTcwZWNmNTdhNTRi
-    MjMyODc0OWZhY2M0YTc1ODdmZjllNWIwZDZmOGU3MzQ5YWVmN2E1YzNlOWI0
-    ZDFjNjQ2NWQwZmYzNzc0MTk0OTM3ZjhmYmE3NWM1YzZhOGExYTg=
+    OGM4NzAzMjNjM2FiYzA2ZWFlMDBlNjQyZTk4Yzk2NGEwYWI2NDkyMTFhYjAw
+    NWFjMGYzOThiMmY0YmY4NmZjYzljNjkzZGY1MDQwMjQ3MDhjZWM5ZmMxNTBk
+    NWE2NmI2N2U3MGRkMWJiZTlmMWIyMGQ5MzRhYjNjMGZjOGEzYjQ=
   data.tar.gz: !binary |-
-    MGNkN2Y2NTcyNThhZTFlZGYzZDQ3OTRmY2MyYjVhZTU0OTE2MjVhYWVlN2Q0
-    YWMxMjEyNGU1Mjk1NzNjMmE0NjRiZmNiMmJjOTdjZTY0ZTNhNWIzNzJiYjIw
-    NDFmM2RlYzY2ZTEzZTllZDdhZDAyOGJlODRkYWRiNDg2NDljZTI=
+    Njk5MWY2MTE2ZGI0OWRkZjU1MWMzNzg2ZjNiMTZmN2FhZGExMzI3MDk2MDI0
+    OWEyM2I2ZDQyYjc3NWZjYTJhZGUwNzY2MzcxNWM0YzBlYTg2NjJhNDAyNTcz
+    ZTVkMGI4MjhiZDE2MTE3MmMzNGJmNmRlOGY3MDU3YzEzNjRhOWY=

data/README.md

@@ -2,11 +2,11 @@
 
 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 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.
+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.
 
 `HouseVote` and `SenateVote` have different attributes due to parliamentary conventions and the presence or absence of data in one chamber or the other. Senators are uniquely identified by a `lis_member_id`; House members are uniquely identified by a `bioguide_id` beginning in 2003. Prior to 2003, there is no unique ID for House members, but using a combination of name, state and political party one can be manfactured. House member attributes also include an `unaccented_name` and an `name` attribute that may contain accent characters.
 
-Hulse is named for Carl Hulse, a longtime congressional correspondent for The New York Times.
+Hulse is named for [Carl Hulse](https://www.nytimes.com/learning/students/ask_reporters/Carl_Hulse.html), a longtime congressional correspondent for The New York Times.
 
 ## Installation
 

data/hulse.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_dependency "httparty"
+  spec.add_dependency "oj"
 end

data/lib/hulse/house_vote.rb

@@ -1,21 +1,21 @@
 module Hulse
   class HouseVote
-    
+
     attr_reader :majority, :congress, :session, :chamber, :vote_number, :bill_number, :question, :vote_type, :vote_result, :vote_timestamp, :description,
     :party_summary, :vote_count, :members, :amendment_number, :amendment_author
-    
+
     def initialize(params={})
       params.each_pair do |k,v|
         instance_variable_set("@#{k}", v)
       end
-    end    
+    end
 
     def self.find(year, vote)
-      url = "http://clerk.house.gov/evs/#{year.to_s}/roll#{vote}.xml"
+      url = "http://clerk.house.gov/evs/#{year.to_s}/roll#{vote.to_s.rjust(3,"0")}.xml"
       response = HTTParty.get(url)
       self.create_from_vote(response.parsed_response['rollcall_vote'])
     end
-    
+
     def self.create_from_vote(response)
       party_totals = []
       response['vote_metadata']['vote_totals']['totals_by_party'].each do |p|
@@ -29,22 +29,22 @@ module Hulse
         m['legislator']['vote'] = m['vote']
         members << m['legislator'].inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
       end
-      self.new(:majority => response['vote_metadata']['majority'],
-        :congress => response['vote_metadata']['congress'].to_i,
-        :session => response['vote_metadata']['session'],
-        :chamber => response['vote_metadata']['chamber'],
-        :vote_number => response['vote_metadata']['rollcall_num'].to_i,
-        :bill_number => response['vote_metadata']['legis_num'],
-        :question => response['vote_metadata']['vote_question'],
-        :amendment_number => response['vote_metadata']['amendment_num'],
-        :amendment_author => response['vote_metadata']['amendment_author'],
-        :vote_type => response['vote_metadata']['vote_type'],
-        :vote_result => response['vote_metadata']['vote_result'],
-        :vote_timestamp => DateTime.parse(response['vote_metadata']['action_date'] + ' ' + response['vote_metadata']['action_time']['time_etz']),
-        :description => response['vote_metadata']['vote_desc'],
-        :party_summary => party_totals,
-        :vote_count => response['vote_metadata']['vote_totals']['totals_by_vote'].reject{|k,v| k == 'total_stub'}.inject({}){|memo,(k,v)| memo[k.to_sym] = v.to_i; memo},
-        :members => members)
+      self.new(majority: response['vote_metadata']['majority'],
+        congress: response['vote_metadata']['congress'].to_i,
+        session: response['vote_metadata']['session'],
+        chamber: response['vote_metadata']['chamber'],
+        vote_number: response['vote_metadata']['rollcall_num'].to_i,
+        bill_number: response['vote_metadata']['legis_num'],
+        question: response['vote_metadata']['vote_question'],
+        amendment_number: response['vote_metadata']['amendment_num'],
+        amendment_author: response['vote_metadata']['amendment_author'],
+        vote_type: response['vote_metadata']['vote_type'],
+        vote_result: response['vote_metadata']['vote_result'],
+        vote_timestamp: DateTime.parse(response['vote_metadata']['action_date'] + ' ' + response['vote_metadata']['action_time']['time_etz']),
+        description: response['vote_metadata']['vote_desc'],
+        party_summary: party_totals,
+        vote_count: response['vote_metadata']['vote_totals']['totals_by_vote'].reject{|k,v| k == 'total_stub'}.inject({}){|memo,(k,v)| memo[k.to_sym] = v.to_i; memo},
+        members: members)
       end
   end
 end

data/lib/hulse/senate_vote.rb

@@ -1,49 +1,49 @@
 module Hulse
   class SenateVote
-    
-    attr_reader :congress, :session, :year, :vote_number, :vote_timestamp, :updated_at, :vote_question_text, :vote_document_text, 
+
+    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
-    
+
     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.to_s}#{session.to_s}/vote_#{congress.to_s}_#{session.to_s}_#{vote.to_s.rjust(5,"0")}.xml"
+      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)
       self.create_from_vote(response.parsed_response['roll_call_vote'])
     end
-    
+
     def self.create_from_vote(response)
       members = []
       response['members']['member'].each do |m|
         members << m.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
       end
-      self.new(:congress => response['congress'].to_i,
-        :session => response['session'].to_i,
-        :year => response['congress_year'].to_i,
-        :vote_number => response['vote_number'].to_i,
-        :vote_timestamp => DateTime.parse(response['vote_date']),
-        :updated_at => DateTime.parse(response['modify_date']),
-        :vote_question_text => response['vote_question_text'],
-        :vote_document_text => response['vote_document_text'],
-        :vote_result_text => response['vote_result_text'],
-        :question => response['question'],
-        :vote_title => response['vote_title'],
-        :majority_requirement => response['majority_requirement'],
-        :vote_result => response['vote_result'],
-        :document => response['document'].inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo},
-        :amendment => response['amendment'].inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo},
-        :vote_count => response['count'].inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo},
-        :tie_breaker => response['tie_breaker'].inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo},
-        :members => members
-      )  
+      self.new(congress: response['congress'].to_i,
+        session: response['session'].to_i,
+        year: response['congress_year'].to_i,
+        vote_number: response['vote_number'].to_i,
+        vote_timestamp: DateTime.parse(response['vote_date']),
+        updated_at: DateTime.parse(response['modify_date']),
+        vote_question_text: response['vote_question_text'],
+        vote_document_text: response['vote_document_text'],
+        vote_result_text: response['vote_result_text'],
+        question: response['question'],
+        vote_title: response['vote_title'],
+        majority_requirement: response['majority_requirement'],
+        vote_result: response['vote_result'],
+        document: response['document'].inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo},
+        amendment: response['amendment'].inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo},
+        vote_count: response['count'].inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo},
+        tie_breaker: response['tie_breaker'].inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo},
+        members: members
+      )
     end
-    
-    
+
+
   end
 end

data/lib/hulse/version.rb

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

data/lib/hulse.rb

@@ -6,42 +6,19 @@ require 'oj'
 
 module Hulse
   class Utils
-    
-    CONGRESSES = {
-      2014 => 113,
-      2013 => 113,
-      2012 => 112,
-      2011 => 112,
-      2010 => 111,
-      2009 => 111,
-      2008 => 110,
-      2007 => 110,
-      2006 => 109,
-      2005 => 109,
-      2004 => 108,
-      2003 => 108,
-      2002 => 107,
-      2001 => 107,
-      2000 => 106,
-      1999 => 106,
-      1998 => 106,
-      1997 => 105,
-      1996 => 105,
-      1995 => 104,
-      1994 => 104,
-      1993 => 103,
-      1992 => 103,
-      1991 => 102,
-      1990 => 102,
-      1989 => 101
-    }
-    
+
+    # this function is more intuitive when you solve for the other side:
+    # year = 1789 + (2 * (congress - 1))
+    def self.congress_for_year(year)
+      ((year.to_i + 1) / 2) - 894
+    end
+
     def self.convert_year_to_congress_and_session(year)
-      congress = CONGRESSES[year]
+      congress = congress_for_year year
       session = year.odd? ? 1 : 2
       return [congress, session]
     end
-    
-    
+
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hulse
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: '0.1'
 platform: ruby
 authors:
 - Derek Willis
@@ -52,6 +52,20 @@ dependencies:
     - - ! '>='
       - !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.
 email:
 - dwillis@gmail.com