spidr.rb in spidr-0.6.0

- old
+ new

@@ -1,90 +1,23 @@
+require 'spidr/settings/proxy'
+require 'spidr/settings/timeouts'
+require 'spidr/settings/user_agent'
 require 'spidr/agent'
 
 module Spidr
-  # Common proxy port.
-  COMMON_PROXY_PORT = 8080
+  extend Settings::Proxy
+  extend Settings::Timeouts
+  extend Settings::UserAgent
 
-  # Default proxy information.
-  DEFAULT_PROXY = {
-    host:     nil,
-    port:     COMMON_PROXY_PORT,
-    user:     nil,
-    password: nil
-  }
-
   #
-  # Proxy information used by all newly created Agent objects by default.
-  #
-  # @return [Hash]
-  #   The Spidr proxy information.
-  #
-  def Spidr.proxy
-    @@spidr_proxy ||= DEFAULT_PROXY
-  end
-
-  #
-  # Sets the proxy information used by Agent objects.
-  #
-  # @param [Hash] new_proxy
-  #   The new proxy information.
-  #
-  # @option new_proxy [String] :host
-  #   The host-name of the proxy.
-  #
-  # @option new_proxy [Integer] :port (COMMON_PROXY_PORT)
-  #   The port of the proxy.
-  #
-  # @option new_proxy [String] :user
-  #   The user to authenticate with the proxy as.
-  #
-  # @option new_proxy [String] :password
-  #   The password to authenticate with the proxy.
-  #
-  # @return [Hash]
-  #   The new proxy information.
-  #
-  def Spidr.proxy=(new_proxy)
-    @@spidr_proxy = {port: COMMON_PROXY_PORT}.merge(new_proxy)
-  end
-
-  #
-  # Disables the proxy settings used by all newly created Agent objects.
-  #
-  def Spidr.disable_proxy!
-    @@spidr_proxy = DEFAULT_PROXY
-    return true
-  end
-
-  #
-  # The User-Agent string used by all Agent objects by default.
-  #
-  # @return [String]
-  #   The Spidr User-Agent string.
-  #
-  def Spidr.user_agent
-    @@spidr_user_agent ||= nil
-  end
-
-  #
-  # Sets the Spidr User-Agent string.
-  #
-  # @param [String] new_agent
-  #   The new User-Agent string.
-  #
-  def Spidr.user_agent=(new_agent)
-    @@spidr_user_agent = new_agent
-  end
-
-  #
   # Specifies whether `robots.txt` should be honored globally.
   #
   # @return [Boolean]
   #
   # @since 0.5.0
   #
-  def Spidr.robots?
+  def self.robots?
     @robots
   end
 
   #
   # Enables or disables `robots.txt` globally.
@@ -93,33 +26,36 @@
   #
   # @return [Boolean]
   #
   # @since 0.5.0
   #
-  def Spidr.robots=(mode)
+  def self.robots=(mode)
     @robots = mode
   end
 
   #
   # @see Agent.start_at
   #
-  def Spidr.start_at(url,options={},&block)
+  def self.start_at(url,options={},&block)
     Agent.start_at(url,options,&block)
   end
 
   #
   # @see Agent.host
   #
-  def Spidr.host(name,options={},&block)
+  def self.host(name,options={},&block)
     Agent.host(name,options,&block)
   end
 
   #
   # @see Agent.site
   #
-  def Spidr.site(url,options={},&block)
+  def self.site(url,options={},&block)
     Agent.site(url,options,&block)
   end
 
-  def Spidr.robots
+  # 
+  # @abstract
+  #
+  def self.robots
   end
 end