propublica-nonprofits 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6437649a923bd364755463869cb49f25ae57b91011daaf0cd9db49c409296580
-  data.tar.gz: faed90b755e0059d4717041570ced6600a88e3b9901303db6596ec221aa45411
+  metadata.gz: 5ee18bd7818572112bdf4f432addfdf9b92b4f7b668615aa892f69415a61b6da
+  data.tar.gz: 7dedc8936f70be2bbf9895dd55ab7f1fd8a3233b6fe618a588a76f85699344c3
 SHA512:
-  metadata.gz: eb357db6551a934f3f8bf1ef40ddbc9b1577129835d16ca258d2c6925107045af42bc6efa6f0c7b8cbb4146d4a10055efbc77deae5bedb86e544500648f7d03a
-  data.tar.gz: 47c904c59ab652d679b34be83483102509fee8a1344cbb0ec5c83d17f2741b7760bfbac47984fc2b830dedbba73e1b86c42146b1a1f340c870c4f085ba153300
+  metadata.gz: b6a531cfd9d39703efcf5c8c9c3a8c53cf91d9f37bf43e7258b7f1bca2f8a9a7cca4792a2b10d460a62c606eba8dac9a3fea53dacd972ec042d20b0df6e7e8d1
+  data.tar.gz: 8ee15efdd7e79e57b2860a21ed5dc4d2d2aa9cb067683593e1ed97baafd4320c5f615092f4f8e4b2324273f104dd2bb36de94034b44135a6c3a026a4f6c62cb8

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    propublica-nonprofits (0.1.0)
+    propublica-nonprofits (0.3.0)
       faraday
       json
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     coderay (1.1.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    faraday (0.15.2)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    hashdiff (0.3.7)
+    hashdiff (1.0.0)
     json (2.1.0)
     method_source (0.9.0)
     minitest (5.11.3)
@@ -25,14 +25,14 @@ GEM
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.2)
+    public_suffix (4.0.1)
     rake (10.5.0)
-    safe_yaml (1.0.4)
+    safe_yaml (1.0.5)
     vcr (4.0.0)
-    webmock (3.4.2)
+    webmock (3.7.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
@@ -48,4 +48,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.16.5
+   1.17.2

data/lib/propublica/nonprofits.rb

@@ -1,17 +1,46 @@
 require "propublica/nonprofits/version"
 require "propublica/nonprofits/organization"
 
-require 'faraday'
-require 'json'
+require "faraday"
+require "json"
 
-API_BASE_URL = %(https://projects.propublica.org/nonprofits/api/v2)
+API_BASE_URL = %(https://projects.propublica.org)
+API_SEARCH_PATH = %(/nonprofits/api/v2/search.json)
 
 module Propublica
   module Nonprofits
-    def self.search(term)
-      response = Faraday.get("#{API_BASE_URL}/search.json?q='#{term}'")
-      attributes = JSON.parse(response.body)
-      organizations = attributes.dig("organizations")
+    def self.search(term, state: nil, page: nil, fetch_all: false)
+      organizations = []
+      more_pages = true
+
+      page =
+        case
+        when page
+          page
+        when fetch_all && page
+          raise "Page is set but we are fetching all, chose one or the other"
+        else
+          0
+        end
+
+      while (more_pages)
+        response = connection.get do |request|
+          request.url(API_SEARCH_PATH)
+
+          request.params["q"] = term
+          request.params["state[id]"] = state if state
+          request.params["page"] = page if page
+        end
+        
+
+        attributes = JSON.parse(response.body)
+        new_organizations = attributes.fetch("organizations", [])
+        organizations.push(*new_organizations)
+
+        more_pages = fetch_all && new_organizations.any?
+        page += 1
+      end
+
       organizations.lazy.map do |basic_attrs|
         Propublica::Nonprofits::Organization.new("basic" => basic_attrs)
       end
@@ -23,10 +52,14 @@ module Propublica
     end
 
     def self.find_attributes(ein)
-      response = Faraday.get("#{API_BASE_URL}/organizations/#{ein}.json")
+      response = connection.get("/nonprofits/api/v2/organizations/#{ein}.json")
       JSON.parse(response.body)
     end
 
+    def self.connection
+      @connection ||= Faraday.new(url: API_BASE_URL)
+    end
+
     class Error < StandardError; end
     class DataNotFetched < Error; end
   end

data/lib/propublica/nonprofits/version.rb

@@ -1,5 +1,5 @@
 module Propublica
   module Nonprofits
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propublica-nonprofits
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ricky Chilcott
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2019-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -182,8 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for the Propublica Nonprofits API https://projects.propublica.org/nonprofits/api/v2