fech 1.8.1 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cf99fb20f8adabe6735e03ac5b55357bfe0f542f
-  data.tar.gz: ae036cc7bd2e0eea197d6333e2189e54a65d881d
+SHA256:
+  metadata.gz: a65ffc421f1476a1377a5c7301f203d84092810b89d981fa215dff7b79ff8fb5
+  data.tar.gz: cef4ac29dda973b6e4eabaa3fe002c8ff25912681430bf3f6b0fa141b52f1c29
 SHA512:
-  metadata.gz: 9516d5194de65aeda2d98c56e7fd08fee53b355607c51c0bd035fc0b9c49c13b0eac33233804c354d6c61ebe14ea0e2399d8a9d29a9312c4f8bc9c40e1be445f
-  data.tar.gz: 53f56dd6ce040929ad1e5db9db7ea407634e2be3fc1e011f14a30e8e37457021764ad65366b7c9b4eba2c90fe2861ca29f4723b852ec506f018b6592aa4d89fc
+  metadata.gz: 6176c211f7a1639281f7b0f169249f60c8aa3542a8f6d6295f9df9310da6fbd20dcfa230dcad9bc4931833e10db7c319620cc73f39372ccab83440f0cbf76fc2
+  data.tar.gz: 7d1ffa2b9d92c43705b6aa704cd30cff93fefb641a8f0b8c7a9692c78e8a8643aa424a42f143f2644ea03572a1437c29c69467a4190d82ad4b632c3949dd1c18

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fech (1.8)
+    fech (1.9)
       ensure-encoding
       fastercsv
       people

data/lib/fech/filing.rb

@@ -3,7 +3,7 @@ require 'open-uri'
 require 'ensure/encoding'
 
 module Fech
-  
+
   # Fech::Filing downloads an Electronic Filing given its ID, and will search
   # rows by row type. Using a child Translator object, the data in each row
   # is automatically mapped at runtime into a labeled Hash. Additional
@@ -11,8 +11,8 @@ module Fech
   class Filing
     # first filing number using the version >=3.00 format
     # note that there are plenty of <v3 filings after this, so readable? still needs to be checked
-    FIRST_V3_FILING = 11850 
-    
+    FIRST_V3_FILING = 11850
+
     attr_accessor :filing_id, :download_dir
 
     # Create a new Filing object, assign the download directory to system's
@@ -44,7 +44,7 @@ module Fech
       end
       self
     end
-    
+
     # Access the header (first) line of the filing, containing information
     # about the filing's version and metadata about the software used to file it.
     # @return [Hash] a hash that assigns labels to the values of the filing's header row
@@ -53,7 +53,7 @@ module Fech
         return parse_row?(row)
       end
     end
-    
+
     # Access the summary (second) line of the filing, containing aggregate and
     # top-level information about the filing.
     # @return [Hash] a hash that assigns labels to the values of the filing's summary row
@@ -63,7 +63,7 @@ module Fech
         return parse_row?(row)
       end
     end
-    
+
     # Access all lines of the filing that match a given row type. Will return an
     # Array of all available lines if called directly, or will yield the mapped
     # rows one by one if a block is passed.
@@ -88,7 +88,7 @@ module Fech
       end
       block_given? ? nil : data
     end
-    
+
     # Decides what to do with a given row. If the row's type matches the desired
     # type, or if no type was specified, it will run the row through #map.
     # If :raw was passed true, a flat, unmapped data array will be returned.
@@ -119,14 +119,14 @@ module Fech
     def map(row, opts={})
       data = Fech::Mapped.new(self, row.first)
       full_row_map = map_for(row.first)
-      
+
       # If specific fields were asked for, return only those
       if opts[:include]
         row_map = full_row_map.select { |k| opts[:include].include?(k) }
       else
         row_map = full_row_map
       end
-      
+
       # Inserts the row into data, performing any specified preprocessing
       # on individual cells along the way
       row_map.each_with_index do |field, index|
@@ -141,7 +141,7 @@ module Fech
         end
         data[field] = value
       end
-      
+
       # Performs any specified group preprocessing / combinations
       if translator
         combinations = translator.get_translations(:row => row.first,
@@ -156,14 +156,14 @@ module Fech
       end
       data
     end
-    
+
     # Returns the column names for given row type and the filing's version
     # in the order they appear in row data.
     # @param [String, Regexp] row_type representation of the row desired
     def map_for(row_type)
       mappings.for_row(row_type)
     end
-    
+
     # Returns the column names for given row type and version in the order
     # they appear in row data.
     # @param [String, Regexp] row_type representation of the row desired
@@ -171,7 +171,7 @@ module Fech
     def self.map_for(row_type, opts={})
       Fech::Mappings.for_row(row_type, opts)
     end
-    
+
     # Accessor for @translator. Will return the Translator initialized in
     # Filing's initializer if built-in translations were passed to Filing's
     # initializer ({:translate => [:foo, :bar]}).
@@ -190,19 +190,19 @@ module Fech
         translator
       end
     end
-    
+
     # Whether this filing amends a previous filing or not.
     def amendment?
       !amends.nil?
     end
-    
+
     # Returns the filing ID of the past filing this one amends,
     # nil if this is a first-draft filing.
     # :report_id in the HDR line references the amended filing
     def amends
       header[:report_id]
     end
-    
+
     # Combines an array of keys and values into an Fech::Mapped object,
     # a type of Hash.
     # @param [Array] keys the desired keys for the new hash
@@ -211,12 +211,12 @@ module Fech
     def hash_zip(keys, values)
       Fech::Mapped.new(self, values.first).merge(Hash[*keys.zip(values).flatten])
     end
-    
+
     # The version of the FEC software used to generate this Filing
     def filing_version
       @filing_version ||= parse_filing_version
     end
-    
+
     # Pulls out the version number from the header line.
     # Must parse this line manually, since we don't know the version yet, and
     # thus the delimiter type is still a mystery.
@@ -228,12 +228,12 @@ module Fech
         @csv_parser.parse(first, :col_sep => "\034").flatten[2]
       end
     end
-    
+
     # Only FEC format 3.00 + is supported
     def readable?
       filing_version.to_i >= 3
     end
-    
+
     # Gets or creats the Mappings instance for this filing_version
     def mappings
       @mapping ||= Fech::Mappings.new(filing_version)
@@ -279,16 +279,16 @@ module Fech
     def fix_f99_contents
       @customized = true
       content = file_contents.read
-      
+
       if RUBY_VERSION > "1.9.2"
         content.encode!('UTF-16', 'UTF-8', :invalid => :replace, :undef => :replace, :replace => '?')
         content.encode!('UTF-8', 'UTF-16')
       else
         require 'iconv'
-        ic = Iconv.new('UTF-8//IGNORE', 'UTF-8') 
+        ic = Iconv.new('UTF-8//IGNORE', 'UTF-8')
         content = ic.iconv(content + ' ')[0..-2] # add valid byte before converting, then remove it
       end
-      
+
       regex = /\n\[BEGINTEXT\]\n(.*?)\[ENDTEXT\]\n/mi # some use eg [EndText]
       match = content.match(regex)
       if match
@@ -311,7 +311,7 @@ module Fech
     end
 
     def filing_url
-      "http://docquery.fec.gov/dcdev/posted/#{filing_id}.fec"
+      "https://docquery.fec.gov/dcdev/posted/#{filing_id}.fec"
     end
 
     # Iterates over and yields the Filing's lines
@@ -341,11 +341,11 @@ module Fech
     def each_row_with_index(&block)
       each_row(:with_index => true, &block)
     end
-    
+
     # @return [String] the delimiter used in the filing's version
     def delimiter
       filing_version.to_f < 6 ? "," : "\034"
     end
-    
+
   end
 end

data/lib/fech/senate_filing.rb

@@ -1,7 +1,7 @@
 module Fech
   class SenateFiling < Filing
     def filing_url
-      "http://docquery.fec.gov/senate/posted/#{filing_id}.fec"
+      "https://docquery.fec.gov/senate/posted/#{filing_id}.fec"
     end
   end
 end

data/lib/fech/version.rb

@@ -1,3 +1,3 @@
 module Fech
-  VERSION = "1.8.1"
+  VERSION = "1.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fech
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.9.1
 platform: ruby
 authors:
 - Michael Strickland
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-01 00:00:00.000000000 Z
+date: 2019-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
@@ -252,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fech
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Ruby library for parsing FEC filings.