fechell 0.1.9 → 0.2.0

data/Manifest

@@ -1,75 +1,80 @@
-fechell.gemspec
-lib/defs/3.00.csv
-lib/defs/5.00.csv
-lib/defs/5.1.csv
-lib/defs/5.2.csv
-lib/defs/5.3.csv
-lib/defs/6.1.csv
-lib/defs/6.2.csv
-lib/defs/6.3.csv
-lib/defs/6.4.csv
-lib/fechell/forms.rb
-lib/fechell.rb
-lib/tests/f3test.rb
-lib/tests/satest.rb
-lib/tests/sbtest.rb
-lib/tests/sc1test.rb
-lib/tests/sctest.rb
-lib/tests/testdata/F3-3.00-32564-SC1.fec
-lib/tests/testdata/F3-3.00-32777.fec
-lib/tests/testdata/F3-3.00-32909-SC.fec
-lib/tests/testdata/F3-3.00-32933-SB.fec
-lib/tests/testdata/F3-3.00-32933.fec
-lib/tests/testdata/F3-5.00-97348.fec
-lib/tests/testdata/F3-5.00-97424-SB.fec
-lib/tests/testdata/F3-5.00-97424-SC.fec
-lib/tests/testdata/F3-5.00-97424.fec
-lib/tests/testdata/F3-5.00-97986-SC1.fec
-lib/tests/testdata/F3-5.1-116177-SC1.fec
-lib/tests/testdata/F3-5.1-116437-SC2.fec
-lib/tests/testdata/F3-5.1-126642.fec
-lib/tests/testdata/F3-5.1-126655-SB.fec
-lib/tests/testdata/F3-5.1-126655-SC.fec
-lib/tests/testdata/F3-5.1-126655.fec
-lib/tests/testdata/F3-5.2-170434.fec
-lib/tests/testdata/F3-5.2-170443.fec
-lib/tests/testdata/F3-5.2-170775-SC.fec
-lib/tests/testdata/F3-5.2-170890-SC.fec
-lib/tests/testdata/F3-5.2-170890.fec
-lib/tests/testdata/F3-5.2-171146-SC1.fec
-lib/tests/testdata/F3-5.2-171146.fec
-lib/tests/testdata/F3-5.3-210119-SB.fec
-lib/tests/testdata/F3-5.3-210119.fec
-lib/tests/testdata/F3-5.3-210142-SC1.fec
-lib/tests/testdata/F3-5.3-210142.fec
-lib/tests/testdata/F3-5.3-210250.fec
-lib/tests/testdata/F3-5.3-212438-SC.fec
-lib/tests/testdata/F3-6.1-331453-SB.fec
-lib/tests/testdata/F3-6.1-331453.fec
-lib/tests/testdata/F3-6.1-332530-SC.fec
-lib/tests/testdata/F3-6.1-332675.fec
-lib/tests/testdata/F3-6.1-333405-SC1.fec
-lib/tests/testdata/F3-6.1-333405.fec
-lib/tests/testdata/F3-6.2-350353-SC.fec
-lib/tests/testdata/F3-6.2-350353.fec
-lib/tests/testdata/F3-6.2-350775-SB.fec
-lib/tests/testdata/F3-6.2-350775.fec
-lib/tests/testdata/F3-6.2-350844-SC1.fec
-lib/tests/testdata/F3-6.2-350844.fec
-lib/tests/testdata/F3-6.3-413014.fec
-lib/tests/testdata/F3-6.3-413060-SC.fec
-lib/tests/testdata/F3-6.3-413226-SB.fec
-lib/tests/testdata/F3-6.3-413226.fec
-lib/tests/testdata/F3-6.3-413284-SC1.fec
-lib/tests/testdata/F3-6.4-420048-SC.fec
-lib/tests/testdata/F3-6.4-420048.fec
-lib/tests/testdata/F3-6.4-420106.fec
-lib/tests/testdata/F3-6.4-423088-SC1.fec
-lib/tests/testdata/F3-6.4-423088.fec
-lib/tests/testdata/F3-6.4-424094.fec
-lib/tests/testdata/F3-6.4-424586-SB.fec
-lib/tests/testdata/F3-6.4-424586.fec
-lib/tests.rb
-Manifest
-Rakefile
-README.rdoc
+fechell.gemspec
+lib/defs/3.00.csv
+lib/defs/5.00.csv
+lib/defs/5.1.csv
+lib/defs/5.2.csv
+lib/defs/5.3.csv
+lib/defs/6.1.csv
+lib/defs/6.2.csv
+lib/defs/6.3.csv
+lib/defs/6.4.csv
+lib/defs/7.0.csv
+lib/fechell/forms.rb
+lib/fechell.rb
+lib/tests/f3test.rb
+lib/tests/satest.rb
+lib/tests/sbtest.rb
+lib/tests/sc1test.rb
+lib/tests/sctest.rb
+lib/tests/testdata/F3-3.00-32564-SC1.fec
+lib/tests/testdata/F3-3.00-32777.fec
+lib/tests/testdata/F3-3.00-32909-SC.fec
+lib/tests/testdata/F3-3.00-32933-SB.fec
+lib/tests/testdata/F3-3.00-32933.fec
+lib/tests/testdata/F3-5.00-97348.fec
+lib/tests/testdata/F3-5.00-97424-SB.fec
+lib/tests/testdata/F3-5.00-97424-SC.fec
+lib/tests/testdata/F3-5.00-97424.fec
+lib/tests/testdata/F3-5.00-97986-SC1.fec
+lib/tests/testdata/F3-5.1-116177-SC1.fec
+lib/tests/testdata/F3-5.1-116437-SC2.fec
+lib/tests/testdata/F3-5.1-126642.fec
+lib/tests/testdata/F3-5.1-126655-SB.fec
+lib/tests/testdata/F3-5.1-126655-SC.fec
+lib/tests/testdata/F3-5.1-126655.fec
+lib/tests/testdata/F3-5.2-170434.fec
+lib/tests/testdata/F3-5.2-170443.fec
+lib/tests/testdata/F3-5.2-170775-SC.fec
+lib/tests/testdata/F3-5.2-170890-SC.fec
+lib/tests/testdata/F3-5.2-170890.fec
+lib/tests/testdata/F3-5.2-171146-SC1.fec
+lib/tests/testdata/F3-5.2-171146.fec
+lib/tests/testdata/F3-5.3-210119-SB.fec
+lib/tests/testdata/F3-5.3-210119.fec
+lib/tests/testdata/F3-5.3-210142-SC1.fec
+lib/tests/testdata/F3-5.3-210142.fec
+lib/tests/testdata/F3-5.3-210250.fec
+lib/tests/testdata/F3-5.3-212438-SC.fec
+lib/tests/testdata/F3-6.1-331453-SB.fec
+lib/tests/testdata/F3-6.1-331453.fec
+lib/tests/testdata/F3-6.1-332530-SC.fec
+lib/tests/testdata/F3-6.1-332675.fec
+lib/tests/testdata/F3-6.1-333405-SC1.fec
+lib/tests/testdata/F3-6.1-333405.fec
+lib/tests/testdata/F3-6.2-350353-SC.fec
+lib/tests/testdata/F3-6.2-350353.fec
+lib/tests/testdata/F3-6.2-350775-SB.fec
+lib/tests/testdata/F3-6.2-350775.fec
+lib/tests/testdata/F3-6.2-350844-SC1.fec
+lib/tests/testdata/F3-6.2-350844.fec
+lib/tests/testdata/F3-6.3-413014.fec
+lib/tests/testdata/F3-6.3-413060-SC.fec
+lib/tests/testdata/F3-6.3-413226-SB.fec
+lib/tests/testdata/F3-6.3-413226.fec
+lib/tests/testdata/F3-6.3-413284-SC1.fec
+lib/tests/testdata/F3-6.4-420048-SC.fec
+lib/tests/testdata/F3-6.4-420048.fec
+lib/tests/testdata/F3-6.4-420106.fec
+lib/tests/testdata/F3-6.4-423088-SC1.fec
+lib/tests/testdata/F3-6.4-423088.fec
+lib/tests/testdata/F3-6.4-424094.fec
+lib/tests/testdata/F3-6.4-424586-SB.fec
+lib/tests/testdata/F3-6.4-424586.fec
+lib/tests/testdata/F3-7.0-720829-SB.fec
+lib/tests/testdata/F3-7.0-720829-SC.fec
+lib/tests/testdata/F3-7.0-723958.fec
+lib/tests/testdata/F3-70-TESTDATA-SC1.FEC
+lib/tests.rb
+Rakefile
+README.rdoc
+Manifest

data/README.rdoc

@@ -4,7 +4,13 @@ Parsing a loading electronically filed fundraising reports from the Federal Elec
 
 == Install
 
-sudo gem install offensivepolitics-fechell
+	# remove old versions from github installs
+
+	sudo gem uninstall offensivepolitics-fechell
+
+	# install new version hosted @ gemcutter / rubygems.org
+	
+	sudo gem install fechell
 
 == Usage
 
@@ -33,40 +39,22 @@ sudo gem install offensivepolitics-fechell
 
 	# extract the financial summary of each campaign. we want total receipts this period and cycle to date, total disbursements this period and cycle to date, 
 	# and the cash position at the beginning and end of this reporting period
+
 	# note we're using the new FECForm.form_for function that takes any version FECHell parameter hash and returns a full ruby object
-	
 	['goode.fec','perriello.fec'].each do |filename|
-	    fec_version, original_form_type, form_type, values = h.header_lines(filrname)
+	  fec_version, original_form_type, form_type, values = h.header_lines(filename)
 		next unless form_type == "F3" && fec_version.to_i >= 3
-		
+	
 		f = FECForm.schedule_for(form_type, fec_version, values)
-		puts "For: #{}"
-	    puts "Total receipts this period: #{values['Column A 24. Total Receipts this Period']}"
-	    puts "Total receipts cycle-to-date: #{values['Column B 16. Total Receipts']}"
-	    puts "Total disbursements this period: #{values['Column A 26. Total Disbursements this Period']}"
-	    puts "Total disbursements cycle-to-date: #{values['Column B 22. Total Disbursements']}"
-	    puts "Cash-on-hand beginning of period: #{values['Column A 23. Cash Beginning Reporting Period']}"
-	    puts "Cash-on-hand end of period:  #{values['Column A 27. Cash on hand at Close Period']}"
-		
-		
-	  h.process(filename) do |v|
-	    schedule = v[0]
-	    values = v[1]
-	    next if schedule != 'F3'
-	    form = FECForm.form_for(form_type)
-	    puts "For '#{values['COMMITTEE NAME']}'"
-    
-    
-	    puts "Total receipts this period: #{values['Column A 24. Total Receipts this Period']}"
-	    puts "Total receipts cycle-to-date: #{values['Column B 16. Total Receipts']}"
-	    puts "Total disbursements this period: #{values['Column A 26. Total Disbursements this Period']}"
-	    puts "Total disbursements cycle-to-date: #{values['Column B 22. Total Disbursements']}"
-	    puts "Cash-on-hand beginning of period: #{values['Column A 23. Cash Beginning Reporting Period']}"
-	    puts "Cash-on-hand end of period:  #{values['Column A 27. Cash on hand at Close Period']}"
-	  puts "\n"
-	  end
+		puts "For: #{f.committee_name}"
+	  puts "Total receipts this period: #{f.col_A_line_24}"
+	  puts "Total receipts cycle-to-date: #{f.col_B_line_16}"
+	  puts "Total disbursements this period: #{f.col_A_line_26}"
+	  puts "Total disbursements cycle-to-date: #{f.col_B_line_22}"
+	  puts "Cash-on-hand beginning of period: #{f.col_A_line_23}"
+	  puts "Cash-on-hand end of period:  #{f.col_A_line_27}"
+		puts "\n\n"
 	end
-
 	# From this output we see that Rep Goode outspent Perriello by more than a million dollars, but still lost his seat by 727 votes.
 
 	puts "==="
@@ -74,6 +62,7 @@ sudo gem install offensivepolitics-fechell
 	# fetch HuckPac F3X, Post General, 2008
 	savefile('huckpac.fec','http://query.nictusa.com/dcdev/posted/407479.fec')
 	# extract disbursements (schedule B) made this period by HuckPAC with the expenditure purpose(key="EXPENDITURE PURPOPOSE DESCRIPTION") of "Payroll"
+	# still using the previous hash syntax since the object model for F3X forms isn't done yet
 	puts "TO,DATE,AMOUNT"
 	h.process("huckpac.fec") do |v|
 	  schedule = v[0]
@@ -91,6 +80,10 @@ sudo gem install offensivepolitics-fechell
 
 
 == Changes
+  0.2.0
+    Updated CSV definition for V7.0 of FECFile.
+    Added tests for V7.0, except Schedule C/1 since nobody has filed an actual for yet!
+    
   0.1.9
     Massive speedup in form-type detection
     Dozens of changes to definition files 

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('fechell', '0.1.9') do |p|
+Echoe.new('fechell', '0.2.0') do |p|
   p.description    = "Parse electronically filed FEC reports."
   p.url            = "http://offensivepolitics.net/fechell"
   p.author         = "Jason Holt"

data/fechell.gemspec

@@ -1,33 +1,33 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{fechell}
-  s.version = "0.1.9"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jason Holt"]
-  s.date = %q{2010-03-22}
-  s.description = %q{Parse electronically filed FEC reports.}
-  s.email = %q{jjh@offensivepolitics.net}
-  s.extra_rdoc_files = ["README.rdoc"]
-  s.files = ["fechell.gemspec", "lib/defs/3.00.csv", "lib/defs/5.00.csv", "lib/defs/5.1.csv", "lib/defs/5.2.csv", "lib/defs/5.3.csv", "lib/defs/6.1.csv", "lib/defs/6.2.csv", "lib/defs/6.3.csv", "lib/defs/6.4.csv", "lib/fechell/forms.rb", "lib/fechell.rb", "lib/tests/f3test.rb", "lib/tests/satest.rb", "lib/tests/sbtest.rb", "lib/tests/sc1test.rb", "lib/tests/sctest.rb", "lib/tests/testdata/F3-3.00-32564-SC1.fec", "lib/tests/testdata/F3-3.00-32777.fec", "lib/tests/testdata/F3-3.00-32909-SC.fec", "lib/tests/testdata/F3-3.00-32933-SB.fec", "lib/tests/testdata/F3-3.00-32933.fec", "lib/tests/testdata/F3-5.00-97348.fec", "lib/tests/testdata/F3-5.00-97424-SB.fec", "lib/tests/testdata/F3-5.00-97424-SC.fec", "lib/tests/testdata/F3-5.00-97424.fec", "lib/tests/testdata/F3-5.00-97986-SC1.fec", "lib/tests/testdata/F3-5.1-116177-SC1.fec", "lib/tests/testdata/F3-5.1-116437-SC2.fec", "lib/tests/testdata/F3-5.1-126642.fec", "lib/tests/testdata/F3-5.1-126655-SB.fec", "lib/tests/testdata/F3-5.1-126655-SC.fec", "lib/tests/testdata/F3-5.1-126655.fec", "lib/tests/testdata/F3-5.2-170434.fec", "lib/tests/testdata/F3-5.2-170443.fec", "lib/tests/testdata/F3-5.2-170775-SC.fec", "lib/tests/testdata/F3-5.2-170890-SC.fec", "lib/tests/testdata/F3-5.2-170890.fec", "lib/tests/testdata/F3-5.2-171146-SC1.fec", "lib/tests/testdata/F3-5.2-171146.fec", "lib/tests/testdata/F3-5.3-210119-SB.fec", "lib/tests/testdata/F3-5.3-210119.fec", "lib/tests/testdata/F3-5.3-210142-SC1.fec", "lib/tests/testdata/F3-5.3-210142.fec", "lib/tests/testdata/F3-5.3-210250.fec", "lib/tests/testdata/F3-5.3-212438-SC.fec", "lib/tests/testdata/F3-6.1-331453-SB.fec", "lib/tests/testdata/F3-6.1-331453.fec", "lib/tests/testdata/F3-6.1-332530-SC.fec", "lib/tests/testdata/F3-6.1-332675.fec", "lib/tests/testdata/F3-6.1-333405-SC1.fec", "lib/tests/testdata/F3-6.1-333405.fec", "lib/tests/testdata/F3-6.2-350353-SC.fec", "lib/tests/testdata/F3-6.2-350353.fec", "lib/tests/testdata/F3-6.2-350775-SB.fec", "lib/tests/testdata/F3-6.2-350775.fec", "lib/tests/testdata/F3-6.2-350844-SC1.fec", "lib/tests/testdata/F3-6.2-350844.fec", "lib/tests/testdata/F3-6.3-413014.fec", "lib/tests/testdata/F3-6.3-413060-SC.fec", "lib/tests/testdata/F3-6.3-413226-SB.fec", "lib/tests/testdata/F3-6.3-413226.fec", "lib/tests/testdata/F3-6.3-413284-SC1.fec", "lib/tests/testdata/F3-6.4-420048-SC.fec", "lib/tests/testdata/F3-6.4-420048.fec", "lib/tests/testdata/F3-6.4-420106.fec", "lib/tests/testdata/F3-6.4-423088-SC1.fec", "lib/tests/testdata/F3-6.4-423088.fec", "lib/tests/testdata/F3-6.4-424094.fec", "lib/tests/testdata/F3-6.4-424586-SB.fec", "lib/tests/testdata/F3-6.4-424586.fec", "lib/tests.rb", "Manifest", "Rakefile", "README.rdoc"]
-  s.homepage = %q{http://offensivepolitics.net/fechell}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Fechell", "--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{fechell}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Parse electronically filed FEC reports.}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fastercsv>, [">= 0"])
-    else
-      s.add_dependency(%q<fastercsv>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<fastercsv>, [">= 0"])
-  end
-end
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{fechell}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jason Holt"]
+  s.date = %q{2011-07-07}
+  s.description = %q{Parse electronically filed FEC reports.}
+  s.email = %q{jjh@offensivepolitics.net}
+  s.extra_rdoc_files = ["README.rdoc"]
+  s.files = ["fechell.gemspec", "lib/defs/3.00.csv", "lib/defs/5.00.csv", "lib/defs/5.1.csv", "lib/defs/5.2.csv", "lib/defs/5.3.csv", "lib/defs/6.1.csv", "lib/defs/6.2.csv", "lib/defs/6.3.csv", "lib/defs/6.4.csv", "lib/defs/7.0.csv", "lib/fechell/forms.rb", "lib/fechell.rb", "lib/tests/f3test.rb", "lib/tests/satest.rb", "lib/tests/sbtest.rb", "lib/tests/sc1test.rb", "lib/tests/sctest.rb", "lib/tests/testdata/F3-3.00-32564-SC1.fec", "lib/tests/testdata/F3-3.00-32777.fec", "lib/tests/testdata/F3-3.00-32909-SC.fec", "lib/tests/testdata/F3-3.00-32933-SB.fec", "lib/tests/testdata/F3-3.00-32933.fec", "lib/tests/testdata/F3-5.00-97348.fec", "lib/tests/testdata/F3-5.00-97424-SB.fec", "lib/tests/testdata/F3-5.00-97424-SC.fec", "lib/tests/testdata/F3-5.00-97424.fec", "lib/tests/testdata/F3-5.00-97986-SC1.fec", "lib/tests/testdata/F3-5.1-116177-SC1.fec", "lib/tests/testdata/F3-5.1-116437-SC2.fec", "lib/tests/testdata/F3-5.1-126642.fec", "lib/tests/testdata/F3-5.1-126655-SB.fec", "lib/tests/testdata/F3-5.1-126655-SC.fec", "lib/tests/testdata/F3-5.1-126655.fec", "lib/tests/testdata/F3-5.2-170434.fec", "lib/tests/testdata/F3-5.2-170443.fec", "lib/tests/testdata/F3-5.2-170775-SC.fec", "lib/tests/testdata/F3-5.2-170890-SC.fec", "lib/tests/testdata/F3-5.2-170890.fec", "lib/tests/testdata/F3-5.2-171146-SC1.fec", "lib/tests/testdata/F3-5.2-171146.fec", "lib/tests/testdata/F3-5.3-210119-SB.fec", "lib/tests/testdata/F3-5.3-210119.fec", "lib/tests/testdata/F3-5.3-210142-SC1.fec", "lib/tests/testdata/F3-5.3-210142.fec", "lib/tests/testdata/F3-5.3-210250.fec", "lib/tests/testdata/F3-5.3-212438-SC.fec", "lib/tests/testdata/F3-6.1-331453-SB.fec", "lib/tests/testdata/F3-6.1-331453.fec", "lib/tests/testdata/F3-6.1-332530-SC.fec", "lib/tests/testdata/F3-6.1-332675.fec", "lib/tests/testdata/F3-6.1-333405-SC1.fec", "lib/tests/testdata/F3-6.1-333405.fec", "lib/tests/testdata/F3-6.2-350353-SC.fec", "lib/tests/testdata/F3-6.2-350353.fec", "lib/tests/testdata/F3-6.2-350775-SB.fec", "lib/tests/testdata/F3-6.2-350775.fec", "lib/tests/testdata/F3-6.2-350844-SC1.fec", "lib/tests/testdata/F3-6.2-350844.fec", "lib/tests/testdata/F3-6.3-413014.fec", "lib/tests/testdata/F3-6.3-413060-SC.fec", "lib/tests/testdata/F3-6.3-413226-SB.fec", "lib/tests/testdata/F3-6.3-413226.fec", "lib/tests/testdata/F3-6.3-413284-SC1.fec", "lib/tests/testdata/F3-6.4-420048-SC.fec", "lib/tests/testdata/F3-6.4-420048.fec", "lib/tests/testdata/F3-6.4-420106.fec", "lib/tests/testdata/F3-6.4-423088-SC1.fec", "lib/tests/testdata/F3-6.4-423088.fec", "lib/tests/testdata/F3-6.4-424094.fec", "lib/tests/testdata/F3-6.4-424586-SB.fec", "lib/tests/testdata/F3-6.4-424586.fec", "lib/tests/testdata/F3-7.0-720829-SB.fec", "lib/tests/testdata/F3-7.0-720829-SC.fec", "lib/tests/testdata/F3-7.0-723958.fec", "lib/tests/testdata/F3-70-TESTDATA-SC1.FEC", "lib/tests.rb", "Rakefile", "README.rdoc", "Manifest"]
+  s.homepage = %q{http://offensivepolitics.net/fechell}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Fechell", "--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{fechell}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Parse electronically filed FEC reports.}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<fastercsv>, [">= 0"])
+    else
+      s.add_dependency(%q<fastercsv>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<fastercsv>, [">= 0"])
+  end
+end

data/lib/defs/7.0.csv

@@ -0,0 +1 @@
+HDR;FORM TYPE;FEC TAG;FEC File Version;Filing Software Name;Filing Software Version;Report ID;Report Number