hulse 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e3f583aa3f033ea1521592d7fa1e9ef68595c90
-  data.tar.gz: 25837d1ae234c7a1d3b665c6d9a145304264aecb
+  metadata.gz: ded08df41744269d3ff29c0963310cd71c6d9a2f
+  data.tar.gz: f78c202e8f5f140586d990db213fe68f0726ae14
 SHA512:
-  metadata.gz: 0f594dcb5a9e8d88aab795965d1fe0ec5da794bebd6bbd3405d5240d93ddcc010c33c897ddc06f75601224535d6a8ec78e0eb16147a61053ab87cf990586318a
-  data.tar.gz: 06676904a50ce89268890b3a952a1f6f997dc3efaa910c1984ce5ba6ca94edee7dddaaa2c2841cdf4a6efe37515e0eaac957463b5b26738d420935ef7c4a1b4b
+  metadata.gz: f6d939fd1e7ec77e20e8b9c2cd472ffc574bfd5c17e4abd941d200163abae7cc4b3f2f0684b4690597aa19b994f753ac17a08ec0a0c5412e0d161d2939285bbf
+  data.tar.gz: 0abd003544ed00748fbf56f337d929652b357336ba552146534a01d6326400cbf3db9c389430f301e7b7787fc1240ec8e7abcc07f55c929091c376575fe8260c

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/**/**/*_test.rb']
+  t.verbose = true
+end
+
+task :default => 'test'

data/hulse.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
   spec.add_dependency "httparty"
   spec.add_dependency "oj"
 end

data/lib/hulse/house_vote.rb

@@ -18,8 +18,10 @@ module Hulse
 
     def self.create_from_vote(response)
       party_totals = []
-      response['vote_metadata']['vote_totals']['totals_by_party'].each do |p|
-        party_totals << p.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+      if response['vote_metadata']['vote_totals']['totals_by_party']
+        response['vote_metadata']['vote_totals']['totals_by_party'].each do |p|
+          party_totals << p.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+        end
       end
       members = []
       mappings = {"__content__" => "name"}
@@ -29,6 +31,11 @@ module Hulse
         m['legislator']['vote'] = m['vote']
         members << m['legislator'].inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
       end
+      if response['vote_metadata']['vote_question'] == 'Election of the Speaker'
+        vote_counts = response['vote_metadata']['vote_totals']['totals_by_candidate'].reject{|k,v| k == 'total_stub'}.inject({}){|memo,(k,v)| memo[k['candidate'].to_sym] = k['candidate_total'].to_i; memo}
+      else
+        vote_counts = 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}
+      end
       self.new(majority: response['vote_metadata']['majority'],
         congress: response['vote_metadata']['congress'].to_i,
         session: response['vote_metadata']['session'],
@@ -43,7 +50,7 @@ module Hulse
         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},
+        vote_count: vote_counts,
         members: members)
       end
   end

data/lib/hulse/version.rb

@@ -1,3 +1,3 @@
 module Hulse
-  VERSION = "0.3"
+  VERSION = "0.4"
 end

data/lib/hulse.rb

@@ -1,8 +1,8 @@
+require 'httparty'
+require 'oj'
 require "hulse/version"
 require "hulse/house_vote"
 require "hulse/senate_vote"
-require 'httparty'
-require 'oj'
 
 module Hulse
   class Utils
@@ -15,7 +15,7 @@ module Hulse
 
     def self.convert_year_to_congress_and_session(year)
       congress = congress_for_year year
-      session = year.odd? ? 1 : 2
+      session = year.to_i.odd? ? 1 : 2
       return [congress, session]
     end
 

data/test/test_helper.rb

@@ -0,0 +1,2 @@
+require 'minitest/autorun'
+require 'minitest/pride'

data/test/utils_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+require_relative '../lib/hulse'
+
+module Hulse
+  class UtilsTest < Minitest::Test
+    def test_congress_for_year
+      assert_equal 101, Utils.congress_for_year(1990)
+      assert_equal 106, Utils.congress_for_year('2000')
+      assert_equal 6, Utils.congress_for_year('1800')
+      assert_equal 1, Utils.congress_for_year('1789')
+
+      # TODO: probably not what is expected
+      assert_equal -4, Utils.congress_for_year('1780')
+    end
+
+    def test_convert_year_to_congress_and_session
+      congress, session = Utils.convert_year_to_congress_and_session(1990)
+      assert_equal 101, congress
+      assert_equal 2,   session
+
+      congress, session = Utils.convert_year_to_congress_and_session('1789')
+      assert_equal 1, congress
+      assert_equal 1, session
+
+      # TODO: probably not what is expected
+      congress, session = Utils.convert_year_to_congress_and_session('1780')
+      assert_equal -4, congress
+      assert_equal 2, session
+    end
+  end
+end

metadata

@@ -1,69 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: hulse
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Derek Willis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   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: minitest
+  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.
@@ -73,7 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -83,6 +97,8 @@ files:
 - lib/hulse/house_vote.rb
 - lib/hulse/senate_vote.rb
 - lib/hulse/version.rb
+- test/test_helper.rb
+- test/utils_test.rb
 homepage: ''
 licenses:
 - MIT
@@ -93,19 +109,21 @@ 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.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Hulse is a Ruby gem for accessing House and Senate roll call votes from the
   official sources on house.gov and senate.gov
-test_files: []
+test_files:
+- test/test_helper.rb
+- test/utils_test.rb