dubdubdub 0.2.0 → 0.2.2

data/dubdubdub.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dubdubdub"
-  s.version = "0.2.0"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Hu"]
-  s.date = "2012-12-03"
+  s.date = "2012-12-04"
   s.description = "A library that provides web utility methods with proxification."
   s.email = "axsuul@gmail.com"
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "dubdubdub.gemspec",
     "lib/dubdubdub.rb",
     "lib/dubdubdub/client.rb",
+    "lib/dubdubdub/configuration.rb",
     "lib/dubdubdub/exceptions.rb",
     "spec/dubdubdub_spec.rb",
     "spec/spec_helper.rb",

data/lib/dubdubdub.rb

@@ -1,9 +1,27 @@
 class DubDubDub
   # Version
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 
   attr_accessor :client
 
+  class << self
+    attr_accessor :proxies
+  end
+
+  def self.configure
+    yield(configuration)
+  end
+
+  # Returns DubDubDub::Configuration or instantiates if doesn't exit
+  def self.configuration
+    @configuration ||= DubDubDub::Configuration.new
+  end
+
+   # Reset configuration back to defaults, useful for testing
+  def self.reset_configuration!
+    @configuration = nil
+  end
+
   def initialize(options = {})
     @client = DubDubDub::Client.new(options)
   end
@@ -19,4 +37,5 @@ class DubDubDub
 end
 
 require File.expand_path(File.dirname(__FILE__) + '/dubdubdub/exceptions')
+require File.expand_path(File.dirname(__FILE__) + '/dubdubdub/configuration')
 require File.expand_path(File.dirname(__FILE__) + '/dubdubdub/client')

data/lib/dubdubdub/client.rb

@@ -6,7 +6,27 @@ class DubDubDub::Client
   attr_accessor :proxy_host, :proxy_port, :proxy_user, :proxy_password
 
   def initialize(options = {})
-    self.proxy = options[:proxy] if options[:proxy]
+    default_options = {
+      proxy: false
+    }
+
+    options = default_options.merge(options)
+
+    # If we want to use a proxy
+    if options[:proxy]
+      # If true and we have a proxy list, use a random one from the list
+      # or ignore and don't use a proxy at all
+      if options[:proxy] == true
+        if DubDubDub.proxies and DubDubDub.proxies.is_a?(Array) and DubDubDub.proxies.any?
+          self.proxy = DubDubDub.proxies.sample
+        else
+          raise DubDubDub::Exception, "No proxies have been specified!"
+        end
+      # Otherwise, it should be a proxy url
+      else
+        self.proxy = options[:proxy]
+      end
+    end
   end
 
   def proxy_port=(port)
@@ -26,6 +46,8 @@ class DubDubDub::Client
   end
 
   def proxy?
+    return false if DubDubDub.configuration.ignore_proxies
+
     !!proxy
   end
 

data/lib/dubdubdub/configuration.rb

@@ -0,0 +1,9 @@
+class DubDubDub::Configuration
+  # Ignores all attempts to use proxies
+  attr_accessor :ignore_proxies
+
+  def initialize
+    # Default config values
+    self.ignore_proxies = false
+  end
+end

data/spec/dubdubdub_spec.rb

@@ -31,12 +31,75 @@ describe DubDubDub do
       www.proxy_port.should == 80
     end
 
+    it "can specify to use a random proxy from list of proxies set" do
+      proxies = ["localhost:8000", "localhost:4000", "12.12.12.12:3000"]
+      DubDubDub.proxies = proxies
+
+      www = DubDubDub.new(proxy: true)
+      www.should be_proxy
+
+      proxies.include?(www.proxy).should be_true
+    end
+
+    it "raises an error if we have specified to use a proxy from the list but there are none" do
+      DubDubDub.proxies = []
+      lambda { DubDubDub.new(proxy: true) }.should raise_error(DubDubDub::Exception)
+
+      DubDubDub.proxies = nil
+      lambda { DubDubDub.new(proxy: true) }.should raise_error(DubDubDub::Exception)
+    end
+
     it "does not pass the method to client if that method doesn't exist within the client" do
       www = DubDubDub.new
       lambda { www.some_method_that_doesnt_exist }.should raise_error(NameError)
     end
   end
 
+  describe '::configuration' do
+    it "accesses config object" do
+      DubDubDub.configuration.should be_a DubDubDub::Configuration
+    end
+
+    it "has default config values" do
+      DubDubDub.configuration.ignore_proxies.should be_false
+    end
+  end
+
+  describe '::reset_configuration!' do
+    it "resets configuration by to defaults" do
+      DubDubDub.configure do |config|
+        config.ignore_proxies = true
+      end
+
+      DubDubDub.configuration.ignore_proxies.should be_true
+
+      DubDubDub.reset_configuration!
+
+      DubDubDub.configuration.ignore_proxies.should be_false
+    end
+  end
+
+  describe '::configure' do
+    it "sets config attributes" do
+      DubDubDub.configure do |config|
+        config.ignore_proxies = true
+      end
+
+      DubDubDub.configuration.ignore_proxies.should be_true
+    end
+  end
+
+  describe '::proxies' do
+    it "is nil by default" do
+      DubDubDub.proxies.should be_nil
+    end
+
+    it "can be set" do
+      DubDubDub.proxies = ["localhost:8000"]
+      DubDubDub.proxies.should be == ["localhost:8000"]
+    end
+  end
+
   describe '#client' do
     it "returns the client" do
       www.client.should be_a DubDubDub::Client
@@ -54,6 +117,15 @@ describe DubDubDub do
       agent.proxy_addr.should == "localhost"
       agent.proxy_port.should == 8000
     end
+
+    it "ignores proxy if configured" do
+      DubDubDub.configuration.ignore_proxies = true
+
+      www.proxy = "localhost:8000"
+      agent = www.mechanize
+      agent.proxy_addr.should be_nil
+      agent.proxy_port.should be_nil
+    end
   end
 
   describe '#get' do

data/spec/spec_helper.rb

@@ -13,4 +13,8 @@ RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run focus: true
   config.run_all_when_everything_filtered = true
+
+  config.after(:each) do
+    DubDubDub.reset_configuration!
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dubdubdub
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -172,6 +172,7 @@ files:
 - dubdubdub.gemspec
 - lib/dubdubdub.rb
 - lib/dubdubdub/client.rb
+- lib/dubdubdub/configuration.rb
 - lib/dubdubdub/exceptions.rb
 - spec/dubdubdub_spec.rb
 - spec/spec_helper.rb
@@ -206,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1273812053448365973
+      hash: -2077159284295139736
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: