propublica-nonprofits 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c05c2a3977841806bac525c3c642db9a94bf0755c3d098c4852276b092b49168
-  data.tar.gz: ecbbd8799e9d43592ea52d8e2ab4754f74fef539dec2a3eab0d7a415513acf1b
+  metadata.gz: e0a19befd3e19f50b9aece3f7a75d06ef204b05f9f8f6dfbe3bd086976329cb1
+  data.tar.gz: 267fee39254403c855b03559e365bc11c5789a2416f7793d424d6d539649f38b
 SHA512:
-  metadata.gz: 1e30af0a7b67f51505022bf3a6e8b63f91fff5bb702c5a531dbed24585194d8e9d0f966b4097d128c67d1a98bc26e44ca533acd64e4681fa6d7ab2ef17da55c3
-  data.tar.gz: 9c34f58bc0c29ccabd62af0d62974f71f3557a907551e0f83521e657b20e5534f4afa9c78d1203dd83270be48cd3f7420059dba90069e263eb885c1e58628c30
+  metadata.gz: 0362c9a826f7f929fa1295c1c262ea49874db544b0c547b4c6b97cd27c51bab3b8151303f0330ce4617915513bcb128ffe8dcec250926d977f972ce6b023a7f1
+  data.tar.gz: ada943260642735058447b391bba1ea961e9e425fc3796a07baddbd64c5a9e7aa402040f32d2aea2fc69afd8337ab402b8afe5577ed4f111bcfde480b085d4e2

data/Gemfile.lock

@@ -1,52 +1,35 @@
 PATH
   remote: .
   specs:
-    propublica-nonprofits (1.0.0)
-      faraday
+    propublica-nonprofits (1.1.1)
+      faraday (> 1.0, < 3.0)
       json
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    coderay (1.1.2)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    faraday (1.5.1)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    base64 (0.2.0)
+    crack (0.4.5)
+      rexml
+    faraday (2.7.12)
+      base64
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    hashdiff (1.0.0)
-    json (2.5.1)
-    method_source (0.9.0)
+    faraday-net_http (3.0.2)
+    hashdiff (1.0.1)
+    json (2.7.1)
     minitest (5.11.3)
     minitest-line (0.6.5)
       minitest (~> 5.0)
-    multipart-post (2.1.1)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (4.0.6)
+    public_suffix (5.0.1)
     rake (13.0.1)
-    ruby2_keywords (0.0.4)
-    safe_yaml (1.0.5)
-    vcr (4.0.0)
-    webmock (3.7.6)
-      addressable (>= 2.3.6)
+    rexml (3.2.5)
+    ruby2_keywords (0.0.5)
+    vcr (6.1.0)
+    webmock (3.18.1)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
 
@@ -58,10 +41,10 @@ DEPENDENCIES
   minitest (~> 5.0)
   minitest-line
   propublica-nonprofits!
-  pry
   rake (~> 13.0)
+  rexml
   vcr
   webmock
 
 BUNDLED WITH
-   2.2.23
+   2.3.10

data/lib/propublica/nonprofits/version.rb

@@ -1,5 +1,5 @@
 module Propublica
   module Nonprofits
-    VERSION = "1.0.0"
+    VERSION = "1.1.1"
   end
 end

data/lib/propublica/nonprofits.rb

@@ -21,8 +21,7 @@ end
 
 module Propublica
   module Nonprofits
-    class DataNotFetched < StandardError
-    end
+    DataNotFetched = Class.new(StandardError)
 
     def self.search(term, state: nil, ntee: nil, page: nil, fetch_all: false)
       search_results(term, state: state, ntee: ntee, page: page, fetch_all: fetch_all)
@@ -48,22 +47,12 @@ module Propublica
           params["ntee[id]"] = ntee if ntee
           params["page"] = page if page
 
-          response = Faraday.default_connection.get("#{API_BASE_URL}/#{API_SEARCH_PATH}", params)
-          parsed_response =
-            if response.body.is_a?(Hash)
-              response.body
-            else
-              begin
-                JSON.parse(response.body)
-              rescue JSON::ParserError => e
-                raise JSON::ParserError.new("Propublica API Parsing Error: #{e.message}")
-              end
-            end
-
-          max_pages = parsed_response.dig("num_pages") || max_pages
+          response = connection.get("/#{API_SEARCH_PATH}", params)
+          max_pages = response.body.dig("num_pages") || max_pages
 
           yielder <<
-            parsed_response
+            response
+              .body
               .fetch("organizations", [])
               .map { |basic_attrs| Propublica::Nonprofits::Organization.new("basic" => basic_attrs) }
 
@@ -74,24 +63,34 @@ module Propublica
           end
         end
       end
+
+    rescue JSON::ParserError => e
+      raise JSON::ParserError.new("Propublica API Parsing Error: #{e.message}")
     end
 
     def self.find(ein)
-      attributes = self.find_attributes(ein)
-      Propublica::Nonprofits::Organization.new(attributes)
+      Propublica::Nonprofits::Organization.new(
+        self.find_attributes(ein)
+      )
     end
 
-    def self.find_attributes(ein)
-      response = Faraday.get("#{API_BASE_URL}/nonprofits/api/v2/organizations/#{ein}.json")
-      if response.body.is_a?(Hash)
-        response.body
-      else
-        begin
-          JSON.parse(response.body)
-        rescue JSON::ParserError => e
-          raise JSON::ParserError.new("Propublica API Parsing Error: #{e.message}")
+    def self.connection
+      Faraday
+        .new(API_BASE_URL) do |f|
+          f.use Faraday::Response::RaiseError
+          f.response :json
         end
-      end
+    end
+
+    def self.find_attributes(ein)
+      connection
+        .get("/nonprofits/api/v2/organizations/#{ein}.json")
+        .body
+
+    rescue JSON::ParserError => e
+      raise JSON::ParserError.new("Propublica API Parsing Error: #{e.message}")
+    rescue Faraday::ServerError, Faraday::ClientError => e
+      raise DataNotFetched.new("Propublica API Error: #{e.message}")
     end
   end
 end

data/propublica-nonprofits.gemspec

@@ -25,11 +25,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", ">= 2.2.10"
   spec.add_development_dependency "minitest-line"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
+  spec.add_development_dependency "rexml"
 
-  spec.add_dependency "faraday"
+  spec.add_dependency "faraday", "> 1.0", "< 3.0"
   spec.add_dependency "json"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propublica-nonprofits
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ricky Chilcott
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -109,19 +95,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -183,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Ruby wrapper for the Propublica Nonprofits API https://projects.propublica.org/nonprofits/api/v2