nicinfo 1.3.0.pre.alpha1 → 1.5.0

data/lib/nicinfo/demo/ns-simple.json

@@ -1,6 +1,6 @@
 {
-    "nicInfo_demoUrl" : "https://rdap.arin.net/registry/nameserver/ns2.example.com",
-    "nicInfo_demoHint" : "nicinfo ns2.example.com",
+    "nicInfo_demoUrl" : "https://rdap.arin.net/registry/nameserver/ns2.example.example",
+    "nicInfo_demoHint" : "nicinfo ns2.example.example",
     "rdapConformance":[
         "rdap_level_0"
     ],

data/lib/nicinfo/demo/ns-very-simple.json

@@ -1,6 +1,6 @@
 {
-    "nicInfo_demoUrl" : "https://rdap.arin.net/registry/nameserver/ns1.example.com",
-    "nicInfo_demoHint" : "nicinfo ns1.example.com",
+    "nicInfo_demoUrl" : "https://rdap.arin.net/registry/nameserver/ns1.example.example",
+    "nicInfo_demoHint" : "nicinfo ns1.example.example",
     "rdapConformance":[
         "rdap_level_0"
     ],

data/lib/nicinfo/demo/ns.json

@@ -1,5 +1,5 @@
 {
-    "nicInfo_demoUrl" : "https://rdap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example",
+    "nicInfo_demoUrl" : "https://rdap.arin.net/registry/nameserver/ns1.xn--fo-5ja.example",
     "nicInfo_demoHint" : "nicinfo ns1.xn--fo-5ja.example",
     "rdapConformance":[
         "rdap_level_0"
@@ -25,9 +25,9 @@
         }
     ],
     "handle":"XXXX",
-    "objectClassName":"entity",
+    "objectClassName":"nameserver",
     "ldhName":"ns1.xn--fo-5ja.example",
-    "unicodeName":"foo.example",
+    "unicodeName":"ns1.foo.example",
     "status":[ "active" ],
     "ipAddresses":{
         "v4":[ "192.0.2.1", "192.0.2.2" ],
@@ -43,9 +43,9 @@
     ],
     "links":[
         {
-            "value":"https://rdap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example",
+            "value":"https://rdap-bootstrap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example",
             "rel":"self",
-            "href":"https://rdap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example"
+            "href":"https://rdap-bootstrap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example"
         }
     ],
     "port43":"whois.example.net",

data/lib/nicinfo/domain.rb

@@ -32,7 +32,7 @@ module NicInfo
     end
     respObjs = ResponseObjSet.new config
     obj_array.each do |array_object|
-      domain = Domain.new( config ).process( array_object )
+      domain = config.factory.new_domain.process( array_object )
       root = domain.to_node
       data_node.add_root( root )
       if !domain.entities.empty? or !domain.nameservers.empty?
@@ -112,13 +112,13 @@ module NicInfo
       @entities = @common.process_entities @objectclass
       json_nses = NicInfo::get_nameservers json_data
       json_nses.each do |json_ns|
-        ns = Ns.new( @config )
+        ns = @config.factory.new_ns
         ns.process( json_ns )
         @nameservers << ns
       end if json_nses
       json_net = NicInfo::get_network json_data
       if json_net
-        ip = Ip.new @config
+        ip = @config.factory.new_ip
         ip.process json_net
         @network = ip
       end
@@ -140,10 +140,10 @@ module NicInfo
     def display
       @config.logger.start_data_item
       @config.logger.data_title "[ DOMAIN ]"
-      @config.logger.terse "Handle", NicInfo::get_handle( @objectclass )
-      @config.logger.extra "Object Class Name", NicInfo::get_object_class_name( @objectclass )
-      @config.logger.terse "Domain Name", NicInfo::get_ldhName( @objectclass )
-      @config.logger.datum "I18N Domain Name", NicInfo::get_unicodeName( @objectclass )
+      @config.logger.terse "Handle", NicInfo::get_handle( @objectclass ), NicInfo::AttentionType::SUCCESS
+      @config.logger.extra "Object Class Name", NicInfo::get_object_class_name( @objectclass, "domain", @config )
+      @config.logger.terse "Domain Name", NicInfo::get_ldhName( @objectclass ), NicInfo::AttentionType::SUCCESS
+      @config.logger.datum "I18N Domain Name", NicInfo::get_unicodeName( @objectclass ), NicInfo::AttentionType::SUCCESS
       variants = @objectclass[ "variants" ]
       variant_no = 1
       variants.each do |variant|

data/lib/nicinfo/entity.rb

@@ -21,7 +21,7 @@ require 'nicinfo/data_tree'
 module NicInfo
 
   def NicInfo.display_entity json_data, config, data_tree
-    entity = Entity.new( config ).process( json_data )
+    entity = config.factory.new_entity.process( json_data )
 
     respobjs = ResponseObjSet.new config
     root = entity.to_node
@@ -64,7 +64,7 @@ module NicInfo
       if entity_array.instance_of? Array
         display_array = Array.new
         entity_array.each do |ea|
-          entity = Entity.new( config ).process( ea )
+          entity = config.factory.new_entity.process( ea )
           display_array << entity
         end
         NicInfo.display_object_with_entities( display_array, config, data_tree )
@@ -112,7 +112,8 @@ module NicInfo
 
     attr_accessor :fns, :names, :phones, :emails, :adrs, :kind, :titles, :roles, :orgs
 
-    def initialize
+    def initialize( config )
+      @config = config
       @fns = Array.new
       @names = Array.new
       @phones = Array.new
@@ -130,93 +131,103 @@ module NicInfo
     def process entity
       if ( vcard = get_vcard( entity ) ) != nil
         vcardElements = vcard[ 1 ]
-        vcardElements.each do |element|
-          if element[ 0 ] == "fn"
-            @fns << element[ 3 ]
-          end
-          if element[ 0 ] == "n"
-            name = ""
-            if element[ 3 ][ -1 ].instance_of? Array
-              name << element[ 3 ][ -1 ].join( ' ' )
+        if vcardElements.nil? || vcardElements.size == 0
+          @config.conf_msgs << "jCard (vCard) is empty."
+        elsif vcardElements[ 0 ][ 0 ] != "version"
+          @config.conf_msgs << "jCard (vCard) does not have required version first element."
+        end
+        if !vcardElements.nil?
+          vcardElements.each do |element|
+            if element[ 0 ] == "fn"
+              @fns << element[ 3 ]
             end
-            name << ' ' if name[-1] != ' '
-            name << element[ 3 ][ 1 ]
-            if element[ 3 ][ 2 ] && !element[ 3 ][ 2 ].empty?
-              name << " " << element[ 3 ][ 2 ]
+            if element[ 0 ] == "n"
+              name = ""
+              if element[ 3 ][ -1 ].instance_of? Array
+                name << element[ 3 ][ -1 ].join( ' ' )
+              end
+              name << ' ' if name[-1] != ' '
+              name << element[ 3 ][ 1 ]
+              if element[ 3 ][ 2 ] && !element[ 3 ][ 2 ].empty?
+                name << " " << element[ 3 ][ 2 ]
+              end
+              if element[ 3 ][ 3 ] && !element[ 3 ][ 3 ].empty?
+                name << " " << element[ 3 ][ 3 ]
+              end
+              name << " " << element[ 3 ][ 0 ]
+              if element[ 3 ][ -2 ].instance_of? Array
+                name << " " << element[ 3 ][ -2 ].join( ' ' )
+              end
+              @names << name.strip
             end
-            if element[ 3 ][ 3 ] && !element[ 3 ][ 3 ].empty?
-              name << " " << element[ 3 ][ 3 ]
+            if element[ 0 ] == "tel"
+              tel = Tel.new
+              if (type = element[ 1 ][ "type" ]) != nil
+                tel.type << type if type.instance_of? String
+                tel.type = type if type.instance_of? Array
+              end
+              if (str = element[ 3 ] ).start_with?( "tel:" )
+                tel.number=str[ /^tel\:([^;]*)/,1 ]
+                tel.ext=str[ /[^;]*ext=(.*)/,1 ]
+              else
+                tel.number=str
+              end
+              @phones << tel
             end
-            name << " " << element[ 3 ][ 0 ]
-            if element[ 3 ][ -2 ].instance_of? Array
-              name << " " << element[ 3 ][ -2 ].join( ' ' )
+            if element[ 0 ] == "email"
+              email = Email.new
+              if (type = element[ 1 ][ "type" ]) != nil
+                email.type << type if type.instance_of? String
+                email.type = type if type.instance_of? Array
+              end
+              email.addr=element[ 3 ]
+              @emails << email
             end
-            @names << name
-          end
-          if element[ 0 ] == "tel"
-            tel = Tel.new
-            if (type = element[ 1 ][ "type" ]) != nil
-              tel.type << type if type.instance_of? String
-              tel.type = type if type.instance_of? Array
+            if element[ 0 ] == "adr"
+              adr = Adr.new
+              if (type = element[ 1 ][ "type" ]) != nil
+                adr.type << type if type.instance_of? String
+                adr.type = type if type.instance_of? Array
+              end
+              if (label = element[ 1 ][ "label" ]) != nil
+                adr.label = label.split( "\n" )
+              else
+                adr.pobox=element[ 3 ][ 0 ]
+                adr.extended=element[ 3 ][ 1 ]
+                adr.street=element[ 3 ][ 2 ]
+                adr.locality=element[ 3 ][ 3 ]
+                adr.region=element[ 3 ][ 4 ]
+                adr.postal=element[ 3 ][ 5 ]
+                adr.country=element[ 3 ][ 6 ]
+                adr.structured=true
+              end
+              @adrs << adr
             end
-            if (str = element[ 3 ] ).start_with?( "tel:" )
-              tel.number=str[ /^tel\:([^;]*)/,1 ]
-              tel.ext=str[ /[^;]*ext=(.*)/,1 ]
-            else
-              tel.number=str
+            if element[ 0 ] == "kind"
+              @kind = element[ 3 ]
             end
-            @phones << tel
-          end
-          if element[ 0 ] == "email"
-            email = Email.new
-            if (type = element[ 1 ][ "type" ]) != nil
-              email.type << type if type.instance_of? String
-              email.type = type if type.instance_of? Array
+            if element[ 0 ] == "title"
+              @titles << element[ 3 ]
             end
-            email.addr=element[ 3 ]
-            @emails << email
-          end
-          if element[ 0 ] == "adr"
-            adr = Adr.new
-            if (type = element[ 1 ][ "type" ]) != nil
-              adr.type << type if type.instance_of? String
-              adr.type = type if type.instance_of? Array
+            if element[ 0 ] == "role"
+              @roles << element[ 3 ]
             end
-            if (label = element[ 1 ][ "label" ]) != nil
-              adr.label = label.split( "\n" )
-            else
-              adr.pobox=element[ 3 ][ 0 ]
-              adr.extended=element[ 3 ][ 1 ]
-              adr.street=element[ 3 ][ 2 ]
-              adr.locality=element[ 3 ][ 3 ]
-              adr.region=element[ 3 ][ 4 ]
-              adr.postal=element[ 3 ][ 5 ]
-              adr.country=element[ 3 ][ 6 ]
-              adr.structured=true
+            if element[ 0 ] == "org"
+              org = Org.new
+              if (type = element[ 1 ][ "type" ]) != nil
+                org.type << type if type.instance_of? String
+                org.type = type if type.instance_of? Array
+              end
+              names = element[ 3 ]
+              org.names << names if names.instance_of? String
+              org.names = org.names + names if names.instance_of? Array
+              @orgs << org
             end
-            @adrs << adr
-          end
-          if element[ 0 ] == "kind"
-            @kind = element[ 3 ]
-          end
-          if element[ 0 ] == "title"
-            @titles << element[ 3 ]
-          end
-          if element[ 0 ] == "role"
-            @roles << element[ 3 ]
-          end
-          if element[ 0 ] == "org"
-            org = Org.new
-            if (type = element[ 1 ][ "type" ]) != nil
-              org.type << type if type.instance_of? String
-              org.type = type if type.instance_of? Array
-            end
-            names = element[ 3 ]
-            org.names << names if names.instance_of? String
-            org.names = org.names + names if names.instance_of? Array
-            @orgs << org
           end
         end
+        if @fns.empty?
+          @config.conf_msgs << "jCard (vCard) has no required 'fn' property."
+        end
       end
       return self
     end
@@ -232,7 +243,7 @@ module NicInfo
 
     def initialize config
       @config = config
-      @jcard = JCard.new
+      @jcard = JCard.new( config )
       @common = CommonJson.new config
       @entity = nil
       @asEvents = Array.new
@@ -258,7 +269,7 @@ module NicInfo
       json_networks = NicInfo::get_networks( @objectclass )
       json_networks.each do |json_network|
         if json_network.is_a?( Hash )
-          network = Ip.new( @config )
+          network = @config.factory.new_ip
           network.process( json_network )
           @networks << network
         else
@@ -269,7 +280,7 @@ module NicInfo
       json_autnums = NicInfo::get_autnums( @objectclass )
       json_autnums.each do |json_autnum|
         if json_autnum.is_a?( Hash )
-          autnum = Autnum.new( @config )
+          autnum = @config.factory.new_autnum
           autnum.process( json_autnum )
           @autnums << autnum
         else
@@ -282,20 +293,20 @@ module NicInfo
     def display
       @config.logger.start_data_item
       @config.logger.data_title "[ ENTITY ]"
-      @config.logger.terse "Handle", NicInfo::get_handle( @objectclass )
-      @config.logger.extra "Object Class Name", NicInfo::get_object_class_name( @objectclass )
+      @config.logger.terse "Handle", NicInfo::get_handle( @objectclass ), NicInfo::AttentionType::SUCCESS
+      @config.logger.extra "Object Class Name", NicInfo::get_object_class_name( @objectclass, "entity", @config )
       @jcard.fns.each do |fn|
-        @config.logger.terse "Name", fn
+        @config.logger.terse "Common Name", fn, NicInfo::AttentionType::SUCCESS
       end
       @jcard.names.each do |n|
-        @config.logger.extra "Name", n
+        @config.logger.extra "Formal Name", n, NicInfo::AttentionType::SUCCESS
       end
       @jcard.orgs.each do |org|
         item_value = org.names.join( ", " )
         if !org.type.empty?
           item_value << " ( #{org.type.join( ", " )} )"
         end
-        @config.logger.terse "Organization", item_value
+        @config.logger.terse "Organization", item_value, NicInfo::AttentionType::SUCCESS
       end
       @jcard.titles.each do |title|
         @config.logger.extra "Title", title

data/lib/nicinfo/error_code.rb

@@ -15,40 +15,37 @@
 require 'nicinfo/config'
 require 'nicinfo/nicinfo_logger'
 require 'nicinfo/utils'
+require 'nicinfo/common_json'
 
 module NicInfo
 
   # deals with RDAP error code structures
   class ErrorCode
 
-    def display_error_code ec, config
-      config.logger.start_data_item
+    attr_accessor :config
+
+    def initialize( config )
+      @config = config
+      @common = CommonJson.new( config )
+    end
+
+    def display_error_code ec
+      @config.logger.start_data_item
       title = ec[ "title" ]
       if title == nil
         title = ""
       end
-      config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "[ ERROR ]", title
-      config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "Code", ec[ "errorCode" ]
+      @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "[ ERROR ]", title, NicInfo::AttentionType::ERROR
+      @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "Code", ec[ "errorCode" ]
       description = ec[ "description" ]
       i = 1
       description.each do |line|
-        config.logger.prose NicInfo::DataAmount::NORMAL_DATA, i.to_s, line
+        @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, i.to_s, line
         i = i + 1
       end
       links = ec[ "links" ]
-      if links
-        alternate = NicInfo.get_alternate_link links
-        config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "More", alternate if alternate
-        about = NicInfo.get_about_link links
-        config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "About", about if about
-        tos = NicInfo.get_tos_link links
-        config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "TOS", tos if tos
-        copyright = NicInfo.get_copyright_link links
-        config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "(C)", copyright if copyright
-        license = NicInfo.get_license_link links
-        config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "License", license if license
-      end
-      config.logger.end_data_item
+      @common.display_simple_links( links )
+      @config.logger.end_data_item
     end
 
   end

data/lib/nicinfo/factory.rb

@@ -0,0 +1,56 @@
+# Copyright (C) 2017 American Registry for Internet Numbers
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+# IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+module NicInfo
+
+  # Creates objects we want to mock
+  class Factory
+
+    attr_accessor :config
+
+    def initialize( config )
+      @config = config
+    end
+
+    def new_error_code
+      return ErrorCode.new( config )
+    end
+
+    def new_autnum
+      return Autnum.new( config )
+    end
+
+    def new_domain
+      return Domain.new( config )
+    end
+
+    def new_entity
+      return Entity.new( config )
+    end
+
+    def new_ip
+      return Ip.new( config )
+    end
+
+    def new_notices
+      return Notices.new( config )
+    end
+
+    def new_ns
+      return Ns.new( config )
+    end
+
+  end
+
+end