campaign_cash 2.3.1 → 2.3.2

data/README.rdoc

@@ -8,10 +8,12 @@
 
 == DESCRIPTION:
 
-Simple ruby wrapper for The New York Times Campaign Finance API[http://developer.nytimes.com/docs/read/campaign_finance_api]. You'll need an API key.
+Simple ruby wrapper for The New York Times Campaign Finance API[http://developer.nytimes.com/docs/read/campaign_finance_api]. You'll need an API key. Tested under Ruby 1.8.7, 1.9.2 and 1.9.3 and JRuby 1.6.7.
 
 == News
 
+* April 10, 2012: Version 2.3.2 released. Bugfix for Committee#find.
+* March 22, 2012: Version 2.3.1 released. Added filing_id to Filing objects and Committee#unamended_filings method.
 * March 15, 2012: Version 2.3 released. Added committee_type to Filing objects and offset to Candidate methods.
 * March 9, 2012: Version 2.2.1 released. Added transfers_in attribute to President#detail.
 * Feb. 8, 2012: Version 2.1.0 released. Added better support for independent expenditures and FilingSummary class for presidential candidate filings.
@@ -113,6 +115,11 @@ Individual Committee objects can retrieve an array of filings they have made dur
   committee.filings
   #=> [#<CampaignCash::Filing:0x101bc9100 @amended_uri=nil, @paper=false, @amended=false, @committee_name=nil, @date_coverage_from=#<Date: 4911793/2,0,2299161>, @original_uri=nil, @report_title="YEAR-END", @date_coverage_to=#<Date: 4911853/2,0,2299161>, @form_type="F3", @committee=nil, @original_filing=nil, @fec_uri="http://query.nictusa.com/cgi-bin/dcdev/forms/C00326389/756540/">,...]
   
+The filings method returns an array of all filings, including originals and amendments. If you want to retrieve the list of unamended filings for a committee within a cycle -- in other words, the latest version of reports -- use the unamended_filings method:
+
+  committee = Committee.find("C00326389", 2012)
+  committee.unamended_filings  
+  
 For more information on Filing objects, see Filings below.
   
 To retrieve a list of the 20 most recently added committees (note that no cycle parameter is needed; this method always uses the most recent cycle):

data/lib/campaign_cash/committee.rb

@@ -85,7 +85,7 @@ module CampaignCash
 							 :interest_group => get_interest_group(params['interest_group']),
 							 :committee_type => get_committee_type(params['committee_type']),
 							 :designation => get_designation(params['designation']),
-							 :other_cycles => params['other_cycles'].map{|cycle| cycle['cycle']['fec_committee']['cycle']}
+							 :other_cycles => params['other_cycles'].map{|cycle| cycle['cycle']['cycle']}
 		end
 		
 		def self.create_from_search_results(params={})

data/lib/campaign_cash/electioneering_communication.rb

@@ -15,20 +15,20 @@ module CampaignCash
     def self.latest(offset = nil)
       cycle = CURRENT_CYCLE
       results = invoke("#{cycle}/electioneering_communications", {:offset => offset})['results']
-      results.map {|obj| ElectioneeringCommunication.create(obj["electioneering_communication"])}
+      results.map {|obj| ElectioneeringCommunication.create(obj)}
     end
     
     def self.committee(committee_id, offset = nil)
       cycle = CURRENT_CYCLE
       results = invoke("#{cycle}/committees/#{committee_id}/electioneering_communications", {:offset => offset})['results']
-      results.map {|obj| ElectioneeringCommunication.create(obj["electioneering_communication"])}
+      results.map {|obj| ElectioneeringCommunication.create(obj)}
     end
 
     def self.date(date, offset = nil)
       cycle = CURRENT_CYCLE
       d     = Date.strptime(date, '%m/%d/%Y')
       results = invoke("#{cycle}/electioneering_communications/#{d.year}/#{d.month}/#{d.day}", {:offset => offset})['results']
-      results.map {|obj| ElectioneeringCommunication.create(obj["electioneering_communication"])}
+      results.map {|obj| ElectioneeringCommunication.create(obj)}
     end
   end
 end

data/lib/campaign_cash/filing_summary.rb

@@ -15,7 +15,7 @@ module CampaignCash
 		
 		def self.by_id(id)
       cycle = CURRENT_CYCLE
-      result = FilingSummary.create(Base.invoke("#{cycle}/filings/#{id}")["results"]["filing_summary"])
+      result = FilingSummary.create(Base.invoke("#{cycle}/filings/#{id}")["results"])
     end
   end
 end

data/lib/campaign_cash/independent_expenditure.rb

@@ -1,7 +1,7 @@
 module CampaignCash
   class IndependentExpenditure < Base
     
-    attr_reader :committee, :district, :state, :committee_name, :purpose, :candidate, :candidate_name, :support_or_oppose, :date, :amount, :office, :amendment, :date_received, :payee, :fec_uri, :transaction_id, :unique_id
+    attr_reader :committee, :district, :state, :committee_name, :purpose, :candidate, :candidate_name, :support_or_oppose, :date, :amount, :office, :amendment, :date_received, :payee, :fec_uri, :transaction_id, :unique_id, :filing_id, :amended_from
     
     def initialize(params={})
       params.each_pair do |k,v|

data/lib/campaign_cash/individual_contribution.rb

@@ -16,19 +16,19 @@ module CampaignCash
     def self.committee(fecid, offset=nil)
       cycle = CURRENT_CYCLE
       results = invoke("#{cycle}/contributions/committee/#{fecid}", {:offset => offset})['results']
-      results.map{|c| IndividualContribution.create(c["contribution"]) }
+      results.map{|c| IndividualContribution.create(c) }
     end
     
     def self.filing(form_id, offset=nil)
       cycle = CURRENT_CYCLE
       results = invoke("#{cycle}/contributions/filing/#{form_id}", {:offset => offset})['results']
-      results.map{|c| IndividualContribution.create(c["contribution"]) }
+      results.map{|c| IndividualContribution.create(c) }
     end
     
     def self.candidate(fecid, offset=nil)
       cycle = CURRENT_CYCLE
       results = invoke("#{cycle}/contributions/candidate/#{fecid}", {:offset => offset})['results']
-      results.map{|c| IndividualContribution.create(c["contribution"]) }
+      results.map{|c| IndividualContribution.create(c) }
     end
     
   end

data/lib/campaign_cash/version.rb

@@ -1,3 +1,3 @@
 module CampaignCash
-  VERSION = "2.3.1"
+  VERSION = "2.3.2"
 end

data/test/campaign_cash/test_candidate.rb

@@ -74,20 +74,20 @@ class TestCampaignCash::TestCandidate < Test::Unit::TestCase
 	end
 		
 	context "state candidates" do
-	  should "return 32 total candidates from Rhode Island" do
-	    assert_equal Candidate.state('RI', nil, nil, 2010).length, 32
+	  should "return 33 total candidates from Rhode Island" do
+	    assert_equal Candidate.state('RI', nil, nil, 2010).size, 33
     end
 	  
-	  should "return 29 House candidates from Rhode Island" do
-	    assert_equal Candidate.state('RI', "house", nil, 2010).length, 29
+	  should "return 30 House candidates from Rhode Island" do
+	    assert_equal Candidate.state('RI', "house", nil, 2010).size, 30
 	  end
 	  
-	  should "return 3 Senate candidates from Rhode Island" do
-	    assert_equal Candidate.state('RI', "senate", nil, 2010).length, 3
+	  should "return least 3 Senate candidates from Rhode Island" do
+	    assert_equal Candidate.state('RI', "senate", nil, 2010).size, 3
 	  end
 	  
 	  should "return 17 House candidates from District 1 of Rhode Island" do
-	    assert_equal Candidate.state('RI', "house", 1, 2010).length, 17
+	    assert_equal Candidate.state('RI', "house", 1, 2010).size, 17
 	  end
 	end
 end

metadata

@@ -1,92 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: campaign_cash
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 2.3.2
   prerelease: 
-  segments: 
-  - 2
-  - 3
-  - 1
-  version: 2.3.1
 platform: ruby
-authors: 
+authors:
 - Derek Willis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-10 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153723340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153723340
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2153722800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153722800
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2153722300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153722300
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &2153721920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *2153721920
 description: A client for The New York Times Campaign Finance API
-email: 
+email:
 - dwillis@nytimes.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -119,40 +94,29 @@ files:
 - test/test_helper.rb
 homepage: http://rubygems.org/gems/campaign_cash
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: campaign_cash
 rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Following the money.
-test_files: 
+test_files:
 - test/campaign_cash/test_candidate.rb
 - test/campaign_cash/test_committee.rb
 - test/campaign_cash/test_electioneering_communication.rb