whois 3.6.5 → 4.0.0.pre.beta1

data/lib/whois.rb

@@ -7,13 +7,6 @@
 #++
 
 
-require 'active_support/core_ext/array/extract_options'
-require 'active_support/core_ext/array/wrap'
-require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/kernel/singleton_class'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/time/calculations'
-
 require 'whois/version'
 require 'whois/errors'
 require 'whois/client'
@@ -44,73 +37,6 @@ module Whois
 
     alias_method :whois, :lookup
 
-    def query(object)
-      deprecate("Whois.query is now Whois.lookup")
-      lookup(object)
-    end
-
-    # Checks whether the object represented by <tt>object</tt> is available.
-    #
-    # Warning: this method is only available if a Whois parser exists
-    # for the top level domain of <tt>object</tt>.
-    # If no parser exists for <tt>object</tt>, you'll receive a
-    # warning message and the method will return <tt>nil</tt>.
-    # This is a technical limitation. Browse the lib/whois/record/parsers
-    # folder to view all available parsers.
-    #
-    # @param  [String] object The string to be sent as query parameter.
-    #         It is intended to be a domain name, otherwise this method
-    #         may return unexpected responses.
-    # @return [Boolean]
-    #
-    # @example
-    #   Whois.available?("google.com")
-    #   # => false
-    #
-    # @example
-    #   Whois.available?("google-is-not-available-try-again-later.com")
-    #   # => true
-    #
-    def available?(object)
-      result = lookup(object).available?
-      if result.nil?
-        warn  "This method is not supported for this kind of object.\n" +
-              "Use Whois.lookup('#{object}') instead."
-      end
-      result
-    end
-
-    # Checks whether the object represented by <tt>object</tt> is registered.
-    #
-    # Warning: this method is only available if a Whois parser exists
-    # for the top level domain of <tt>object</tt>.
-    # If no parser exists for <tt>object</tt>, you'll receive a warning message
-    # and the method will return <tt>nil</tt>.
-    # This is a technical limitation. Browse the lib/whois/record/parsers folder
-    # to view all available parsers.
-    #
-    # @param  [String] object The string to be sent as query parameter.
-    #         It is intended to be a domain name, otherwise this method
-    #         may return unexpected responses.
-    # @return [Boolean]
-    #
-    # @example
-    #   Whois.registered?("google.com")
-    #   # => true
-    #
-    # @example
-    #   Whois.registered?("google-is-not-available-try-again-later.com")
-    #   # => false
-    #
-    def registered?(object)
-      result = lookup(object).registered?
-      if result.nil?
-        warn  "This method is not supported for this kind of object.\n" +
-              "Use Whois.lookup('#{object}') instead."
-      end
-      result
-    end
-
 
     # Echoes a deprecation warning message.
     #
@@ -140,7 +66,7 @@ module Whois
         " http://github.com/weppos/whois/issues"
     end
 
-  private
+    private
 
     def deprecation_caller_message(callstack)
       file, line, method = extract_callstack(callstack)

data/lib/whois/errors.rb

@@ -87,48 +87,4 @@ module Whois
 
   # @!endgroup
 
-
-  # @!group Parser
-
-  # Generic class for parser errors.
-  class ParserError < Error
-  end
-
-  # Raised when the library hasn't been able to load a valid parser
-  # according to current settings and you're trying to access a property
-  # that requires a valid parser.
-  class ParserNotFound < ParserError
-  end
-
-  # Raised when you are trying to access an attribute that has not been implemented.
-  class AttributeNotImplemented < ParserError
-  end
-
-  # Raised when you are trying to access an attribute that is not supported.
-  class AttributeNotSupported < ParserError
-  end
-
-  # @!endgroup
-
-
-  # @!group Response
-
-  # Generic class for response errors.
-  class ResponseError < Error
-  end
-
-  # Raised when attempting to access a property when the response is throttled.
-  #
-  # @see Whois::Record::Parser::Base#response_throttled?
-  class ResponseIsThrottled < ResponseError
-  end
-
-  # Raised when attempting to access a property when the response is unavailable.
-  #
-  # @see Whois::Record::Parser::Base#response_unavailable?
-  class ResponseIsUnavailable < ResponseError
-  end
-
-  # @!endgroup
-
 end

data/lib/whois/record.rb

@@ -14,8 +14,6 @@ module Whois
 
   class Record
 
-    autoload :Parser, 'whois/record/parser'
-
 
     # @return [Whois::Server] The server that originated this record.
     attr_reader :server
@@ -35,17 +33,6 @@ module Whois
     end
 
 
-    # Checks if this class respond to given method.
-    #
-    # Overrides the default implementation to add support
-    # for {Parser::PROPERTIES} and {Parser::METHODS}.
-    #
-    # @return [Boolean]
-    #
-    def respond_to?(symbol, include_private = false)
-      respond_to_parser_method?(symbol) || super
-    end
-
     # Returns a String representation of this record.
     #
     # @return [String] The record content.
@@ -125,230 +112,6 @@ module Whois
       @content ||= parts.map(&:body).join("\n")
     end
 
-    # Lazy-loads and returns the parser proxy for current record.
-    #
-    # @return [Whois::Record::Parser]
-    #
-    def parser
-      @parser ||= Parser.new(self)
-    end
-
-    # Checks if the <tt>property</tt> passed as symbol
-    # is supported in any of the parsers.
-    #
-    # @param  [Symbol] property The name of the property to check.
-    # @return [Boolean]
-    #
-    # @see Whois::Record::Parser#property_any_supported?
-    #
-    def property_any_supported?(property)
-      parser.property_any_supported?(property)
-    end
-
-
-    # @!group Properties
-
-    # Returns a Hash containing all supported properties for this record
-    # along with corresponding values.
-    #
-    # @return [{ Symbol => Object }]
-    #
-    def properties
-      hash = {}
-      Parser::PROPERTIES.each { |property| hash[property] = send(property) }
-      hash
-    end
-
-    # @!endgroup
-
-
-    # @!group Methods
-
-    # Shortcut for <tt>#registrant_contacts.first</tt>.
-    #
-    # @return [Whois::Record::Contact]
-    #         If the property is supported and a contact exists.
-    # @return [nil]
-    #         If the property is not supported or the contact doesn't exist.
-    #
-    # @see Whois::Record#registrant_contacts
-    #
-    def registrant_contact
-      if property_any_supported?(:registrant_contacts)
-        parser.registrant_contacts.first
-      end
-    end
-
-    # Shortcut for <tt>#admin_contacts.first</tt>.
-    #
-    # @return [Whois::Record::Contact]
-    #         If the property is supported and a contact exists.
-    # @return [nil]
-    #         If the property is not supported or the contact doesn't exist.
-    #
-    # @see Whois::Record#admin_contacts
-    #
-    def admin_contact
-      if property_any_supported?(:admin_contacts)
-        parser.admin_contacts.first
-      end
-    end
-
-    # Shortcut for <tt>#technical_contacts.first</tt>.
-    #
-    # @return [Whois::Record::Contact]
-    #         If the property is supported and a contact exists.
-    # @return [nil]
-    #         If the property is not supported or the contact doesn't exist.
-    #
-    # @see Whois::Record#technical_contacts
-    #
-    def technical_contact
-      if property_any_supported?(:technical_contacts)
-        parser.technical_contacts.first
-      end
-    end
-
-    # Collects and returns all the contacts.
-    #
-    # @return [Array<Whois::Record::Contact>]
-    #
-    # @see Whois::Record::Parser#contacts
-    #
-    def contacts
-      parser.contacts
-    end
-
-    # @!endgroup
-
-
-    # @!group Response
-
-    # Checks whether this {Whois::Record} is different than +other+.
-    #
-    # Comparing the {Whois::Record} content is not as trivial as you may think.
-    # WHOIS servers can inject into the WHOIS response strings that changes at every request,
-    # such as the timestamp the request was generated or the number of requests left
-    # for your current IP.
-    #
-    # These strings causes a simple equal comparison to fail even if
-    # the registry data is the same.
-    #
-    # This method should provide a bulletproof way to detect whether this record
-    # changed compared with +other+.
-    #
-    # @param  [Whois::Record] other The other record instance to compare.
-    # @return [Boolean]
-    #
-    # @see Whois::Record::Parser#changed?
-    #
-    def changed?(other)
-      !unchanged?(other)
-    end
-
-    # The opposite of {#changed?}.
-    #
-    # @param  [Whois::Record] other The other record instance to compare.
-    # @return [Boolean]
-    #
-    # @see Whois::Record::Parser#unchanged?
-    #
-    def unchanged?(other)
-      unless other.is_a?(self.class)
-        raise(ArgumentError, "Can't compare `#{self.class}' with `#{other.class}'")
-      end
-
-      equal?(other) || parser.unchanged?(other.parser)
-    end
-
-
-    # Checks whether this is an incomplete response.
-    #
-    # @return [Boolean]
-    #
-    # @see Whois::Record::Parser#response_incomplete?
-    #
-    def response_incomplete?
-      parser.response_incomplete?
-    end
-
-    # Checks whether this is a throttle response.
-    #
-    # @return [Boolean]
-    #
-    # @see Whois::Record::Parser#response_throttled?
-    #
-    def response_throttled?
-      parser.response_throttled?
-    end
-
-    # Checks whether this is an unavailable response.
-    #
-    # @return [Boolean]
-    #
-    # @see Whois::Record::Parser#response_unavailable?
-    #
-    def response_unavailable?
-      parser.response_unavailable?
-    end
-
-    # @!endgroup
-
-
-    private
-
-    # @api private
-    def self.define_property_method(method)
-      class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def #{method}(*args, &block)
-          if property_any_supported?(:#{method})
-            parser.#{method}(*args, &block)
-          end
-        end
-      RUBY
-    end
-
-    # @api private
-    def self.define_method_method(method)
-      class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def #{method}(*args, &block)
-          if parser.respond_to?(:#{method})
-            parser.#{method}(*args, &block)
-          end
-        end
-      RUBY
-    end
-
-    # @api private
-    def self.define_question_method(method)
-      class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def #{method}?
-          !#{method}.nil?
-        end
-      RUBY
-    end
-
-    def respond_to_parser_method?(symbol)
-      name = symbol.to_s =~ /\?$/ ? symbol.to_s[0..-2] : symbol
-      Parser::PROPERTIES.include?(name.to_sym) || Parser::METHODS.include?(name.to_sym)
-    end
-
-    # Delegates all method calls to the internal parser.
-    def method_missing(method, *args, &block)
-      if Parser::PROPERTIES.include?(method)
-        self.class.define_property_method(method)
-        send(method, *args, &block)
-      elsif Parser::METHODS.include?(method)
-        self.class.define_method_method(method)
-        send(method, *args, &block)
-      elsif method.to_s =~ /([a-z_]+)\?/ and (Parser::PROPERTIES + Parser::METHODS).include?($1.to_sym)
-        self.class.define_question_method($1)
-        send(method)
-      else
-        super
-      end
-    end
-
   end
 
 end

data/lib/whois/record/part.rb

@@ -7,9 +7,6 @@
 #++
 
 
-require 'whois/record/super_struct'
-
-
 module Whois
   class Record
 
@@ -23,7 +20,26 @@ module Whois
     # @attr [String] body The body containing the WHOIS output.
     # @attr [String] host The host which returned the body.
     #
-    class Part < SuperStruct.new(:body, :host)
+    class Part < Struct.new(:body, :host)
+
+      def initialize(*args)
+        if args.first.is_a? Hash
+          initialize_with_hash(args.first)
+        elsif args.size == 0
+          super
+        else
+          raise ArgumentError
+        end
+        yield(self) if block_given?
+      end
+
+      private
+
+      def initialize_with_hash(attributes = {})
+        attributes.each do |key, value|
+          self[key] = value
+        end
+      end
     end
 
   end

data/lib/whois/server/adapters/base.rb

@@ -17,15 +17,21 @@ module Whois
     module Adapters
 
       class Base
+        class << self
+          def query_handler
+            @query_handler ||= SocketHandler.new
+          end
+
+          def query_handler=(handler)
+            @query_handler = handler
+          end
+        end
 
         # Default WHOIS request port.
         DEFAULT_WHOIS_PORT = 43
         # Default bind hostname.
         DEFAULT_BIND_HOST = "0.0.0.0"
 
-        class_attribute :query_handler
-        self.query_handler = SocketHandler.new
-
         # @return [Symbol] The type of WHOIS server.
         attr_reader :type
         # @return [String] The allocation this server is responsible for.
@@ -124,6 +130,15 @@ module Whois
           raise NotImplementedError
         end
 
+        # Gets the current query handler for this class.
+        #
+        # @see Whois::Servers::Adapters::Base.query_handler
+        #
+        # @return [Object] the query handler
+        def query_handler
+          self.class.query_handler
+        end
+
 
         private