hulse 0.8 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bba650c8b0b6ada1ef76edc9a42070ab12e7890
-  data.tar.gz: 2047fb904a719d427a8f9e925c3fe70ce754b1b9
+  metadata.gz: b4315687d83cb3538a49513cad526082b9fdb392
+  data.tar.gz: 7068e30d8ef2225b07adb5ba89398db653105bc6
 SHA512:
-  metadata.gz: 623269c8d40b0489316c4053b664656e3aea73b484ffdf082898c0b58960d24e4fbb1c2205809b8e53ed28984cfcf3059273cc95359901235f5817047d8bef05
-  data.tar.gz: 1e0cd5aaa909e46753edb38c85e404711cceef893d11ddb56fc2ff144e1fa9f890f4d82a868458ddff023cd608a26673e0ee3a0c8693fd0c8930230b7fbac4da
+  metadata.gz: 0fc0fa0737da4e7a035ef016ed253ad041e892f98102b70d2c29d3bcdf7fdd74d2bd15e5344e7f5064870554922c826b4910a57b789a12758fbad3e25a0553e7
+  data.tar.gz: cf4de0b1e8ff1967d76988419104f75722a1816d80ef2fcb35529a51f62c8e58b4e9fac746744f136e3bef219e12178fdf2ef4a9b75ee948306af48c57086f59

data/hulse.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "nokogiri"
   spec.add_dependency "oj"
   spec.add_dependency "american_date"
+  spec.add_dependency "activesupport"
 end

data/lib/hulse.rb

@@ -10,6 +10,7 @@ require "hulse/house_member"
 require "hulse/house_floor"
 require "hulse/senate_vote"
 require "hulse/senate_member"
+require "active_support/core_ext/integer/inflections"
 
 module Hulse
   class Utils
@@ -26,6 +27,24 @@ module Hulse
       return [congress, session]
     end
 
+    def self.bill_url(congress, bill_number)
+      bill_title = bill_number.scan(/[A-Z]+/).join.upcase
+      if bill_title == 'HR'
+        bt = 'house-bill'
+      elsif bill_title == 'HRES'
+        bt = 'house-resolution'
+      elsif bill_title == 'HJRES'
+        bt = 'house-joint-resolution'
+      elsif bill_title == 'S'
+        bt = 'senate-bill'
+      elsif bill_title == 'SRES'
+        bt = 'senate-resolution'
+      elsif bill_title == 'SJRES'
+        bt = 'senate-joint-resolution'
+      end
+      bill_num = bill_number.scan(/\d/).join
+      "https://www.congress.gov/bill/#{congress.to_i.ordinalize.to_s}-congress/#{bt}/#{bill_num}"
+    end
 
   end
 end

data/lib/hulse/house_vote.rb

@@ -2,7 +2,7 @@ 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
+    :party_summary, :vote_count, :members, :amendment_number, :amendment_author, :bill_url
 
     def initialize(params={})
       params.each_pair do |k,v|
@@ -51,6 +51,7 @@ module Hulse
         chamber: response['vote_metadata']['chamber'],
         vote_number: response['vote_metadata']['rollcall_num'].to_i,
         bill_number: response['vote_metadata']['legis_num'],
+        bill_url: response['vote_metadata']['legis_num'] ? Hulse::Utils.bill_url(response['vote_metadata']['congress'], response['vote_metadata']['legis_num']) : nil,
         question: response['vote_metadata']['vote_question'],
         amendment_number: response['vote_metadata']['amendment_num'],
         amendment_author: response['vote_metadata']['amendment_author'],

data/lib/hulse/senate_vote.rb

@@ -3,7 +3,7 @@ module Hulse
 
     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_date, :issue
+    :vote_date, :issue, :bill_url, :nomination_url
 
     def initialize(params={})
       params.each_pair do |k,v|
@@ -60,5 +60,22 @@ module Hulse
       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
+
+    def is_nomination_vote?
+      document[:document_type] == 'PN' ? true : false
+    end
+
+    def nomination_url
+      "https://www.congress.gov/nomination/#{congress.to_i.ordinalize.to_s}-congress/#{document[:document_number].to_s}" if document[:document_type] == 'PN'
+    end
+
+    def bill_url
+      if document[:document_name] and document[:document_type] != 'PN'
+        Hulse::Utils.bill_url(congress, document[:document_name].gsub('.',''))
+      else
+        nil
+      end
+    end
+
   end
 end

data/lib/hulse/version.rb

@@ -1,3 +1,3 @@
 module Hulse
-  VERSION = "0.8"
+  VERSION = "0.9"
 end

data/test/house_vote_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+require_relative '../lib/hulse'
+
+module Hulse
+  class HouseVoteTest < Minitest::Test
+
+    def setup
+      @hv = HouseVote.find(2015,582)
+      @sv = HouseVote.find(2015,581)
+    end
+
+    def test_bill_url
+      assert_equal @hv.bill_url, "https://www.congress.gov/bill/114th-congress/house-bill/1853"
+      assert_equal @sv.bill_url, nil
+    end
+
+  end
+end

data/test/senate_vote_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+require_relative '../lib/hulse'
+
+module Hulse
+  class SenateVoteTest < Minitest::Test
+
+    def setup
+      @sv = SenateVote.find(2015,291)
+      @nv = SenateVote.find(2015,274)
+    end
+
+    def test_bill_url
+      assert_equal @sv.bill_url, "https://www.congress.gov/bill/114th-congress/senate-bill/754"
+      assert_equal @nv.bill_url, nil
+    end
+
+    def test_nomination
+      assert_equal @nv.is_nomination_vote?, true
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hulse
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: '0.9'
 platform: ruby
 authors:
 - Derek Willis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-24 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  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 and members into Ruby objects for your legislative
   pleasure.
 email:
@@ -131,6 +145,8 @@ files:
 - lib/hulse/senate_member.rb
 - lib/hulse/senate_vote.rb
 - lib/hulse/version.rb
+- test/house_vote_test.rb
+- test/senate_vote_test.rb
 - test/test_helper.rb
 - test/utils_test.rb
 homepage: ''
@@ -159,6 +175,8 @@ specification_version: 4
 summary: Hulse is a Ruby gem for accessing House and Senate roll call votes and member
   data from the official sources on house.gov and senate.gov
 test_files:
+- test/house_vote_test.rb
+- test/senate_vote_test.rb
 - test/test_helper.rb
 - test/utils_test.rb
 has_rdoc: