campaign_cash 1.6 → 1.7

data/Gemfile.lock

@@ -0,0 +1,19 @@
+PATH
+  remote: .
+  specs:
+    campaign_cash (1.7)
+      json
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    json (1.6.3)
+    shoulda (2.11.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (>= 1.0.0)
+  campaign_cash!
+  shoulda

data/README.rdoc

@@ -8,7 +8,15 @@ Simple ruby wrapper for The New York Times Campaign Finance API[http://developer
 
 == INSTALL:
 
-* <tt>gem install campaign_cash</tt>
+Install Campaign Cash as a gem:
+
+  gem install campaign_cash
+  
+For use in a Rails 3 application, put the following in your Gemfile:
+
+  gem 'campaign_cash'
+
+then issue the 'bundle install' command. Campaign Cash has been tested under Ruby 1.8.7 and 1.9.2.
 
 == USAGE:
 

data/campaign_cash.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "json"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "shoulda"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/campaign_cash/base.rb

@@ -42,7 +42,7 @@ module CampaignCash
   		end
   		
   		def date_parser(date)
-  		  date ? Date.parse(date) : nil
+  		  date ? Date.strptime(date, '%Y-%m-%d') : nil
   		end
   		
   		# Returns the election cycle (even-numbered) from a date.

data/lib/campaign_cash/candidate.rb

@@ -21,12 +21,12 @@ module CampaignCash
 		def self.create(params={})
 			self.new :name => params['name'],
 							 :id => params['id'],
-							 :state => params['state'].split('/').last[0..1],
-							 :office => parse_office(params['id'].first),
+							 :state => parse_state(params['state']),
+							 :office => parse_office(params['id']),
 							 :district => parse_district(params['district']),
 							 :party => params['party'],
 							 :fec_uri => params['fec_uri'],
-							 :committee_id => params['committee'].split('/').last[0..8],
+							 :committee_id => parse_committee_id(params['committee']),
 							 :mailing_city => params['mailing_city'],
 							 :mailing_address => params['mailing_address'],
 							 :mailing_state => params['mailing_state'],
@@ -49,18 +49,27 @@ module CampaignCash
 		def self.create_from_search_results(params={})
 		  self.new :name => params['candidate']['name'],
 		           :id => params['candidate']['id'],
-		           :state => params['state'].split('/').last[0..1],
-		           :office => parse_office(params['candidate']['id'].first),
+		           :state => params['candidate']['id'][2..3],
+		           :office => parse_office(params['candidate']['id'][0..0]),
 		           :district => parse_district(params['district']),
 		           :party => params['candidate']['party'],
-		           :committee_id => params['committee'].split('/').last[0..8]
+		           :committee_id => parse_committee_id(params['committee'])
 		  
 		end
 		
+		def self.parse_state(state)
+		  state.split('/').last[0..1] if state
+		end
+		
+		def self.parse_committee_id(committee)
+		  committee.nil? ? nil : committee.split('/').last[0..8]
+		end
+		
 		def self.parse_office(id)
-		  if id.first == "H"
+		  return nil unless id
+		  if id[0..0] == "H"
 		    'house'
-		  elsif id.first == 'S'
+		  elsif id[0..0] == 'S'
 		    'senate'
 		  else
 		    'president'
@@ -68,7 +77,7 @@ module CampaignCash
 		end
 		
 		def self.parse_district(uri)
-		  if uri.split('/').last.split('.').first.to_i > 0
+		  if uri and uri.split('/').last.split('.').first.to_i > 0
 		    uri.split('/').last.split('.').first.to_i
 		  else
 		    0

data/lib/campaign_cash/committee.rb

@@ -35,7 +35,7 @@ module CampaignCash
 							 :end_cash => params['end_cash'],
 							 :date_coverage_from => params['date_coverage_from'],
 							 :date_coverage_to => params['date_coverage_to'],
-							 :candidate => params['candidate'],
+							 :candidate_id => parse_candidate(params['candidate']),
 							 :other_cycles => params['other_cycles'].map{|cycle| cycle['cycle']['fec_committee']['cycle']}
 		end
 		
@@ -48,13 +48,18 @@ module CampaignCash
 		           :district => params['district'],
 		           :party => params['party'],
 		           :relative_uri => params['relative_uri'],
-		           :candidate => params['candidate'],
+		           :candidate_id => parse_candidate(params['candidate']),
 		           :treasurer => params['treasurer'],
 		           :fec_uri => params['fec_uri'],
 		           :super_pac => params['super_pac'],
 		           :sponsor_name => params['sponsor_name']
 		  
 		end
+		
+		def self.parse_candidate(candidate)
+		  return nil if candidate.nil?
+		  candidate.split('/').last.split('.').first
+		end
     
     def self.find(fecid, cycle=CURRENT_CYCLE)
 			reply = invoke("#{cycle}/committees/#{fecid}")

data/lib/campaign_cash/filing.rb

@@ -42,7 +42,7 @@ module CampaignCash
 		end
 		
 		def self.date(year, month, day)
-		  cycle = cycle_from_date(Date.parse("#{month}/#{day}/#{year}"))
+		  cycle = cycle_from_date(Date.strptime("#{month}/#{day}/#{year}", '%m/%d/%Y'))
 		  reply = Base.invoke("#{cycle}/filings/#{year}/#{month}/#{day}", {})
 		  results = reply['results']
 			@filings = results.map{|c| Filing.create(c)}

data/lib/campaign_cash/independent_expenditure.rb

@@ -32,7 +32,7 @@ module CampaignCash
     end
     
     def self.date(date)
-      d = Date.parse(date)
+      d = Date.strptime(date, '%m/%d/%Y')
       cycle = cycle_from_date(d)
       reply = Base.invoke("#{cycle}/independent_expenditures/#{d.year}/#{d.month}/#{d.day}")
       results = reply['results']

data/lib/campaign_cash/version.rb

@@ -1,3 +1,3 @@
 module CampaignCash
-  VERSION = "1.6"
+  VERSION = "1.7"
 end

data/test/campaign_cash/test_candidate.rb

@@ -14,7 +14,7 @@ class TestCampaignCash::TestCandidate < Test::Unit::TestCase
 			assert_kind_of(Candidate, @candidate)
 		end
 		
-		%w(name id state district party fec_uri committee).each do |attr|
+		%w(name id party fec_uri).each do |attr|
 			should "assign the value of the @#{attr} attribute from the '#{attr}' key in the hash" do
 				assert_equal(@result[attr], @candidate.send(attr))
 			end
@@ -37,7 +37,7 @@ class TestCampaignCash::TestCandidate < Test::Unit::TestCase
 	
 	context "New Candidates" do
 	  setup do
-		  reply = Base.invoke('2010/candidates/new', {})
+		  reply = Base.invoke('2012/candidates/new', {})
 			results = reply['results']
 	    @candidates = results.map{|c| Candidate.create(c)}
 	  end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: campaign_cash
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
-  - 6
-  version: "1.6"
+  - 7
+  version: "1.7"
 platform: ruby
 authors: 
 - Derek Willis
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-18 00:00:00 -05:00
+date: 2011-12-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,20 @@ dependencies:
         version: 1.0.0
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: A thin client for The New York Times Campaign Finance API
 email: 
 - dwillis@nytimes.com
@@ -59,6 +73,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile