propublica-nonprofits 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f1548a6ab99d0cc5bc651916c1591c0339b0644531533e507f9a1395fd21aa1
-  data.tar.gz: f991cc23ad0289a3ff680f7be2bae80930b6e1777ca990917b4302e815674c73
+  metadata.gz: 6437649a923bd364755463869cb49f25ae57b91011daaf0cd9db49c409296580
+  data.tar.gz: faed90b755e0059d4717041570ced6600a88e3b9901303db6596ec221aa45411
 SHA512:
-  metadata.gz: 5fa50cbfdd4a595c2772a97080be6cf71e465e1263e7b902916b142f849e8cd38522c9ce42acce04ac28d20597a1b6196189ec4c8e3f27280b5703dab3954038
-  data.tar.gz: 6292726cce32f0e3a403c29dd5e7fca49accfa43c45e8d2a5bc2e978fc0774ffd3bc880d75d7580ca24c0e5838f34a75ddf4b638a1e4040b0e9053781a94ae12
+  metadata.gz: eb357db6551a934f3f8bf1ef40ddbc9b1577129835d16ca258d2c6925107045af42bc6efa6f0c7b8cbb4146d4a10055efbc77deae5bedb86e544500648f7d03a
+  data.tar.gz: 47c904c59ab652d679b34be83483102509fee8a1344cbb0ec5c83d17f2741b7760bfbac47984fc2b830dedbba73e1b86c42146b1a1f340c870c4f085ba153300

data/.gitignore

@@ -6,3 +6,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+/*.gem
+.DS_Store

data/Gemfile.lock

@@ -19,6 +19,8 @@ GEM
     json (2.1.0)
     method_source (0.9.0)
     minitest (5.11.3)
+    minitest-line (0.6.5)
+      minitest (~> 5.0)
     multipart-post (2.0.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
@@ -38,6 +40,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.16)
   minitest (~> 5.0)
+  minitest-line
   propublica-nonprofits!
   pry
   rake (~> 10.0)
@@ -45,4 +48,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.16.2
+   1.16.5

data/bin/console

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
 require "propublica/nonprofits"
 
 # You can add fixtures and/or initialization code here to make experimenting

data/lib/propublica/nonprofits/organization.rb

@@ -38,28 +38,44 @@ module Propublica
 
       def error
         ensure_full_request!
-        @error ||= attributes["error"]
+        @error ||= attributes["error"] || ""
+      end
+
+      def error?
+        !error.empty?
       end
 
       private
 
       attr_reader :attributes
+      attr_accessor :full_request_made
+
+      def full_request_made?
+        !!full_request_made
+      end
 
       def ensure_full_request!
-        return if @full_request == true
+        return if full_request_made?
 
-        required_keys = ["organization", "filings_with_data", "filings_without_data", "data_source", "api_version", "error"].freeze
-        @full_request = (attributes.keys & required_keys) == required_keys
-        return if @full_request == true
+        self.full_request_made = (attributes.keys & required_keys) == required_keys
+        return if full_request_made?
 
         fetch_full_request!
       end
 
+      def required_keys
+        ["organization", "filings_with_data", "filings_without_data", "data_source", "api_version", "error"].freeze
+      end
+
+      def ein
+        @attributes.dig("organization", "ein") || self.basic.ein
+      end
+
       def fetch_full_request!
         # Fetch all attributes and merge with what we have now
-        new_attrs = Propublica::Nonprofits.find_attributes(self.basic.ein)
+        new_attrs = Propublica::Nonprofits.find_attributes(ein)
         attributes.merge!(new_attrs)
-        @full_request = true
+        self.full_request_made = true
       end
     end
   end

data/lib/propublica/nonprofits/organization/dynamic_parser.rb

@@ -7,11 +7,7 @@ module Propublica
           fields.each do |field|
             define_method field do
               vars = self.instance_variable_get("@attributes")
-              vars.fetch(field.to_s) do
-                class_name = self.class.to_s.split("::").last
-                raise Propublica::Nonprofits::DataNotFetched,
-                  "#{class_name}##{field} not fetched from API. This may be due to an API error or because you tried to access a Basic property on the full results"
-              end
+              vars.fetch(field.to_s) { raise_field_fetch_error(field) }
             end
           end
         end
@@ -27,6 +23,12 @@ module Propublica
         private
 
         attr_reader :attributes
+
+        def raise_field_fetch_error(field)
+          class_name = self.class.to_s.split("::").last
+          raise Propublica::Nonprofits::DataNotFetched,
+            "#{class_name}##{field} not fetched from API. This may be due to an API error or because you tried to access a Basic property on the full results"
+        end
       end
     end
   end

data/lib/propublica/nonprofits/version.rb

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

data/propublica-nonprofits.gemspec

@@ -24,9 +24,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "minitest-line"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propublica-nonprofits
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ricky Chilcott
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest-line
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement