iana-data 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a732c3eecaaa5d69c11766b2566566cdb6b780ce
-  data.tar.gz: ad5edb9e28796712e1f675aa3c7d7b0ce0f5ee54
+  metadata.gz: d5fdb0b10d3112feec02cc89426839715ed65557
+  data.tar.gz: 8467afe37c36ad8e04accab7c8060a9462ef8968
 SHA512:
-  metadata.gz: 087a3b8f4aee08a82c12e9395ab8cc4c09fc0d3728652fd319e2c70903597216768f93b3738a54c31847a5f9653fce623f13cecc6878c8b0a74c2f3cc272ca8b
-  data.tar.gz: f1f414f6e5d6a113b4a49b8288257c151134189e8c8b04f0c9918440dfd766c317a890baa32abd691ed8f2a18b8397f67edb5192aa00cf7da4c79b6263090406
+  metadata.gz: ac75ad3a2e515b8f5a950bfaddc9f8154128bd2182ff2f30393b88388dd9e8cb181e72ccecd379988a4280471d21fc1381fd1ff5ecc7d4758d44853af5ae29ca
+  data.tar.gz: 2ab92e0cd29d5bd38ec5a1a19ff58a86f4c8da87fb321422bd2d9b18c7b7c09f39042fb0ebe688ae61f37d20be66016e43a1bcd8457b6544f8766389e83be12a

data/.gitignore

@@ -6,3 +6,5 @@ data
 doc
 Manifest
 pkg
+iana-data*.gem
+iana.tmproj

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    iana-data (1.1.3)
+    iana-data (1.2.1)
       nokogiri (~> 1.6)
       open-uri-cached (= 0.0.5)
 

data/README.md

@@ -1,5 +1,6 @@
 ## What
-IANA Ruby module version 1.1.3
+IANA Ruby module [![Gem Version](https://badge.fury.io/rb/iana-data.svg)](https://badge.fury.io/rb/iana-data)
+[![Code Climate](https://codeclimate.com/github/ringe/iana/badges/gpa.svg)](https://codeclimate.com/github/ringe/iana)
 
 Look up TCP/IP port numbers, protocols, top-level domains, et al.
 

data/Rakefile

@@ -30,27 +30,3 @@ Rake::TestTask.new do |t|
   t.test_files = FileList['test/*.rb']
   t.verbose = true
 end
-
-desc 'count source lines of code'
-task :count do
-  system('cloc lib')
-end
-
-namespace :todo do
-  desc 'List TODOs in all .rb files under lib/'
-  task(:list) do
-      FileList["lib/**/*.rb", "bin/**/*.rb"].egrep(/TODO/)
-  end
- 
-  desc 'Edit all TODOs in VIM' # or your favorite editor
-  task(:edit) do
-      # jump to the first TODO in the first file
-      cmd = 'vim +/TODO/' 
- 
-      filelist = []
-      FileList["lib/**/*.rb"].egrep(/TODO/) { |fn,cnt,line| filelist << fn }
- 
-      # will fork a new process and exit, if you're using gvim
-      system("#{cmd} #{filelist.sort.join(' ')}") 
-  end
-end

data/lib/iana.rb

@@ -9,16 +9,9 @@ end # IANA
 require 'open-uri'
 require 'open-uri/cached'
 
-#require 'consumer'
-require 'iana/ethertype'
 require 'iana/port'
 require 'iana/protocol'
 require 'iana/tld'
 require 'iana/lsr'
 
-# TODO implement consumer model
-# TODO complete documentaion
-# TODO implement unit tests
-# TODO lookup needs to be more flexible
-
 raise RuntimeError, 'This library is for require only' if $0 == __FILE__

data/lib/iana/port.rb

@@ -6,6 +6,8 @@
 
 module IANA
   class Port
+    SOURCE = "http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.csv"
+
     attr_reader :port, :keyword, :protocol, :description
 
     def initialize(port, keyword, protocol, description)
@@ -18,17 +20,16 @@ module IANA
     def protocol; @protocol; end
     def description; @description; end
 
+    def self.source
+      @source ||= open(SOURCE).read
+    end
+
     # Download IANA ports list in XML format, return list
     # http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xml
     def self.iana_list
-      source = open("http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.csv").
-        read
-
       # concatenate multiline strings, then split on newline
       lines = source.gsub(/(?<!\r)\n/, ' ').split(/\r\n/)
-
       ports = {}
-
       begin
         while (line = lines.shift)
           # skip lines which do not contain the ,proto, pattern

data/lib/iana/protocol.rb

@@ -9,6 +9,8 @@ require 'nokogiri'
 
 module IANA
   class Protocol
+    SOURCE = "http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml"
+
     attr_reader :protocol, :name, :description, :references
 
     def initialize(protocol, name, description, xref)
@@ -21,19 +23,17 @@ module IANA
     def description; @description; end
     def references; @references; end
 
+    def self.source
+      @source ||= open(SOURCE).read
+    end
+
     # Download IANA protocols list in XML format, return list
     # http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml
     def self.iana_list
-      source = open("http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml").read
-
       protocols = {}
-      updated = nil
-
       begin
         doc = Nokogiri::XML(source)
-        updated = doc.css('registry/updated').text
         doc.css('registry/registry/record').each do |r|
-          # range
           value = r.css('value').text
           if value =~ /-/ then
             low,high = value.split('-').map(&:to_i)
@@ -42,11 +42,9 @@ module IANA
             high = low
           end
 
-          # name
           name = r.css('name').text
           name = nil if !name.nil? && name.empty?
 
-          # description
           description = r.css('description').text
           description = nil if !description.nil? && description.empty?
 
@@ -67,7 +65,6 @@ module IANA
           end
         end
       end
-
       return protocols
     end
 

data/lib/iana/version.rb

@@ -1,3 +1,3 @@
 module Iana
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iana-data
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Runar Ingebrigtsen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,14 +113,11 @@ files:
 - bin/console
 - bin/setup
 - example-data/lsr.txt
-- examples/ethertypes.rb
 - examples/ports.rb
 - examples/protocols.rb
 - examples/tlds.rb
 - iana.gemspec
-- iana.tmproj
 - lib/iana.rb
-- lib/iana/ethertype.rb
 - lib/iana/lsr.rb
 - lib/iana/port.rb
 - lib/iana/protocol.rb

data/examples/ethertypes.rb

@@ -1,51 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-# vim: expandtab tabstop=2 softtabstop=2 shiftwidth=2
-
-# examples/ethertypes.rb
-
-require 'pathname'
-dir = Pathname.new(File.expand_path(__FILE__)).realpath
-require File.join(File.dirname(dir.to_s), '../lib/iana')
-
-SCRIPT = File.basename(__FILE__)
-
-def known_ethertype?(ethertype)
-
-  IANA_ETHERTYPES.include?(ethertype)
-end
-
-if ARGV.length == 1
-  begin
-    IANA_ETHERTYPES, IANA_ETHERTYPES_UPDATED = IANA::EtherType::load(ARGV[0])
-  rescue
-    puts "#{SCRIPT}: #{$!}"
-    exit 1
-  end
-else
-  puts "Usage: #{SCRIPT} <ethernet-numbers>"
-  exit 1
-end
-
-puts "updated #{IANA_ETHERTYPES_UPDATED} => #{IANA_ETHERTYPES.size} entries"
-puts
-IANA_ETHERTYPES.each do |t|
-  print "#{t.begin}"
-  print "-#{t.end}" if t.end != t.begin
-  puts " => #{t.description}"
-end
-puts
-
-# known in :begin => true
-puts "86dd is known? => #{IANA::EtherType.known?("86dd")}"
-
-# known in :end => true
-puts "8a97 is known? => #{IANA::EtherType.known?("8a97")}"
-
-# known between :begin and :end => true
-puts "8709 is known? => #{IANA::EtherType.known?("8709")}"
-
-# unknown => false
-puts "fefe is known? => #{IANA::EtherType.known?("fefe")}"
-
-exit 0

data/iana.tmproj

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>documents</key>
-	<array>
-		<dict>
-			<key>filename</key>
-			<string>README</string>
-		</dict>
-		<dict>
-			<key>filename</key>
-			<string>LICENSE</string>
-		</dict>
-		<dict>
-			<key>filename</key>
-			<string>Rakefile</string>
-		</dict>
-		<dict>
-			<key>expanded</key>
-			<true/>
-			<key>name</key>
-			<string>lib</string>
-			<key>regexFolderFilter</key>
-			<string>!.*/(\.[^/]*|CVS|_darcs|_MTN|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$</string>
-			<key>sourceDirectory</key>
-			<string>lib</string>
-		</dict>
-		<dict>
-			<key>expanded</key>
-			<true/>
-			<key>name</key>
-			<string>examples</string>
-			<key>regexFolderFilter</key>
-			<string>!.*/(\.[^/]*|CVS|_darcs|_MTN|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$</string>
-			<key>sourceDirectory</key>
-			<string>examples</string>
-		</dict>
-	</array>
-	<key>fileHierarchyDrawerWidth</key>
-	<integer>200</integer>
-	<key>metaData</key>
-	<dict/>
-	<key>showFileHierarchyDrawer</key>
-	<true/>
-	<key>windowFrame</key>
-	<string>{{638, 167}, {728, 637}}</string>
-</dict>
-</plist>

data/lib/iana/ethertype.rb

@@ -1,99 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-# vim: expandtab tabstop=2 softtabstop=2 shiftwidth=2
-
-# lib/iana/ethertype.rb
-
-module IANA
-  module EtherType
-    EtherType = Struct.new('ETHERTYPE', :begin, :end, :description)
-
-    # I hate doing it this way, but the inconsistency of IANA data files...
-    LAST_ENTRY = '^ 65535   FFFF        -      -     Reserved               \[RFC1701\]$'
-
-    # load IANA Ether types list from flat file:
-    # http://www.iana.org/assignments/ethernet-numbers
-    def self.load(pathname)
-      raise ArgumentError, 'nil pathname' if pathname.nil?
-      raise ArgumentError, 'invalid pathname class' if pathname.class != String
-      raise ArgumentError, 'empty pathname' if pathname.empty?
-
-      # TODO: better error checking for files with incorrect content
-
-      ethertypes = []
-      updated = nil
-
-      begin
-        f = File.new(pathname, 'r')
-        while (line = f.gets)
-          line.chomp!
-
-          # extract update stamp
-          if line =~ /^\(last updated (\d{4}-\d{2}-\d{2})\)\s*$/
-            updated = $1
-            next
-          end
-
-          # skip lines that don't have [XXX] or (XXX) at the end
-          next if line !~ /\[\w*\]$/ && line !~ /\([\w\s]*\)$/
-
-          # now skip all lines that don't begin with a space
-          next if line !~ /^[\t\ ]*/
-
-          # skip over decimal Ethertype
-          pos = 0
-          if line =~ /^\t\ /
-            pos = 2
-          else
-            pos = 9
-          end
-
-          # clean up ridiculous IANA formatting
-          line.gsub!(/^\t/, '8') # TODO: investigate this weirdness
-          line.gsub!(/\t     -/, '        -')
-          line.gsub!(/\t\t\t  /, '                     ')
-          line.gsub!(/\t/, '   ')
-
-          tmp = line[pos..-1]
-
-          ethertype = tmp[0..9].strip!
-          low, high = ethertype.split('-')
-          high = low if high.nil?
-
-          description, *junk = tmp[25..-1].split('[')
-          description.strip!
-
-          et = EtherType.new(low, high, description)
-          ethertypes << et
-
-          # short-circuit as soon as we've hit the end of the list
-          break if line =~ /#{LAST_ENTRY}/
-        end
-      ensure
-        f.close if !f.nil?
-      end
-
-      return ethertypes, updated
-    end
-
-    # is specified Ether type known
-    def self.known?(ethertype)
-      raise ArgumentError, 'nil ethertype' if ethertype.nil?
-      raise ArgumentError, 'invalid ethertype class' if \
-        ethertype.class != String
-      raise ArgumentError, 'empty ethertype' if ethertype.empty?
-
-      IANA_ETHERTYPES.each do |t|
-        return true if ethertype.upcase == t.begin
-        if t.end != t.begin
-          return true if ethertype.upcase >= t.begin && \
-            ethertype.upcase <= t.end
-        end
-      end
-
-      false
-    end
-  end
-end
-
-raise RuntimeError, 'This library is for require only' if $0 == __FILE__