whois-parser 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8d389cb6d9d042a0a3d367f3990cf345152059c889a509627698b113918a1e9
-  data.tar.gz: 6c4f04da1b81da7a4b5f54a4c050ebebf11dd8dd6e4072be1e3d025717316671
+  metadata.gz: 11fadd44db1e1f3ba9135eff5e3546a282b240f905b347995d601c35a4612905
+  data.tar.gz: a7a2895cd9650fe4921c2a308c6738f79586def8b1e0e5c6e68abffd19b80ef9
 SHA512:
-  metadata.gz: cb95c920da4e7ec031366e3261cff880f508fd380bcee97df4dd4e80457c3599b9fe205a9b720161cecb36569b70be2e51c697c3e4e1d3bd6c3241eccb05ab52
-  data.tar.gz: 59b6d898dc2bd51a98b7ce78665f5c2a7ce81106b990f5618b2aea8a91ccc0d8618247ac68f294d59d6eb376bff5a89e6568906d6643d8cba71d9ce0580d82b0
+  metadata.gz: d1335c3a551693f092e4477de64fbd93409c2bc102d8a302302d1eee710135ea8513bb4421a98e2866cbb6496fcc060bba84d87d73c8552abfe1a2b384fc732e
+  data.tar.gz: 540bcc4b1246d8286d44be1114066014faafea3b8b135f2d4a44002887abf2d27e4d93a42245387d6b59f07d958f8068a24e8ce78b7eb6bf615894dbed0f9296

data/.gitignore

@@ -0,0 +1,9 @@
+# Bundler
+/.bundle/
+/Gemfile.lock
+/pkg/
+
+# YARD
+/.yardoc
+/_yardoc/
+/doc/

data/.rspec

@@ -0,0 +1 @@
+--colour

data/.ruby-gemset

@@ -0,0 +1 @@
+whois-parser

data/.simplecov

@@ -0,0 +1,3 @@
+SimpleCov.start do
+  add_filter "/spec/"
+end

data/.travis.yml

@@ -0,0 +1,27 @@
+language: ruby
+
+rvm:
+  - "2.0"
+  - "2.1"
+  - "2.2"
+  - "2.3"
+  - "2.4"
+  - "2.5"
+  - "jruby-9.1.5.0"
+  - "ruby-head"
+
+env:
+  - COVERALL=1
+
+cache:
+  - bundler
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: jruby-9.1.5.0
+
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'

data/CHANGELOG.md

@@ -3,6 +3,13 @@
 This project uses [Semantic Versioning 2.0.0](http://semver.org/).
 
 
+#### Release 1.2.0
+
+- CHANGED: Updated .ORG parser to the latest response (GH-98, GH-97). [Thanks @talarini]
+- CHANGED: Updated .IO, .AC, .SH, .TM parsers to the latest response.
+- CHANGED: Renamed WhoisDomainKg to WhoisKg (GH-48)
+
+
 #### Release 1.1.0
 
 - NEW: Added .FM parser (GH-74). [Thanks @thomas07vt]

data/CONTRIBUTING.md

@@ -4,45 +4,45 @@
 
 Fork, then clone the repo:
 
-```shell
+~~~shell
 git clone git@github.com:your-username/whois-parser.git
-```
+~~~
 
 Set up your machine:
 
-```shell
+~~~shell
 bundle
-```
+~~~
 
 Make sure the tests pass:
 
-```shell
+~~~shell
 $ bundle exec rake
-```
+~~~
 
 To propose a change/feature/patch, create your feature branch:
 
-```shell
+~~~shell
 git checkout -b my-new-feature
-```
+~~~
 
 Make your change. Add tests for your change. Make the tests pass:
 
-```shell
+~~~shell
 bundle exec rake
-```
+~~~
 
 `utils/mkwhois.rb` can be used to quicky generate `status_available.txt` and `status_registered.txt` files for your tests
 
-```shell
+~~~shell
 ruby utils/mkwhois.rb google.com status_available
-```
+~~~
 
 Commit your changes:
 
-```shell
+~~~shell
 git commit -am 'Add some feature'
-```
+~~~
 
 Push to your fork and [submit a pull request](https://github.com/weppos/whois-parser/compare/).
 

data/Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'activesupport', '< 5' if RUBY_VERSION < '2.2.2'

data/Rakefile

@@ -0,0 +1,33 @@
+require 'bundler/gem_tasks'
+
+
+# Run test by default.
+task :default => :spec
+task :test => :spec
+
+
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new do |t|
+  t.verbose = !ENV["VERBOSE"].nil?
+end
+
+
+require 'yard'
+
+YARD::Rake::YardocTask.new(:yardoc) do |y|
+  y.options = ["--output-dir", "yardoc"]
+end
+
+namespace :yardoc do
+  task :clobber do
+    rm_r "yardoc" rescue nil
+  end
+end
+
+task :clobber => "yardoc:clobber"
+
+
+Dir["tasks/**/*.rake"].each do |file|
+  load(file)
+end

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "whois/parser"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/lib/whois/parser.rb

@@ -18,7 +18,7 @@ require 'active_support/core_ext/time/calculations'
 require_relative 'parser/version'
 require_relative 'parser/errors'
 
-# These extensions add Whois::Record#parser, the Whois.registered?, and 
+# These extensions add Whois::Record#parser, the Whois.registered?, and
 # Whois.available? shortcuts.
 # These are handy convenient methods, and they are loaded by default.
 require_relative 'parser_extensions/whois'
@@ -63,7 +63,7 @@ module Whois
     #
     # @api private
     # @private
-    def bug!(error, message)
+    def self.bug!(error, message)
       raise error, message.dup          +
           " Please report the issue at" +
           " http://github.com/weppos/whois-parser/issues"

data/lib/whois/parser/version.rb

@@ -1,6 +1,6 @@
 module Whois
   class Parser
     # The current library version.
-    VERSION = "1.1.0".freeze
+    VERSION = "1.2.0".freeze
   end
 end

data/lib/whois/parsers/base_icann_compliant.rb

@@ -82,15 +82,15 @@ module Whois
 
 
       property_supported :registrant_contacts do
-        build_contact('Registrant', Parser::Contact::TYPE_REGISTRANT)
+        build_contact("Registrant", Parser::Contact::TYPE_REGISTRANT)
       end
 
       property_supported :admin_contacts do
-        build_contact('Admin', Parser::Contact::TYPE_ADMINISTRATIVE)
+        build_contact("Admin", Parser::Contact::TYPE_ADMINISTRATIVE)
       end
 
       property_supported :technical_contacts do
-        build_contact('Tech', Parser::Contact::TYPE_TECHNICAL)
+        build_contact("Tech", Parser::Contact::TYPE_TECHNICAL)
       end
 
 

data/lib/whois/parsers/base_icb.rb

@@ -7,85 +7,44 @@
 #++
 
 
-require_relative 'base'
+require_relative 'base_icann_compliant'
 
 
 module Whois
   class Parsers
 
-    class BaseIcb < Base
+    class BaseIcb < BaseIcannCompliant
 
-      property_not_supported :disclaimer
-
-
-      property_supported :domain do
-        if registered?
-          content_for_scanner.match(/^Domain : (.+)\n/)[1]
-        elsif available?
-          content_for_scanner.match(/^Domain (.+) is available/)[1]
-        end
-      end
-
-      property_not_supported :domain_id
+      self.scanner = Scanners::BaseIcannCompliant, {
+          pattern_available: /^NOT FOUND/
+      }
 
 
-      property_supported :status do
-        if available?
-          :available
-        else
-          :registered
-        end
-      end
-
-      property_supported :available? do
-        !!(content_for_scanner =~ /^Domain (.+?) is available/)
-      end
-
-      property_supported :registered? do
-        !available?
-      end
-
-
-      property_not_supported :created_on
+      property_not_supported :disclaimer
 
-      property_not_supported :updated_on
 
       property_supported :expires_on do
-        if content_for_scanner =~ /Expiry : (.+?)\n/
-          parse_time($1)
+        node("Registry Expiry Date") do |value|
+          parse_time(value)
         end
       end
 
 
-      property_not_supported :registrar
-
       property_supported :registrant_contacts do
-        lines = content_for_scanner.scan(/^Owner\s+: (.+)\n/).flatten
-        return if lines.empty?
-
-        Parser::Contact.new(
-          type:         Parser::Contact::TYPE_REGISTRANT,
-          name:         lines[0],
-          organization: lines[1],
-          address:      lines[2],
-          zip:          nil,
-          state:        lines[4],
-          city:         lines[3],
-          country:      lines[5]
-        )
+        node("Registrant Organization") do
+          Parser::Contact.new({
+              type:         Parser::Contact::TYPE_REGISTRANT,
+              organization: node("Registrant Organization"),
+              state:        node("Registrant State/Province"),
+              country_code: node("Registrant Country"),
+          })
+        end
       end
 
       property_not_supported :admin_contacts
 
       property_not_supported :technical_contacts
 
-
-      property_supported :nameservers do
-        content_for_scanner.scan(/^NS \d\s+: (.+)/).flatten.map do |name|
-          Parser::Nameserver.new(name: name)
-        end
-      end
-
     end
 
   end

data/lib/whois/parsers/{whois.domain.kg.rb → whois.kg.rb}

@@ -13,18 +13,15 @@ require_relative 'base'
 module Whois
   class Parsers
 
+    # Parser for the whois.kg server.
     #
-    # = whois.domain.kg
+    # @note This parser is just a stub and provides only a few basic methods
+    #   to check for domain availability and get domain status.
+    #   Please consider to contribute implementing missing methods.
     #
-    # Parser for the whois.domain.kg server.
-    #
-    # NOTE: This parser is just a stub and provides only a few basic methods
-    # to check for domain availability and get domain status.
-    # Please consider to contribute implementing missing methods.
-    # See WhoisNicIt parser for an explanation of all available methods
-    # and examples.
-    #
-    class WhoisDomainKg < Base
+    # @see Whois::Parsers::Example
+    #   The Example parser for the list of all available methods.
+    class WhoisKg < Base
 
       property_supported :status do
         if available?

data/lib/whois/parsers/whois.nic.io.rb

@@ -39,7 +39,7 @@ module Whois
 
       # NEWPROPERTY
       def reserved?
-        !!content_for_scanner.match(/^Domain reserved\n/)
+        !!(content_for_scanner =~ /^Reserved by Registry\n/)
       end
 
     end

data/lib/whois/parsers/whois.nic.tm.rb

@@ -7,7 +7,7 @@
 #++
 
 
-require_relative 'base_icb'
+require_relative 'base'
 
 
 module Whois
@@ -18,12 +18,78 @@ module Whois
     # @see Whois::Parsers::Example
     #   The Example parser for the list of all available methods.
     #
-    class WhoisNicTm < BaseIcb
+    class WhoisNicTm < Base
 
-      property_not_supported :expires_on
+      property_not_supported :disclaimer
 
 
-      property_not_supported :nameservers
+      property_supported :domain do
+        if registered?
+          content_for_scanner.match(/^Domain : (.+)\n/)[1]
+        elsif available?
+          content_for_scanner.match(/^Domain (.+) is available/)[1]
+        end
+      end
+
+      property_not_supported :domain_id
+
+
+      property_supported :status do
+        if available?
+          :available
+        else
+          :registered
+        end
+      end
+
+      property_supported :available? do
+        !!(content_for_scanner =~ /^Domain (.+?) is available/)
+      end
+
+      property_supported :registered? do
+        !available?
+      end
+
+
+      property_not_supported :created_on
+
+      property_not_supported :updated_on
+
+      property_supported :expires_on do
+        if content_for_scanner =~ /Expiry : (.+?)\n/
+          parse_time($1)
+        end
+      end
+
+
+      property_not_supported :registrar
+
+      property_supported :registrant_contacts do
+        lines = content_for_scanner.scan(/^Owner\s+: (.+)\n/).flatten
+        return if lines.empty?
+
+        Parser::Contact.new(
+            type:         Parser::Contact::TYPE_REGISTRANT,
+            name:         lines[0],
+            organization: lines[1],
+            address:      lines[2],
+            zip:          nil,
+            state:        lines[4],
+            city:         lines[3],
+            country:      lines[5]
+        )
+      end
+
+      property_not_supported :admin_contacts
+
+      property_not_supported :technical_contacts
+
+
+      property_supported :nameservers do
+        content_for_scanner.scan(/^NS \d\s+: (.+)/).flatten.map do |name|
+          Parser::Nameserver.new(name: name)
+        end
+      end
 
     end