campaign_cash 2.6.2 → 2.7

data/lib/campaign_cash/contribution.rb

@@ -2,8 +2,8 @@ module CampaignCash
   class Contribution < Base
 
     attr_reader :date, :candidate_uri, :primary_general, :amount, :state, :name, 
-    :image_uri, :party, :district, :committee_uri, :results, :total_results, :total_amount, 
-    :cycle, :record_number, :transaction_id, :transaction_type
+  :image_uri, :party, :district, :committee_uri, :results, :total_results, :total_amount, 
+  :cycle, :record_number, :transaction_id, :transaction_type
 
     def initialize(params={})
       params.each_pair do |k,v|
@@ -12,44 +12,44 @@ module CampaignCash
     end
 
     def self.to_candidate(params={})
-      self.new :committee => parse_committee(params['committee']),
-        :cycle => params['cycle'].to_i,
-        :total_amount => params['total_amount'].to_f,
-        :results => params['results'].map{|c| OpenStruct.new({
-        :candidate => parse_candidate(params['candidate_uri']),
-        :date => date_parser(c['date']),
-        :primary_general => c['primary_general'],
-        :amount => c['amount'].to_f,
-        :state => c['state'],
-        :name => c['name'],
-        :image_uri => c['image_uri'],
-        :party => c['party'],
-        :district => c['district'],
-        :record_number => c['record_number'],
-        :transaction_type => c['transaction_type'],
-        :transaction_id => c['transaction_id']
+      self.new committee: parse_committee(params['committee']),
+      cycle: params['cycle'].to_i,
+      total_amount: params['total_amount'].to_f,
+      results: params['results'].map{|c| OpenStruct.new({
+      candidate: parse_candidate(params['candidate_uri']),
+      date: date_parser(c['date']),
+      primary_general: c['primary_general'],
+      amount: c['amount'].to_f,
+      state: c['state'],
+      name: c['name'],
+      image_uri: c['image_uri'],
+      party: c['party'],
+      district: c['district'],
+      record_number: c['record_number'],
+      transaction_type: c['transaction_type'],
+      transaction_id: c['transaction_id']
         })}
 
     end
 
     def self.all_candidates(params={})
-      self.new :committee => parse_committee(params['committee']),
-        :cycle => params['cycle'].to_i,
-        :total_amount => params['total_amount'].to_f,
-        :total_results => params['total_results'].to_i,
-        :results => params['results'].map{|c| OpenStruct.new({
-        :date => date_parser(c['date']),
-        :candidate => parse_candidate(c['candidate_uri']),
-        :primary_general => c['primary_general'],
-        :amount => c['amount'].to_f,
-        :state => c['state'],
-        :name => c['name'],
-        :image_uri => c['image_uri'],
-        :party => c['party'],
-        :district => c['district'],
-        :record_number => c['record_number'],
-        :transaction_type => c['transaction_type'],
-        :transaction_id => c['transaction_id']
+      self.new committee: parse_committee(params['committee']),
+      cycle: params['cycle'].to_i,
+      total_amount: params['total_amount'].to_f,
+      total_results: params['total_results'].to_i,
+      results: params['results'].map{|c| OpenStruct.new({
+      date: date_parser(c['date']),
+      candidate: parse_candidate(c['candidate_uri']),
+      primary_general: c['primary_general'],
+      amount: c['amount'].to_f,
+      state: c['state'],
+      name: c['name'],
+      image_uri: c['image_uri'],
+      party: c['party'],
+      district: c['district'],
+      record_number: c['record_number'],
+      transaction_type: c['transaction_type'],
+      transaction_id: c['transaction_id']
         })}
 
     end

data/lib/campaign_cash/electioneering_communication.rb

@@ -14,20 +14,20 @@ module CampaignCash
 
     def self.latest(offset = nil)
       cycle = CURRENT_CYCLE
-      results = invoke("#{cycle}/electioneering_communications", {:offset => offset})['results']
+      results = invoke("#{cycle}/electioneering_communications", {offset: offset})['results']
       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 = invoke("#{cycle}/committees/#{committee_id}/electioneering_communications", {offset: offset})['results']
         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 = invoke("#{cycle}/electioneering_communications/#{d.year}/#{d.month}/#{d.day}", {offset: offset})['results']
         results.map {|obj| ElectioneeringCommunication.create(obj)}
     end
   end

data/lib/campaign_cash/filing.rb

@@ -2,8 +2,8 @@ module CampaignCash
   class Filing < Base
 
     attr_reader :committee_name, :date_coverage_from, :amended_uri, :fec_uri, :date_coverage_to, :committee, :report_title, :amended, :date_filed, 
-    :cycle, :form_type, :original_filing, :original_uri, :paper, :committee_type, :filing_id, :receipts_total, :disbursements_total, :cash_on_hand,
-    :is_amendment
+  :cycle, :form_type, :original_filing, :original_uri, :paper, :committee_type, :filing_id, :receipts_total, :disbursements_total, :cash_on_hand,
+  :is_amendment
 
     def initialize(params={})
       params.each_pair do |k,v|
@@ -12,37 +12,37 @@ module CampaignCash
     end
 
     def self.create(params={}, name=nil)
-      self.new :date_coverage_from => date_parser(params['date_coverage_from']),
-        :date_coverage_to => date_parser(params['date_coverage_to']),
-        :committee => parse_committee(params['committee']),
-        :report_title => params['report_title'].strip,
-        :fec_uri => params['fec_uri'],
-        :amended => params['amended'],
-        :amended_uri => params['amended_uri'],
-        :original_filing => params['original_filing'],
-        :original_uri => params['original_uri'],
-        :paper => params['paper'],
-        :form_type => params['form_type'],
-        :filing_id => params['filing_id'],
-        :committee_type => Committee.get_committee_type(params['committee_type']),
-        :committee_name => params['committee_name'],
-        :receipts_total => params['receipts_total'],
-        :contributions_total => params['contributions_total'],
-        :disbursements_total => params['disbursements_total'],
-        :cash_on_hand => params['cash_on_hand'],
-        :is_amendment => params['is_amendment']
+      self.new date_coverage_from: date_parser(params['date_coverage_from']),
+      date_coverage_to: date_parser(params['date_coverage_to']),
+      committee: parse_committee(params['committee']),
+      report_title: params['report_title'].strip,
+      fec_uri: params['fec_uri'],
+      amended: params['amended'],
+      amended_uri: params['amended_uri'],
+      original_filing: params['original_filing'],
+      original_uri: params['original_uri'],
+      paper: params['paper'],
+      form_type: params['form_type'],
+      filing_id: params['filing_id'],
+      committee_type: Committee.get_committee_type(params['committee_type']),
+      committee_name: params['committee_name'],
+      receipts_total: params['receipts_total'],
+      contributions_total: params['contributions_total'],
+      disbursements_total: params['disbursements_total'],
+      cash_on_hand: params['cash_on_hand'],
+      is_amendment: params['is_amendment']
     end
 
     def self.today(offset=nil)
       cycle=CURRENT_CYCLE
-      reply = Base.invoke("#{cycle}/filings", {:offset => offset})
+      reply = Base.invoke("#{cycle}/filings", {offset: offset})
       results = reply['results']
       results.map{|c| Filing.create(c)}
     end
 
     def self.date(year, month, day, offset=nil)
       cycle = cycle_from_date(Date.strptime("#{month}/#{day}/#{year}", '%m/%d/%Y'))
-        reply = Base.invoke("#{cycle}/filings/#{year}/#{month}/#{day}", {:offset => offset})
+        reply = Base.invoke("#{cycle}/filings/#{year}/#{month}/#{day}", {offset: offset})
         results = reply['results']
       results.map{|c| Filing.create(c)}
     end
@@ -51,12 +51,12 @@ module CampaignCash
       cycle=CURRENT_CYCLE
       reply = Base.invoke("#{cycle}/filings/types",{})
       results = reply['results']
-      results.map{|ft| OpenStruct.new({:id => ft['id'], :name => ft['name'].strip})}
+      results.map{|ft| OpenStruct.new({id: ft['id'], name: ft['name'].strip})}
     end
     
     def self.amendments(offset=nil)
       cycle=CURRENT_CYCLE
-      reply = Base.invoke("#{cycle}/filings/amendments", {:offset => offset})
+      reply = Base.invoke("#{cycle}/filings/amendments", {offset: offset})
       results = reply['results']
       results.map{|c| Filing.create(c)}
     end

data/lib/campaign_cash/form.rb

@@ -10,8 +10,8 @@ module CampaignCash
     end
 
     def self.create(params={})
-      self.new :id => params['id'],
-        :name => params['name']
+      self.new id: params['id'],
+      name: params['name']
     end
 
     def self.form_types

data/lib/campaign_cash/independent_expenditure.rb

@@ -2,8 +2,8 @@ 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, :filing_id, :amended_from
+  :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|
@@ -12,32 +12,32 @@ module CampaignCash
     end
 
     def self.create(params={})
-      self.new :committee => parse_committee(params['fec_committee']),
-        :committee_name => params['fec_committee_name'],
-        :candidate => parse_candidate(params['fec_candidate']),
-        :office => params['office'],
-        :state => params['state'] ? params['state'].strip : nil,
-        :district => params['district'],
-        :date => date_parser(params['date']),
-        :support_or_oppose => params['support_or_oppose'],
-        :payee => params['payee'],
-        :purpose => params['purpose'],
-        :amount => params['amount'].to_f,
-        :fec_uri => params['fec_uri'],
-        :date_received => date_parser(params['date_received']),
-        :amendment => params['amendment'],
-        :transaction_id => params['transaction_id'],
-        :candidate_name => params['candidate_name'],
-        :filing_id      => params['filing_id'].to_i,
-        :amended_from   => params['amended_from'], # <= original filing ID will be nil if amendment is false
+      self.new committee: parse_committee(params['fec_committee']),
+      committee_name: params['fec_committee_name'],
+      candidate: parse_candidate(params['fec_candidate']),
+      office: params['office'],
+      state: params['state'] ? params['state'].strip : nil,
+      district: params['district'],
+      date: date_parser(params['date']),
+      support_or_oppose: params['support_or_oppose'],
+      payee: params['payee'],
+      purpose: params['purpose'],
+      amount: params['amount'].to_f,
+      fec_uri: params['fec_uri'],
+      date_received: date_parser(params['date_received']),
+      amendment: params['amendment'],
+      transaction_id: params['transaction_id'],
+      candidate_name: params['candidate_name'],
+      filing_id: params['filing_id'].to_i,
+      amended_from: params['amended_from'], # <= original filing ID will be nil if amendment is false
         # unique_id is a SHA1 of filing_id and transaction_id
         # If the expenditure is amended, the unique_id will be amended_from + transaction_id
         # so it can be used as an overrideable unique key
-        :unique_id => params['unique_id']
+      unique_id: params['unique_id']
     end
 
     def self.latest(offset=nil)
-      reply = Base.invoke("#{Base::CURRENT_CYCLE}/independent_expenditures",{:offset => offset})
+      reply = Base.invoke("#{Base::CURRENT_CYCLE}/independent_expenditures",{offset: offset})
       results = reply['results']
       results.map{|c| IndependentExpenditure.create(c)}
     end
@@ -45,14 +45,14 @@ module CampaignCash
     def self.date(date,offset=nil)
       d = Date.strptime(date, '%m/%d/%Y')
       cycle = cycle_from_date(d)
-      reply = Base.invoke("#{cycle}/independent_expenditures/#{d.year}/#{d.month}/#{d.day}", {:offset => offset})
+      reply = Base.invoke("#{cycle}/independent_expenditures/#{d.year}/#{d.month}/#{d.day}", {offset: offset})
         results = reply['results']
       results.map{|c| IndependentExpenditure.create(c)}      
     end
 
     def self.committee(id, cycle, offset=nil)
       independent_expenditures = []
-      reply = Base.invoke("#{cycle}/committees/#{id}/independent_expenditures",{:offset => offset})
+      reply = Base.invoke("#{cycle}/committees/#{id}/independent_expenditures",{offset: offset})
         results = reply['results']
       comm = reply['fec_committee']
       results.each do |result|
@@ -64,7 +64,7 @@ module CampaignCash
 
     def self.candidate(id, cycle, offset=nil)
       independent_expenditures = []
-      reply = Base.invoke("#{cycle}/candidates/#{id}/independent_expenditures",{:offset => offset})
+      reply = Base.invoke("#{cycle}/candidates/#{id}/independent_expenditures",{offset: offset})
         results = reply['results']
       cand = reply['fec_candidate']
       results.each do |result|
@@ -75,7 +75,7 @@ module CampaignCash
     end
 
     def self.president(cycle=CURRENT_CYCLE,offset=nil)
-      reply = Base.invoke("#{cycle}/president/independent_expenditures",{:offset => offset})
+      reply = Base.invoke("#{cycle}/president/independent_expenditures",{offset: offset})
       results = reply['results']
       results.map{|c| IndependentExpenditure.create(c)}
     end

data/lib/campaign_cash/individual_contribution.rb

@@ -15,21 +15,14 @@ module CampaignCash
 
     def self.committee(fecid, offset=nil)
       cycle = CURRENT_CYCLE
-      results = invoke("#{cycle}/contributions/committee/#{fecid}", {:offset => offset})['results']
+      results = invoke("#{cycle}/contributions/committee/#{fecid}", {offset: offset})['results']
         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 = invoke("#{cycle}/contributions/filing/#{form_id}", {offset: offset})['results']
         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) }
-    end
-
   end
 end

data/lib/campaign_cash/late_contribution.rb

@@ -2,9 +2,9 @@ module CampaignCash
   class LateContribution < Base
 
     attr_reader :contribution_date, :contributor_prefix, :contributor_zip, :contributor_suffix, :contributor_state, 
-    :entity_type, :contributor_employer, :contributor_occupation, :fec_committee_id, :transaction_id, :contributor_last_name,
-    :office_state, :contributor_fec_id, :contribution_amount, :contributor_street_1, :contributor_street_2, :contributor_city,
-    :contributor_middle_name, :cycle, :fec_filing_id, :fec_candidate_id, :contributor_first_name, :contributor_organization_name
+  :entity_type, :contributor_employer, :contributor_occupation, :fec_committee_id, :transaction_id, :contributor_last_name,
+  :office_state, :contributor_fec_id, :contribution_amount, :contributor_street_1, :contributor_street_2, :contributor_city,
+  :contributor_middle_name, :cycle, :fec_filing_id, :fec_candidate_id, :contributor_first_name, :contributor_organization_name
     
     def initialize(params={})
       params.each_pair do |k,v|
@@ -18,19 +18,19 @@ module CampaignCash
 
     def self.latest(offset = nil)
       cycle = CURRENT_CYCLE
-      results = invoke("#{cycle}/contributions/48hour", {:offset => offset})['results']
+      results = invoke("#{cycle}/contributions/48hour", {offset: offset})['results']
       results.map {|obj| create(obj)}
     end
 
     def self.candidate(candidate_id, offset = nil)
       cycle = CURRENT_CYCLE
-      results = invoke("#{cycle}/candidates/#{candidate_id}/48hour", {:offset => offset})['results']
+      results = invoke("#{cycle}/candidates/#{candidate_id}/48hour", {offset: offset})['results']
       results.map {|obj| create(obj)}
     end
 
     def self.committee(committee_id, offset = nil)
       cycle = CURRENT_CYCLE
-      results = invoke("#{cycle}/committees/#{committee_id}/48hour", {:offset => offset})['results']
+      results = invoke("#{cycle}/committees/#{committee_id}/48hour", {offset: offset})['results']
       results.map {|obj| create(obj)}
     end
   end

data/lib/campaign_cash/president.rb

@@ -2,10 +2,10 @@ module CampaignCash
   class President < Base
 
     attr_reader :committee_id, :name, :id, :party, :office, :date_coverage_from, :date_coverage_to, :total_receipts, :total_disbursements,
-      :end_cash, :total_refunds, :total_contributions, :net_individual_contributions, :net_pac_contributions, :transfers_in, 
-      :net_party_contributions, :net_candidate_contributions, :net_primary_contributions, :net_general_contributions,
-      :federal_funds, :contributions_less_than_200, :contributions_200_499, :contributions_500_1499, :contributions_1500_2499,
-      :contributions_max
+    :end_cash, :total_refunds, :total_contributions, :net_individual_contributions, :net_pac_contributions, :transfers_in, 
+    :net_party_contributions, :net_candidate_contributions, :net_primary_contributions, :net_general_contributions,
+    :federal_funds, :contributions_less_than_200, :contributions_200_499, :contributions_500_1499, :contributions_1500_2499,
+    :contributions_max
 
     def initialize(params={})
       params.each_pair do |k,v|
@@ -15,45 +15,45 @@ module CampaignCash
 
     # Creates a new president summary object from a JSON API presidential response.
     def self.create_summary(params={})
-      self.new :name => params['name'],
-        :id => params['candidate_id'],
-        :party => get_party(params['party']),
-        :office => 'president',
-        :committee_id => params['committee_id'],
-        :total_receipts => params['total_receipts'],
-        :total_disbursements => params['total_disbursements'],
-        :end_cash => params['cash_on_hand'],
-        :date_coverage_from => params['date_coverage_from'],
-        :date_coverage_to => params['date_coverage_to']
+      self.new name: params['name'],
+      id: params['candidate_id'],
+      party: get_party(params['party']),
+      office: 'president',
+      committee_id: params['committee_id'],
+      total_receipts: params['total_receipts'],
+      total_disbursements: params['total_disbursements'],
+      end_cash: params['cash_on_hand'],
+      date_coverage_from: params['date_coverage_from'],
+      date_coverage_to: params['date_coverage_to']
     end
 
     # Creates a detailed president object
     def self.create_detail(params={})
-      self.new :name => params['candidate_name'],
-        :id => params['candidate_id'],
-        :party => get_party(params['party']),
-        :office => 'president',
-        :committee_id => params['committee_id'],
-        :total_receipts => params['total_receipts'],
-        :total_contributions => params['total_contributions'],
-        :total_disbursements => params['total_disbursements'],
-        :end_cash => params['cash_on_hand'],
-        :date_coverage_from => params['date_coverage_from'],
-        :date_coverage_to => params['date_coverage_to'],
-        :total_refunds => params['total_refunds'],
-        :net_individual_contributions => params['net_individual_contributions'],
-        :net_pac_contributions => params['net_pac_contributions'],
-        :net_party_contributions => params['net_party_contributions'],
-        :net_candidate_contributions => params['net_candidate_contributions'],
-        :net_primary_contributions => params['net_primary_contributions'],
-        :net_general_contributions => params['net_general_contributions'],
-        :federal_funds => params['federal_funds'],
-        :transfers_in => params['transfers_in'],
-        :contributions_less_than_200 => params['total_contributions_less_than_200'],
-        :contributions_200_499 => params['contributions_200_499'],
-        :contributions_500_1499 => params['contributions_500_1499'],
-        :contributions_1500_2499 => params['contributions_1500_2499'],
-        :contributions_max => params['total_contributions_max']
+      self.new name: params['candidate_name'],
+      id: params['candidate_id'],
+      party: get_party(params['party']),
+      office: 'president',
+      committee_id: params['committee_id'],
+      total_receipts: params['total_receipts'],
+      total_contributions: params['total_contributions'],
+      total_disbursements: params['total_disbursements'],
+      end_cash: params['cash_on_hand'],
+      date_coverage_from: params['date_coverage_from'],
+      date_coverage_to: params['date_coverage_to'],
+      total_refunds: params['total_refunds'],
+      net_individual_contributions: params['net_individual_contributions'],
+      net_pac_contributions: params['net_pac_contributions'],
+      net_party_contributions: params['net_party_contributions'],
+      net_candidate_contributions: params['net_candidate_contributions'],
+      net_primary_contributions: params['net_primary_contributions'],
+      net_general_contributions: params['net_general_contributions'],
+      federal_funds: params['federal_funds'],
+      transfers_in: params['transfers_in'],
+      contributions_less_than_200: params['total_contributions_less_than_200'],
+      contributions_200_499: params['contributions_200_499'],
+      contributions_500_1499: params['contributions_500_1499'],
+      contributions_1500_2499: params['contributions_1500_2499'],
+      contributions_max: params['total_contributions_max']
     end
 
     # Returns an array of presidential candidates for a given cycle, defaults to the current cycle.