brreg 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a6e30a9269501b25a98364724e53ee31dd23dd9e
-  data.tar.gz: 47dfc36c49d85f61561f66a66079267abb93d109
+SHA256:
+  metadata.gz: 9d20871bf9a0c7bf08e2ee2331ed03bb0ce2a3dd2545d7b28b0c150e57c206e4
+  data.tar.gz: 6d21f7ba3b987eeb013f3df2e0c3e1116159250f616e20641854381a6c73c832
 SHA512:
-  metadata.gz: 9829df08b4b3841748a0e0d4aa65c2582b0bf1b02ef73598430e55480d950b160b77162205111f7ae27f58f4104d90ddfdd6b9f85c56b1a1436aae4963081bd1
-  data.tar.gz: 72e009f56e37d35baa2b1206c68cd13990b2aa9d6e19dd9ece184a4d6f61279b572650bf9f9f19ba9df625aa8a955235072f9c9470f0d899dd81d9914ed9bc94
+  metadata.gz: '0499839d05a11289b5f09b07f091f4c6c26972e9a3d96a67185ffc87068a5edb41ac0bf23378c4e2f73d0612faf2950c38476dab926173b2d2c3880958d625f2'
+  data.tar.gz: f2ed13bce171af06b19ea3eefd838dc690943511a1c5a85efeb27523f6287057b13acb643a191d1c8fa9011e80846821fdfc990ef2121fe8614074e6ff4dfffb

data/bin/brreg

@@ -10,7 +10,7 @@ opts = OptionParser.new do |opt|
   opt.banner = "Usage: brreg [options] OR brreg orgnr/query/domain"
 
   opt.on('-n', '--orgnr ORGNR', 'Organisasjonsnummer') do |orgnr|
-    cli_params[:orgnr] = orgnr.to_i
+    cli_params[:orgnr] = orgnr
   end
 
   opt.on('-q', '--query QUERY', 'Firmanavn') do |query|
@@ -30,11 +30,10 @@ rescue OptionParser::InvalidOption, OptionParser::MissingArgument
   exit
 end
 
-def numeric?(object)
-  true if Float(object) rescue false
+def is_orgnr?(object)
+  object.class == String && object.gsub(/\D/, '').length == 9
 end
 
-
 if cli_params.length > 0
   if cli_params[:orgnr]
     Brreg.find_by_orgnr(cli_params[:orgnr])
@@ -44,9 +43,9 @@ if cli_params.length > 0
     Brreg.find_by_domain( cli_params[:domain])
   end
 elsif ARGV.length > 0
-  input = ARGV.first
-  if numeric?(input)
-    Brreg.find_by_orgnr( input.to_i )
+  input = ARGV.join(' ')
+  if is_orgnr?(input)
+    Brreg.find_by_orgnr( input )
   elsif input.include?('.no')
     Brreg.find_by_domain( input )
   else

data/brreg.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |spec|
   spec.executables   = "brreg"
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
 end

data/lib/brreg/version.rb

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

data/lib/brreg.rb

@@ -3,34 +3,36 @@ require 'net/http'
 require 'json'
 
 module Brreg
-  BrregURI = 'https://hotell.difi.no/api/json/brreg/enhetsregisteret'
+  BrregURI = 'https://data.brreg.no/enhetsregisteret/api/enheter'
   def self.find_by_orgnr(orgnr)
-    if !orgnr || orgnr.class != String
-      puts "Ugyldig verdi"
-      return false
-    end
-    if orgnr
-      orgnr = orgnr.gsub(/\D/, '')
-    end
-    if orgnr.empty?
+    if !orgnr
       puts "Ugyldig verdi"
       return false
+    else
+      if orgnr.class == String
+        orgnr = orgnr.gsub(/\D/, '')
+        if orgnr.empty? || orgnr.length != 9
+          puts "Ugyldig verdi"
+          return false
+        end
+      end
     end
-    res = get_json( { :orgnr => orgnr } )
+    res = get_json( { :organisasjonsnummer => orgnr } )
     if res.is_a?(Net::HTTPSuccess)
       jsonres = JSON.parse(res.body)
-      if jsonres['posts'].to_i > 0
-        company = jsonres['entries'].first
+      matches = jsonres['_embedded']['enheter']
+      if matches.length > 0
+        company = matches.first
         puts "\n"
         puts "\e[32mViser oppføring for orgnr #{orgnr}\e[0m"
         puts "\n"
         puts company['navn']
-        puts company['forretningsadr']
-        puts company['forradrpostnr'] + ' ' + company['forradrpoststed']
+        puts company['forretningsadresse']['adresse']
+        puts company['forretningsadresse']['postnummer'] + ' ' + company['forretningsadresse']['poststed']
         if !company['postadresse'].empty?
           puts 'Postadresse:'
-          puts company['postadresse']
-          puts company['ppostnr'] + ' ' + company['ppoststed']
+          puts company['postadresse']['adresse']
+          puts company['postadresse']['postnummer'] + ' ' + company['postadresse']['poststed']
         end
       else
         puts "Fant ingen oppføring for #{orgnr}"
@@ -44,7 +46,7 @@ module Brreg
     if res.gsub('Id Number').first
       orgnr = /\Id Number..................:\s(\d{9})/
       if res.match(orgnr)
-        Brreg.find_by_orgnr( res.scan(orgnr).first.first.to_i )
+        Brreg.find_by_orgnr( res.scan(orgnr).first.first )
         puts "\nBasert på Whois fra domenet #{domain}"
       else
         puts "Domenet har ikke et vanlig orgnr."
@@ -60,17 +62,17 @@ module Brreg
     puts "\n"
     puts "\e[32mTreff i Enhetsregisteret basert på søket '#{query}'\e[0m"
     puts "\n"
-    res = self.get_json( { :query => query } )
+    res = self.get_json( { :navn => query } )
     if res.is_a?(Net::HTTPSuccess)
       jsonres = JSON.parse(res.body)
-      matches = jsonres['posts'].to_i
-      if matches > 0
-        if matches == 1
+      matches = jsonres['_embedded']['enheter']
+      if matches.length > 0
+        if matches.length == 1
           puts "Fant 1 oppføring"
-          Brreg.find_by_orgnr( jsonres['entries'].first['orgnr'] )
+          Brreg.find_by_orgnr( matches.first['organisasjonsnummer'] )
         else
-          for entry in jsonres['entries']
-            puts entry['orgnr'] + ' ' + entry['navn']
+          for entry in matches
+            puts entry['organisasjonsnummer'] + ' ' + entry['navn']
           end
         end
       else

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: brreg
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Espen Antonsen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2024-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 description: Search Norwegian companies
 email:
 - espen@inspired.no
@@ -60,7 +60,7 @@ files:
 homepage: http://github.com/espen/brreg
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -75,9 +75,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
-signing_key: 
+rubygems_version: 3.5.16
+signing_key:
 specification_version: 4
 summary: Search Enhetsregisteret i Brønnøysundsregisteret
 test_files: []