ecfs 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa5da38c0c5348fa0c845d28c0f9c2516cf33bb3
-  data.tar.gz: 30aed783337f289d994d490d26240bb43b6266e4
+  metadata.gz: c1a6dcf7a11a8fe5074e894553719aea9451fc6f
+  data.tar.gz: e2edf307df0346fb87ee5e8328f4b830fa7adc5f
 SHA512:
-  metadata.gz: e91e0878401399171a6f346d72049a3d3c71975d2a6ca1671e7775a8f49e5a7bfac62e84765a7ec27b500e95599c2a8df77e684fe3e4885ee2e0a1dc9446432e
-  data.tar.gz: 0fd4b2971174f2c3317016d85282a056b046ea3f06702349b92de6b5f50804ddf35591aa0e41f10f70e260fbfe28d009e2e2147cf3e8fd1eaa73b8ab960d4d41
+  metadata.gz: 2577e742cacbaaff43926f6f69302cb7e4172b62e56bfd7717f670d6c2140f868bc84ecfd3d04a543bdb3456d59a8a260683306b2686e7636e1d17102af1cbd9
+  data.tar.gz: e39b2abf1052849b29a8a5e672758ffc508009ff62cdff395c490cd46e02e4372d68ba78cd72c9ee4709d0d661bdbef2af79d47b7f56e8a5da255ce8430a9214

data/lib/ecfs/solr_scrape_query.rb

@@ -9,6 +9,25 @@ module ECFS
     attr_accessor :received_min_date
     attr_accessor :after_scrape
     
+    def filing_to_citation(filing)
+      patterns = {
+        "COMMENT" => "Comments",
+        "REPLY TO COMMENTS" => "Reply Comments",
+        "NOTICE OF EXPARTE" => "Ex Parte Letter"
+      }
+  
+      case filing["type_of_filing"]
+      when "COMMENT"
+        return "Comments of #{filing['name_of_filer']}"
+      when "REPLY TO COMMENTS"
+        return "Reply Comments of #{filing['name_of_filer']}"
+      when "NOTICE OF EXPARTE"
+        return "#{filing['name_of_filer']} Ex Parte Letter"
+      else
+        return "#{filing["type_of_filing"].downcase.capitalize} of #{filing['name_of_filer']}"
+      end
+    end
+    
     def filings_from_docket_number(docket_number, start=0, received_min_date=nil, after_scrape=nil)
       url = "http://apps.fcc.gov/ecfs/solr/search?sort=dateRcpt&proceeding=#{docket_number}&dir=asc&start=#{start}"
       
@@ -47,6 +66,10 @@ module ECFS
         }
       end
       
+      filings.each do |filing|
+        filing['citation'] = filing_to_citation(filing)
+      end
+      
       if after_scrape
         after_scrape.call(filings)
       end
@@ -54,25 +77,6 @@ module ECFS
       return filings, total
     end
     
-    def filing_to_citation(filing)
-      patterns = {
-        "COMMENT" => "Comments",
-        "REPLY TO COMMENTS" => "Reply Comments",
-        "NOTICE OF EXPARTE" => "Ex Parte Letter"
-      }
-  
-      case filing["type_of_filing"]
-      when "COMMENT"
-        return "Comments of #{filing['name_of_filer']}"
-      when "REPLY TO COMMENTS"
-        return "Reply Comments of #{filing['name_of_filer']}"
-      when "NOTICE OF EXPARTE"
-        return "#{filing['name_of_filer']} Ex Parte Letter"
-      else
-        return "#{filing["type_of_filing"].downcase.capitalize} of #{filing['name_of_filer']}"
-      end
-    end
-    
     def get
       url = "http://apps.fcc.gov/ecfs/solr/search?sort=dateRcpt&proceeding=#{@docket_number}&dir=asc&start=0"
       filings = []
@@ -87,10 +91,6 @@ module ECFS
       pages.each do |page|
         filings.concat filings_from_docket_number(@docket_number, page, @received_min_date, @after_scrape)[0]
       end
-      
-      filings.each do |filing|
-        filing['citation'] = filing_to_citation(filing)
-      end
 
       filings
     end

data/lib/ecfs/version.rb

@@ -1,3 +1,3 @@
 module ECFS
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/test/test_solr_scrape.rb

@@ -26,6 +26,7 @@ class TestSolrScrape < MiniTest::Unit::TestCase
       assert filings.first.is_a?(Hash)
       assert filings.first.has_key?('docket_number')
       assert filings.first.has_key?('citation')
+      assert filings.first
       
       filing_date = DateTime.strptime(filings.first['date_received'], "%m/%d/%Y")
       min_date = DateTime.strptime('11/28/14', "%m/%d/%Y")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecfs
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Alan deLevie