campaign_cash 0.0.4 → 0.0.5

data/lib/campaign_cash/base.rb

@@ -9,6 +9,7 @@ module CampaignCash
   	API_VERSION = 'v3'
   	API_NAME = 'elections/us'
   	API_BASE = "/svc/#{API_NAME}/#{API_VERSION}/finances"
+  	CURRENT_CYCLE = 2010
 
   	@@api_key = nil
   	@@copyright = nil

data/lib/campaign_cash/candidate.rb

@@ -52,31 +52,31 @@ module CampaignCash
 		  
 		end
 
-    def self.find_by_fecid(cycle, fecid)
+    def self.find(fecid, cycle=CURRENT_CYCLE)
 			reply = invoke("#{cycle}/candidates/#{fecid}")
 			result = reply['results']
 			self.create_from_api(result.first) if result.first
     end
     
-    def self.leaders(cycle, category)
+    def self.leaders(category, cycle=CURRENT_CYCLE)
 			reply = invoke("#{cycle}/candidates/leaders/#{category}",{})
 			results = reply['results']
       results.map{|c| self.create_from_api(c)}
     end
     
-    def self.search(cycle, name)
+    def self.search(name, cycle=CURRENT_CYCLE)
 			reply = invoke("#{cycle}/candidates/search", {:query => name})
 			results = reply['results']      
       results.map{|c| self.create_from_api_search_results(c)}
     end
     
-    def self.new_candidates(cycle)
+    def self.new_candidates(cycle=CURRENT_CYCLE)
 			reply = invoke("#{cycle}/candidates/new",{})
 			results = reply['results']      
       results.map{|c| self.create_from_api(c)}      
     end
     
-    def self.state_chamber(cycle, state, chamber, district=nil)
+    def self.state_chamber(state, chamber, district=nil, cycle=CURRENT_CYCLE)
       district ? path = "#{cycle}/seats/#{state}/#{chamber}/#{district}" : path = "#{cycle}/seats/#{state}/#{chamber}"
 			reply = invoke(path,{})
 			results = reply['results']

data/lib/campaign_cash/committee.rb

@@ -52,19 +52,19 @@ module CampaignCash
 		  
 		end
     
-    def self.find_by_fecid(cycle, fecid)
+    def self.find(fecid, cycle=CURRENT_CYCLE)
 			reply = invoke("#{cycle}/committees/#{fecid}")
 			result = reply['results']
 			self.create_from_api(result.first) if result.first
     end
     
-    def self.search(cycle, name)
+    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)}
     end
     
-    def self.new_candidates(cycle)
+    def self.new_candidates(cycle=CURRENT_CYCLE)
 			reply = invoke("#{cycle}/committees/new",{})
 			results = reply['results']      
       results.map{|c| self.create_from_api(c)}      

data/lib/campaign_cash/filing.rb

@@ -21,13 +21,13 @@ module CampaignCash
 		end
 		
 		def self.today
-		  cycle = cycle_from_date
+		  cycle=CURRENT_CYCLE
 		  reply = Base.invoke("#{cycle}/filings", {})
 		  results = reply['results']
 			@filings = results.map{|c| Filing.create_from_api(c)}
 		end
 		
-		def self.ymd(year, month, day)
+		def self.date(year, month, day)
 		  cycle = cycle_from_date(Date.parse("#{month}/#{day}/#{year}"))
 		  reply = Base.invoke("#{cycle}/filings/#{year}/#{month}/#{day}", {})
 		  results = reply['results']

data/lib/campaign_cash/version.rb

@@ -1,3 +1,3 @@
 module CampaignCash
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/campaign_cash/test_candidate.rb

@@ -73,7 +73,7 @@ class TestCampaignCash::TestCandidate < Test::Unit::TestCase
 	
 	context "state candidates" do
 	  setup do
-		  @candidates = Candidate.state_chamber(2010, 'RI', 'house')
+		  @candidates = Candidate.state_chamber('RI', 'house', nil, 2010)
 	  end
 	  
 	  should "return 29 House candidates from Rhode Island" do

data/test/campaign_cash/test_filing.rb

@@ -6,27 +6,17 @@ class TestCampaignCash::TestFiling < Test::Unit::TestCase
 	context "a day" do
 	  setup do
 	    month, day, year = "11", "27", "2010"
-		  reply = Base.invoke("2010/filings/#{year}/#{month}/#{day}", {})
-		  @results = reply['results']
-			@filings = @results.map{|c| Filing.create_from_api(c)}
+		  @filings = Filing.date(year, month, day)
 	  end
 	  
 		should "return a list of objects of the Filing type" do
 			assert_kind_of(Filing, @filings.first)
 		end
-		
-		%w(committee_name fec_uri committee amended).each do |attr|
-			should "assign the value of the @#{attr} attribute from the '#{attr}' key in the hash" do
-				assert_equal(@results.first[attr], @filings.first.send(attr))
-			end
-		end
 	end
 	
 	context "today's filings" do
 	  setup do
-		  reply = Base.invoke('2010/filings', {})
-		  @results = reply['results']
-			@filings = @results.map{|c| Filing.create_from_api(c)}
+			@filings = Filing.today
 	  end
 	  
 		should "return a list of objects of the Filing type" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: campaign_cash
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Derek Willis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-03 00:00:00 -05:00
+date: 2010-12-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency