fech 0.9.2 → 0.9.3

data/lib/fech/fech_utils.rb

@@ -8,8 +8,8 @@ module FechUtils
     :hdr   => /^hdr$/i,
     :f1    => /^f1/i,
     :f1m   => /(^f1m[^a|n])/i,
-    :f2    => /(^f2[^a|n])/i,
-    :f24   => /^f24/i,
+    :f2    => /(^f2[^4])/i,
+    :f24   => /(^f24[an])/i,
     :f3    => /^f3[a|n|t]/i,
     :f3l   => /^f3l[a|n]/i,
     :f3p   => /(^f3p$)|(^f3p[^s|3])/i,
@@ -21,11 +21,14 @@ module FechUtils
     :f5    => /^f5[na]/i,
     :f56   => /^f56/i,
     :f57   => /^f57/i,
+    :f7    => /^f7[na]/i,
+    :f76   => /^f76/i,
     :f9    => /^f9/i,
     :f91   => /^f91/i,
     :f92   => /^f92/i,
     :f93   => /^f93/i,
     :f94   => /^f94/i,
+    :f99   => /^f99/i,
     :sa    => /^sa/i,
     :sb    => /^sb/i,
     :sc    => /^sc[^1-2]/i,

data/lib/fech/map_generator.rb

@@ -10,14 +10,14 @@ module Fech
     FILING_VERSIONS   = ["8.0", "7.0", "6.4", "6.3", "6.2", "6.1",
                          "5.3", "5.2", "5.1", "5.0", "3"]
     BASE_ROW_TYPES    = ["HDR", "F1", "F1M", "F2", "F24", "F3", "F3L", "F3P", "F3P31", "F3PS", "F3S", "F3X", 
-                         "F4", "F5", "F56", "F57", "F9", "F91", "F92", "F93", "F94",
+                         "F4", "F5", "F56", "F57", "F7", "F76", "F9", "F91", "F92", "F93", "F94", "F99",
                          "SchA", "SchB", "SchC", "SchC1", "SchC2", "SchD", "SchE", 
                          "SchF", "TEXT"]
     ROW_TYPE_MATCHERS = {
       "HDR"    => FechUtils::ROW_TYPES[:hdr],
       "F1"     => FechUtils::ROW_TYPES[:f1],
-      "F1M"     => FechUtils::ROW_TYPES[:f1m],
-      "F2"    => FechUtils::ROW_TYPES[:f2],
+      "F1M"    => FechUtils::ROW_TYPES[:f1m],
+      "F2"     => FechUtils::ROW_TYPES[:f2],
       "F24"    => FechUtils::ROW_TYPES[:f24],
       "F3"     => FechUtils::ROW_TYPES[:f3],
       "F3L"    => FechUtils::ROW_TYPES[:f3l],
@@ -25,16 +25,19 @@ module Fech
       "F3S"    => FechUtils::ROW_TYPES[:f3s],
       "F3P31"  => FechUtils::ROW_TYPES[:f3p31],
       "F3PS"   => FechUtils::ROW_TYPES[:f3ps],
-      "F3X"   => FechUtils::ROW_TYPES[:f3x],
-      "F4"   => FechUtils::ROW_TYPES[:f4],
-      "F5"    => FechUtils::ROW_TYPES[:f5],
+      "F3X"    => FechUtils::ROW_TYPES[:f3x],
+      "F4"     => FechUtils::ROW_TYPES[:f4],
+      "F5"     => FechUtils::ROW_TYPES[:f5],
       "F56"    => FechUtils::ROW_TYPES[:f56],
       "F57"    => FechUtils::ROW_TYPES[:f57],
+      "F7"     => FechUtils::ROW_TYPES[:f7],
+      "F76"    => FechUtils::ROW_TYPES[:f76],
       "F9"     => FechUtils::ROW_TYPES[:f9],
       "F91"    => FechUtils::ROW_TYPES[:f91],
       "F92"    => FechUtils::ROW_TYPES[:f92],
       "F93"    => FechUtils::ROW_TYPES[:f93],
       "F94"    => FechUtils::ROW_TYPES[:f94],
+      "F99"    => FechUtils::ROW_TYPES[:f99],
       "SchA"   => FechUtils::ROW_TYPES[:sa],
       "SchB"   => FechUtils::ROW_TYPES[:sb],
       "SchC"   => FechUtils::ROW_TYPES[:sc],

data/lib/fech/rendered_maps.rb

@@ -19,13 +19,13 @@ module Fech
       '^5.3|5.2|5.1|5.0|3.0' => [:form_type, :filer_committee_id_number, :committee_name, :street_1, :street_2, :city, :state, :zip, :committee_type, :affiliated_date_f1_filed, :affiliated_committee_id_number, :affiliated_committee_name, :first_candidate_id_number, :first_candidate_name, :first_candidate_office, :first_candidate_state, :first_candidate_district, :first_candidate_contribution_date, :second_candidate_id_number, :second_candidate_name, :second_candidate_office, :second_candidate_state, :second_candidate_district, :second_candidate_contribution_date, :third_candidate_id_number, :third_candidate_name, :third_candidate_office, :third_candidate_state, :third_candidate_district, :third_candidate_contribution_date, :fourth_candidate_id_number, :fourth_candidate_name, :fourth_candidate_office, :fourth_candidate_state, :fourth_candidate_district, :fourth_candidate_contribution_date, :fifth_candidate_id_number, :fifth_candidate_name, :fifth_candidate_office, :fifth_candidate_state, :fifth_candidate_district, :fifth_candidate_contribution_date, :fifty_first_contributor_date, :original_registration_date, :requirements_met_date, :treasurer_name, :date_signed],
       '^8.0|7.0|6.4|6.3|6.2|6.1' => [:form_type, :filer_committee_id_number, :committee_name, :street_1, :street_2, :city, :state, :zip, :committee_type, :affiliated_date_f1_filed, :affiliated_committee_id_number, :affiliated_committee_name, :first_candidate_id_number, :first_candidate_last_name, :first_candidate_first_name, :first_candidate_middle_name, :first_candidate_prefix, :first_candidate_suffix, :first_candidate_office, :first_candidate_state, :first_candidate_district, :first_candidate_contribution_date, :second_candidate_id_number, :second_candidate_last_name, :second_candidate_second_name, :second_candidate_middle_name, :second_candidate_prefix, :second_candidate_suffix, :second_candidate_office, :second_candidate_state, :second_candidate_district, :second_candidate_contribution_date, :third_candidate_id_number, :third_candidate_last_name, :third_candidate_third_name, :third_candidate_middle_name, :third_candidate_prefix, :third_candidate_suffix, :third_candidate_office, :third_candidate_state, :third_candidate_district, :third_candidate_contribution_date, :fourth_candidate_id_number, :fourth_candidate_last_name, :fourth_candidate_fourth_name, :fourth_candidate_middle_name, :fourth_candidate_prefix, :fourth_candidate_suffix, :fourth_candidate_office, :fourth_candidate_state, :fourth_candidate_district, :fourth_candidate_contribution_date, :fifth_candidate_id_number, :fifth_candidate_last_name, :fifth_candidate_fifth_name, :fifth_candidate_middle_name, :fifth_candidate_prefix, :fifth_candidate_suffix, :fifth_candidate_office, :fifth_candidate_state, :fifth_candidate_district, :fifth_candidate_contribution_date, :fifty_first_contributor_date, :original_registration_date, :requirements_met_date, :treasurer_last_name, :treasurer_first_name, :treasurer_middle_name, :treasurer_prefix, :treasurer_suffix, :date_signed],
     },
-    "(^f2[^a|n])" => {
+    "(^f2[^4])" => {
       '^3.0' => [:form_type, :candidate_id_number, :candidate_name, :candidate_street_1, :candidate_street_2, :candidate_city, :candidate_state, :candidate_zip, :candidate_party_code, :candidate_office, :candidate_state, :candidate_district, :election_year, :committee_id_number, :committee_name, :committee_street_1, :committee_street_2, :committee_city, :committee_state, :committee_zip, :authorized_committee_id_number, :authorized_committee_name, :authorized_committee_street_1, :authorized_committee_street_2, :authorized_committee_city, :authorized_committee_state, :authorized_committee_zip, :candidate_signature_name, :date_signed],
       '^8.0|7.0|6.4' => [:form_type, :candidate_id_number, :candidate_last_name, :candidate_first_name, :candidate_middle_name, :candidate_prefix, :candidate_suffix, :change_of_address, :candidate_street_1, :candidate_street_2, :candidate_city, :candidate_state, :candidate_zip, :candidate_party_code, :candidate_office, :candidate_state, :candidate_district, :election_year, :committee_id_number, :committee_name, :committee_street_1, :committee_street_2, :committee_city, :committee_state, :committee_zip, :authorized_committee_id_number, :authorized_committee_name, :authorized_committee_street_1, :authorized_committee_street_2, :authorized_committee_city, :authorized_committee_state, :authorized_committee_zip, :candidate_signature_last_name, :candidate_signature_first_name, :candidate_signature_middle_name, :candidate_signature_prefix, :candidate_signature_suffix, :date_signed],
       '^6.3|6.2|6.1' => [:form_type, :candidate_id_number, :candidate_last_name, :candidate_first_name, :candidate_middle_name, :candidate_prefix, :candidate_suffix, :change_of_address, :candidate_street_1, :candidate_street_2, :candidate_city, :candidate_state, :candidate_zip, :candidate_party_code, :candidate_office, :candidate_state, :candidate_district, :election_year, :committee_id_number, :committee_name, :committee_street_1, :committee_street_2, :committee_city, :committee_state, :committee_zip, :authorized_committee_id_number, :authorized_committee_name, :authorized_committee_street_1, :authorized_committee_street_2, :authorized_committee_city, :authorized_committee_state, :authorized_committee_zip, :primary_personal_funds_declared, :general_personal_funds_declared, :candidate_signature_last_name, :candidate_signature_first_name, :candidate_signature_middle_name, :candidate_signature_prefix, :candidate_signature_suffix, :date_signed],
       '^5.3|5.2|5.1|5.0' => [:form_type, :candidate_id_number, :candidate_name, :candidate_street_1, :candidate_street_2, :candidate_city, :candidate_state, :candidate_zip, :candidate_party_code, :candidate_office, :candidate_state, :candidate_district, :election_year, :committee_id_number, :committee_name, :committee_street_1, :committee_street_2, :committee_city, :committee_state, :committee_zip, :authorized_committee_id_number, :authorized_committee_name, :authorized_committee_street_1, :authorized_committee_street_2, :authorized_committee_city, :authorized_committee_state, :authorized_committee_zip, :candidate_signature_name, :date_signed, :primary_personal_funds_declared, :general_personal_funds_declared, :candidate_last_name, :candidate_first_name, :candidate_middle_name, :candidate_prefix, :candidate_suffix],
     },
-    "^f24" => {
+    "(^f24[an])" => {
       '^7.0|6.4|6.3|6.2|6.1' => [:form_type, :filer_committee_id_number, :report_type, :committee_name, :street_1, :street_2, :city, :state, :zip, :treasurer_last_name, :treasurer_first_name, :treasurer_middle_name, :treasurer_prefix, :treasurer_suffix, :date_signed],
       '^8.0' => [:form_type, :filer_committee_id_number, :report_type, :original_amendment_date, :committee_name, :street_1, :street_2, :city, :state, :zip, :treasurer_last_name, :treasurer_first_name, :treasurer_middle_name, :treasurer_prefix, :treasurer_suffix, :date_signed],
       '^5.0|5.1|5.2|5.3' => [:form_type, :filer_committee_id_number, :committee_name, :street_1, :street_2, :city, :state, :zip, nil, :date_signed, :report_type],
@@ -85,6 +85,14 @@ module Fech
       '^5.3|5.2|5.1|5.0' => [:form_type, :filer_committee_id_number, :entity_type, :payee_name, :payee_street_1, :payee_street_2, :payee_city, :payee_state, :payee_zip, :expenditure_purpose_descrip, :expenditure_date, :expenditure_amount, :support_oppose_code, :candidate_id_number, :candidate_name, :candidate_office, :candidate_state, :candidate_district, nil, nil, nil, nil, nil, nil, :conduit_name, :conduit_street_1, :conduit_street_2, :conduit_city, :conduit_state, :conduit_zip, nil, :transaction_id_number, :category_code, :expenditure_purpose_code, :calendar_y_t_d_per_election_office, :election_code, :election_other_description],
       '^3' => [:form_type, :filer_committee_id_number, :entity_type, :payee_name, :payee_street_2, nil, :payee_city, :payee_state, :payee_zip, :expenditure_purpose_descrip, :expenditure_date, :expenditure_amount, :support_oppose_code, :candidate_id_number, :candidate_name, :candidate_office, :candidate_state, :candidate_district, nil, nil, nil, nil, nil, nil, :conduit_name, :conduit_street_1, :conduit_street_2, :conduit_city, :conduit_state, :conduit_zip, :amended_code],
     },
+    "^f7[na]" => {
+      '^5.3|5.2|5.1|5.0|3.0' => [:form_type, :filer_committee_id_number, :organization_name, :street_1, :street_2, :city, :state, :zip, :organization_type, :report_code, :election_date, :election_state, :coverage_from_date, :coverage_through_date, :total_costs, :person_designated_name, :date_signed, :person_designated_title],
+      '^8.0|7.0|6.4|6.3|6.2|6.1' => [:form_type, :filer_committee_id_number, :organization_name, :street_1, :street_2, :city, :state, :zip, :organization_type, :report_code, :election_date, :election_state, :coverage_from_date, :coverage_through_date, :total_costs, :person_designated_last_name, :person_designated_first_name, :person_designated_middle_name, :person_designated_prefix, :person_designated_suffix, :person_designated_title, :date_signed],
+    },
+    "^f76" => {
+      '^5.3|5.2|5.1|5.0|3.0' => [:form_type, :filer_committee_id_number, :communication_type, :communication_type_description, :communication_class, :communication_date, :support_oppose_code, :candidate_id_number, :candidate_name, :candidate_office, :candidate_state, :candidate_district, :election_code, :communication_cost, nil, :transaction_id],
+      '^8.0|7.0|6.4|6.3|6.2|6.1' => [:form_type, :filer_committee_id_number, :transaction_id, :communication_type, :communication_type_description, :communication_class, :communication_date, :communication_cost, :election_code, :election_other_description, :support_oppose_code, :candidate_id_number, :candidate_last_name, :candidate_first_name, :candidate_middle_name, :candidate_prefix, :candidate_suffix, :candidate_office, :candidate_state, :candidate_district],
+    },
     "^f9" => {
       '^8.0|7.0|6.4|6.3|6.2' => [:form_type, :filer_committee_id_number, :entity_type, :organization_name, :individual_last_name, :individual_first_name, :individual_middle_name, :individual_prefix, :individual_suffix, :change_of_address, :street_1, :street_2, :city, :state, :zip, :individual_employer, :individual_occupation, :coverage_from_date, :coverage_through_date, :date_public_distribution, :communication_title, :filer_code, :filer_code_description, :segregated_bank_account, :custodian_last_name, :custodian_first_name, :custodian_middle_name, :custodian_prefix, :custodian_suffix, :custodian_street_1, :custodian_street_2, :custodian_city, :custodian_state, :custodian_zip, :custodian_employer, :custodian_occupation, :total_donations, :total_disbursements, :person_completing_last_name, :person_completing_first_name, :person_completing_middle_name, :person_completing_prefix, :person_completing_suffix, :date_signed],
       '^6.1' => [:form_type, :filer_committee_id_number, :entity_type, :organization_name, :individual_last_name, :individual_first_name, :individual_middle_name, :individual_prefix, :individual_suffix, :change_of_address, :street_1, :street_2, :city, :state, :zip, :individual_employer, :individual_occupation, :coverage_from_date, :coverage_through_date, :date_public_distribution, :communication_title, :qualified_non_profit, :segregated_bank_account, :custodian_last_name, :custodian_first_name, :custodian_middle_name, :custodian_prefix, :custodian_suffix, :custodian_street_1, :custodian_street_2, :custodian_city, :custodian_state, :custodian_zip, :custodian_employer, :custodian_occupation, :total_donations, :total_disbursements, :person_completing_last_name, :person_completing_first_name, :person_completing_middle_name, :person_completing_prefix, :person_completing_suffix, :date_signed],
@@ -111,6 +119,11 @@ module Fech
       '^5.3|5.2|5.1|5.0' => [:form_type, :filer_committee_id_number, :candidate_id_number, :candidate_name, :candidate_office, :candidate_state, :candidate_district, :election_code, :election_other_description, nil, :transaction_id, :back_reference_tran_id_number, :back_reference_sched_name],
       '^8.0|7.0|6.4|6.3|6.2|6.1' => [:form_type, :filer_committee_id_number, :transaction_id, :back_reference_tran_id_number, :back_reference_sched_name, :candidate_id_number, :candidate_last_name, :candidate_first_name, :candidate_middle_name, :candidate_prefix, :candidate_suffix, :candidate_office, :candidate_state, :candidate_district, :election_code, :election_other_description],
     },
+    "^f99" => {
+      '^5.3|5.2|5.1|5.0' => [:form_type, :filer_committee_id_number, :committee_name, :street_1, :street_2, :city, :state, :zip, :treasurer_name, :date_signed, :text_code],
+      '^8.0|7.0|6.4|6.3|6.2|6.1' => [:form_type, :filer_committee_id_number, :committee_name, :street_1, :street_2, :city, :state, :zip, :treasurer_last_name, :treasurer_first_name, :treasurer_middle_name, :treasurer_prefix, :treasurer_suffix, :date_signed, :text_code],
+      '^3' => [:form_type, :filer_committee_id_number, :committee_name, :street_1, :street_2, :city, :state, :zip, :treasurer_name, :date_signed],
+    },
     "^sa" => {
       '^5.0' => [:form_type, :filer_committee_id_number, :entity_type, :contributor_name, :contributor_street_1, :contributor_street_2, :contributor_city, :contributor_state, :contributor_zip, :election_code, :election_other_description, :contributor_employer, :contributor_occupation, :contribution_aggregate, :contribution_date, :contribution_amount, :contribution_purpose_code, :contribution_purpose_descrip, :donor_committee_fec_id, :donor_candidate_fec_id, :donor_candidate_name, :donor_candidate_office, :donor_candidate_state, :donor_candidate_district, :conduit_name, :conduit_street1, :conduit_street2, :conduit_city, :conduit_state, :conduit_zip, :memo_code, :memo_text_description, nil, :transaction_id, :back_reference_tran_id_number, :back_reference_sched_name, :reference_code, :increased_limit_code],
       '^5.1' => [:form_type, :filer_committee_id_number, :entity_type, :contributor_name, :contributor_street_1, :contributor_street_2, :contributor_city, :contributor_state, :contributor_zip, :election_code, :election_other_description, :contributor_employer, :contributor_occupation, :contribution_aggregate, :contribution_date, :contribution_amount, :contribution_purpose_code, :contribution_purpose_descrip, :donor_committee_fec_id, :donor_candidate_fec_id, :donor_candidate_name, :donor_candidate_office, :donor_candidate_state, :donor_candidate_district, :conduit_name, :conduit_street1, :conduit_street2, :conduit_city, :conduit_state, :conduit_zip, :memo_code, :memo_text_description, nil, :transaction_id, :back_reference_tran_id_number, :back_reference_sched_name, :reference_code, :increased_limit_code, :contributor_organization_name, :contributor_last_name, :contributor_first_name, :contributor_middle_name, :contributor_prefix, :contributor_suffix],

data/lib/fech/version.rb

@@ -1,3 +1,3 @@
 module Fech
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

data/sources/F7.csv

@@ -0,0 +1 @@
+canonical,^8.0|7.0|6.4|6.3|6.2|6.1,,^5.3|5.2|5.1|5.0|3.0,

data/sources/F76.csv

@@ -0,0 +1 @@
+canonical,^8.0|7.0|6.4|6.3|6.2|6.1,,^5.3|5.2|5.1|5.0|3.0,

data/sources/F99.csv

@@ -0,0 +1 @@
+canonical,^8.0|7.0|6.4|6.3|6.2|6.1,,^5.3|5.2|5.1|5.0,,^3,

data/spec/data/747058.fec

@@ -0,0 +1,4 @@
+HDRFEC8.0FECfile8.0.1.0(f28)
+F7NC70003223Los Angeles County Federation of Labor, AFL-CIO2130 James M. Wood Blvd.Los AngelesCA90006LQ3201107012011093014901.35DurazoMaria ElenaTreasurer20111007
+F76C70003223F76.4100DMM201107017635.10R2011RunoffSH8CA36097HahnJaniceHCA36
+F76C70003223F76.4101TPM201107017266.25R2011RunoffSH8CA36097HahnJaniceHCA36

data/spec/filing_spec.rb

@@ -18,7 +18,9 @@ describe Fech::Filing do
     @filing_f1m = Fech::Filing.new(730635)
     @filing_f1m.stubs(:file_path).returns(File.join(File.dirname(__FILE__), 'data', '730635.fec'))
     @filing_f3 = Fech::Filing.new(82094)
-    @filing_f3.stubs(:file_path).returns(File.join(File.dirname(__FILE__), 'data', '82094.fec'))   
+    @filing_f3.stubs(:file_path).returns(File.join(File.dirname(__FILE__), 'data', '82094.fec'))
+    @filing_f7 = Fech::Filing.new(747058)
+    @filing_f7.stubs(:file_path).returns(File.join(File.dirname(__FILE__), 'data', '747058.fec'))
   end
   
   describe "#filing_version" do
@@ -67,7 +69,9 @@ describe Fech::Filing do
       sum_f3 = @filing_f3.summary
       sum_f3[:form_type].should == "F3N"
       sum_f1m = @filing_f1m.summary
-      sum_f1m[:form_type].should == "F1MA"  
+      sum_f1m[:form_type].should == "F1MA"
+      sum_f7 = @filing_f7.summary
+      sum_f7[:form_type].should == 'F7N' 
     end
   end
   
@@ -98,6 +102,7 @@ describe Fech::Filing do
       @filing_pac.rows_like(/^sd/).size.should == 1
       @filing_ec.rows_like(/^f91/).size.should == 1
       @filing_f3.rows_like(/^sa/).size.should == 17
+      @filing_f7.rows_like(/^f76/).size.should == 2
     end
     
     it "should return an array if no block is given" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fech
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Michael Strickland
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-29 00:00:00 -05:00
+date: 2012-03-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -193,11 +193,14 @@ files:
 - sources/F5.csv
 - sources/F56.csv
 - sources/F57.csv
+- sources/F7.csv
+- sources/F76.csv
 - sources/F9.csv
 - sources/F91.csv
 - sources/F92.csv
 - sources/F93.csv
 - sources/F94.csv
+- sources/F99.csv
 - sources/HDR.csv
 - sources/SchA.csv
 - sources/SchB.csv
@@ -224,6 +227,7 @@ files:
 - spec/data/467627.fec
 - spec/data/723604.fec
 - spec/data/730635.fec
+- spec/data/747058.fec
 - spec/data/748730.fec
 - spec/data/752356.fec
 - spec/data/753533.fec