npa_lookup 1.2.0 → 1.3.0

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/bin/lookup

@@ -7,6 +7,16 @@ require 'terminal-table/import' #http://vision-media.ca/resources/ruby/ruby-term
 
 SPACES = "18"
 
+#Make sure we have numbers
+def safeParse(strToParse)
+  if strToParse =~ /\A\d+\Z/
+    return strToParse.to_s
+  else
+    raise Exception
+  end
+end
+
+#colorize tables
 def colorize(text, color_code,how_many_spaces)
   "\e[#{color_code}m#{text}\e[#{how_many_spaces}C\033[0m\033[0m"
 end
@@ -18,21 +28,29 @@ def blue(text,how_many_spaces); colorize(text, 34,how_many_spaces); end
 def cyan(text,how_many_spaces); colorize(text, 36,how_many_spaces); end
 def white(test,how_many_spaces);colorize(test,37,how_many_spaces);end
 
+# format arguments for API call
 def parse_args(i)
-  i=i.to_s
-  if i.length==3
-    return i
-  elsif i.length==6
-    i=i.dup
-    i.insert(3, '/')
-  elsif i.length==10
-    return i
-  else
-    puts "Error {NumberError}"
+    begin 
+      case safeParse(i).length
+        when 3  
+          return i
+        when 6
+          i=i.dup
+          i.insert(3, '/')
+        when 10
+          return i
+        else
+          puts "Error {NumberError}"
+          exit!
+      end
+  rescue Exception
+    puts "#{i} is invalid"
     exit!
   end
 end
 
+## Take in args and hit API
+
 ARGV.each do|a|
     uri = URI.parse("http://digits.cloudvox.com/#{parse_args(a)}.json")
     response = Net::HTTP.get_response(uri)
@@ -43,20 +61,26 @@ ARGV.each do|a|
     exit!
   end
 
+  ## Simplify JSON structure 
+
     data = jsonObject['allocation']
     
+    ## Start table (terminal-table)
     t = table ['Data', 'Value']
     t << [red("NPA","18"),yellow("#{data['npa']}",SPACES)]
 
+    ## If nxx is not there don't include it in table
     if data['nxx']!=nil; t << [red("Nxx","18"),yellow("#{data['nxx']}",SPACES)];end
 
+    ## If ratecenter_formatted is not there don't include it in table
     if data['ratecenter_formatted'] !=nil&&data['ratecenter_formatted']!=""; t << [red("City","18"),yellow("#{data['ratecenter_formatted']}",SPACES)]; end
 
     t << [red("State","18"),yellow("#{data['region']}",SPACES)]
     t << [red("Status","18"),yellow("#{data['status'].capitalize}",SPACES)]
 
+    ## If carrier_name is not there don't include it in table
     if data['carrier_name'] !=nil; t << [red("Carrier","18"),yellow("#{data['carrier_name']}",SPACES)]; end
 
     puts t 
-    puts "\n\n"
+    puts "\n"
 end

data/lib/npa_lookup.rb

@@ -7,6 +7,16 @@ require 'terminal-table/import' #http://vision-media.ca/resources/ruby/ruby-term
 
 SPACES = "18"
 
+#Make sure we have numbers
+def safeParse(strToParse)
+  if strToParse =~ /\A\d+\Z/
+    return strToParse.to_s
+  else
+    raise Exception
+  end
+end
+
+#colorize tables
 def colorize(text, color_code,how_many_spaces)
   "\e[#{color_code}m#{text}\e[#{how_many_spaces}C\033[0m\033[0m"
 end
@@ -18,21 +28,29 @@ def blue(text,how_many_spaces); colorize(text, 34,how_many_spaces); end
 def cyan(text,how_many_spaces); colorize(text, 36,how_many_spaces); end
 def white(test,how_many_spaces);colorize(test,37,how_many_spaces);end
 
+# format arguments for API call
 def parse_args(i)
-  i=i.to_s
-  if i.length==3
-    return i
-  elsif i.length==6
-    i=i.dup
-    i.insert(3, '/')
-  elsif i.length==10
-    return i
-  else
-    puts "Error {NumberError}"
+    begin 
+      case safeParse(i).length
+        when 3  
+          return i
+        when 6
+          i=i.dup
+          i.insert(3, '/')
+        when 10
+          return i
+        else
+          puts "Error {NumberError}"
+          exit!
+      end
+  rescue Exception
+    puts "#{i} is invalid"
     exit!
   end
 end
 
+## Take in args and hit API
+
 ARGV.each do|a|
     uri = URI.parse("http://digits.cloudvox.com/#{parse_args(a)}.json")
     response = Net::HTTP.get_response(uri)
@@ -43,20 +61,26 @@ ARGV.each do|a|
     exit!
   end
 
+  ## Simplify JSON structure 
+
     data = jsonObject['allocation']
     
+    ## Start table (terminal-table)
     t = table ['Data', 'Value']
     t << [red("NPA","18"),yellow("#{data['npa']}",SPACES)]
 
+    ## If nxx is not there don't include it in table
     if data['nxx']!=nil; t << [red("Nxx","18"),yellow("#{data['nxx']}",SPACES)];end
 
+    ## If ratecenter_formatted is not there don't include it in table
     if data['ratecenter_formatted'] !=nil&&data['ratecenter_formatted']!=""; t << [red("City","18"),yellow("#{data['ratecenter_formatted']}",SPACES)]; end
 
     t << [red("State","18"),yellow("#{data['region']}",SPACES)]
     t << [red("Status","18"),yellow("#{data['status'].capitalize}",SPACES)]
 
+    ## If carrier_name is not there don't include it in table
     if data['carrier_name'] !=nil; t << [red("Carrier","18"),yellow("#{data['carrier_name']}",SPACES)]; end
 
     puts t 
-    puts "\n\n"
+    puts "\n"
 end

data/npa_lookup.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{npa_lookup}
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Dyer"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: npa_lookup
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - John Dyer