nzbn 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dc28d59b4a7c4dc9c77238af7eeb51ec1410fe25
-  data.tar.gz: 7a33e4e396c173ebce722c3923bbcebb1e2741db
+SHA256:
+  metadata.gz: fb52da02245857cd4a78cb20994cb4ad8be45c0f95680faa6b44e8f7137e23ea
+  data.tar.gz: ca14b0d78da8415a56b3de8c76917ab0b08a982e0eeded420b6e4fee3979bd24
 SHA512:
-  metadata.gz: a1d9c5dcd0497c1ba0d3d2265fe9457873d56d290ae7769d1dab2912a5cf6c80dc0ced76719a1981db69bcd1b6820c1d41c99c1110a224da63caf20f19d87bd9
-  data.tar.gz: ecb9322f9810a64c86a02c6353fa5d8c1eb30b08627800a4bd3cee81b2bcfbc0f14b6f14b268e8ff58fe40865813e822be2d59e672f1e923083e853338f431c3
+  metadata.gz: 03afc942f4e01aab0cbb2cbca4728d4d614c2f75a97f001f46c79b3a94affd3b7d3bf8552b4543b27136a33b6fb04929dae0f12ebc561d452943ff2bbe65fec2
+  data.tar.gz: 65e277beb72c4641dafa2a1e2c58e91f0b55c12d91144d21a81445246037dc5c1ea40136eb32a1f4f39ec817a88c964826a6888bd073d409828896b44d3009ee

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 /nzbn-0.1.0.gem
+/.idea/

data/lib/nzbn/version.rb

@@ -1,3 +1,3 @@
 module Nzbn
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/lib/nzbn.rb

@@ -3,57 +3,57 @@ require "nzbn/version"
 module NZBN
   require 'rubygems'
   require 'time'
-  require 'curb'
+  require 'rest-client'
   require 'base64'
 
+  NZBN_API_VERSION="v4"
 
-    def self.entities(search_term, entity_status, page_size)
-      entity_status = "registered" if entity_status.blank?
-      page_size = 50 if page_size.blank?
-      r = Curl::Easy.new("https://api.business.govt.nz/services/v3/nzbn/entities?search-term=#{search_term}&entity-status=#{entity_status}&page-size=#{page_size}") do |curl|
-        curl.headers['Authorization'] = 'Bearer ' + access_token
-        curl.http_auth_types = :basic
-        curl.verbose = true
-      end
-      r.perform
-      return JSON.parse(r.body_str)
-    end
+  class DataError < StandardError; end
+  class AuthError < StandardError; end
 
-    def self.entity(nzbn)
-      r = Curl::Easy.new("https://api.business.govt.nz/services/v3/nzbn/entities/#{nzbn}") do |curl|
-        curl.headers['Authorization'] = 'Bearer ' + access_token
-        curl.http_auth_types = :basic
-        curl.verbose = true
-      end
-      r.perform
-      return JSON.parse(r.body_str)
+  def self.entities(search_term, entity_status, page_size)
+    entity_status = "registered" if entity_status.blank?
+    page_size = 50 if page_size.blank?
+    response = RestClient.get("https://api.business.govt.nz/services/#{NZBN_API_VERSION}/nzbn/entities?search-term=#{search_term}&entity-status=#{entity_status}&page-size=#{page_size}",
+                       { authorization: "Bearer #{access_token}", accept: 'application/json' })
+    begin
+      JSON.parse(response.body).with_indifferent_access
+    rescue JSON::ParserError
+      raise NZBN::DataError, "NZBN API returned bad data"
     end
-
-    def self.filings(nzbn)
-      r = Curl::Easy.new("https://api.business.govt.nz/services/v3/nzbn/entities/#{nzbn}/filings") do |curl|
-        curl.headers['Authorization'] = 'Bearer ' + access_token
-        curl.http_auth_types = :basic
-        curl.verbose = true
-      end
-      r.perform
-      return JSON.parse(r.body_str)
+  end
+
+  def self.entity(nzbn)
+    response = RestClient.get("https://api.business.govt.nz/services/#{NZBN_API_VERSION}/nzbn/entities/#{nzbn}",
+                              { authorization: "Bearer #{access_token}", accept: 'application/json' })
+    begin
+      JSON.parse(response.body).with_indifferent_access
+    rescue JSON::ParserError
+      raise NZBN::DataError, "NZBN API returned bad data"
     end
-
-
+  end
+
+  def self.filings(nzbn)
+    response = RestClient.get("https://api.business.govt.nz/services/#{NZBN_API_VERSION}/nzbn/entities/#{nzbn}/filings",
+                              { authorization: "Bearer #{access_token}", accept: 'application/json' })
+    begin
+      JSON.parse(response.body).with_indifferent_access
+    rescue JSON::ParserError
+      raise NZBN::DataError, "NZBN API returned bad data"
+    end
+  end
 
   private
 
+  def self.access_token
+    begin
+      response = RestClient.post("https://api.business.govt.nz/services/token", { grant_type: "client_credentials" },
+                               { grant_type: "client_credentials", authorization: "Basic #{Base64.strict_encode64(ENV["NZBN_ID"] + ":" + ENV["NZBN_SECRET"])}" })
 
-    def self.access_token
-        c = Curl::Easy.http_post("https://api.business.govt.nz/services/token", "grant_type=client_credentials") do |curl|
-          curl.headers['grant_type'] = 'client_credentials'
-          curl.headers['Authorization'] = 'Basic ' + Base64.strict_encode64(ENV["NZBN_ID"] + ":" + ENV["NZBN_SECRET"])
-          curl.http_auth_types = :basic
-          curl.verbose = true
-        end
-        c.perform
-        return JSON.parse(c.body_str)["access_token"]
+      JSON.parse(response.body)["access_token"]
+    rescue JSON::ParserError, NoMethodError
+      raise NZBN::AuthError, "Authentication failed! Are you missing NZBN_ID or NZBN_SECRET?"
     end
 
-
+  end
 end

data/nzbn.gemspec

@@ -6,8 +6,8 @@ require "nzbn/version"
 Gem::Specification.new do |spec|
   spec.name          = "nzbn"
   spec.version       = Nzbn::VERSION
-  spec.authors       = ["T Pearse"]
-  spec.email         = ["t.pearse@gmail.com"]
+  spec.authors       = ["T Pearse", "Theo Morra"]
+  spec.email         = ["t.pearse@gmail.com", "git@theom.nz"]
 
   spec.summary       = %q{Simple and fast authenticating ruby API wrapper for the NZBN API}
   spec.description   = %q{Search, update details and manage New Zealand companies through the NZBN register.}
@@ -32,6 +32,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "curb", "~> 0.96"
+  spec.add_runtime_dependency "rest-client", "~> 2.1.0"
 
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: nzbn
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - T Pearse
-autorequire: 
+- Theo Morra
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-07-30 00:00:00.000000000 Z
+date: 2022-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,23 +40,24 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.96'
-  type: :development
+        version: 2.1.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.96'
+        version: 2.1.0
 description: Search, update details and manage New Zealand companies through the NZBN
   register.
 email:
 - t.pearse@gmail.com
+- git@theom.nz
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -75,7 +77,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,9 +92,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Simple and fast authenticating ruby API wrapper for the NZBN API
 test_files: []