brreg 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6e30a9269501b25a98364724e53ee31dd23dd9e
-  data.tar.gz: 47dfc36c49d85f61561f66a66079267abb93d109
+  metadata.gz: 57311df2ec6b491193bbdde7980d5f483d6f97b0
+  data.tar.gz: 7a835b1662dc73f76750d39b0d10b2b0e84fcfa9
 SHA512:
-  metadata.gz: 9829df08b4b3841748a0e0d4aa65c2582b0bf1b02ef73598430e55480d950b160b77162205111f7ae27f58f4104d90ddfdd6b9f85c56b1a1436aae4963081bd1
-  data.tar.gz: 72e009f56e37d35baa2b1206c68cd13990b2aa9d6e19dd9ece184a4d6f61279b572650bf9f9f19ba9df625aa8a955235072f9c9470f0d899dd81d9914ed9bc94
+  metadata.gz: 6393a3dc02c2b4406970db867f51527d0626a54854d254962d67cee1ef524f18cb7631fcc6de69204b200c8c7bbf0f90584c4aa3e015276cd3cf9498129df8ac
+  data.tar.gz: 83ebff255523a9c3420c2c58aa8deaf8913362f200098f695a92d058e7ff47b7e56c5681cf933a1a73571c6ef4a57ab4e18b75bd1376127b9b8e8eb828cff205

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/lib/brreg.rb

@@ -5,16 +5,17 @@ require 'json'
 module Brreg
   BrregURI = 'https://hotell.difi.no/api/json/brreg/enhetsregisteret'
   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 } )
     if res.is_a?(Net::HTTPSuccess)
@@ -44,7 +45,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."

data/lib/brreg/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brreg
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Espen Antonsen