campaign_cash 1.2 → 1.3

data/campaign_cash.gemspec

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path("../lib/campaign_cash/version", __FILE__)
+$:.push File.expand_path("../lib", __FILE__)
+require "campaign_cash/version"
 
 Gem::Specification.new do |s|
   s.name        = "campaign_cash"
@@ -17,7 +18,8 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler", ">= 1.0.0"
 
-  s.files        = `git ls-files`.split("\n")
-  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
-  s.require_path = 'lib'
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end

data/lib/campaign_cash/base.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'open-uri'
 require 'json'
 require 'date'
+require 'ostruct'
 
 module CampaignCash
   class Base

data/lib/campaign_cash/committee.rb

@@ -6,7 +6,7 @@ module CampaignCash
                 :total_receipts, :total_contributions, :total_from_individuals, 
                 :total_from_pacs, :candidate_loans, :total_disbursements,
                 :total_refunds, :debts_owed, :begin_cash, :end_cash,
-                :date_coverage_to, :date_coverage_from
+                :date_coverage_to, :date_coverage_from, :other_cycles
     
     def initialize(params={})
       params.each_pair do |k,v|
@@ -35,7 +35,8 @@ 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 => params['candidate'],
+							 :other_cycles => params['other_cycles'].map{|cycle| cycle['cycle']['fec_committee']['cycle']}
 		end
 		
 		def self.create_from_search_results(params={})
@@ -55,19 +56,24 @@ module CampaignCash
     def self.find(fecid, cycle=CURRENT_CYCLE)
 			reply = invoke("#{cycle}/committees/#{fecid}")
 			result = reply['results']
-			self.create_from_api(result.first) if result.first
+			create(result.first) if result.first
     end
     
     def self.search(name, cycle=CURRENT_CYCLE)
 			reply = invoke("#{cycle}/committees/search", {:query => name})
 			results = reply['results']      
-      results.map{|c| self.create_from_api_search_results(c)}
+      results.map{|c| create_from_search_results(c)}
     end
     
     def self.new_committees(cycle=CURRENT_CYCLE)
 			reply = invoke("#{cycle}/committees/new",{})
 			results = reply['results']      
-      results.map{|c| self.create_from_api(c)}      
+      results.map{|c| create(c)}      
+    end
+    
+    def contributions
+      reply = invoke("#{cycle}/committees/#{id}/contributions")
+      
     end
     
   end

data/lib/campaign_cash/contribution.rb

@@ -1,7 +1,7 @@
 module CampaignCash
   class Contribution < Base
     
-    attr_reader :date, :candidate_uri, :primary_general, :amount, :state, :name, :image_uri, :party, :district
+    attr_reader :date, :candidate_uri, :primary_general, :amount, :state, :name, :image_uri, :party, :district, :committee_uri, :results, :total_results, :total_amount, :cycle
     
     def initialize(params={})
       params.each_pair do |k,v|
@@ -9,18 +9,32 @@ module CampaignCash
       end
     end
     
-		def self.create(cycle, committee, params={}, candidate = params['candidate'])
-		  self.new :date => date_parser(params[:date]),
-		           :candidate_uri => candidate,
-		           :committee_uri => committee,
-		           :primary_general => params[:primary_general],
-		           :amount => params[:amount],
-		           :state => params[:state],
-		           :name => params[:name],
-		           :image_uri => params[:image_uri],
-		           :party => params[:party],
-		           :district => params[:district],
-		           :cycle => cycle
+		def self.create(params={})
+		  self.new :committee_uri => params['committee'],
+		           :total_results => params['total_results'],
+		           :cycle => params['cycle'],
+		           :total_amount => params['total_amount'],
+		           :results => params['results'].map{|c| OpenStruct.new({
+               :date => date_parser(c['date']),
+		           :candidate_uri => c['candidate_uri'],
+		           :primary_general => c['primary_general'],
+		           :amount => c['amount'],
+		           :state => c['state'],
+		           :name => c['name'],
+		           :image_uri => c['image_uri'],
+		           :party => c['party'],
+		           :district => c['district']})}
+		           
 		end
+		
+    def self.find(fecid, cycle=CURRENT_CYCLE, candidate=nil)
+      if candidate
+        reply = invoke("#{cycle}/committees/#{fecid}/contributions/candidates/#{candidate}")
+			else
+			  reply = invoke("#{cycle}/committees/#{fecid}/contributions")
+			end
+			create(reply)
+    end
+		
   end
 end

data/lib/campaign_cash/version.rb

@@ -1,3 +1,3 @@
 module CampaignCash
-  VERSION = "1.2"
+  VERSION = "1.3"
 end

data/lib/campaign_cash.rb

@@ -1,15 +1,3 @@
-# A Ruby wrapper for [The New York Times Campaign Finance API](http://developer.nytimes.com/docs/read/campaign_finance_api).
-
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-require "campaign_cash/base"
-# [Candidate methods](candidate.html)
-require "campaign_cash/candidate"
-# [Committee methods](committee.html)
-require "campaign_cash/committee"
-# [Filing methods](filing.html)
-require "campaign_cash/filing"
-require "campaign_cash/contribution"
-require "campaign_cash/form"
-require "campaign_cash/version"
+%w(base candidate committee contribution filing form).each do |f|
+  require File.join(File.dirname(__FILE__), '../lib/campaign_cash', f)
+end

data/test/campaign_cash/test_candidate.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 class TestCampaignCash::TestCandidate < Test::Unit::TestCase
 	include CampaignCash

data/test/campaign_cash/test_committee.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 class TestCampaignCash::TestCommittee < Test::Unit::TestCase
 	include CampaignCash
@@ -56,40 +56,45 @@ class TestCampaignCash::TestCommittee < Test::Unit::TestCase
 	    @filings = results.map{|f| Filing.create_from_filings(f)}
 	  end
 	  
-	  should "return 20 filings" do
-	    assert_equal @filings.size, 20
+	  should "return 11 filings" do
+	    assert_equal @filings.size, 11
+	  end
+	end
+
+	context "committee detail" do
+	  setup do
+	    @committee = Committee.find('C00084475', 2012)
+	  end
+	  
+	  should "return 16 other cycles" do
+	    assert_equal @committee.other_cycles.size, 16
 	  end
 	end
 	
 	context "committee contributions" do
 	  setup do
-	    reply = Base.invoke('2010/committees/C00458588/contributions', {})
-	    results = reply['results']
-	    @committee = reply['committee']
-	    @num_records = reply['total_results']
-	    @total_amount = reply['total_amount']
-	    @contributions = results.map{|c| Contribution.create(@committee, c)}
+	    @contribution = Contribution.find('C00458588', 2010)
 	  end
 	  
 	  should "return 125 total results" do
-	    assert_equal @num_records, 125
+	    assert_equal @contribution.total_results, 125
+	  end
+	  
+	  should "return a $5,000 contribution to Renee Ellmers" do
+	    assert_equal @contribution.results.detect{|c| c.candidate_uri == "/candidates/H0NC02059.json"}.amount, 5000
 	  end
+	  
 	end
 	
 	context "committee contributions to a candidate" do
 	  setup do
 	    reply = Base.invoke('2010/committees/C00458588/contributions/candidates/H0NC02059', {})
-	    results = reply['results']
-	    @cycle = reply['cycle']
-	    @committee = reply['committee']
-	    @candidate = reply['candidate']
-	    @total_amount = reply['total_amount']
-	    @contributions = results.map{|c| Contribution.create(@cycle, @committee, c, @candidate)}
+	    @contribution = Contribution.create(reply)
 	  end
 	  
 	  should "return 2 results totaling $10,000" do
-	    assert_equal @contributions.size, 2
-	    assert_equal @total_amount, 10000
+	    assert_equal @contribution.results.size, 2
+	    assert_equal @contribution.total_amount, 10000
 	  end
 	end
 end

data/test/campaign_cash/test_filing.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 class TestCampaignCash::TestFiling < Test::Unit::TestCase
 	include CampaignCash

data/test/campaign_cash/test_form.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 class TestCampaignCash::TestForm < Test::Unit::TestCase
 	include CampaignCash

data/test/test_helper.rb

@@ -1,25 +1,18 @@
 require 'test/unit'
 require 'rubygems'
 require 'shoulda'
-require 'mocha'
 require 'json'
+require 'ostruct'
 
-require File.dirname(__FILE__) + '/../lib/campaign_cash'
-require File.dirname(__FILE__) + '/../lib/campaign_cash/base'
-require File.dirname(__FILE__) + '/../lib/campaign_cash/candidate'
-require File.dirname(__FILE__) + '/../lib/campaign_cash/committee'
-require File.dirname(__FILE__) + '/../lib/campaign_cash/contribution'
-require File.dirname(__FILE__) + '/../lib/campaign_cash/filing'
-require File.dirname(__FILE__) + '/../lib/campaign_cash/form'
+%w(base candidate committee contribution filing form).each do |f|
+  require File.join(File.dirname(__FILE__), '../lib/campaign_cash', f)
+end
+
+include CampaignCash
 
 # set your NYT Campaign Finance API key as an environment variable to run the tests
 API_KEY = ENV['NYT_CAMPFIN_API_KEY']
 CampaignCash::Base.api_key = API_KEY
 
-def api_url_for(path, params = {})
-	full_params = params.merge 'api-key' => API_KEY
-	CampaignCash::Base.build_request_url(path, full_params).to_s
-end
-
 module TestCampaignCash
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: campaign_cash
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 1
-  - 2
-  version: "1.2"
+  - 3
+  version: "1.3"
 platform: ruby
 authors: 
 - Derek Willis
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-15 00:00:00 -04:00
+date: 2011-07-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,5 +111,9 @@ rubygems_version: 1.4.2
 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_filing.rb
+- test/campaign_cash/test_form.rb
+- test/test_helper.rb