nicinfo 1.3.0.pre.alpha1 → 1.5.0

data/lib/nicinfo/notices.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011,2012,2013,2014 American Registry for Internet Numbers
+# Copyright (C) 2011-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
@@ -15,20 +15,28 @@
 require 'nicinfo/config'
 require 'nicinfo/nicinfo_logger'
 require 'nicinfo/utils'
+require 'nicinfo/common_json'
 
 module NicInfo
 
   # deals with RDAP notices structures
   class Notices
 
-    def Notices.is_excessive_notice notices, config
+    attr_accessor :config
+
+    def initialize( config )
+      @config = config
+      @common = CommonJson.new( config )
+    end
+
+    def is_excessive_notice notices
       return false if !notices
       return false if notices.length == 0
       return true if notices.length > 2
       word_count = 0
       line_count = 0
       notices.each do |notice|
-        descriptions = NicInfo::get_descriptions notice, config
+        descriptions = NicInfo::get_descriptions notice, @config
         descriptions.each do |line|
           line_count = line_count + 1
           word_count = word_count + line.length
@@ -40,69 +48,54 @@ module NicInfo
       return false
     end
 
-    def display_notices json_response, config, ignore_excessive
+    def display_notices json_response, ignore_excessive
 
       notices = json_response[ "notices" ]
       return if notices == nil
-      if (Notices::is_excessive_notice(notices,config) ) && (config.logger.data_amount != NicInfo::DataAmount::EXTRA_DATA) && !ignore_excessive
-        config.logger.start_data_item
-        config.logger.raw NicInfo::DataAmount::NORMAL_DATA, "Excessive Notices"
-        config.logger.raw NicInfo::DataAmount::NORMAL_DATA, "-----------------"
-        config.logger.raw NicInfo::DataAmount::NORMAL_DATA, "Response contains excessive notices."
-        config.logger.raw NicInfo::DataAmount::NORMAL_DATA, "Use the \"-V\" or \"--data extra\" options to see them."
-        config.logger.end_data_item
+      if (is_excessive_notice(notices) ) && (@config.logger.data_amount != NicInfo::DataAmount::EXTRA_DATA) && !ignore_excessive
+        @config.logger.start_data_item
+        @config.logger.raw NicInfo::DataAmount::NORMAL_DATA, "Excessive Notices", NicInfo::AttentionType::INFO
+        @config.logger.raw NicInfo::DataAmount::NORMAL_DATA, "-----------------", NicInfo::AttentionType::INFO
+        @config.logger.raw NicInfo::DataAmount::NORMAL_DATA, "Response contains excessive notices.", NicInfo::AttentionType::INFO
+        @config.logger.raw NicInfo::DataAmount::NORMAL_DATA, "Use the \"-V\" or \"--data extra\" options to see them.", NicInfo::AttentionType::INFO
+        @config.logger.end_data_item
       else
         notices.each do |notice|
-          display_single_notice notice, config
+          display_single_notice notice
         end
       end
 
     end
 
-    def display_single_notice notice, config
-      config.logger.start_data_item
+    def display_single_notice notice
+      @config.logger.start_data_item
       title = notice[ "title" ]
       if title == nil
         title = ""
       end
-      config.conf_msgs << "'title' in 'notice' is not a string." unless title.instance_of?( String )
-      config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "[ NOTICE ]", title
+      @config.conf_msgs << "'title' in 'notice' is not a string." unless title.instance_of?( String )
+      @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "[ NOTICE ]", title, NicInfo::AttentionType::SECONDARY
       type = notice[ "type" ]
       if type != nil
-        config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "Type", NicInfo.capitalize( type )
+        @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "Type", NicInfo.capitalize( type ), NicInfo::AttentionType::SECONDARY
       end
       description = notice[ "description" ]
       i = 1
       if description.instance_of?( Array )
         description.each do |line|
           if line.instance_of?( String )
-            config.logger.prose NicInfo::DataAmount::NORMAL_DATA, i.to_s, line
+            @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, i.to_s, line, NicInfo::AttentionType::SECONDARY
             i = i + 1
           else
-            config.conf_msgs << "eleemnt of 'description' in 'notice' is not a string."
+            @config.conf_msgs << "eleemnt of 'description' in 'notice' is not a string."
           end
         end
       else
-        config.conf_msgs << "'description' in 'notice' is not an array."
+        @config.conf_msgs << "'description' in 'notice' is not an array."
       end
       links = notice[ "links" ]
-      if links
-        if links.instance_of?( Array )
-          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
-        else
-          config.conf_msgs << "'links' is not an array."
-        end
-      end
-      config.logger.end_data_item
+      @common.display_simple_links( links )
+      @config.logger.end_data_item
     end
 
   end

data/lib/nicinfo/ns.rb

@@ -22,7 +22,7 @@ require 'nicinfo/data_tree'
 module NicInfo
 
   def NicInfo.display_ns json_data, config, data_node
-    ns = Ns.new( config ).process( json_data )
+    ns = config.factory.new_ns.process( json_data )
     NicInfo::display_object_with_entities( ns, config, data_node )
   end
 
@@ -32,7 +32,7 @@ module NicInfo
       if ns_array.instance_of? Array
         display_array = Array.new
         ns_array.each do |ea|
-          ns = Ns.new( config ).process( ea )
+          ns = config.factory.new_ns.process( ea )
           display_array << ns
         end
         NicInfo::display_object_with_entities( display_array, config, data_node )
@@ -65,19 +65,19 @@ module NicInfo
     def display
       @config.logger.start_data_item
       @config.logger.data_title "[ NAME SERVER ]"
-      @config.logger.terse "Handle", NicInfo::get_handle( @objectclass )
-      @config.logger.extra "Object Class Name", NicInfo::get_object_class_name( @objectclass )
-      @config.logger.terse "Host Name", NicInfo::get_ldhName( @objectclass )
-      @config.logger.terse "IDN Host 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, "nameserver", @config )
+      @config.logger.terse "Host Name", NicInfo::get_ldhName( @objectclass ), NicInfo::AttentionType::SUCCESS
+      @config.logger.terse "IDN Host Name", NicInfo::get_unicodeName( @objectclass ), NicInfo::AttentionType::SUCCESS
       ipAddrs = @objectclass[ "ipAddresses" ]
       if ipAddrs
         v6Addrs = ipAddrs[ "v6" ]
         v6Addrs.each do |v6|
-          @config.logger.terse "IPv6 Address", v6
+          @config.logger.terse "IPv6 Address", v6, NicInfo::AttentionType::SUCCESS
         end if v6Addrs
         v4Addrs = ipAddrs[ "v4" ]
         v4Addrs.each do |v4|
-          @config.logger.terse "IPv4 Address", v4
+          @config.logger.terse "IPv4 Address", v4, NicInfo::AttentionType::SUCCESS
         end if v4Addrs
       end
       @common.display_status @objectclass

data/lib/nicinfo/utils.rb

@@ -55,8 +55,14 @@ module NicInfo
     return json_data[ "handle" ]
   end
 
-  def NicInfo.get_object_class_name json_data
-    return json_data[ "objectClassName" ]
+  def NicInfo.get_object_class_name json_data, expected, config
+    objectClassName =  json_data[ "objectClassName" ]
+    if objectClassName == nil
+      config.conf_msgs << "Expected 'objectClassName' is not present."
+    elsif objectClassName != expected
+      config.conf_msgs << "Expected 'objectClassName' to be '#{expected}' but it is '#{objectClassName}'."
+    end
+    return objectClassName
   end
 
   def NicInfo.get_ldhName json_data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nicinfo
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre.alpha1
+  version: 1.5.0
 platform: ruby
 authors:
 - Andrew Newton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
@@ -16,20 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
+        version: 2.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.4
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: jcrvalidator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 0.8.3
 description: A command-line RDAP client.
 email: andy@arin.net
 executables:
@@ -74,8 +96,11 @@ files:
 - lib/nicinfo/entity.rb
 - lib/nicinfo/enum.rb
 - lib/nicinfo/error_code.rb
+- lib/nicinfo/factory.rb
 - lib/nicinfo/female-first-names.txt
 - lib/nicinfo/ip.rb
+- lib/nicinfo/jcr/rdap.jcr
+- lib/nicinfo/jcr/strict.jcr
 - lib/nicinfo/key_data.rb
 - lib/nicinfo/last-names.txt
 - lib/nicinfo/male-first-names.txt
@@ -100,12 +125,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: RDAP Client